Release 1.13.6

This reverts commit b6a599f8a6.

Core/Other/FormGuide.cs

@@ -8,6 +8,7 @@ using TweetDuck.Core.Handling;
 using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Utils;
 using System.Text.RegularExpressions;
+using TweetDuck.Data;
 using TweetDuck.Resources;
 
 namespace TweetDuck.Core.Other{
@@ -15,6 +16,8 @@ namespace TweetDuck.Core.Other{
         private const string GuideUrl = "https://tweetduck.chylex.com/guide/v2/";
         private const string GuidePathRegex = @"^guide(?:/v\d+)?(?:/(#.*))?";
 
+        private static readonly ResourceLink DummyPage = new ResourceLink("http://td/dummy", ResourceHandler.FromString(""));
+
         public static bool CheckGuideUrl(string url, out string hash){
             if (!url.Contains("//tweetduck.chylex.com/guide")){
                 hash = null;
@@ -53,6 +56,7 @@ namespace TweetDuck.Core.Other{
         }
 
         private readonly ChromiumWebBrowser browser;
+        private string nextUrl;
 
         private FormGuide(string url, FormBrowser owner){
             InitializeComponent();
@@ -75,6 +79,9 @@ namespace TweetDuck.Core.Other{
             browser.BrowserSettings.BackgroundColor = (uint)BackColor.ToArgb();
             browser.Dock = DockStyle.None;
             browser.Location = ControlExtensions.InvisibleLocation;
+
+            browser.SetupResourceHandler(DummyPage);
+
             Controls.Add(browser);
 
             Disposed += (sender, args) => {
@@ -86,15 +93,19 @@ namespace TweetDuck.Core.Other{
         }
 
         private void Reload(string url){
+            nextUrl = url;
             browser.LoadingStateChanged += browser_LoadingStateChanged;
             browser.Dock = DockStyle.None;
             browser.Location = ControlExtensions.InvisibleLocation;
-            browser.Load("about:blank");
+            browser.Load(DummyPage.Url);
-            browser.Load(url);
         }
 
         private void browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){
-            if (!e.IsLoading && browser.Address != "about:blank"){
+            if (!e.IsLoading){
+                if (browser.Address == DummyPage.Url){
+                    browser.Load(nextUrl);
+                }
+                else{
                     this.InvokeAsyncSafe(() => {
                         browser.Location = Point.Empty;
                         browser.Dock = DockStyle.Fill;
@@ -103,13 +114,13 @@ namespace TweetDuck.Core.Other{
                     browser.LoadingStateChanged -= browser_LoadingStateChanged;
                 }
             }
+        }
 
         private void browser_FrameLoadStart(object sender, FrameLoadStartEventArgs e){
             BrowserUtils.SetZoomLevel(browser.GetBrowser(), Program.UserConfig.ZoomLevel);
         }
 
         private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
-            // idiot chromium
             ScriptLoader.ExecuteScript(e.Frame, "Array.prototype.forEach.call(document.getElementsByTagName('A'), ele => ele.addEventListener('click', e => { e.preventDefault(); window.open(ele.getAttribute('href')); }))", "gen:links");
         }
 

Core/Other/Settings/Dialogs/DialogSettingsRestart.Designer.cs

@@ -41,7 +41,7 @@
             this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnCancel.AutoSize = true;
             this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.btnCancel.Location = new System.Drawing.Point(214, 148);
+            this.btnCancel.Location = new System.Drawing.Point(215, 146);
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.btnCancel.Size = new System.Drawing.Size(57, 25);
@@ -55,7 +55,7 @@
             this.btnRestart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnRestart.AutoSize = true;
             this.btnRestart.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.btnRestart.Location = new System.Drawing.Point(151, 148);
+            this.btnRestart.Location = new System.Drawing.Point(152, 146);
             this.btnRestart.Name = "btnRestart";
             this.btnRestart.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.btnRestart.Size = new System.Drawing.Size(57, 25);
@@ -74,7 +74,7 @@
             this.cbLogging.Size = new System.Drawing.Size(70, 19);
             this.cbLogging.TabIndex = 0;
             this.cbLogging.Text = "Logging";
-            this.toolTip.SetToolTip(this.cbLogging, "Logging JavaScript output into TD_Console.txt file in the data folder.");
+            this.toolTip.SetToolTip(this.cbLogging, "Logs JavaScript output into TD_Console.txt file in the data folder.");
             this.cbLogging.UseVisualStyleBackColor = true;
             // 
             // tbDataFolder
@@ -136,7 +136,7 @@
             this.flowPanel.Location = new System.Drawing.Point(9, 9);
             this.flowPanel.Margin = new System.Windows.Forms.Padding(0);
             this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(266, 138);
+            this.flowPanel.Size = new System.Drawing.Size(266, 136);
             this.flowPanel.TabIndex = 0;
             this.flowPanel.WrapContents = false;
             // 
@@ -144,7 +144,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(284, 185);
+            this.ClientSize = new System.Drawing.Size(284, 183);
             this.Controls.Add(this.flowPanel);
             this.Controls.Add(this.btnRestart);
             this.Controls.Add(this.btnCancel);

Core/Utils/BrowserUtils.cs

@@ -11,7 +11,8 @@ using TweetDuck.Data;
 
 namespace TweetDuck.Core.Utils{
     static class BrowserUtils{
-        public static string HeaderUserAgent => Program.BrandName+" "+Application.ProductVersion;
+        public static string UserAgentVanilla => Program.BrandName+" "+Application.ProductVersion;
+        public static string UserAgentChrome => "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/"+Cef.ChromiumVersion+" Safari/537.36";
         
         public static void SetupCefArgs(IDictionary<string, string> args){
             if (!Program.SystemConfig.HardwareAcceleration){
@@ -167,7 +168,7 @@ namespace TweetDuck.Core.Utils{
             WindowsUtils.EnsureTLS12();
 
             WebClient client = new WebClient{ Proxy = null };
-            client.Headers[HttpRequestHeader.UserAgent] = HeaderUserAgent;
+            client.Headers[HttpRequestHeader.UserAgent] = UserAgentVanilla;
             return client;
         }
 

Program.cs

@@ -19,7 +19,7 @@ namespace TweetDuck{
         public const string BrandName = "TweetDuck";
         public const string Website = "https://tweetduck.chylex.com";
 
-        public const string VersionTag = "1.13.5";
+        public const string VersionTag = "1.13.6";
 
         public static readonly string ProgramPath = AppDomain.CurrentDomain.BaseDirectory;
         public static readonly bool IsPortable = File.Exists(Path.Combine(ProgramPath, "makeportable"));
@@ -133,7 +133,7 @@ namespace TweetDuck{
             CefSharpSettings.LegacyJavascriptBindingEnabled = true;
 
             CefSettings settings = new CefSettings{
-                UserAgent = BrowserUtils.HeaderUserAgent,
+                UserAgent = BrowserUtils.UserAgentChrome,
                 BrowserSubprocessPath = BrandName+".Browser.exe",
                 CachePath = StoragePath,
                 UserDataPath = CefDataPath,

Resources/PostBuild.ps1

@@ -35,12 +35,12 @@ try{
   New-Item -ItemType directory -Path $targetDir -Name "plugins\official" | Out-Null
   New-Item -ItemType directory -Path $targetDir -Name "plugins\user" | Out-Null
   
-  Copy-Item (Join-Path $projectDir "Resources\Scripts\*") -Destination (Join-Path $targetDir "scripts") -Recurse
+  Copy-Item (Join-Path $projectDir "Resources\Scripts\*") -Recurse -Destination (Join-Path $targetDir "scripts")
-  Copy-Item (Join-Path $projectDir "Resources\Plugins\*") -Exclude ".debug", "emoji-instructions.txt" -Destination (Join-Path $targetDir "plugins\official") -Recurse
+  Copy-Item (Join-Path $projectDir "Resources\Plugins\*") -Recurse -Destination (Join-Path $targetDir "plugins\official") -Exclude ".debug", "emoji-instructions.txt" 
   
   if ($configuration -eq "Debug"){
     New-Item -ItemType directory -Path $targetDir -Name "plugins\user\.debug" | Out-Null
-    Copy-Item (Join-Path $projectDir "Resources\Plugins\.debug\*") -Destination (Join-Path $targetDir "plugins\user\.debug") -Recurse
+    Copy-Item (Join-Path $projectDir "Resources\Plugins\.debug\*") -Recurse -Destination (Join-Path $targetDir "plugins\user\.debug")
   }
   
   # Helper functions
@@ -62,8 +62,8 @@ try{
   function Rewrite-File{
     [CmdletBinding()]
     Param(
-      [Parameter(Mandatory = $True, ValueFromPipeline = $True)][array] $lines,
+      [Parameter(Mandatory = $True, Position = 1)] $file,
-      [Parameter(Mandatory = $True, Position = 1)] $file
+      [Parameter(Mandatory = $True, Position = 2)] $lines
     )
     
     $relativePath = $file.FullName.Substring($targetDir.Length)
@@ -72,7 +72,9 @@ try{
       $lines = (,("#" + $version) + $lines)
     }
     
-    $lines | Where { $_ -ne '' } | Set-Content -Path $file.FullName
+    $lines = $lines | Where { $_ -ne '' }
+    
+    [IO.File]::WriteAllLines($file.FullName, $lines)
     Write-Host "Processed" $relativePath
   }
   
@@ -81,36 +83,38 @@ try{
   Check-Carriage-Return("emoji-ordering.txt")
   
   ForEach($file in Get-ChildItem -Path $targetDir -Filter "*.js" -Exclude "configuration.default.js" -Recurse){
-    $lines = Get-Content -Path $file.FullName
+    $lines = [IO.File]::ReadLines($file.FullName)
     $lines = $lines | % { $_.TrimStart() }
     $lines = $lines -Replace '^(.*?)((?<=^|[;{}()])\s?//(?:\s.*|$))?$', '$1'
     $lines = $lines -Replace '(?<!\w)return(\s.*?)? if (.*?);', 'if ($2)return$1;'
-    ,$lines | Rewrite-File $file
+    Rewrite-File $file $lines
   }
   
   ForEach($file in Get-ChildItem -Path $targetDir -Filter "*.css" -Recurse){
-    $lines = Get-Content -Path $file.FullName
+    $lines = [IO.File]::ReadLines($file.FullName)
     $lines = $lines -Replace '\s*/\*.*?\*/', ''
     $lines = $lines -Replace '^\s+(.+):\s?(.+?)(?:\s?(!important))?;$', '$1:$2$3;'
     $lines = $lines -Replace '^(\S.*?) {$', '$1{'
-    @(($lines | Where { $_ -ne '' }) -Join ' ') | Rewrite-File $file
+    $lines = @(($lines | Where { $_ -ne '' }) -Join ' ')
+    Rewrite-File $file $lines
   }
   
   ForEach($file in Get-ChildItem -Path $targetDir -Filter "*.html" -Recurse){
-    $lines = Get-Content -Path $file.FullName
+    $lines = [IO.File]::ReadLines($file.FullName)
-    ,($lines | % { $_.TrimStart() }) | Rewrite-File $file
+    $lines = $lines | % { $_.TrimStart() }
+    Rewrite-File $file $lines
   }
   
-  ForEach($file in Get-ChildItem -Path $targetDir -Filter "*.meta" -Recurse){
+  ForEach($file in Get-ChildItem -Path (Join-Path $targetDir "plugins") -Filter "*.meta" -Recurse){
-    $lines = Get-Content -Path $file.FullName
+    $lines = [IO.File]::ReadLines($file.FullName)
     $lines = $lines -Replace '\{version\}', $version
-    ,$lines | Rewrite-File $file
+    Rewrite-File $file $lines
   }
   
-  Write-Host "-------------------"
+  Write-Host "------------------"
   $sw.Stop()
   Write-Host "Finished in" $([math]::Round($sw.Elapsed.TotalMilliseconds)) "ms"
-  Write-Host -------------------
+  Write-Host ------------------
 }catch{
   Write-Host "Encountered an error while running PostBuild.ps1 on line" $_.InvocationInfo.ScriptLineNumber
   Write-Host $_

TweetDuck.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.props')" />
   <Import Project="packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.props')" />
@@ -419,7 +419,6 @@ powershell -ExecutionPolicy Unrestricted -File "$(ProjectDir)Resources\PostBuild
     <Exec Command="del &quot;$(TargetDir)*.pdb&quot;" />
     <Exec Command="del &quot;$(TargetDir)*.xml&quot;" />
     <Delete Files="$(TargetDir)CefSharp.BrowserSubprocess.exe" />
-    <Delete Files="$(TargetDir)devtools_resources.pak" />
     <Delete Files="$(TargetDir)widevinecdmadapter.dll" />
   </Target>
   <PropertyGroup>

bld/gen_full.iss

@@ -38,11 +38,13 @@ MinVersion=0,6.1
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalTasks}"; Flags: unchecked
+Name: "devtools"; Description: "{cm:TaskDevTools}"; GroupDescription: "{cm:AdditionalTasks}"; Flags: unchecked
 
 [Files]
 Source: "..\bin\x86\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\bin\x86\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "*.xml,*.pdb,CefSharp.BrowserSubprocess.exe,devtools_resources.pak,widevinecdmadapter.dll"
+Source: "..\bin\x86\Release\devtools_resources.pak"; DestDir: "{app}"; Flags: ignoreversion; Tasks: devtools
+Source: "..\bin\x86\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "devtools_resources.pak"
 
 [Icons]
 Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Check: TDIsUninstallable
@@ -58,9 +60,14 @@ Type: filesandordirs; Name: "{app}\scripts"
 Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\Cache"
 Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\GPUCache"
 
+[CustomMessages]
+AdditionalTasks=Additional shortcuts and components:
+TaskDevTools=Install dev tools
+
 [Code]
 var UpdatePath: String;
 var ForceRedistPrompt: String;
+var VisitedTasksPage: Boolean;
 
 function TDGetNetFrameworkVersion: Cardinal; forward;
 function TDIsVCMissing: Boolean; forward;
@@ -71,6 +78,7 @@ function InitializeSetup: Boolean;
 begin
   UpdatePath := ExpandConstant('{param:UPDATEPATH}')
   ForceRedistPrompt := ExpandConstant('{param:PROMPTREDIST}')
+  VisitedTasksPage := False
   
   if (TDGetNetFrameworkVersion() < 379893) and (MsgBox('{#MyAppName} requires .NET Framework 4.5.2 or newer,'+#13+#10+'please visit {#MyAppShortURL} for a download link.'+#13+#10+#13+#10'Do you want to proceed with the setup anyway?', mbCriticalError, MB_YESNO or MB_DEFBUTTON2) = IDNO) then
   begin
@@ -106,12 +114,14 @@ begin
   Result := (PageID = wpSelectDir) and (UpdatePath <> '')
 end;
 
-{ Check the desktop icon task if not updating. }
+{ Check the desktop icon task if not updating, and dev tools task if already installed. }
 procedure CurPageChanged(CurPageID: Integer);
 begin
-  if CurPageID = wpSelectTasks then
+  if (CurPageID = wpSelectTasks) and (not VisitedTasksPage) then
   begin
-    WizardForm.TasksList.Checked[WizardForm.TasksList.Items.Count-1] := (UpdatePath = '');
+    WizardForm.TasksList.Checked[WizardForm.TasksList.Items.Count-2] := (UpdatePath = '')
+    WizardForm.TasksList.Checked[WizardForm.TasksList.Items.Count-1] := FileExists(ExpandConstant('{app}\devtools_resources.pak'))
+    VisitedTasksPage := True
   end;
 end;
 

bld/gen_port.iss

@@ -37,16 +37,25 @@ MinVersion=0,6.1
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
+[Tasks]
+Name: "devtools"; Description: "{cm:TaskDevTools}"; GroupDescription: "{cm:AdditionalTasks}"; Flags: unchecked
+
 [Files]
 Source: "..\bin\x86\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\bin\x86\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "*.xml,*.pdb,CefSharp.BrowserSubprocess.exe,devtools_resources.pak,widevinecdmadapter.dll"
+Source: "..\bin\x86\Release\devtools_resources.pak"; DestDir: "{app}"; Flags: ignoreversion; Tasks: devtools
+Source: "..\bin\x86\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "devtools_resources.pak"
 
 [Run]
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall shellexec skipifsilent
 
+[CustomMessages]
+AdditionalTasks=Additional components:
+TaskDevTools=Install dev tools
+
 [Code]
 var UpdatePath: String;
 var ForceRedistPrompt: String;
+var VisitedTasksPage: Boolean;
 
 function TDGetNetFrameworkVersion: Cardinal; forward;
 function TDIsVCMissing: Boolean; forward;
@@ -57,6 +66,7 @@ function InitializeSetup: Boolean;
 begin
   UpdatePath := ExpandConstant('{param:UPDATEPATH}')
   ForceRedistPrompt := ExpandConstant('{param:PROMPTREDIST}')
+  VisitedTasksPage := False
   
   if (TDGetNetFrameworkVersion() < 379893) and (MsgBox('{#MyAppName} requires .NET Framework 4.5.2 or newer,'+#13+#10+'please visit {#MyAppShortURL} for a download link.'+#13+#10+#13+#10'Do you want to proceed with the setup anyway?', mbCriticalError, MB_YESNO or MB_DEFBUTTON2) = IDNO) then
   begin
@@ -92,6 +102,16 @@ begin
   Result := (PageID = wpSelectDir) and (UpdatePath <> '')
 end;
 
+{ Check the dev tools task if already installed. }
+procedure CurPageChanged(CurPageID: Integer);
+begin
+  if (CurPageID = wpSelectTasks) and (not VisitedTasksPage) then
+  begin
+    WizardForm.TasksList.Checked[WizardForm.TasksList.Items.Count-1] := FileExists(ExpandConstant('{app}\devtools_resources.pak'))
+    VisitedTasksPage := True
+  end;
+end;
+
 { Install VC++ if downloaded, and create a 'makeportable' file for portable installs. }
 procedure CurStepChanged(CurStep: TSetupStep);
 begin

bld/gen_upd.iss

@@ -13,7 +13,7 @@
 
 [Setup]
 AppId={{{#MyAppID}}
-AppName={#MyAppName} Update
+AppName={#MyAppName}
 AppVersion={#MyAppVersion}
 AppVerName={#MyAppName} {#MyAppVersion}
 AppPublisher={#MyAppPublisher}
@@ -161,6 +161,7 @@ end;
 { Prepare download plugin if there are any files to download, and set the installation path. }
 procedure InitializeWizard();
 begin
+  WizardForm.Caption := WizardForm.Caption + ' Update';
   WizardForm.DirEdit.Text := UpdatePath;
   
   if idpFilesCount <> 0 then
@@ -318,7 +319,7 @@ begin
     WizardForm.ProgressGauge.Style := npbstMarquee;
     
     try
-      if Exec(InstallFile, '/SP- /SILENT /MERGETASKS="!desktopicon" /UPDATEPATH="'+UpdatePath+'"', '', SW_SHOW, ewWaitUntilTerminated, ResultCode) then
+      if Exec(InstallFile, '/SP- /SILENT /UPDATEPATH="'+UpdatePath+'"', '', SW_SHOW, ewWaitUntilTerminated, ResultCode) then
       begin
         if ResultCode <> 0 then
         begin

packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.redist.x64" version="3.3282.1731" targetFramework="net452" xmlns="" />
+  <package id="cef.redist.x64" version="3.3282.1731" targetFramework="net452" />
-  <package id="cef.redist.x86" version="3.3282.1731" targetFramework="net452" xmlns="" />
+  <package id="cef.redist.x86" version="3.3282.1731" targetFramework="net452" />
-  <package id="CefSharp.Common" version="64.0.0-CI2508" targetFramework="net452" xmlns="" />
+  <package id="CefSharp.Common" version="64.0.0-CI2508" targetFramework="net452" />
-  <package id="CefSharp.WinForms" version="64.0.0-CI2508" targetFramework="net452" xmlns="" />
+  <package id="CefSharp.WinForms" version="64.0.0-CI2508" targetFramework="net452" />
 </packages>