Release 1.16.1

Support system font in notifications, but revert to Arial everywhere by default
Reset script cache when holding Shift during browser reload
2025-09-14 01:32:10 +02:00 · 2018-08-28 21:11:31 +02:00 · 2018-08-28 21:06:53 +02:00 · 2018-08-24 16:34:55 +02:00 · 2018-08-23 20:08:34 +02:00 · 2018-08-23 19:51:43 +02:00
13 changed files with 118 additions and 49 deletions
--- a/Core/FormBrowser.cs
+++ b/Core/FormBrowser.cs
@@ -15,6 +15,7 @@ using TweetDuck.Core.Other.Settings.Dialogs;
 using TweetDuck.Core.Utils;
 using TweetDuck.Plugins;
 using TweetDuck.Plugins.Events;
+using TweetDuck.Resources;
 using TweetDuck.Updates;

 namespace TweetDuck.Core{
@@ -365,7 +366,11 @@ namespace TweetDuck.Core{

        public void ReloadToTweetDeck(){
            #if DEBUG
-            Resources.ScriptLoader.HotSwap();
+            ScriptLoader.HotSwap();
+            #else
+            if (ModifierKeys.HasFlag(Keys.Shift)){
+                ScriptLoader.ClearCache();
+            }
            #endif

            ignoreUpdateCheckError = false;
--- a/Core/Handling/ContextMenuBase.cs
+++ b/Core/Handling/ContextMenuBase.cs
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using CefSharp;
@@ -123,33 +122,11 @@ namespace TweetDuck.Core.Handling{
                    break;

                case MenuViewImage: {
-                    void ViewImage(string path){
-                        string ext = Path.GetExtension(path);
-
-                        if (TwitterUtils.ValidImageExtensions.Contains(ext)){
-                            WindowsUtils.OpenAssociatedProgram(path);
-                        }
-                        else{
-                            FormMessage.Error("Image Download", "Invalid file extension "+ext, FormMessage.OK);
-                        }
-                    }
-
                    string url = Context.MediaUrl;
-                    string file = Path.Combine(BrowserCache.CacheFolder, TwitterUtils.GetImageFileName(url) ?? Path.GetRandomFileName());

                    control.InvokeAsyncSafe(() => {
-                        if (File.Exists(file)){
-                            ViewImage(file);
-                        }
-                        else{
+                        TwitterUtils.ViewImage(url, ImageQuality);
                        analytics.AnalyticsFile.ViewedImages.Trigger();
-
-                            BrowserUtils.DownloadFileAsync(TwitterUtils.GetMediaLink(url, ImageQuality), file, () => {
-                                ViewImage(file);
-                            }, ex => {
-                                FormMessage.Error("Image Download", "An error occurred while downloading the image: "+ex.Message, FormMessage.OK);
-                            });
-                        }
                    });
                    
                    break;
--- a/Core/Notification/TweetNotification.cs
+++ b/Core/Notification/TweetNotification.cs
@@ -59,7 +59,7 @@ namespace TweetDuck.Core.Notification{
                build.Append("<style type='text/css'>").Append(customCSS).Append("</style>");
            }
            
-            build.Append("</head><body class='scroll-styled-v");
+            build.Append("</head><body class='scroll-styled-v system-font-stack");

            if (!string.IsNullOrEmpty(bodyClasses)){
                build.Append(' ').Append(bodyClasses);
--- a/Core/Utils/BrowserUtils.cs
+++ b/Core/Utils/BrowserUtils.cs
@@ -207,9 +207,13 @@ namespace TweetDuck.Core.Utils{
            return client;
        }

-        public static WebClient DownloadFileAsync(string url, string target, Action onSuccess, Action<Exception> onFailure){
+        public static WebClient DownloadFileAsync(string url, string target, string cookie, Action onSuccess, Action<Exception> onFailure){
            WebClient client = CreateWebClient();

+            if (cookie != null){
+                client.Headers[HttpRequestHeader.Cookie] = cookie;
+            }
+
            client.DownloadFileCompleted += (sender, args) => {
                if (args.Cancelled){
                    try{
--- a/Core/Utils/TwitterUtils.cs
+++ b/Core/Utils/TwitterUtils.cs
@@ -4,8 +4,12 @@ using System.Drawing;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
+using TweetDuck.Core.Management;
 using TweetDuck.Core.Other;
 using TweetDuck.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using Cookie = CefSharp.Cookie;

 namespace TweetDuck.Core.Utils{
    static class TwitterUtils{
@@ -48,7 +52,10 @@ namespace TweetDuck.Core.Utils{
            if (quality == ImageQuality.Orig){
                string result = ExtractMediaBaseLink(url);

-                if (result != url || url.Contains("//pbs.twimg.com/media/")){
+                if (url.Contains("//ton.twitter.com/") && url.Contains("/ton/data/dm/")){
+                    result += ":large";
+                }
+                else if (result != url || url.Contains("//pbs.twimg.com/media/")){
                    result += ":orig";
                }

@@ -63,6 +70,32 @@ namespace TweetDuck.Core.Utils{
            return BrowserUtils.GetFileNameFromUrl(ExtractMediaBaseLink(url));
        }

+        public static void ViewImage(string url, ImageQuality quality){
+            void ViewImageInternal(string path){
+                string ext = Path.GetExtension(path);
+
+                if (ValidImageExtensions.Contains(ext)){
+                    WindowsUtils.OpenAssociatedProgram(path);
+                }
+                else{
+                    FormMessage.Error("Image Download", "Invalid file extension "+ext, FormMessage.OK);
+                }
+            }
+
+            string file = Path.Combine(BrowserCache.CacheFolder, GetImageFileName(url) ?? Path.GetRandomFileName());
+            
+            if (WindowsUtils.FileExistsAndNotEmpty(file)){
+                ViewImageInternal(file);
+            }
+            else{
+                DownloadFileAuth(GetMediaLink(url, quality), file, () => {
+                    ViewImageInternal(file);
+                }, ex => {
+                    FormMessage.Error("Image Download", "An error occurred while downloading the image: "+ex.Message, FormMessage.OK);
+                });
+            }
+        }
+        
        public static void DownloadImage(string url, string username, ImageQuality quality){
            DownloadImages(new string[]{ url }, username, quality);
        }
@@ -91,14 +124,14 @@ namespace TweetDuck.Core.Utils{
                    }

                    if (urls.Length == 1){
-                        BrowserUtils.DownloadFileAsync(firstImageLink, dialog.FileName, null, OnFailure);
+                        DownloadFileAuth(firstImageLink, dialog.FileName, null, OnFailure);
                    }
                    else{
                        string pathBase = Path.ChangeExtension(dialog.FileName, null);
                        string pathExt = Path.GetExtension(dialog.FileName);

                        for(int index = 0; index < urls.Length; index++){
-                            BrowserUtils.DownloadFileAsync(GetMediaLink(urls[index], quality), $"{pathBase} {index+1}{pathExt}", null, OnFailure);
+                            DownloadFileAuth(GetMediaLink(urls[index], quality), $"{pathBase} {index+1}{pathExt}", null, OnFailure);
                        }
                    }
                }
@@ -117,11 +150,33 @@ namespace TweetDuck.Core.Utils{
                Filter = "Video"+(string.IsNullOrEmpty(ext) ? " (unknown)|*.*" : $" (*{ext})|*{ext}")
            }){
                if (dialog.ShowDialog() == DialogResult.OK){
-                    BrowserUtils.DownloadFileAsync(url, dialog.FileName, null, ex => {
+                    DownloadFileAuth(url, dialog.FileName, null, ex => {
                        FormMessage.Error("Video Download", "An error occurred while downloading the video: "+ex.Message, FormMessage.OK);
                    });
                }
            }
        }
+
+        private static void DownloadFileAuth(string url, string target, Action onSuccess, Action<Exception> onFailure){
+            const string AuthCookieName = "auth_token";
+
+            TaskScheduler scheduler = TaskScheduler.FromCurrentSynchronizationContext();
+
+            using(ICookieManager cookies = Cef.GetGlobalCookieManager()){
+                cookies.VisitUrlCookiesAsync(url, true).ContinueWith(task => {
+                    string cookieStr = null;
+
+                    if (task.Status == TaskStatus.RanToCompletion){
+                        Cookie found = task.Result?.Find(cookie => cookie.Name == AuthCookieName); // the list may be null
+
+                        if (found != null){
+                            cookieStr = $"{found.Name}={found.Value}";
+                        }
+                    }
+
+                    BrowserUtils.DownloadFileAsync(url, target, cookieStr, onSuccess, onFailure);
+                }, scheduler);
+            }
+        }
    }
 }
--- a/Core/Utils/WindowsUtils.cs
+++ b/Core/Utils/WindowsUtils.cs
@@ -66,6 +66,14 @@ namespace TweetDuck.Core.Utils{
            }
        }

+        public static bool FileExistsAndNotEmpty(string path){
+            try{
+                return new FileInfo(path).Length > 0;
+            }catch{
+                return false;
+            }
+        }
+
        public static bool OpenAssociatedProgram(string file, string arguments = "", bool runElevated = false){
            try{
                using(Process.Start(new ProcessStartInfo{
--- a/Program.cs
+++ b/Program.cs
@@ -20,7 +20,7 @@ namespace TweetDuck{
        public const string BrandName = "TweetDuck";
        public const string Website = "https://tweetduck.chylex.com";

-        public const string VersionTag = "1.16";
+        public const string VersionTag = "1.16.1";

        public static readonly string ProgramPath = AppDomain.CurrentDomain.BaseDirectory;
        public static readonly bool IsPortable = File.Exists(Path.Combine(ProgramPath, "makeportable"));
--- a/Resources/Plugins/clear-columns/browser.js
+++ b/Resources/Plugins/clear-columns/browser.js
@@ -111,15 +111,17 @@ enabled(){
  // styles
  
  this.css = window.TDPF_createCustomStyle(this);
+  
  this.css.insert(".js-app-add-column.is-hidden + .clear-columns-btn-all-parent { display: none; }");
-  this.css.insert(".column-header-links { min-width: 51px !important; }");
-  this.css.insert("[data-td-icon='icon-message'] .column-header-links { min-width: 110px !important; }");
  this.css.insert(".column-navigator-overflow .clear-columns-btn-all-parent { display: none !important; }");
  this.css.insert(".column-navigator-overflow { bottom: 224px !important; }");
-  this.css.insert("[data-action='td-clearcolumns-dosingle'] { padding: 3px 0 !important; }");
-  this.css.insert("[data-action='clear'].btn-options-tray { display: none !important; }");
-  this.css.insert("[data-td-icon='icon-schedule'] .td-clear-column-shortcut { display: none; }");
-  this.css.insert("[data-td-icon='icon-custom-timeline'] .td-clear-column-shortcut { display: none; }");
+  
+  this.css.insert(".column-header-links { min-width: 51px !important; }");
+  this.css.insert(".column[data-td-icon='icon-message'] .column-header-links { min-width: 110px !important; }");
+  this.css.insert(".btn-options-tray[data-action='clear'] { display: none !important; }");
+  
+  this.css.insert(".column[data-td-icon='icon-schedule'] a[data-action='td-clearcolumns-dosingle'] { display: none; }");
+  this.css.insert(".column[data-td-icon='icon-custom-timeline'] a[data-action='td-clearcolumns-dosingle'] { display: none; }");
 }

 ready(){
--- a/Resources/Plugins/edit-design/browser.js
+++ b/Resources/Plugins/edit-design/browser.js
@@ -14,6 +14,7 @@ enabled(){
    themeColorTweaks: true,
    revertIcons: true,
    showCharacterCount: true,
+    forceArialFont: true,
    increaseQuoteTextSize: false,
    smallComposeTextSize: false,
    optimizeAnimations: true,
@@ -430,6 +431,10 @@ enabled(){
      this.css.insert("#tduck .tweet-actions > li:nth-child(4) { margin-right: 2px !important }");
    }
    
+    if (this.config.forceArialFont){
+      this.css.insert("#tduck .system-font-stack { font-family: Arial, sans-serif; font-weight: 400 }");
+    }
+    
    if (this.config.increaseQuoteTextSize){
      this.css.insert(".quoted-tweet { font-size: 1em !important }");
    }
@@ -595,6 +600,10 @@ ${iconData.map(entry => `#tduck .icon-${entry[0]}:before{content:\"\\f0${entry[1
 html[data-td-font] { font-size: ${this.config.fontSize} !important }
 .avatar { border-radius: ${this.config.avatarRadius}% !important }

+${this.config.forceArialFont ? `
+#tduck .system-font-stack { font-family: Arial, sans-serif; font-weight: 400 }
+` : ``}
+
 ${this.config.increaseQuoteTextSize ? `
 .quoted-tweet { font-size: 1em !important }
 ` : ``}
--- a/Resources/Plugins/edit-design/modal.html
+++ b/Resources/Plugins/edit-design/modal.html
@@ -69,6 +69,10 @@
            <option value="custom-px">Custom</option>
            <option value="change-custom-px">Change custom value...</option>
          </select>
+          <label class="checkbox">
+            <input data-td-key="forceArialFont" class="js-theme-checkbox touch-larger-label" type="checkbox">
+            Use Arial as default font
+          </label>
          <label class="checkbox">
            <input data-td-key="increaseQuoteTextSize" class="js-theme-checkbox touch-larger-label" type="checkbox">
            Increase quoted tweet font size
--- a/Resources/ScriptLoader.cs
+++ b/Resources/ScriptLoader.cs
@@ -80,6 +80,10 @@ namespace TweetDuck.Resources{
            }
        }

+        public static void ClearCache(){
+            CachedData.Clear();
+        }
+
        private static void ShowLoadError(Control sync, string message){
            sync?.InvokeSafe(() => FormMessage.Error("Resource Error", message, FormMessage.OK));
        }
@@ -128,7 +132,7 @@ namespace TweetDuck.Resources{
            sw.Stop();
            Debug.WriteLine("Finished rebuild script in "+sw.ElapsedMilliseconds+" ms");

-            CachedData.Clear();
+            ClearCache();

            // Force update plugin manager setup scripts

--- a/Resources/Scripts/styles/browser.css
+++ b/Resources/Scripts/styles/browser.css
@@ -253,9 +253,9 @@ a[data-full-url] {
  bottom: 0 !important;
 }

-/**********************************************************/
-/* Prevent column icons from being hidden by column title */
-/**********************************************************/
+/**************************************************************************/
+/* Prevent column icons from being hidden by column title & fix alignment */
+/**************************************************************************/

 .column-header-title {
  overflow: hidden !important;
@@ -270,9 +270,10 @@ a[data-full-url] {

 .column-header-links {
  max-width: 100% !important;
+  text-align: right;
 }

-[data-td-icon="icon-message"] .column-header-links {
+.column[data-td-icon="icon-message"] .column-header-links {
  min-width: 86px;
 }

@@ -455,18 +456,18 @@ a:not(.tweet-detail-action) .reply-triangle {
 /* Fix cut off usernames in Messages column */
 /********************************************/

-[data-td-icon="icon-message"].is-shifted-1 .column-title-container {
+.column[data-td-icon="icon-message"].is-shifted-1 .column-title-container {
  height: 100%;
  border-bottom-color: transparent;
 }

-#tduck [data-td-icon="icon-message"].is-shifted-1 .column-title-items {
+#tduck .column[data-td-icon="icon-message"].is-shifted-1 .column-title-items {
  height: 100%;
  margin-left: 4px !important;
  padding-top: 1px;
 }

-[data-td-icon="icon-message"].is-shifted-1 .username {
+.column[data-td-icon="icon-message"].is-shifted-1 .username {
  vertical-align: bottom;
 }

--- a/Updates/UpdateInfo.cs
+++ b/Updates/UpdateInfo.cs
@@ -26,7 +26,7 @@ namespace TweetDuck.Updates{
        }

        public void BeginSilentDownload(){
-            if (File.Exists(InstallerPath)){
+            if (WindowsUtils.FileExistsAndNotEmpty(InstallerPath)){
                DownloadStatus = UpdateDownloadStatus.Done;
                return;
            }
@@ -48,7 +48,7 @@ namespace TweetDuck.Updates{
                    return;
                }

-                currentDownload = BrowserUtils.DownloadFileAsync(downloadUrl, InstallerPath, () => {
+                currentDownload = BrowserUtils.DownloadFileAsync(downloadUrl, InstallerPath, null, () => {
                    DownloadStatus = UpdateDownloadStatus.Done;
                    currentDownload = null;
                }, e => {
Author	SHA1	Message	Date
chylex	2ea38b88ce	Release 1.16.1	2018-08-28 21:11:31 +02:00
chylex	2c4f2be57d	Support system font in notifications, but revert to Arial everywhere by default	2018-08-28 21:06:53 +02:00
chylex	fa4beea425	Reset script cache when holding Shift during browser reload	2018-08-24 16:34:55 +02:00
chylex	7a976edc82	Ignore cached files for updates and viewed images if their contents are empty	2018-08-23 20:08:34 +02:00
chylex	bb22c35221	Fix broken context menu options for images in DMs Closes #238	2018-08-23 19:51:43 +02:00
chylex	ff3dc59016	Move 'View image in photo viewer' handling to TwitterUtils	2018-08-23 19:32:20 +02:00
chylex	2e4dd3df3e	Fix column icon alignment & clear icon not being hidden for certain columns	2018-08-18 14:55:08 +02:00
chylex	b82e5d33f9	Add .column to data-td-icon attribute selectors (very minor optimization)	2018-08-18 14:41:30 +02:00