Release 1.16.3

Closes #240

Configuration/ConfigManager.cs

@@ -10,21 +10,25 @@ namespace TweetDuck.Configuration{
     sealed class ConfigManager{
         public UserConfig User { get; }
         public SystemConfig System { get; }
+        public PluginConfig Plugins { get; }
         
         public event EventHandler ProgramRestartRequested;
 
         private readonly FileConfigInstance<UserConfig> infoUser;
         private readonly FileConfigInstance<SystemConfig> infoSystem;
+        private readonly PluginConfigInstance infoPlugins;
 
         private readonly IConfigInstance<BaseConfig>[] infoList;
 
         public ConfigManager(){
             User = new UserConfig(this);
             System = new SystemConfig(this);
+            Plugins = new PluginConfig(this);
             
             infoList = new IConfigInstance<BaseConfig>[]{
                 infoUser = new FileConfigInstance<UserConfig>(Program.UserConfigFilePath, User, "program options"),
-                infoSystem = new FileConfigInstance<SystemConfig>(Program.SystemConfigFilePath, System, "system options")
+                infoSystem = new FileConfigInstance<SystemConfig>(Program.SystemConfigFilePath, System, "system options"),
+                infoPlugins = new PluginConfigInstance(Program.PluginConfigFilePath, Plugins)
             };
 
             // TODO refactor further
@@ -51,16 +55,19 @@ namespace TweetDuck.Configuration{
         public void LoadAll(){
             infoUser.Load();
             infoSystem.Load();
+            infoPlugins.Load();
         }
 
         public void SaveAll(){
             infoUser.Save();
             infoSystem.Save();
+            infoPlugins.Save();
         }
 
         public void ReloadAll(){
             infoUser.Reload();
             infoSystem.Reload();
+            infoPlugins.Reload();
         }
 
         private void TriggerProgramRestartRequested(){

Configuration/Instance/PluginConfigInstance.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace TweetDuck.Configuration.Instance{
+    class PluginConfigInstance : IConfigInstance<PluginConfig>{
+        public PluginConfig Instance { get; }
+
+        private readonly string filename;
+
+        public PluginConfigInstance(string filename, PluginConfig instance){
+            this.filename = filename;
+            this.Instance = instance;
+        }
+
+        public void Load(){
+            try{
+                using(StreamReader reader = new StreamReader(new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.Read), Encoding.UTF8)){
+                    string line = reader.ReadLine();
+
+                    if (line == "#Disabled"){
+                        HashSet<string> newDisabled = new HashSet<string>();
+
+                        while((line = reader.ReadLine()) != null){
+                            newDisabled.Add(line);
+                        }
+
+                        Instance.ReloadSilently(newDisabled);
+                    }
+                }
+            }catch(FileNotFoundException){
+            }catch(DirectoryNotFoundException){
+            }catch(Exception e){
+                Program.Reporter.HandleException("Plugin Configuration Error", "Could not read the plugin configuration file. If you continue, the list of disabled plugins will be reset to default.", true, e);
+            }
+        }
+
+        public void Save(){
+            try{
+                using(StreamWriter writer = new StreamWriter(new FileStream(filename, FileMode.Create, FileAccess.Write, FileShare.None), Encoding.UTF8)){
+                    writer.WriteLine("#Disabled");
+
+                    foreach(string identifier in Instance.DisabledPlugins){
+                        writer.WriteLine(identifier);
+                    }
+                }
+            }catch(Exception e){
+                Program.Reporter.HandleException("Plugin Configuration Error", "Could not save the plugin configuration file.", true, e);
+            }
+        }
+
+        public void Reload(){
+            Load();
+        }
+
+        public void Reset(){
+            try{
+                File.Delete(filename);
+                Instance.ReloadSilently(Instance.ConstructWithDefaults<PluginConfig>().DisabledPlugins);
+            }catch(Exception e){
+                Program.Reporter.HandleException("Plugin Configuration Error", "Could not delete the plugin configuration file.", true, e);
+                return;
+            }
+            
+            Reload();
+        }
+    }
+}

Configuration/PluginConfig.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using TweetDuck.Plugins;
+using TweetDuck.Plugins.Events;
+
+namespace TweetDuck.Configuration{
+    sealed class PluginConfig : ConfigManager.BaseConfig, IPluginConfig{
+        private static readonly string[] DefaultDisabled = {
+            "official/clear-columns",
+            "official/reply-account"
+        };
+
+        // CONFIGURATION
+
+        public IEnumerable<string> DisabledPlugins => disabled;
+        
+        public event EventHandler<PluginChangedStateEventArgs> PluginChangedState;
+
+        public void SetEnabled(Plugin plugin, bool enabled){
+            if ((enabled && disabled.Remove(plugin.Identifier)) || (!enabled && disabled.Add(plugin.Identifier))){
+                PluginChangedState?.Invoke(this, new PluginChangedStateEventArgs(plugin, enabled));
+                Save();
+            }
+        }
+
+        public bool IsEnabled(Plugin plugin){
+            return !disabled.Contains(plugin.Identifier);
+        }
+
+        public void ReloadSilently(IEnumerable<string> newDisabled){
+            disabled.Clear();
+            disabled.UnionWith(newDisabled);
+        }
+
+        private readonly HashSet<string> disabled = new HashSet<string>(DefaultDisabled);
+        
+        // END OF CONFIG
+
+        public PluginConfig(ConfigManager configManager) : base(configManager){}
+
+        protected override ConfigManager.BaseConfig ConstructWithDefaults(ConfigManager configManager){
+            return new PluginConfig(configManager);
+        }
+    }
+}

Configuration/UserConfig.cs

@@ -23,9 +23,9 @@ namespace TweetDuck.Configuration{
         public bool BestImageQuality          { get; set; } = true;
         public bool EnableAnimatedImages      { get; set; } = true;
 
-        public bool _enableSmoothScrolling = true;
+        private bool _enableSmoothScrolling = true;
-        public bool _enableTouchAdjustment = false;
+        private bool _enableTouchAdjustment = false;
-        public string _customCefArgs       = null;
+        private string _customCefArgs       = null;
 
         public string BrowserPath            { get; set; } = null;
         public bool IgnoreTrackingUrlWarning { get; set; } = false;

Core/Bridge/PropertyBridge.cs

@@ -1,4 +1,5 @@
 using System.Text;
+using TweetDuck.Configuration;
 
 namespace TweetDuck.Core.Bridge{
     static class PropertyBridge{
@@ -10,20 +11,21 @@ namespace TweetDuck.Core.Bridge{
             string Bool(bool value) => value ? "true;" : "false;";
             string Str(string value) => '"'+value+"\";";
 
-            StringBuilder build = new StringBuilder().Append("(function(x){");
+            UserConfig config = Program.Config.User;
+            StringBuilder build = new StringBuilder(128).Append("(function(x){");
 
-            build.Append("x.expandLinksOnHover=").Append(Bool(Program.UserConfig.ExpandLinksOnHover));
+            build.Append("x.expandLinksOnHover=").Append(Bool(config.ExpandLinksOnHover));
             
             if (environment == Environment.Browser){
-                build.Append("x.openSearchInFirstColumn=").Append(Bool(Program.UserConfig.OpenSearchInFirstColumn));
+                build.Append("x.openSearchInFirstColumn=").Append(Bool(config.OpenSearchInFirstColumn));
-                build.Append("x.keepLikeFollowDialogsOpen=").Append(Bool(Program.UserConfig.KeepLikeFollowDialogsOpen));
+                build.Append("x.keepLikeFollowDialogsOpen=").Append(Bool(config.KeepLikeFollowDialogsOpen));
-                build.Append("x.muteNotifications=").Append(Bool(Program.UserConfig.MuteNotifications));
+                build.Append("x.muteNotifications=").Append(Bool(config.MuteNotifications));
-                build.Append("x.notificationMediaPreviews=").Append(Bool(Program.UserConfig.NotificationMediaPreviews));
+                build.Append("x.notificationMediaPreviews=").Append(Bool(config.NotificationMediaPreviews));
-                build.Append("x.translationTarget=").Append(Str(Program.UserConfig.TranslationTarget));
+                build.Append("x.translationTarget=").Append(Str(config.TranslationTarget));
             }
 
             if (environment == Environment.Notification){
-                build.Append("x.skipOnLinkClick=").Append(Bool(Program.UserConfig.NotificationSkipOnLinkClick));
+                build.Append("x.skipOnLinkClick=").Append(Bool(config.NotificationSkipOnLinkClick));
             }
             
             return build.Append("})(window.$TDX=window.$TDX||{})").ToString();

Core/Bridge/TweetDeckBridge.cs

@@ -1,13 +1,9 @@
-using System.Collections.Generic;
+using System.Windows.Forms;
-using System.Text;
-using System.Windows.Forms;
-using CefSharp;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Management;
 using TweetDuck.Core.Notification;
 using TweetDuck.Core.Other;
 using TweetDuck.Core.Utils;
-using TweetDuck.Resources;
 
 namespace TweetDuck.Core.Bridge{
     class TweetDeckBridge{
@@ -15,25 +11,10 @@ namespace TweetDuck.Core.Bridge{
         public static string NotificationHeadLayout { get; private set; }
         public static readonly ContextInfo ContextInfo = new ContextInfo();
 
-        private static readonly Dictionary<string, string> SessionData = new Dictionary<string, string>(2);
-
         public static void ResetStaticProperties(){
             FontSize = NotificationHeadLayout = null;
         }
 
-        public static void RestoreSessionData(IFrame frame){
-            if (SessionData.Count > 0){
-                StringBuilder build = new StringBuilder().Append("window.TD_SESSION={");
-                
-                foreach(KeyValuePair<string, string> kvp in SessionData){
-                    build.Append(kvp.Key).Append(":'").Append(kvp.Value.Replace("'", "\\'")).Append("',");
-                }
-
-                ScriptLoader.ExecuteScript(frame, build.Append("}").ToString(), "gen:session");
-                SessionData.Clear();
-            }
-        }
-
         private readonly FormBrowser form;
         private readonly FormNotificationMain notification;
 
@@ -79,12 +60,6 @@ namespace TweetDuck.Core.Bridge{
             public void DisplayTooltip(string text){
                 form.InvokeAsyncSafe(() => form.DisplayTooltip(text));
             }
-
-            public void SetSessionData(string key, string value){
-                form.InvokeSafe(() => { // do not use InvokeAsyncSafe, return only after invocation
-                    SessionData.Add(key, value);
-                });
-            }
         }
 
         // Notification only

Core/FormBrowser.cs

@@ -14,13 +14,13 @@ using TweetDuck.Core.Other.Analytics;
 using TweetDuck.Core.Other.Settings.Dialogs;
 using TweetDuck.Core.Utils;
 using TweetDuck.Plugins;
-using TweetDuck.Plugins.Enums;
 using TweetDuck.Plugins.Events;
+using TweetDuck.Resources;
 using TweetDuck.Updates;
 
 namespace TweetDuck.Core{
     sealed partial class FormBrowser : Form, AnalyticsFile.IProvider{
-        private static UserConfig Config => Program.UserConfig;
+        private static UserConfig Config => Program.Config.User;
 
         public bool IsWaiting{
             set{
@@ -63,7 +63,7 @@ namespace TweetDuck.Core{
 
             Text = Program.BrandName;
             
-            this.plugins = new PluginManager(Program.PluginPath, Program.PluginConfigFilePath);
+            this.plugins = new PluginManager(Program.Config.Plugins, Program.PluginPath);
             this.plugins.Reloaded += plugins_Reloaded;
             this.plugins.Executed += plugins_Executed;
             this.plugins.Reload();
@@ -79,11 +79,9 @@ namespace TweetDuck.Core{
             this.updateBridge.UpdateDelayed += updateBridge_UpdateDelayed;
             this.updateBridge.UpdateDismissed += updateBridge_UpdateDismissed;
 
-            this.browser = new TweetDeckBrowser(this, new TweetDeckBridge.Browser(this, notification), updateBridge);
+            this.browser = new TweetDeckBrowser(this, plugins, new TweetDeckBridge.Browser(this, notification), updateBridge);
             this.contextMenu = ContextMenuBrowser.CreateMenu(this);
 
-            this.plugins.Register(browser, PluginEnvironment.Browser, this, true);
-
             Controls.Add(new MenuStrip{ Visible = false }); // fixes Alt freezing the program in Win 10 Anniversary Update
 
             Disposed += (sender, args) => {
@@ -368,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;

Core/Handling/ContextMenuBase.cs

@@ -1,11 +1,11 @@
 using System;
-using System.IO;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using CefSharp;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
 using System.Linq;
+using TweetDuck.Configuration;
 using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Management;
 using TweetDuck.Core.Notification;
@@ -15,7 +15,9 @@ using TweetDuck.Resources;
 
 namespace TweetDuck.Core.Handling{
     abstract class ContextMenuBase : IContextMenuHandler{
-        private static TwitterUtils.ImageQuality ImageQuality => Program.UserConfig.TwitterImageQuality;
+        protected static UserConfig Config => Program.Config.User;
+
+        private static TwitterUtils.ImageQuality ImageQuality => Config.TwitterImageQuality;
         
         private const CefMenuCommand MenuOpenLinkUrl     = (CefMenuCommand)26500;
         private const CefMenuCommand MenuCopyLinkUrl     = (CefMenuCommand)26501;
@@ -29,8 +31,7 @@ namespace TweetDuck.Core.Handling{
         private const CefMenuCommand MenuReadApplyROT13  = (CefMenuCommand)26509;
         private const CefMenuCommand MenuOpenDevTools    = (CefMenuCommand)26599;
         
-        protected ContextInfo.LinkInfo LastLink { get; private set; }
+        protected ContextInfo.ContextData Context { get; private set; }
-        protected ContextInfo.ChirpInfo LastChirp { get; private set; }
 
         private readonly AnalyticsFile.IProvider analytics;
 
@@ -38,19 +39,12 @@ namespace TweetDuck.Core.Handling{
             this.analytics = analytics;
         }
 
-        private void ResetContextInfo(){
-            LastLink = default(ContextInfo.LinkInfo);
-            LastChirp = default(ContextInfo.ChirpInfo);
-            TweetDeckBridge.ContextInfo.Reset();
-        }
-
         public virtual void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model){
             if (!TwitterUtils.IsTweetDeckWebsite(frame) || browser.IsLoading){
-                ResetContextInfo();
+                Context = TweetDeckBridge.ContextInfo.Reset();
             }
             else{
-                LastLink = TweetDeckBridge.ContextInfo.Link;
+                Context = TweetDeckBridge.ContextInfo.Create(parameters);
-                LastChirp = TweetDeckBridge.ContextInfo.Chirp;
             }
             
             if (parameters.TypeFlags.HasFlag(ContextMenuType.Selection) && !parameters.TypeFlags.HasFlag(ContextMenuType.Editable)){
@@ -60,15 +54,12 @@ namespace TweetDuck.Core.Handling{
                 model.AddSeparator();
             }
             
-            bool hasTweetImage = LastLink.IsImage;
-            bool hasTweetVideo = LastLink.IsVideo;
-
             string TextOpen(string name) => "Open "+name+" in browser";
             string TextCopy(string name) => "Copy "+name+" address";
             string TextSave(string name) => "Save "+name+" as...";
             
-            if (parameters.TypeFlags.HasFlag(ContextMenuType.Link) && !parameters.UnfilteredLinkUrl.EndsWith("tweetdeck.twitter.com/#", StringComparison.Ordinal) && !hasTweetImage && !hasTweetVideo){
+            if (Context.Types.HasFlag(ContextInfo.ContextType.Link) && !Context.UnsafeLinkUrl.EndsWith("tweetdeck.twitter.com/#", StringComparison.Ordinal)){
-                if (TwitterUtils.RegexAccount.IsMatch(parameters.UnfilteredLinkUrl)){
+                if (TwitterUtils.RegexAccount.IsMatch(Context.UnsafeLinkUrl)){
                     model.AddItem(MenuOpenLinkUrl, TextOpen("account"));
                     model.AddItem(MenuCopyLinkUrl, TextCopy("account"));
                     model.AddItem(MenuCopyUsername, "Copy account username");
@@ -81,19 +72,19 @@ namespace TweetDuck.Core.Handling{
                 model.AddSeparator();
             }
 
-            if (hasTweetVideo){
+            if (Context.Types.HasFlag(ContextInfo.ContextType.Video)){
                 model.AddItem(MenuOpenMediaUrl, TextOpen("video"));
                 model.AddItem(MenuCopyMediaUrl, TextCopy("video"));
                 model.AddItem(MenuSaveMedia, TextSave("video"));
                 model.AddSeparator();
             }
-            else if (((parameters.TypeFlags.HasFlag(ContextMenuType.Media) && parameters.HasImageContents) || hasTweetImage) && parameters.SourceUrl != TweetNotification.AppLogo.Url){
+            else if (Context.Types.HasFlag(ContextInfo.ContextType.Image) && Context.MediaUrl != TweetNotification.AppLogo.Url){
                 model.AddItem(MenuViewImage, "View image in photo viewer");
                 model.AddItem(MenuOpenMediaUrl, TextOpen("image"));
                 model.AddItem(MenuCopyMediaUrl, TextCopy("image"));
                 model.AddItem(MenuSaveMedia, TextSave("image"));
 
-                if (LastChirp.Images.Length > 1){
+                if (Context.Chirp.Images.Length > 1){
                     model.AddItem(MenuSaveTweetImages, TextSave("all images"));
                 }
 
@@ -106,64 +97,45 @@ namespace TweetDuck.Core.Handling{
 
             switch(commandId){
                 case MenuOpenLinkUrl:
-                    OpenBrowser(control, LastLink.GetUrl(parameters, true));
+                    OpenBrowser(control, Context.LinkUrl);
                     break;
 
                 case MenuCopyLinkUrl:
-                    SetClipboardText(control, LastLink.GetUrl(parameters, false));
+                    SetClipboardText(control, Context.UnsafeLinkUrl);
                     break;
 
-                case MenuCopyUsername:
+                case MenuCopyUsername: {
-                    Match match = TwitterUtils.RegexAccount.Match(parameters.UnfilteredLinkUrl);
+                    string url = Context.UnsafeLinkUrl;
-                    SetClipboardText(control, match.Success ? match.Groups[1].Value : parameters.UnfilteredLinkUrl);
+                    Match match = TwitterUtils.RegexAccount.Match(url);
+
+                    SetClipboardText(control, match.Success ? match.Groups[1].Value : url);
                     control.InvokeAsyncSafe(analytics.AnalyticsFile.CopiedUsernames.Trigger);
                     break;
+                }
 
                 case MenuOpenMediaUrl:
-                    OpenBrowser(control, TwitterUtils.GetMediaLink(LastLink.GetMediaSource(parameters), ImageQuality));
+                    OpenBrowser(control, TwitterUtils.GetMediaLink(Context.MediaUrl, ImageQuality));
                     break;
 
                 case MenuCopyMediaUrl:
-                    SetClipboardText(control, TwitterUtils.GetMediaLink(LastLink.GetMediaSource(parameters), ImageQuality));
+                    SetClipboardText(control, TwitterUtils.GetMediaLink(Context.MediaUrl, ImageQuality));
                     break;
 
                 case MenuViewImage: {
-                    void ViewImage(string path){
+                    string url = Context.MediaUrl;
-                        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 = LastLink.GetMediaSource(parameters);
-                    string file = Path.Combine(BrowserCache.CacheFolder, TwitterUtils.GetImageFileName(url) ?? Path.GetRandomFileName());
 
                     control.InvokeAsyncSafe(() => {
-                        if (File.Exists(file)){
+                        TwitterUtils.ViewImage(url, ImageQuality);
-                            ViewImage(file);
-                        }
-                        else{
                         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;
                 }
 
                 case MenuSaveMedia: {
-                    bool isVideo = LastLink.IsVideo;
+                    bool isVideo = Context.Types.HasFlag(ContextInfo.ContextType.Video);
-                    string url = LastLink.GetMediaSource(parameters);
+                    string url = Context.MediaUrl;
-                    string username = LastChirp.Authors.LastOrDefault();
+                    string username = Context.Chirp.Authors.LastOrDefault();
                     
                     control.InvokeAsyncSafe(() => {
                         if (isVideo){
@@ -180,8 +152,8 @@ namespace TweetDuck.Core.Handling{
                 }
 
                 case MenuSaveTweetImages: {
-                    string[] urls = LastChirp.Images;
+                    string[] urls = Context.Chirp.Images;
-                    string username = LastChirp.Authors.LastOrDefault();
+                    string username = Context.Chirp.Authors.LastOrDefault();
                     
                     control.InvokeAsyncSafe(() => {
                         TwitterUtils.DownloadImages(urls, username, ImageQuality);
@@ -212,7 +184,7 @@ namespace TweetDuck.Core.Handling{
         }
 
         public virtual void OnContextMenuDismissed(IWebBrowser browserControl, IBrowser browser, IFrame frame){
-            ResetContextInfo();
+            Context = TweetDeckBridge.ContextInfo.Reset();
         }
 
         public virtual bool RunContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model, IRunContextMenuCallback callback){

Core/Handling/ContextMenuBrowser.cs

@@ -1,6 +1,7 @@
 using CefSharp;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
+using TweetDuck.Core.Management;
 using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Handling{
@@ -56,12 +57,12 @@ namespace TweetDuck.Core.Handling{
                 InsertSelectionSearchItem(model, MenuSearchInColumn, "Search in a column");
             }
 
-            if (!string.IsNullOrEmpty(LastChirp.TweetUrl) && !isSelecting && !isEditing){
+            if (Context.Types.HasFlag(ContextInfo.ContextType.Chirp) && !isSelecting && !isEditing){
                 model.AddItem(MenuOpenTweetUrl, "Open tweet in browser");
                 model.AddItem(MenuCopyTweetUrl, "Copy tweet address");
                 model.AddItem(MenuScreenshotTweet, "Screenshot tweet to clipboard");
 
-                if (!string.IsNullOrEmpty(LastChirp.QuoteUrl)){
+                if (!string.IsNullOrEmpty(Context.Chirp.QuoteUrl)){
                     model.AddSeparator();
                     model.AddItem(MenuOpenQuotedTweetUrl, "Open quoted tweet in browser");
                     model.AddItem(MenuCopyQuotedTweetUrl, "Copy quoted tweet address");
@@ -77,7 +78,7 @@ namespace TweetDuck.Core.Handling{
             
                 globalMenu.AddItem(CefMenuCommand.Reload, TitleReloadBrowser);
                 globalMenu.AddCheckItem(MenuMute, TitleMuteNotifications);
-                globalMenu.SetChecked(MenuMute, Program.UserConfig.MuteNotifications);
+                globalMenu.SetChecked(MenuMute, Config.MuteNotifications);
                 globalMenu.AddSeparator();
 
                 globalMenu.AddItem(MenuSettings, TitleSettings);
@@ -119,11 +120,11 @@ namespace TweetDuck.Core.Handling{
                     return true;
 
                 case MenuOpenTweetUrl:
-                    OpenBrowser(form, LastChirp.TweetUrl);
+                    OpenBrowser(form, Context.Chirp.TweetUrl);
                     return true;
 
                 case MenuCopyTweetUrl:
-                    SetClipboardText(form, LastChirp.TweetUrl);
+                    SetClipboardText(form, Context.Chirp.TweetUrl);
                     return true;
 
                 case MenuScreenshotTweet:
@@ -131,11 +132,11 @@ namespace TweetDuck.Core.Handling{
                     return true;
 
                 case MenuOpenQuotedTweetUrl:
-                    OpenBrowser(form, LastChirp.QuoteUrl);
+                    OpenBrowser(form, Context.Chirp.QuoteUrl);
                     return true;
 
                 case MenuCopyQuotedTweetUrl:
-                    SetClipboardText(form, LastChirp.QuoteUrl);
+                    SetClipboardText(form, Context.Chirp.QuoteUrl);
                     return true;
 
                 case MenuWriteApplyROT13:
@@ -163,7 +164,7 @@ namespace TweetDuck.Core.Handling{
             menu.MenuItems.Add(TitleAboutProgram,  (sender, args) => form.OpenAbout());
 
             menu.Popup += (sender, args) => {
-                menu.MenuItems[1].Checked = Program.UserConfig.MuteNotifications;
+                menu.MenuItems[1].Checked = Config.MuteNotifications;
                 form.AnalyticsFile.BrowserContextMenus.Trigger();
             };
 
@@ -171,8 +172,8 @@ namespace TweetDuck.Core.Handling{
         }
 
         private static void ToggleMuteNotifications(){
-            Program.UserConfig.MuteNotifications = !Program.UserConfig.MuteNotifications;
+            Config.MuteNotifications = !Config.MuteNotifications;
-            Program.UserConfig.Save();
+            Config.Save();
         }
     }
 }

Core/Handling/General/BrowserProcessHandler.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using CefSharp;
+using TweetDuck.Configuration;
 
 namespace TweetDuck.Core.Handling.General{
     sealed class BrowserProcessHandler : IBrowserProcessHandler{
@@ -9,10 +10,12 @@ namespace TweetDuck.Core.Handling.General{
         }
 
         private static void UpdatePrefsInternal(){
+            UserConfig config = Program.Config.User;
+
             using(IRequestContext ctx = Cef.GetGlobalRequestContext()){
-                ctx.SetPreference("browser.enable_spellchecking", Program.UserConfig.EnableSpellCheck, out string _);
+                ctx.SetPreference("browser.enable_spellchecking", config.EnableSpellCheck, out string _);
-                ctx.SetPreference("spellcheck.dictionary", Program.UserConfig.SpellCheckLanguage, out string _);
+                ctx.SetPreference("spellcheck.dictionary", config.SpellCheckLanguage, out string _);
-                ctx.SetPreference("settings.a11y.animation_policy", Program.UserConfig.EnableAnimatedImages ? "allowed" : "none", out string _);
+                ctx.SetPreference("settings.a11y.animation_policy", config.EnableAnimatedImages ? "allowed" : "none", out string _);
             }
         }
 

Core/Handling/RequestHandlerBase.cs

@@ -1,9 +1,18 @@
-using System.Collections.Specialized;
+// Uncomment to force TweetDeck to load a predefined version of the vendor/bundle scripts and stylesheets
+// #define FREEZE_TWEETDECK_RESOURCES
+
+using System.Collections.Specialized;
 using CefSharp;
 using CefSharp.Handler;
 using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Utils;
 
+#if FREEZE_TWEETDECK_RESOURCES
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text.RegularExpressions;
+#endif
+
 namespace TweetDuck.Core.Handling{
     class RequestHandlerBase : DefaultRequestHandler{
         private readonly bool autoReload;
@@ -31,5 +40,36 @@ namespace TweetDuck.Core.Handling{
                 browser.Reload();
             }
         }
+
+        #if FREEZE_TWEETDECK_RESOURCES
+        private static readonly Regex TweetDeckResourceUrl = new Regex(@"/dist/(.*?)\.(.*?)\.(css|js)$", RegexOptions.Compiled);
+        
+        private static readonly SortedList<string, string> TweetDeckHashes = new SortedList<string, string>(2){
+            { "vendor.js", "d897f6b9ed" },
+            { "bundle.js", "851d3877b9" },
+            { "vendor.css", "ce7cdd10b6" },
+            { "bundle.css", "c339f07047" }
+        };
+
+        public override bool OnResourceResponse(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
+            if (request.ResourceType == ResourceType.Script || request.ResourceType == ResourceType.Stylesheet){
+                string url = request.Url;
+                Match match = TweetDeckResourceUrl.Match(url);
+
+                if (match.Success && TweetDeckHashes.TryGetValue($"{match.Groups[1]}.{match.Groups[3]}", out string hash)){
+                    if (match.Groups[2].Value == hash){
+                        Debug.WriteLine($"Accepting {url}");
+                    }
+                    else{
+                        Debug.WriteLine($"Rewriting {url} hash to {hash}");
+                        request.Url = TweetDeckResourceUrl.Replace(url, $"/dist/$1.{hash}.$3");
+                        return true;
+                    }
+                }
+            }
+
+            return base.OnResourceResponse(browserControl, browser, frame, request, response);
+        }
+        #endif
     }
 }

Core/Handling/RequestHandlerBrowser.cs

@@ -1,16 +1,8 @@
-// Uncomment to force TweetDeck to load a predefined version of the vendor/bundle scripts
+using System.Collections.Specialized;
-// #define FREEZE_TWEETDECK_SCRIPTS
-
-using System.Collections.Specialized;
 using CefSharp;
 using TweetDuck.Core.Handling.Filters;
 using TweetDuck.Core.Utils;
 
-#if FREEZE_TWEETDECK_SCRIPTS
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-#endif
-
 namespace TweetDuck.Core.Handling{
     sealed class RequestHandlerBrowser : RequestHandlerBase{
         public string BlockNextUserNavUrl { get; set; }
@@ -36,36 +28,11 @@ namespace TweetDuck.Core.Handling{
             return base.OnBeforeBrowse(browserControl, browser, frame, request, userGesture, isRedirect);
         }
 
-        #if FREEZE_TWEETDECK_SCRIPTS
-        private static readonly Regex TweetDeckScriptUrl = new Regex(@"/dist/(.*?)\.(.*?)\.js$", RegexOptions.Compiled);
-        
-        private static readonly SortedList<string, string> TweetDeckHashes = new SortedList<string, string>(2){
-            { "vendor", "942c0a20e8" },
-            { "bundle", "1bd75b5854" }
-        };
-        #endif
-
         public override bool OnResourceResponse(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
             if (request.ResourceType == ResourceType.Image && request.Url.Contains("/backgrounds/spinner_blue")){
                 request.Url = TwitterUtils.LoadingSpinner.Url;
                 return true;
             }
-            #if FREEZE_TWEETDECK_SCRIPTS
-            else if (request.ResourceType == ResourceType.Script){
-                Match match = TweetDeckScriptUrl.Match(request.Url);
-
-                if (match.Success && TweetDeckHashes.TryGetValue(match.Groups[1].Value, out string hash)){
-                    if (match.Groups[2].Value == hash){
-                        System.Diagnostics.Debug.WriteLine($"accepting {request.Url}");
-                    }
-                    else{
-                        System.Diagnostics.Debug.WriteLine($"rewriting {request.Url} to {hash}");
-                        request.Url = TweetDeckScriptUrl.Replace(request.Url, "/dist/$1."+hash+".js");
-                        return true;
-                    }
-                }
-            }
-            #endif
 
             return base.OnResourceResponse(browserControl, browser, frame, request, response);
         }

Core/Management/BrowserCache.cs

@@ -28,7 +28,7 @@ namespace TweetDuck.Core.Management{
         }
         
         public static void RefreshTimer(){
-            bool shouldRun = Program.SystemConfig.ClearCacheAutomatically && !ClearOnExit;
+            bool shouldRun = Program.Config.System.ClearCacheAutomatically && !ClearOnExit;
 
             if (!shouldRun && AutoClearTimer != null){
                 AutoClearTimer.Dispose();
@@ -38,7 +38,7 @@ namespace TweetDuck.Core.Management{
                 AutoClearTimer = new Timer(state => {
                     if (AutoClearTimer != null){
                         try{
-                            if (CalculateCacheSize() >= Program.SystemConfig.ClearCacheThreshold*1024L*1024L){
+                            if (CalculateCacheSize() >= Program.Config.System.ClearCacheThreshold*1024L*1024L){
                                 SetClearOnExit();
                             }
                         }catch(Exception){

Core/Management/ContextInfo.cs

@@ -1,49 +1,54 @@
-using CefSharp;
+using System;
+using CefSharp;
 using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Management{
     sealed class ContextInfo{
-        public LinkInfo Link { get; private set; }
+        private LinkInfo link;
-        public ChirpInfo Chirp { get; private set; }
+        private ChirpInfo? chirp;
         
         public ContextInfo(){
             Reset();
         }
         
         public void SetLink(string type, string url){
-            Link = string.IsNullOrEmpty(url) ? new LinkInfo() : new LinkInfo(type, url);
+            link = string.IsNullOrEmpty(url) ? null : new LinkInfo(type, url);
         }
 
         public void SetChirp(string tweetUrl, string quoteUrl, string chirpAuthors, string chirpImages){
-            Chirp = new ChirpInfo(tweetUrl, quoteUrl, chirpAuthors, chirpImages);
+            chirp = string.IsNullOrEmpty(tweetUrl) ? (ChirpInfo?)null : new ChirpInfo(tweetUrl, quoteUrl, chirpAuthors, chirpImages);
         }
 
-        public void Reset(){
+        public ContextData Reset(){
-            Link = new LinkInfo();
+            link = null;
-            Chirp = new ChirpInfo();
+            chirp = null;
+            return ContextData.Empty;
+        }
+
+        public ContextData Create(IContextMenuParams parameters){
+            ContextData.Builder builder = new ContextData.Builder();
+            builder.AddContext(parameters);
+
+            if (link != null){
+                builder.AddOverride(link.Type, link.Url);
+            }
+            
+            if (chirp.HasValue){
+                builder.AddChirp(chirp.Value);
+            }
+
+            return builder.Build();
         }
 
         // Data structures
 
-        public struct LinkInfo{
+        private sealed class LinkInfo{
-            public bool IsLink => type == "link";
+            public string Type { get; }
-            public bool IsImage => type == "image";
+            public string Url { get; }
-            public bool IsVideo => type == "video";
-
-            public string GetUrl(IContextMenuParams parameters, bool safe){
-                return IsLink ? url : (safe ? parameters.LinkUrl : parameters.UnfilteredLinkUrl);
-            }
-
-            public string GetMediaSource(IContextMenuParams parameters){
-                return IsImage || IsVideo ? url : parameters.SourceUrl;
-            }
-
-            private readonly string type;
-            private readonly string url;
 
             public LinkInfo(string type, string url){
-                this.type = type;
+                this.Type = type;
-                this.url = url;
+                this.Url = url;
             }
         }
 
@@ -64,5 +69,93 @@ namespace TweetDuck.Core.Management{
                 this.chirpImages = chirpImages;
             }
         }
+
+        // Constructed context
+
+        [Flags]
+        public enum ContextType{
+            Unknown = 0,
+            Link    = 0b0001,
+            Image   = 0b0010,
+            Video   = 0b0100,
+            Chirp   = 0b1000
+        }
+
+        public sealed class ContextData{
+            public static readonly ContextData Empty = new Builder().Build();
+
+            public ContextType Types { get; }
+
+            public string LinkUrl { get; }
+            public string UnsafeLinkUrl { get; }
+            public string MediaUrl { get; }
+
+            public ChirpInfo Chirp { get; }
+
+            public ContextData(ContextType types, string linkUrl, string unsafeLinkUrl, string mediaUrl, ChirpInfo chirp){
+                Types = types;
+                LinkUrl = linkUrl;
+                UnsafeLinkUrl = unsafeLinkUrl;
+                MediaUrl = mediaUrl;
+                Chirp = chirp;
+            }
+
+            public sealed class Builder{
+                private ContextType types = ContextType.Unknown;
+
+                private string linkUrl = string.Empty;
+                private string unsafeLinkUrl = string.Empty;
+                private string mediaUrl = string.Empty;
+
+                private ChirpInfo chirp = default(ChirpInfo);
+
+                public void AddContext(IContextMenuParams parameters){
+                    ContextMenuType flags = parameters.TypeFlags;
+
+                    if (flags.HasFlag(ContextMenuType.Media) && parameters.HasImageContents){
+                        types |= ContextType.Image;
+                        types &= ~ContextType.Video;
+                        mediaUrl = parameters.SourceUrl;
+                    }
+
+                    if (flags.HasFlag(ContextMenuType.Link)){
+                        types |= ContextType.Link;
+                        linkUrl = parameters.LinkUrl;
+                        unsafeLinkUrl = parameters.UnfilteredLinkUrl;
+                    }
+                }
+
+                public void AddOverride(string type, string url){
+                    switch(type){
+                        case "link":
+                            types |= ContextType.Link;
+                            linkUrl = url;
+                            unsafeLinkUrl = url;
+                            break;
+
+                        case "image":
+                            types |= ContextType.Image;
+                            types &= ~(ContextType.Video | ContextType.Link);
+                            mediaUrl = url;
+                            break;
+
+                        case "video":
+                            types |= ContextType.Video;
+                            types &= ~(ContextType.Image | ContextType.Link);
+                            mediaUrl = url;
+                            break;
+                    }
+                }
+
+                public void AddChirp(ChirpInfo chirp){
+                    this.types |= ContextType.Chirp;
+                    this.chirp = chirp;
+                }
+
+                public ContextData Build(){
+                    return new ContextData(types, linkUrl, unsafeLinkUrl, mediaUrl, chirp);
+                }
+            }
+        }
     }
 }

Core/Management/VideoPlayer.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Windows.Forms;
+using TweetDuck.Configuration;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Other;
 using TweetDuck.Core.Utils;
@@ -9,6 +10,8 @@ using TweetLib.Communication;
 
 namespace TweetDuck.Core.Management{
     sealed class VideoPlayer : IDisposable{
+        private static UserConfig Config => Program.Config.User;
+
         public bool Running => currentInstance != null && currentInstance.Running;
 
         public event EventHandler ProcessExited;
@@ -37,7 +40,7 @@ namespace TweetDuck.Core.Management{
 
                 if ((process = Process.Start(new ProcessStartInfo{
                     FileName = Path.Combine(Program.ProgramPath, "TweetDuck.Video.exe"),
-                    Arguments = $"{owner.Handle} {Program.UserConfig.VideoPlayerVolume} \"{url}\" \"{pipe.GenerateToken()}\"",
+                    Arguments = $"{owner.Handle} {Config.VideoPlayerVolume} \"{url}\" \"{pipe.GenerateToken()}\"",
                     UseShellExecute = false,
                     RedirectStandardOutput = true
                 })) != null){
@@ -68,9 +71,9 @@ namespace TweetDuck.Core.Management{
             owner.InvokeSafe(() => {
                 switch(e.Key){
                     case "vol":
-                        if (int.TryParse(e.Data, out int volume) && volume != Program.UserConfig.VideoPlayerVolume){
+                        if (int.TryParse(e.Data, out int volume) && volume != Config.VideoPlayerVolume){
-                            Program.UserConfig.VideoPlayerVolume = volume;
+                            Config.VideoPlayerVolume = volume;
-                            Program.UserConfig.Save();
+                            Config.Save();
                         }
 
                         break;

Core/Notification/Example/FormNotificationExample.cs

@@ -8,11 +8,11 @@ using TweetDuck.Resources;
 namespace TweetDuck.Core.Notification.Example{
     sealed class FormNotificationExample : FormNotificationMain{
         public override bool RequiresResize => true;
-        protected override bool CanDragWindow => Program.UserConfig.NotificationPosition == TweetNotification.Position.Custom;
+        protected override bool CanDragWindow => Config.NotificationPosition == TweetNotification.Position.Custom;
 
         protected override FormBorderStyle NotificationBorderStyle{
             get{
-                if (Program.UserConfig.NotificationSize == TweetNotification.Size.Custom){
+                if (Config.NotificationSize == TweetNotification.Size.Custom){
                     switch(base.NotificationBorderStyle){
                         case FormBorderStyle.FixedSingle: return FormBorderStyle.Sizable;
                         case FormBorderStyle.FixedToolWindow: return FormBorderStyle.SizableToolWindow;
@@ -23,6 +23,8 @@ namespace TweetDuck.Core.Notification.Example{
             }
         }
 
+        protected override string BodyClasses => base.BodyClasses+" td-example";
+
         public event EventHandler Ready;
 
         private readonly TweetNotification exampleNotification;
@@ -36,7 +38,7 @@ namespace TweetDuck.Core.Notification.Example{
             exampleTweetHTML = exampleTweetHTML.Replace("</p>", @"</p><div style='margin-top:256px'>Scrollbar test padding...</div>");
             #endif
 
-            exampleNotification = TweetNotification.Example(exampleTweetHTML, 176);
+            exampleNotification = new TweetNotification(string.Empty, string.Empty, "Home", exampleTweetHTML, 176, string.Empty, string.Empty);
         }
 
         private void browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){

Core/Notification/FormNotificationBase.cs

@@ -10,7 +10,9 @@ using TweetDuck.Core.Other.Analytics;
 using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Notification{
-    partial class FormNotificationBase : Form, AnalyticsFile.IProvider{
+    abstract partial class FormNotificationBase : Form, AnalyticsFile.IProvider{
+        protected static UserConfig Config => Program.Config.User;
+
         protected static int FontSizeLevel{
             get{
                 switch(TweetDeckBridge.FontSize){
@@ -25,19 +27,18 @@ namespace TweetDuck.Core.Notification{
 
         protected virtual Point PrimaryLocation{
             get{
-                UserConfig config = Program.UserConfig;
                 Screen screen;
 
-                if (config.NotificationDisplay > 0 && config.NotificationDisplay <= Screen.AllScreens.Length){
+                if (Config.NotificationDisplay > 0 && Config.NotificationDisplay <= Screen.AllScreens.Length){
-                    screen = Screen.AllScreens[config.NotificationDisplay-1];
+                    screen = Screen.AllScreens[Config.NotificationDisplay-1];
                 }
                 else{
                     screen = Screen.FromControl(owner);
                 }
             
-                int edgeDist = config.NotificationEdgeDistance;
+                int edgeDist = Config.NotificationEdgeDistance;
 
-                switch(config.NotificationPosition){
+                switch(Config.NotificationPosition){
                     case TweetNotification.Position.TopLeft:
                         return new Point(screen.WorkingArea.X+edgeDist, screen.WorkingArea.Y+edgeDist);
 
@@ -51,12 +52,12 @@ namespace TweetDuck.Core.Notification{
                         return new Point(screen.WorkingArea.X+screen.WorkingArea.Width-edgeDist-Width, screen.WorkingArea.Y+screen.WorkingArea.Height-edgeDist-Height);
 
                     case TweetNotification.Position.Custom:
-                        if (!config.IsCustomNotificationPositionSet){
+                        if (!Config.IsCustomNotificationPositionSet){
-                            config.CustomNotificationPosition = new Point(screen.WorkingArea.X+screen.WorkingArea.Width-edgeDist-Width, screen.WorkingArea.Y+edgeDist);
+                            Config.CustomNotificationPosition = new Point(screen.WorkingArea.X+screen.WorkingArea.Width-edgeDist-Width, screen.WorkingArea.Y+edgeDist);
-                            config.Save();
+                            Config.Save();
                         }
 
-                        return config.CustomNotificationPosition;
+                        return Config.CustomNotificationPosition;
                 }
 
                 return Location;
@@ -93,7 +94,7 @@ namespace TweetDuck.Core.Notification{
         protected override bool ShowWithoutActivation => true;
         
         protected float DpiScale { get; }
-        protected double SizeScale => DpiScale*Program.UserConfig.ZoomLevel/100.0;
+        protected double SizeScale => DpiScale*Config.ZoomLevel/100.0;
 
         protected readonly FormBrowser owner;
         protected readonly ChromiumWebBrowser browser;
@@ -130,8 +131,9 @@ namespace TweetDuck.Core.Notification{
             this.browser.Dock = DockStyle.None;
             this.browser.ClientSize = ClientSize;
             
-            browser.SetupResourceHandler(TwitterUtils.TweetDeckURL, this.resourceHandler);
+            this.browser.SetupResourceHandler(TwitterUtils.TweetDeckURL, this.resourceHandler);
-            browser.SetupResourceHandler(TweetNotification.AppLogo);
+            this.browser.SetupResourceHandler(TweetNotification.AppLogo);
+            this.browser.SetupZoomEvents();
 
             Controls.Add(browser);
 
@@ -184,9 +186,7 @@ namespace TweetDuck.Core.Notification{
             }
         }
 
-        protected virtual string GetTweetHTML(TweetNotification tweet){
+        protected abstract string GetTweetHTML(TweetNotification tweet);
-            return tweet.GenerateHtml(IsCursorOverBrowser ? "td-notification td-hover" : "td-notification", this);
-        }
 
         protected virtual void LoadTweet(TweetNotification tweet){
             currentNotification = tweet;
@@ -202,7 +202,7 @@ namespace TweetDuck.Core.Notification{
 
         protected virtual void UpdateTitle(){
             string title = currentNotification?.ColumnTitle;
-            Text = string.IsNullOrEmpty(title) || !Program.UserConfig.DisplayNotificationColumn ? Program.BrandName : Program.BrandName+" - "+title;
+            Text = string.IsNullOrEmpty(title) || !Config.DisplayNotificationColumn ? Program.BrandName : $"{Program.BrandName} - {title}";
         }
 
         public void ShowTweetDetail(){

Core/Notification/FormNotificationMain.cs

@@ -5,7 +5,6 @@ using System.Windows.Forms;
 using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling;
-using TweetDuck.Core.Other.Interfaces;
 using TweetDuck.Core.Utils;
 using TweetDuck.Data;
 using TweetDuck.Plugins;
@@ -13,7 +12,7 @@ using TweetDuck.Plugins.Enums;
 using TweetDuck.Resources;
 
 namespace TweetDuck.Core.Notification{
-    abstract partial class FormNotificationMain : FormNotificationBase, ITweetDeckBrowser{
+    abstract partial class FormNotificationMain : FormNotificationBase{
         private readonly PluginManager plugins;
         private readonly int timerBarHeight;
 
@@ -29,7 +28,7 @@ namespace TweetDuck.Core.Notification{
 
         public virtual bool RequiresResize{
             get{
-                return !prevDisplayTimer.HasValue || !prevFontSize.HasValue || prevDisplayTimer != Program.UserConfig.DisplayNotificationTimer || prevFontSize != FontSizeLevel;
+                return !prevDisplayTimer.HasValue || !prevFontSize.HasValue || prevDisplayTimer != Config.DisplayNotificationTimer || prevFontSize != FontSizeLevel;
             }
 
             set{
@@ -38,7 +37,7 @@ namespace TweetDuck.Core.Notification{
                     prevFontSize = null;
                 }
                 else{
-                    prevDisplayTimer = Program.UserConfig.DisplayNotificationTimer;
+                    prevDisplayTimer = Config.DisplayNotificationTimer;
                     prevFontSize = FontSizeLevel;
                 }
             }
@@ -46,29 +45,31 @@ namespace TweetDuck.Core.Notification{
 
         private int BaseClientWidth{
             get{
-                switch(Program.UserConfig.NotificationSize){
+                switch(Config.NotificationSize){
                     default:
                         return BrowserUtils.Scale(284, SizeScale*(1.0+0.05*FontSizeLevel));
 
                     case TweetNotification.Size.Custom:
-                        return Program.UserConfig.CustomNotificationSize.Width;
+                        return Config.CustomNotificationSize.Width;
                 }
             }
         }
 
         private int BaseClientHeight{
             get{
-                switch(Program.UserConfig.NotificationSize){
+                switch(Config.NotificationSize){
                     default:
                         return BrowserUtils.Scale(122, SizeScale*(1.0+0.08*FontSizeLevel));
 
                     case TweetNotification.Size.Custom:
-                        return Program.UserConfig.CustomNotificationSize.Height;
+                        return Config.CustomNotificationSize.Height;
                 }
             }
         }
 
-        public Size BrowserSize => Program.UserConfig.DisplayNotificationTimer ? new Size(ClientSize.Width, ClientSize.Height-timerBarHeight) : ClientSize;
+        protected virtual string BodyClasses => IsCursorOverBrowser ? "td-notification td-hover" : "td-notification";
+        
+        public Size BrowserSize => Config.DisplayNotificationTimer ? new Size(ClientSize.Width, ClientSize.Height-timerBarHeight) : ClientSize;
 
         protected FormNotificationMain(FormBrowser owner, PluginManager pluginManager, bool enableContextMenu) : base(owner, enableContextMenu){
             InitializeComponent();
@@ -82,34 +83,12 @@ namespace TweetDuck.Core.Notification{
             browser.LoadingStateChanged += Browser_LoadingStateChanged;
             browser.FrameLoadEnd += Browser_FrameLoadEnd;
 
-            plugins.Register(this, PluginEnvironment.Notification, this);
+            plugins.Register(browser, PluginEnvironment.Notification, this);
 
             mouseHookDelegate = MouseHookProc;
             Disposed += (sender, args) => StopMouseHook(true);
         }
 
-        // implementation of ITweetDeckBrowser
-
-        bool ITweetDeckBrowser.IsTweetDeckWebsite => IsNotificationVisible;
-
-        void ITweetDeckBrowser.RegisterBridge(string name, object obj){
-            browser.RegisterAsyncJsObject(name, obj);
-        }
-
-        void ITweetDeckBrowser.OnFrameLoaded(Action<IFrame> callback){
-            browser.FrameLoadEnd += (sender, args) => {
-                IFrame frame = args.Frame;
-
-                if (frame.IsMain && browser.Address != "about:blank"){
-                    callback(frame);
-                }
-            };
-        }
-
-        void ITweetDeckBrowser.ExecuteFunction(string name, params object[] args){
-            browser.ExecuteScriptAsync(name, args);
-        }
-
         // mouse wheel hook
 
         private void StartMouseHook(){
@@ -131,7 +110,7 @@ namespace TweetDuck.Core.Notification{
                 int eventType = wParam.ToInt32();
 
                 if (eventType == NativeMethods.WM_MOUSEWHEEL && IsCursorOverBrowser){
-                    browser.SendMouseWheelEvent(0, 0, 0, BrowserUtils.Scale(NativeMethods.GetMouseHookData(lParam), Program.UserConfig.NotificationScrollSpeed*0.01), CefEventFlags.None);
+                    browser.SendMouseWheelEvent(0, 0, 0, BrowserUtils.Scale(NativeMethods.GetMouseHookData(lParam), Config.NotificationScrollSpeed*0.01), CefEventFlags.None);
                     return NativeMethods.HOOK_HANDLED;
                 }
                 else if (eventType == NativeMethods.WM_XBUTTONDOWN && DesktopBounds.Contains(Cursor.Position)){
@@ -181,9 +160,11 @@ namespace TweetDuck.Core.Notification{
         }
 
         private void Browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
-            if (e.Frame.IsMain && browser.Address != "about:blank"){
+            IFrame frame = e.Frame;
-                e.Frame.ExecuteJavaScriptAsync(PropertyBridge.GenerateScript(PropertyBridge.Environment.Notification));
+
-                ScriptLoader.ExecuteScript(e.Frame, ScriptLoader.LoadResource("notification.js", this), "root:notification");
+            if (frame.IsMain && browser.Address != "about:blank"){
+                frame.ExecuteJavaScriptAsync(PropertyBridge.GenerateScript(PropertyBridge.Environment.Notification));
+                ScriptLoader.ExecuteFile(frame, "notification.js", this);
             }
         }
 
@@ -200,7 +181,7 @@ namespace TweetDuck.Core.Notification{
             timeLeft -= timerProgress.Interval;
 
             int value = BrowserUtils.Scale(progressBarTimer.Maximum+25, (totalTime-timeLeft)/(double)totalTime);
-            progressBarTimer.SetValueInstant(Program.UserConfig.NotificationTimerCountDown ? progressBarTimer.Maximum-value : value);
+            progressBarTimer.SetValueInstant(Config.NotificationTimerCountDown ? progressBarTimer.Maximum-value : value);
 
             if (timeLeft <= 0){
                 FinishCurrentNotification();
@@ -216,7 +197,7 @@ namespace TweetDuck.Core.Notification{
         public override void HideNotification(){
             base.HideNotification();
             
-            progressBarTimer.Value = Program.UserConfig.NotificationTimerCountDown ? progressBarTimer.Maximum : progressBarTimer.Minimum;
+            progressBarTimer.Value = Config.NotificationTimerCountDown ? progressBarTimer.Maximum : progressBarTimer.Minimum;
             timerProgress.Stop();
             totalTime = 0;
 
@@ -247,7 +228,7 @@ namespace TweetDuck.Core.Notification{
         }
 
         protected override string GetTweetHTML(TweetNotification tweet){
-            string html = base.GetTweetHTML(tweet);
+            string html = tweet.GenerateHtml(BodyClasses, this);
 
             foreach(InjectedHTML injection in plugins.NotificationInjections){
                 html = injection.InjectInto(html);
@@ -258,14 +239,14 @@ namespace TweetDuck.Core.Notification{
 
         protected override void LoadTweet(TweetNotification tweet){
             timerProgress.Stop();
-            totalTime = timeLeft = tweet.GetDisplayDuration(Program.UserConfig.NotificationDurationValue);
+            totalTime = timeLeft = tweet.GetDisplayDuration(Config.NotificationDurationValue);
-            progressBarTimer.Value = Program.UserConfig.NotificationTimerCountDown ? progressBarTimer.Maximum : progressBarTimer.Minimum;
+            progressBarTimer.Value = Config.NotificationTimerCountDown ? progressBarTimer.Maximum : progressBarTimer.Minimum;
 
             base.LoadTweet(tweet);
         }
 
         protected override void SetNotificationSize(int width, int height){
-            if (Program.UserConfig.DisplayNotificationTimer){
+            if (Config.DisplayNotificationTimer){
                 ClientSize = new Size(width, height+timerBarHeight);
                 progressBarTimer.Visible = true;
             }

Core/Notification/FormNotificationTweet.cs

@@ -32,10 +32,10 @@ namespace TweetDuck.Core.Notification{
         public FormNotificationTweet(FormBrowser owner, PluginManager pluginManager) : base(owner, pluginManager, true){
             InitializeComponent();
 
-            Program.UserConfig.MuteToggled += Config_MuteToggled;
+            Config.MuteToggled += Config_MuteToggled;
-            Disposed += (sender, args) => Program.UserConfig.MuteToggled -= Config_MuteToggled;
+            Disposed += (sender, args) => Config.MuteToggled -= Config_MuteToggled;
 
-            if (Program.UserConfig.MuteNotifications){
+            if (Config.MuteNotifications){
                 PauseNotification();
             }
         }
@@ -57,7 +57,7 @@ namespace TweetDuck.Core.Notification{
         // event handlers
 
         private void Config_MuteToggled(object sender, EventArgs e){
-            if (Program.UserConfig.MuteNotifications){
+            if (Config.MuteNotifications){
                 PauseNotification();
             }
             else{
@@ -73,7 +73,7 @@ namespace TweetDuck.Core.Notification{
         }
 
         private void timerIdlePauseCheck_Tick(object sender, EventArgs e){
-            if (NativeMethods.GetIdleSeconds() < Program.UserConfig.NotificationIdlePauseSeconds){
+            if (NativeMethods.GetIdleSeconds() < Config.NotificationIdlePauseSeconds){
                 ResumeNotification();
                 timerIdlePauseCheck.Stop();
             }
@@ -128,7 +128,7 @@ namespace TweetDuck.Core.Notification{
 
         private void LoadNextNotification(){
             if (!IsNotificationVisible){
-                if (Program.UserConfig.NotificationNonIntrusiveMode && IsCursorOverNotificationArea && NativeMethods.GetIdleSeconds() < NonIntrusiveIdleLimit){
+                if (Config.NotificationNonIntrusiveMode && IsCursorOverNotificationArea && NativeMethods.GetIdleSeconds() < NonIntrusiveIdleLimit){
                     if (!timerCursorCheck.Enabled){
                         PauseNotification();
                         timerCursorCheck.Start();
@@ -136,7 +136,7 @@ namespace TweetDuck.Core.Notification{
 
                     return;
                 }
-                else if (Program.UserConfig.NotificationIdlePauseSeconds > 0 && NativeMethods.GetIdleSeconds() >= Program.UserConfig.NotificationIdlePauseSeconds){
+                else if (Config.NotificationIdlePauseSeconds > 0 && NativeMethods.GetIdleSeconds() >= Config.NotificationIdlePauseSeconds){
                     if (!timerIdlePauseCheck.Enabled){
                         PauseNotification();
                         timerIdlePauseCheck.Start();

Core/Notification/TweetNotification.cs

@@ -11,10 +11,6 @@ namespace TweetDuck.Core.Notification{
         private const string DefaultHeadLayout = @"<html class=""scroll-v os-windows dark txt-size--14"" lang=""en-US"" id=""tduck"" data-td-font=""medium"" data-td-theme=""dark""><head><meta charset=""utf-8""><link href=""https://ton.twimg.com/tweetdeck-web/web/dist/bundle.4b1f87e09d.css"" rel=""stylesheet""><style type='text/css'>body { background: rgb(34, 36, 38) !important }</style>";
         public static readonly ResourceLink AppLogo = new ResourceLink("https://ton.twimg.com/tduck/avatar", ResourceHandler.FromByteArray(Properties.Resources.avatar, "image/png"));
         
-        public static TweetNotification Example(string html, int characters){
-            return new TweetNotification(string.Empty, string.Empty, "Home", html, characters, string.Empty, string.Empty, true);
-        }
-
         public enum Position{
             TopLeft, TopRight, BottomLeft, BottomRight, Custom
         }
@@ -32,11 +28,8 @@ namespace TweetDuck.Core.Notification{
         
         private readonly string html;
         private readonly int characters;
-        private readonly bool isExample;
         
-        public TweetNotification(string columnId, string chirpId, string title, string html, int characters, string tweetUrl, string quoteUrl) : this(columnId, chirpId, title, html, characters, tweetUrl, quoteUrl, false){}
+        public TweetNotification(string columnId, string chirpId, string title, string html, int characters, string tweetUrl, string quoteUrl){
-
-        private TweetNotification(string columnId, string chirpId, string title, string html, int characters, string tweetUrl, string quoteUrl, bool isExample){
             this.ColumnId = columnId;
             this.ChirpId = chirpId;
 
@@ -46,7 +39,6 @@ namespace TweetDuck.Core.Notification{
 
             this.html = html;
             this.characters = characters;
-            this.isExample = isExample;
         }
 
         public int GetDisplayDuration(int value){
@@ -54,26 +46,28 @@ namespace TweetDuck.Core.Notification{
         }
 
         public string GenerateHtml(string bodyClasses, Control sync){
-            StringBuilder build = new StringBuilder();
+            string headLayout = TweetDeckBridge.NotificationHeadLayout ?? DefaultHeadLayout;
-            build.Append("<!DOCTYPE html>");
+            string mainCSS = ScriptLoader.LoadResource("styles/notification.css", sync) ?? string.Empty;
-            build.Append(TweetDeckBridge.NotificationHeadLayout ?? DefaultHeadLayout);
+            string customCSS = Program.Config.User.CustomNotificationCSS ?? string.Empty;
-            build.Append("<style type='text/css'>").Append(ScriptLoader.LoadResource("styles/notification.css", sync) ?? string.Empty).Append("</style>");
             
-            if (!string.IsNullOrEmpty(Program.UserConfig.CustomNotificationCSS)){
+            StringBuilder build = new StringBuilder(320 + headLayout.Length + mainCSS.Length + customCSS.Length + html.Length);
-                build.Append("<style type='text/css'>").Append(Program.UserConfig.CustomNotificationCSS).Append("</style>");
+            build.Append("<!DOCTYPE html>");
+            build.Append(headLayout);
+            build.Append("<style type='text/css'>").Append(mainCSS).Append("</style>");
+
+            if (!string.IsNullOrWhiteSpace(customCSS)){
+                build.Append("<style type='text/css'>").Append(customCSS).Append("</style>");
             }
             
-            build.Append("</head>");
+            build.Append("</head><body class='scroll-styled-v");
-            build.Append("<body class='scroll-styled-v");
 
             if (!string.IsNullOrEmpty(bodyClasses)){
                 build.Append(' ').Append(bodyClasses);
             }
 
-            build.Append('\'').Append(isExample ? " td-example-notification" : "").Append("><div class='column' style='width:100%!important;min-height:100vh!important;height:auto!important;overflow:initial!important;'>");
+            build.Append("'><div class='column' style='width:100%!important;min-height:100vh!important;height:auto!important;overflow:initial!important;'>");
             build.Append(html);
-            build.Append("</div></body>");
+            build.Append("</div></body></html>");
-            build.Append("</html>");
             return build.ToString();
         }
     }

Core/Other/Analytics/AnalyticsReport.cs

@@ -40,7 +40,7 @@ namespace TweetDuck.Core.Other.Analytics{
         }
 
         public override string ToString(){
-            StringBuilder build = new StringBuilder();
+            StringBuilder build = new StringBuilder(625);
 
             foreach(DictionaryEntry entry in data){
                 if (entry.Value == null){

Core/Other/Analytics/AnalyticsReportGenerator.cs

@@ -119,8 +119,8 @@ namespace TweetDuck.Core.Other.Analytics{
             }.FinalizeReport();
         }
 
-        private static UserConfig UserConfig => Program.UserConfig;
+        private static UserConfig UserConfig => Program.Config.User;
-        private static SystemConfig SysConfig => Program.SystemConfig;
+        private static SystemConfig SysConfig => Program.Config.System;
 
         private static string Bool(bool value) => value ? "on" : "off";
         private static string Exact(int value) => value.ToString();

Core/Other/FormGuide.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Drawing;
-using System.Drawing;
 using System.Windows.Forms;
 using CefSharp;
 using CefSharp.WinForms;
@@ -73,7 +72,6 @@ namespace TweetDuck.Core.Other{
             };
 
             browser.LoadingStateChanged += browser_LoadingStateChanged;
-            browser.FrameLoadStart += browser_FrameLoadStart;
             browser.FrameLoadEnd += browser_FrameLoadEnd;
             
             browser.BrowserSettings.BackgroundColor = (uint)BackColor.ToArgb();
@@ -81,15 +79,13 @@ namespace TweetDuck.Core.Other{
             browser.Location = ControlExtensions.InvisibleLocation;
 
             browser.SetupResourceHandler(DummyPage);
+            browser.SetupZoomEvents();
 
             Controls.Add(browser);
 
             Disposed += (sender, args) => {
-                Program.UserConfig.ZoomLevelChanged -= Config_ZoomLevelChanged;
                 browser.Dispose();
             };
-
-            Program.UserConfig.ZoomLevelChanged += Config_ZoomLevelChanged;
         }
 
         private void Reload(string url){
@@ -116,16 +112,8 @@ namespace TweetDuck.Core.Other{
             }
         }
 
-        private void browser_FrameLoadStart(object sender, FrameLoadStartEventArgs e){
-            BrowserUtils.SetZoomLevel(browser.GetBrowser(), Program.UserConfig.ZoomLevel);
-        }
-
         private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
             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");
         }
-
-        private void Config_ZoomLevelChanged(object sender, EventArgs e){
-            BrowserUtils.SetZoomLevel(browser.GetBrowser(), Program.UserConfig.ZoomLevel);
-        }
     }
 }

Core/Other/FormPlugins.cs

@@ -3,11 +3,14 @@ using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
+using TweetDuck.Configuration;
 using TweetDuck.Plugins;
 using TweetDuck.Plugins.Controls;
 
 namespace TweetDuck.Core.Other{
     sealed partial class FormPlugins : Form, FormManager.IAppDialog{
+        private static UserConfig Config => Program.Config.User;
+
         private readonly PluginManager pluginManager;
         
         public FormPlugins(){
@@ -19,8 +22,8 @@ namespace TweetDuck.Core.Other{
         public FormPlugins(PluginManager pluginManager) : this(){
             this.pluginManager = pluginManager;
 
-            if (!Program.UserConfig.PluginsWindowSize.IsEmpty){
+            if (!Config.PluginsWindowSize.IsEmpty){
-                Size targetSize = Program.UserConfig.PluginsWindowSize;
+                Size targetSize = Config.PluginsWindowSize;
                 Size = new Size(Math.Max(MinimumSize.Width, targetSize.Width), Math.Max(MinimumSize.Height, targetSize.Height));
             }
             
@@ -29,8 +32,8 @@ namespace TweetDuck.Core.Other{
             };
 
             FormClosed += (sender, args) => {
-                Program.UserConfig.PluginsWindowSize = Size;
+                Config.PluginsWindowSize = Size;
-                Program.UserConfig.Save();
+                Config.Save();
             };
 
             ResizeEnd += (sender, args) => {

Core/Other/Interfaces/ITweetDeckBrowser.cs

@@ -1,12 +0,0 @@
-using System;
-using CefSharp;
-
-namespace TweetDuck.Core.Other.Interfaces{
-    interface ITweetDeckBrowser{
-        bool IsTweetDeckWebsite { get; }
-
-        void RegisterBridge(string name, object obj);
-        void OnFrameLoaded(Action<IFrame> callback);
-        void ExecuteFunction(string name, params object[] args);
-    }
-}

Core/Other/Settings/BaseTabSettings.cs

@@ -4,8 +4,8 @@ using TweetDuck.Configuration;
 
 namespace TweetDuck.Core.Other.Settings{
     class BaseTabSettings : UserControl{
-        protected static UserConfig Config => Program.UserConfig;
+        protected static UserConfig Config => Program.Config.User;
-        protected static SystemConfig SysConfig => Program.SystemConfig;
+        protected static SystemConfig SysConfig => Program.Config.System;
 
         public IEnumerable<Control> InteractiveControls{
             get{

Core/Other/Settings/Dialogs/DialogSettingsCSS.cs

@@ -13,7 +13,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
         private readonly Action<string> reinjectBrowserCSS;
         private readonly Action openDevTools;
 
-        public DialogSettingsCSS(Action<string> reinjectBrowserCSS, Action openDevTools){
+        public DialogSettingsCSS(string browserCSS, string notificationCSS, Action<string> reinjectBrowserCSS, Action openDevTools){
             InitializeComponent();
             
             Text = Program.BrandName+" Options - CSS";
@@ -22,10 +22,10 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
             this.openDevTools = openDevTools;
             
             textBoxBrowserCSS.EnableMultilineShortcuts();
-            textBoxBrowserCSS.Text = Program.UserConfig.CustomBrowserCSS ?? "";
+            textBoxBrowserCSS.Text = browserCSS ?? "";
 
             textBoxNotificationCSS.EnableMultilineShortcuts();
-            textBoxNotificationCSS.Text = Program.UserConfig.CustomNotificationCSS ?? "";
+            textBoxNotificationCSS.Text = notificationCSS ?? "";
 
             if (!BrowserUtils.HasDevTools){
                 btnOpenDevTools.Enabled = false;

Core/Other/Settings/Dialogs/DialogSettingsCefArgs.cs

@@ -8,13 +8,15 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
     sealed partial class DialogSettingsCefArgs : Form{
         public string CefArgs => textBoxArgs.Text;
 
-        public DialogSettingsCefArgs(){
+        private readonly string initialArgs;
+
+        public DialogSettingsCefArgs(string args){
             InitializeComponent();
             
             Text = Program.BrandName+" Options - CEF Arguments";
             
             textBoxArgs.EnableMultilineShortcuts();
-            textBoxArgs.Text = Program.UserConfig.CustomCefArgs ?? "";
+            textBoxArgs.Text = initialArgs = args ?? "";
             textBoxArgs.Select(textBoxArgs.Text.Length, 0);
         }
 
@@ -23,16 +25,14 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
         }
 
         private void btnApply_Click(object sender, EventArgs e){
-            string prevArgs = Program.UserConfig.CustomCefArgs;
+            if (CefArgs == initialArgs){
-
-            if (CefArgs == prevArgs){
                 DialogResult = DialogResult.Cancel;
                 Close();
                 return;
             }
 
             int count = CommandLineArgs.ReadCefArguments(CefArgs).Count;
-            string prompt = count == 0 && !string.IsNullOrWhiteSpace(prevArgs) ? "All current arguments will be removed. Continue?" : count+(count == 1 ? " argument was" : " arguments were")+" detected. Continue?";
+            string prompt = count == 0 && !string.IsNullOrWhiteSpace(initialArgs) ? "All current arguments will be removed. Continue?" : count+(count == 1 ? " argument was" : " arguments were")+" detected. Continue?";
 
             if (FormMessage.Question("Confirm CEF Arguments", prompt, FormMessage.OK, FormMessage.Cancel)){
                 DialogResult = DialogResult.OK;

Core/Other/Settings/Dialogs/DialogSettingsManage.cs

@@ -125,18 +125,19 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                         Program.Config.ProgramRestartRequested += Config_ProgramRestartRequested;
 
                         if (SelectedItems.HasFlag(ProfileManager.Items.UserConfig)){
-                            Program.UserConfig.Reset();
+                            Program.Config.User.Reset();
                         }
 
                         if (SelectedItems.HasFlag(ProfileManager.Items.SystemConfig)){
-                            Program.SystemConfig.Reset();
+                            Program.Config.System.Reset();
                         }
 
                         Program.Config.ProgramRestartRequested -= Config_ProgramRestartRequested;
 
                         if (SelectedItems.HasFlag(ProfileManager.Items.PluginData)){
+                            Program.Config.Plugins.Reset();
+
                             try{
-                                File.Delete(Program.PluginConfigFilePath);
                                 Directory.Delete(Program.PluginDataPath, true);
                             }catch(Exception ex){
                                 Program.Reporter.HandleException("Profile Reset", "Could not delete plugin data.", true, ex);

Core/Other/Settings/Dialogs/DialogSettingsSearchEngine.cs

@@ -10,7 +10,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
             
             Text = Program.BrandName+" Options - Custom Search Engine";
             
-            textBoxUrl.Text = Program.UserConfig.SearchEngineUrl ?? "";
+            textBoxUrl.Text = Program.Config.User.SearchEngineUrl ?? "";
             textBoxUrl.Select(textBoxUrl.Text.Length, 0);
         }
         

Core/Other/Settings/TabSettingsAdvanced.cs

@@ -103,7 +103,7 @@ namespace TweetDuck.Core.Other.Settings{
         #region Configuration
 
         private void btnEditCefArgs_Click(object sender, EventArgs e){
-            DialogSettingsCefArgs form = new DialogSettingsCefArgs();
+            DialogSettingsCefArgs form = new DialogSettingsCefArgs(Config.CustomCefArgs);
 
             form.VisibleChanged += (sender2, args2) => {
                 form.MoveToCenter(ParentForm);
@@ -124,7 +124,7 @@ namespace TweetDuck.Core.Other.Settings{
         }
 
         private void btnEditCSS_Click(object sender, EventArgs e){
-            DialogSettingsCSS form = new DialogSettingsCSS(reinjectBrowserCSS, openDevTools);
+            DialogSettingsCSS form = new DialogSettingsCSS(Config.CustomBrowserCSS, Config.CustomNotificationCSS, reinjectBrowserCSS, openDevTools);
 
             form.VisibleChanged += (sender2, args2) => {
                 form.MoveToCenter(ParentForm);

Core/Other/TrayIcon.cs

@@ -10,7 +10,7 @@ namespace TweetDuck.Core.Other{
             Disabled, DisplayOnly, MinimizeToTray, CloseToTray, Combined
         }
 
-        private static UserConfig Config => Program.UserConfig;
+        private static UserConfig Config => Program.Config.User;
 
         public event EventHandler ClickRestore;
         public event EventHandler ClickClose;
@@ -56,6 +56,7 @@ namespace TweetDuck.Core.Other{
             this.notifyIcon.Text = Program.BrandName;
 
             Config.MuteToggled += Config_MuteToggled;
+            Disposed += (sender, args) => Config.MuteToggled -= Config_MuteToggled;
         }
 
         public TrayIcon(IContainer container) : this(){

Core/TweetDeckBrowser.cs

@@ -10,12 +10,15 @@ using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling;
 using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Notification;
-using TweetDuck.Core.Other.Interfaces;
 using TweetDuck.Core.Utils;
+using TweetDuck.Plugins;
+using TweetDuck.Plugins.Enums;
 using TweetDuck.Resources;
 
 namespace TweetDuck.Core{
-    sealed class TweetDeckBrowser : ITweetDeckBrowser, IDisposable{
+    sealed class TweetDeckBrowser : IDisposable{
+        private static UserConfig Config => Program.Config.User;
+
         public bool Ready { get; private set; }
 
         public bool Enabled{
@@ -39,7 +42,7 @@ namespace TweetDuck.Core{
 
         private string prevSoundNotificationPath = null;
 
-        public TweetDeckBrowser(FormBrowser owner, TweetDeckBridge tdBridge, UpdateBridge updateBridge){
+        public TweetDeckBrowser(FormBrowser owner, PluginManager plugins, TweetDeckBridge tdBridge, UpdateBridge updateBridge){
             RequestHandlerBrowser requestHandler = new RequestHandlerBrowser();
             
             this.browser = new ChromiumWebBrowser(TwitterUtils.TweetDeckURL){
@@ -66,12 +69,13 @@ namespace TweetDuck.Core{
 
             this.browser.SetupResourceHandler(TweetNotification.AppLogo);
             this.browser.SetupResourceHandler(TwitterUtils.LoadingSpinner);
+            this.browser.SetupZoomEvents();
 
             owner.Controls.Add(browser);
+            plugins.Register(browser, PluginEnvironment.Browser, owner, true);
             
-            Program.UserConfig.MuteToggled += UserConfig_MuteToggled;
+            Config.MuteToggled += Config_MuteToggled;
-            Program.UserConfig.ZoomLevelChanged += UserConfig_ZoomLevelChanged;
+            Config.SoundNotificationChanged += Config_SoundNotificationInfoChanged;
-            Program.UserConfig.SoundNotificationChanged += UserConfig_SoundNotificationInfoChanged;
         }
 
         // setup and management
@@ -89,31 +93,12 @@ namespace TweetDuck.Core{
         }
 
         public void Dispose(){
-            Program.UserConfig.MuteToggled -= UserConfig_MuteToggled;
+            Config.MuteToggled -= Config_MuteToggled;
-            Program.UserConfig.ZoomLevelChanged -= UserConfig_ZoomLevelChanged;
+            Config.SoundNotificationChanged -= Config_SoundNotificationInfoChanged;
-            Program.UserConfig.SoundNotificationChanged -= UserConfig_SoundNotificationInfoChanged;
             
             browser.Dispose();
         }
 
-        void ITweetDeckBrowser.RegisterBridge(string name, object obj){
-            browser.RegisterAsyncJsObject(name, obj);
-        }
-
-        void ITweetDeckBrowser.OnFrameLoaded(Action<IFrame> callback){
-            browser.FrameLoadEnd += (sender, args) => {
-                IFrame frame = args.Frame;
-
-                if (frame.IsMain && TwitterUtils.IsTweetDeckWebsite(frame)){
-                    callback(frame);
-                }
-            };
-        }
-
-        void ITweetDeckBrowser.ExecuteFunction(string name, params object[] args){
-            browser.ExecuteScriptAsync(name, args);
-        }
-
         // event handlers
 
         private void browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){
@@ -131,10 +116,6 @@ namespace TweetDuck.Core{
             IFrame frame = e.Frame;
 
             if (frame.IsMain){
-                if (Program.UserConfig.ZoomLevel != 100){
-                    BrowserUtils.SetZoomLevel(browser.GetBrowser(), Program.UserConfig.ZoomLevel);
-                }
-
                 if (TwitterUtils.IsTwitterWebsite(frame)){
                     ScriptLoader.ExecuteFile(frame, "twitter.js", browser);
                 }
@@ -149,12 +130,11 @@ namespace TweetDuck.Core{
             if (frame.IsMain){
                 if (TwitterUtils.IsTweetDeckWebsite(frame)){
                     UpdateProperties();
-                    TweetDeckBridge.RestoreSessionData(frame);
                     ScriptLoader.ExecuteFile(frame, "code.js", browser);
 
                     InjectBrowserCSS();
-                    ReinjectCustomCSS(Program.UserConfig.CustomBrowserCSS);
+                    ReinjectCustomCSS(Config.CustomBrowserCSS);
-                    UserConfig_SoundNotificationInfoChanged(null, EventArgs.Empty);
+                    Config_SoundNotificationInfoChanged(null, EventArgs.Empty);
 
                     TweetDeckBridge.ResetStaticProperties();
 
@@ -162,7 +142,7 @@ namespace TweetDuck.Core{
                         ScriptLoader.ExecuteScript(frame, "TD.storage.Account.prototype.requiresConsent = function(){ return false; }", "gen:gdpr");
                     }
 
-                    if (Program.UserConfig.FirstRun){
+                    if (Config.FirstRun){
                         ScriptLoader.ExecuteFile(frame, "introduction.js", browser);
                     }
                 }
@@ -185,24 +165,22 @@ namespace TweetDuck.Core{
             }
         }
 
-        private void UserConfig_MuteToggled(object sender, EventArgs e){
+        private void Config_MuteToggled(object sender, EventArgs e){
             UpdateProperties();
         }
 
-        private void UserConfig_ZoomLevelChanged(object sender, EventArgs e){
+        private void Config_SoundNotificationInfoChanged(object sender, EventArgs e){
-            BrowserUtils.SetZoomLevel(browser.GetBrowser(), Program.UserConfig.ZoomLevel);
-        }
-
-        private void UserConfig_SoundNotificationInfoChanged(object sender, EventArgs e){
             const string soundUrl = "https://ton.twimg.com/tduck/updatesnd";
-            bool hasCustomSound = Program.UserConfig.IsCustomSoundNotificationSet;
 
-            if (prevSoundNotificationPath != Program.UserConfig.NotificationSoundPath){
+            bool hasCustomSound = Config.IsCustomSoundNotificationSet;
-                browser.SetupResourceHandler(soundUrl, hasCustomSound ? SoundNotification.CreateFileHandler(Program.UserConfig.NotificationSoundPath) : null);
+            string newNotificationPath = Config.NotificationSoundPath;
-                prevSoundNotificationPath = Program.UserConfig.NotificationSoundPath;
+
+            if (prevSoundNotificationPath != newNotificationPath){
+                browser.SetupResourceHandler(soundUrl, hasCustomSound ? SoundNotification.CreateFileHandler(newNotificationPath) : null);
+                prevSoundNotificationPath = newNotificationPath;
             }
 
-            browser.ExecuteScriptAsync("TDGF_setSoundNotificationData", hasCustomSound, Program.UserConfig.NotificationSoundVolume);
+            browser.ExecuteScriptAsync("TDGF_setSoundNotificationData", hasCustomSound, Config.NotificationSoundVolume);
         }
 
         // external handling

Core/Utils/BrowserUtils.cs

@@ -6,6 +6,7 @@ using System.IO;
 using System.Net;
 using System.Windows.Forms;
 using CefSharp.WinForms;
+using TweetDuck.Configuration;
 using TweetDuck.Core.Other;
 using TweetDuck.Data;
 
@@ -16,13 +17,16 @@ namespace TweetDuck.Core.Utils{
 
         public static readonly bool HasDevTools = File.Exists(Path.Combine(Program.ProgramPath, "devtools_resources.pak"));
 
+        private static UserConfig Config => Program.Config.User;
+        private static SystemConfig SysConfig => Program.Config.System;
+        
         public static void SetupCefArgs(IDictionary<string, string> args){
-            if (!Program.SystemConfig.HardwareAcceleration){
+            if (!SysConfig.HardwareAcceleration){
                 args["disable-gpu"] = "1";
                 args["disable-gpu-vsync"] = "1";
             }
 
-            if (Program.UserConfig.EnableSmoothScrolling){
+            if (Config.EnableSmoothScrolling){
                 args["disable-threaded-scrolling"] = "1";
 
                 if (args.TryGetValue("disable-features", out string disabledFeatures)){
@@ -36,7 +40,7 @@ namespace TweetDuck.Core.Utils{
                 args["disable-smooth-scrolling"] = "1";
             }
 
-            if (!Program.UserConfig.EnableTouchAdjustment){
+            if (!Config.EnableTouchAdjustment){
                 args["disable-touch-adjustment"] = "1";
             }
             
@@ -71,6 +75,21 @@ namespace TweetDuck.Core.Utils{
             browser.SetupResourceHandler(resource.Url, resource.Handler);
         }
 
+        public static void SetupZoomEvents(this ChromiumWebBrowser browser){
+            void UpdateZoomLevel(object sender, EventArgs args){
+                SetZoomLevel(browser.GetBrowser(), Config.ZoomLevel);
+            }
+
+            Config.ZoomLevelChanged += UpdateZoomLevel;
+            browser.Disposed += (sender, args) => Config.ZoomLevelChanged -= UpdateZoomLevel;
+
+            browser.FrameLoadStart += (sender, args) => {
+                if (args.Frame.IsMain && Config.ZoomLevel != 100){
+                    SetZoomLevel(args.Browser, Config.ZoomLevel);
+                }
+            };
+        }
+
         private const string TwitterTrackingUrl = "t.co";
 
         public enum UrlCheckResult{
@@ -98,7 +117,7 @@ namespace TweetDuck.Core.Utils{
                         FormGuide.Show(hash);
                     }
                     else{
-                        string browserPath = Program.UserConfig.BrowserPath;
+                        string browserPath = Config.BrowserPath;
 
                         if (browserPath == null || !File.Exists(browserPath)){
                             WindowsUtils.OpenAssociatedProgram(url);
@@ -115,7 +134,7 @@ namespace TweetDuck.Core.Utils{
                     break;
 
                 case UrlCheckResult.Tracking:
-                    if (Program.UserConfig.IgnoreTrackingUrlWarning){
+                    if (Config.IgnoreTrackingUrlWarning){
                         goto case UrlCheckResult.Fine;
                     }
 
@@ -127,8 +146,8 @@ namespace TweetDuck.Core.Utils{
                         DialogResult result = form.ShowDialog();
 
                         if (result == DialogResult.Ignore){
-                            Program.UserConfig.IgnoreTrackingUrlWarning = true;
+                            Config.IgnoreTrackingUrlWarning = true;
-                            Program.UserConfig.Save();
+                            Config.Save();
                         }
 
                         if (result == DialogResult.Ignore || result == DialogResult.Yes){
@@ -147,7 +166,7 @@ namespace TweetDuck.Core.Utils{
         public static void OpenExternalSearch(string query){
             if (string.IsNullOrWhiteSpace(query))return;
             
-            string searchUrl = Program.UserConfig.SearchEngineUrl;
+            string searchUrl = Config.SearchEngineUrl;
             
             if (string.IsNullOrEmpty(searchUrl)){
                 if (FormMessage.Question("Search Options", "You have not configured a default search engine yet, would you like to do it now?", FormMessage.Yes, FormMessage.No)){
@@ -160,7 +179,7 @@ namespace TweetDuck.Core.Utils{
                     if (settings == null)return;
 
                     settings.FormClosed += (sender, args) => {
-                        if (args.CloseReason == CloseReason.UserClosing && Program.UserConfig.SearchEngineUrl != searchUrl){
+                        if (args.CloseReason == CloseReason.UserClosing && Config.SearchEngineUrl != searchUrl){
                             OpenExternalSearch(query);
                         }
                     };
@@ -188,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{

Core/Utils/TwitterUtils.cs

@@ -2,11 +2,14 @@
 using CefSharp;
 using System.Drawing;
 using System.IO;
-using System.Linq;
 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{
@@ -49,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";
                 }
 
@@ -64,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);
         }
@@ -92,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);
                         }
                     }
                 }
@@ -118,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);
+            }
+        }
     }
 }

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{

Plugins/Controls/PluginControl.cs

@@ -89,7 +89,7 @@ namespace TweetDuck.Plugins.Controls{
         }
 
         private void btnToggleState_Click(object sender, EventArgs e){
-            pluginManager.Config.ToggleEnabled(plugin);
+            pluginManager.Config.SetEnabled(plugin, !pluginManager.Config.IsEnabled(plugin));
             UpdatePluginState();
         }
 

Plugins/IPluginConfig.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using TweetDuck.Plugins.Events;
+
+namespace TweetDuck.Plugins{
+    interface IPluginConfig{
+        IEnumerable<string> DisabledPlugins { get; }
+
+        event EventHandler<PluginChangedStateEventArgs> PluginChangedState;
+        
+        void SetEnabled(Plugin plugin, bool enabled);
+        bool IsEnabled(Plugin plugin);
+    }
+}

Plugins/PluginConfig.cs

@@ -1,72 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using TweetDuck.Plugins.Events;
-
-namespace TweetDuck.Plugins{
-    sealed class PluginConfig{
-        public event EventHandler<PluginChangedStateEventArgs> PluginChangedState;
-
-        public IEnumerable<string> DisabledPlugins => disabled;
-        public bool AnyDisabled => disabled.Count > 0;
-
-        private static readonly string[] DefaultDisabled = {
-            "official/clear-columns",
-            "official/reply-account"
-        };
-
-        private readonly HashSet<string> disabled = new HashSet<string>();
-
-        public void SetEnabled(Plugin plugin, bool enabled){
-            if ((enabled && disabled.Remove(plugin.Identifier)) || (!enabled && disabled.Add(plugin.Identifier))){
-                PluginChangedState?.Invoke(this, new PluginChangedStateEventArgs(plugin, enabled));
-            }
-        }
-
-        public void ToggleEnabled(Plugin plugin){
-            SetEnabled(plugin, !IsEnabled(plugin));
-        }
-
-        public bool IsEnabled(Plugin plugin){
-            return !disabled.Contains(plugin.Identifier);
-        }
-
-        public void Save(string file){
-            try{
-                using(StreamWriter writer = new StreamWriter(new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None), Encoding.UTF8)){
-                    writer.WriteLine("#Disabled");
-
-                    foreach(string identifier in disabled){
-                        writer.WriteLine(identifier);
-                    }
-                }
-            }catch(Exception e){
-                Program.Reporter.HandleException("Plugin Configuration Error", "Could not save the plugin configuration file.", true, e);
-            }
-        }
-
-        public void Load(string file){
-            try{
-                using(StreamReader reader = new StreamReader(new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read), Encoding.UTF8)){
-                    string line = reader.ReadLine();
-
-                    if (line == "#Disabled"){
-                        disabled.Clear();
-
-                        while((line = reader.ReadLine()) != null){
-                            disabled.Add(line);
-                        }
-                    }
-                }
-            }catch(FileNotFoundException){
-                disabled.Clear();
-                disabled.UnionWith(DefaultDisabled);
-                Save(file);
-            }catch(DirectoryNotFoundException){
-            }catch(Exception e){
-                Program.Reporter.HandleException("Plugin Configuration Error", "Could not read the plugin configuration file. If you continue, the list of disabled plugins will be reset to default.", true, e);
-            }
-        }
-    }
-}

Plugins/PluginManager.cs

@@ -5,7 +5,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
-using TweetDuck.Core.Other.Interfaces;
+using TweetDuck.Core.Utils;
 using TweetDuck.Data;
 using TweetDuck.Plugins.Enums;
 using TweetDuck.Plugins.Events;
@@ -21,35 +21,38 @@ namespace TweetDuck.Plugins{
         public IEnumerable<Plugin> Plugins => plugins;
         public IEnumerable<InjectedHTML> NotificationInjections => bridge.NotificationInjections;
 
-        public PluginConfig Config { get; }
+        public IPluginConfig Config { get; }
         
         public event EventHandler<PluginErrorEventArgs> Reloaded;
         public event EventHandler<PluginErrorEventArgs> Executed;
         
         private readonly string rootPath;
-        private readonly string configPath;
         private readonly PluginBridge bridge;
 
         private readonly HashSet<Plugin> plugins = new HashSet<Plugin>();
         private readonly Dictionary<int, Plugin> tokens = new Dictionary<int, Plugin>();
         private readonly Random rand = new Random();
 
-        private ITweetDeckBrowser mainBrowser;
+        private IWebBrowser mainBrowser;
+
+        public PluginManager(IPluginConfig config, string rootPath){
+            this.Config = config;
+            this.Config.PluginChangedState += Config_PluginChangedState;
 
-        public PluginManager(string rootPath, string configPath){
             this.rootPath = rootPath;
-            this.configPath = configPath;
-
-            this.Config = new PluginConfig();
             this.bridge = new PluginBridge(this);
-
-            Config.Load(configPath);
-            Config.PluginChangedState += Config_PluginChangedState;
         }
 
-        public void Register(ITweetDeckBrowser browser, PluginEnvironment environment, Control sync, bool asMainBrowser = false){
+        public void Register(IWebBrowser browser, PluginEnvironment environment, Control sync, bool asMainBrowser = false){
-            browser.OnFrameLoaded(frame => ExecutePlugins(frame, environment, sync));
+            browser.FrameLoadEnd += (sender, args) => {
-            browser.RegisterBridge("$TDP", bridge);
+                IFrame frame = args.Frame;
+
+                if (frame.IsMain && TwitterUtils.IsTweetDeckWebsite(frame)){
+                    ExecutePlugins(frame, environment, sync);
+                }
+            };
+
+            browser.RegisterAsyncJsObject("$TDP", bridge);
 
             if (asMainBrowser){
                 mainBrowser = browser;
@@ -57,8 +60,7 @@ namespace TweetDuck.Plugins{
         }
 
         private void Config_PluginChangedState(object sender, PluginChangedStateEventArgs e){
-            mainBrowser?.ExecuteFunction("TDPF_setPluginState", e.Plugin, e.IsEnabled);
+            mainBrowser?.ExecuteScriptAsync("TDPF_setPluginState", e.Plugin, e.IsEnabled);
-            Config.Save(configPath);
         }
 
         public bool IsPluginInstalled(string identifier){
@@ -75,7 +77,7 @@ namespace TweetDuck.Plugins{
 
         public void ConfigurePlugin(Plugin plugin){
             if (bridge.WithConfigureFunction.Contains(plugin)){
-                mainBrowser?.ExecuteFunction("TDPF_configurePlugin", plugin);
+                mainBrowser?.ExecuteScriptAsync("TDPF_configurePlugin", plugin);
             }
             else if (plugin.HasConfig){
                 if (File.Exists(plugin.ConfigPath)){
@@ -113,8 +115,6 @@ namespace TweetDuck.Plugins{
         }
 
         public void Reload(){
-            Config.Load(configPath);
-
             plugins.Clear();
             tokens.Clear();
 

Plugins/PluginScriptGenerator.cs

@@ -1,9 +1,10 @@
-using TweetDuck.Plugins.Enums;
+using System.Linq;
+using TweetDuck.Plugins.Enums;
 
 namespace TweetDuck.Plugins{
     static class PluginScriptGenerator{
-        public static string GenerateConfig(PluginConfig config){
+        public static string GenerateConfig(IPluginConfig config){
-            return config.AnyDisabled ? "window.TD_PLUGINS.disabled = [\""+string.Join("\",\"", config.DisabledPlugins)+"\"];" : string.Empty;
+            return "window.TD_PLUGINS.disabled = ["+string.Join(",", config.DisabledPlugins.Select(id => $"\"{id}\""))+"]";
         }
 
         public static string GeneratePlugin(string pluginIdentifier, string pluginContents, int pluginToken, PluginEnvironment environment){

Program.cs

@@ -1,4 +1,5 @@
 using CefSharp;
+using CefSharp.WinForms;
 using System;
 using System.Diagnostics;
 using System.Globalization;
@@ -19,7 +20,7 @@ namespace TweetDuck{
         public const string BrandName = "TweetDuck";
         public const string Website = "https://tweetduck.chylex.com";
 
-        public const string VersionTag = "1.15.1";
+        public const string VersionTag = "1.16.3";
 
         public static readonly string ProgramPath = AppDomain.CurrentDomain.BaseDirectory;
         public static readonly bool IsPortable = File.Exists(Path.Combine(ProgramPath, "makeportable"));
@@ -50,10 +51,6 @@ namespace TweetDuck{
         public static Reporter Reporter { get; }
         public static ConfigManager Config { get; }
         
-        // TODO
-        public static UserConfig UserConfig => Config.User;
-        public static SystemConfig SystemConfig => Config.System;
-
         static Program(){
             Culture = CultureInfo.CurrentCulture;
             Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
@@ -147,7 +144,7 @@ namespace TweetDuck{
                 #endif
             };
             
-            CommandLineArgs.ReadCefArguments(UserConfig.CustomCefArgs).ToDictionary(settings.CefCommandLineArgs);
+            CommandLineArgs.ReadCefArguments(Config.User.CustomCefArgs).ToDictionary(settings.CefCommandLineArgs);
             BrowserUtils.SetupCefArgs(settings.CefCommandLineArgs);
             
             Cef.Initialize(settings, false, new BrowserProcessHandler());

README.md

@@ -15,7 +15,7 @@ The program was built using Visual Studio 2017. Before opening the solution, ple
 
 After opening the solution, right-click the solution and select **Restore NuGet Packages**, or manually run this command in the **Package Manager Console**:
 ```
-PM> Install-Package CefSharp.WinForms -Version 67.0.0-CI2662 -Source https://www.myget.org/F/cefsharp/api/v3/index.json
+PM> Install-Package CefSharp.WinForms -Version 67.0.0-pre01
 ```
 
 Note that some pre-release builds of CefSharp are not available on NuGet. To correctly restore packages in that case, open **Package Manager Settings**, and add `https://www.myget.org/F/cefsharp/api/v3/index.json` to the list of package sources.
@@ -24,7 +24,7 @@ Note that some pre-release builds of CefSharp are not available on NuGet. To cor
 
 The `Debug` configuration uses a separate data folder by default (`%LOCALAPPDATA%\TweetDuckDebug`) to avoid affecting an existing installation of TweetDuck. You can modify this by opening **TweetDuck Properties** in Visual Studio, clicking the **Debug** tab, and changing the **Command line arguments** field.
 
-While debugging, opening the main menu and clicking **Reload browser** automatically rebuilds all resources in the `Resources/Scripts` and `Resources/Plugins` folders. This allows editing HTML/CSS/JS files and applying the changes without restarting the program, but it will cause a short delay between browser reloads.
+While debugging, opening the main menu and clicking **Reload browser** automatically rebuilds all resources in `Resources/Scripts` and `Resources/Plugins`. This allows editing HTML/CSS/JS files without restarting the program, but it will cause a short delay between browser reloads. An F# compiler must be present when building the project to enable this feature: `C:\Program Files (x86)\Microsoft SDKs\F#\10.1\Framework\v4.0\fsc.exe`
 
 ### Release
 
@@ -32,7 +32,7 @@ Open **Batch Build**, tick all `Release` configurations with `x86` platform, and
 
 After the build succeeds, the `bin/x86/Release` folder will contain files intended for distribution (no debug symbols or other unnecessary files). You may package these files yourself, or see the [Installers](#installers) section for automated installer generation.
 
-The `Release` configuration omits debug symbols and other unnecessary files. You can modify this behavior by opening `TweetDuck.csproj`, and editing the `<Target Name="AfterBuild" Condition="$(ConfigurationName) == Release">` section.
+The `Release` configuration omits debug symbols and other unnecessary files, and it will automatically generate the [update installer](#installers) if the environment is setup correctly. You can modify this behavior by opening `TweetDuck.csproj`, and editing the `<Target Name="AfterBuild" Condition="$(ConfigurationName) == Release">` section.
 
 If you decide to publicly release a custom version, please make it clear that it is not an official release of TweetDuck. There are many references to the official website and this repository, especially in the update system, so search for `chylex.com` and `github.com` in all files and replace them appropriately.
 
@@ -40,7 +40,7 @@ If you decide to publicly release a custom version, please make it clear that it
 
 #### Error: The command (...) exited with code 1
 - This indicates a failed post-build event, open the **Output** tab for logs
-- Determine if there was an IO error from the `rmdir` commands, or whether the error was in the **PostBuild.ps1** script (`Encountered an error while running PostBuild.ps1 on line <xyz>`)
+- Determine if there was an IO error from the `rmdir` commands, the custom MSBuild targets near the end of the [.csproj file](https://github.com/chylex/TweetDuck/blob/master/TweetDuck.csproj), or in the **PostBuild.fsx** script (`Encountered an error while running PostBuild`)
 - Some files are checked for invalid characters:
   - `Resources/Plugins/emoji-keyboard/emoji-ordering.txt` line endings must be LF (line feed); any CR (carriage return) in the file will cause a failed build, and you will need to ensure correct line endings in your text editor
 
@@ -55,22 +55,24 @@ TweetDuck uses **Inno Setup** for installers and updates. First, download and in
 
 Next, add the Inno Setup installation folder (usually `C:\Program Files (x86)\Inno Setup 5`) into your **PATH** environment variable. You may need to restart File Explorer for the change to take place.
 
-Now you can generate installers after a build by running `bld/RUN BUILD.bat`. Note that this will only package the files, you still need to run the [release build](#release) in Visual Studio!
+Now you can generate installers by running `bld/GEN INSTALLERS.bat`. Note that this will only package the files, you still need to run the [release build](#release) in Visual Studio!
 
 After the window closes, three installers will be generated inside the `bld/Output` folder:
 * **TweetDuck.exe**
   * This is the main installer that creates entries in the Start Menu & Programs and Features, and an optional desktop icon
 * **TweetDuck.Update.exe**
   * This is a lightweight update installer that only contains the most important files that usually change across releases
-  * It will automatically download and apply the full installer if the user's current version of CEF does not match (the download link is in `gen_upd.iss` and points to this repository by default)
+  * It will automatically download and apply the full installer if the user's current version of CEF does not match
 * **TweetDuck.Portable.exe**
   * This is a portable installer that does not need administrator privileges
   * It automatically creates a `makeportable` file in the program folder, which forces TweetDuck to run in portable mode
 
+The installers are built for GitHub Releases, where the main and portable installers can download and install Visual C++ if it's missing, and the update installer will download and apply the full installer when needed. If you plan to distribute your own installers via GitHub, you can change the variables in the installer files (`.iss`) and in the update system to point to your repository, and use the power of the existing update system.
+
 #### Notes
 
 > When opening **Batch Build**, you will also see `x64` and `AnyCPU` configurations. These are visible due to what I consider a Visual Studio bug, and will not work without significant changes to the project. Manually running the `Resources/PostCefUpdate.ps1` PowerShell script modifies the downloaded CefSharp packages, and removes the invalid configurations.
 
-> There is a small chance running `RUN BUILD.bat` immediately shows a resource error. If that happens, close the console window (which terminates all Inno Setup processes and leaves corrupted installers in the output folder), and run it again.
+> There is a small chance running `GEN INSTALLERS.bat` immediately shows a resource error. If that happens, close the console window (which terminates all Inno Setup processes and leaves corrupted installers in the output folder), and run it again.
 
-> Running `RUN BUILD.bat` uses about 400 MB of RAM due to high compression. You can lower this to about 140 MB by opening `gen_full.iss` and `gen_port.iss`, and changing `LZMADictionarySize=15360` to `LZMADictionarySize=4096`.
+> Running `GEN INSTALLERS.bat` uses about 400 MB of RAM due to high compression. You can lower this to about 140 MB by opening `gen_full.iss` and `gen_port.iss`, and changing `LZMADictionarySize=15360` to `LZMADictionarySize=4096`.

Resources/Plugins/.debug/notification.js

@@ -0,0 +1,3 @@
+run(){
+  console.info("executed debug plugin in notification");
+}

Resources/Plugins/clear-columns/browser.js

@@ -110,16 +110,27 @@ enabled(){
   
   // styles
   
+  if (!document.getElementById("td-clearcolumns-workaround")){
+    // TD started caching mustaches so disabling the plugin doesn't update the column headers properly...
+    let workaround = document.createElement("style");
+    workaround.id = "td-clearcolumns-workaround";
+    workaround.innerText = "#tduck a[data-action='td-clearcolumns-dosingle'] { display: none }";
+    document.head.appendChild(workaround);
+  }
+  
   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(".column-header-links { min-width: 51px !important; }");
-  this.css.insert("[data-td-icon='icon-schedule'] .td-clear-column-shortcut { display: none; }");
+  this.css.insert(".column[data-td-icon='icon-message'] .column-header-links { min-width: 110px !important; }");
-  this.css.insert("[data-td-icon='icon-custom-timeline'] .td-clear-column-shortcut { display: none; }");
+  this.css.insert(".btn-options-tray[data-action='clear'] { display: none !important; }");
+  
+  this.css.insert("#tduck a[data-action='td-clearcolumns-dosingle'] { display: inline-block; }");
+  this.css.insert("#tduck .column[data-td-icon='icon-schedule'] a[data-action='td-clearcolumns-dosingle'] { display: none; }");
+  this.css.insert("#tduck .column[data-td-icon='icon-custom-timeline'] a[data-action='td-clearcolumns-dosingle'] { display: none; }");
 }
 
 ready(){

Resources/Plugins/edit-design/browser.js

@@ -2,7 +2,6 @@ enabled(){
   // elements & data
   this.css = null;
   this.icons = null;
-  this.htmlModal = null;
   this.config = null;
   
   this.defaultConfig = {
@@ -15,6 +14,7 @@ enabled(){
     themeColorTweaks: true,
     revertIcons: true,
     showCharacterCount: true,
+    forceArialFont: true,
     increaseQuoteTextSize: false,
     smallComposeTextSize: false,
     optimizeAnimations: true,
@@ -41,13 +41,6 @@ enabled(){
   
   const me = this;
   
-  // modal dialog loading
-  $TDP.readFileRoot(this.$token, "modal.html").then(contents => {
-    this.htmlModal = contents;
-  }).catch(err => {
-    $TD.alert("error", "Problem loading data for the design edit plugin: "+err.message);
-  });
-  
   // configuration
   const configFile = "config.json";
   
@@ -112,7 +105,7 @@ enabled(){
   
   // settings click event
   this.onSettingsMenuClickedEvent = () => {
-    return if this.htmlModal === null || this.config === null;
+    return if this.config === null;
     
     setTimeout(() => {
       let menu = $(".js-dropdown-content").children("ul").first();
@@ -181,20 +174,26 @@ enabled(){
       // SELECTS
       else if (tag === "SELECT"){
         let optionCustom = item.find("option[value^='custom']");
+        let optionCustomNew = item.find("option[value^='change-custom']");
         
         let resetMyValue = () => {
           if (!item.val(me.config[key]).val() && optionCustom.length === 1){
             item.val(optionCustom.attr("value"));
             optionCustom.text(getTextForCustom(key));
+            optionCustomNew.show();
+          }
+          else{
+            optionCustom.text("Custom");
+            optionCustomNew.hide();
           }
         };
         
         resetMyValue();
         
-        item.change(function(){ // TODO change doesn't fire when Custom is already selected
+        item.change(function(){
           let val = item.val();
           
-          if (val === "custom-px"){
+          if (val.endsWith("custom-px")){
             val = (prompt("Enter custom value (px):") || "").trim();
             
             if (val){
@@ -204,21 +203,17 @@ enabled(){
               
               if (/^[0-9]+$/.test(val)){
                 updateKey(key, val+"px");
-                optionCustom.text(getTextForCustom(key));
               }
               else{
                 alert("Invalid value, only px values are supported.");
-                resetMyValue();
               }
             }
-            else{
-              resetMyValue();
-            }
           }
           else{
             updateKey(key, item.val());
-            optionCustom.text("Custom");
           }
+          
+          resetMyValue();
         });
       }
       // CUSTOM ELEMENTS
@@ -260,7 +255,7 @@ enabled(){
       
       setTimeout(function(){
         if (theme != TD.settings.getTheme()){
-          $(document).trigger("uiToggleTheme");
+          TD.settings.setTheme(theme);
         }
         
         me.saveConfig();
@@ -268,13 +263,17 @@ enabled(){
       }, 1);
     });
   }).methods({
-    _render: () => $(this.htmlModal),
+    _render: function(){
+      return $(me.htmlModal);
+    },
     destroy: function(){
       if (this.reloadPage){
         window.TDPF_requestReload();
         return;
       }
       
+      delete me.htmlModal;
+      
       $("#td-design-plugin-modal").hide();
       this.supr();
     }
@@ -432,6 +431,11 @@ enabled(){
       this.css.insert("#tduck .tweet-actions > li:nth-child(4) { margin-right: 2px !important }");
     }
     
+    if (this.config.forceArialFont){
+      this.css.insert("#tduck { font-family: Arial, sans-serif; font-weight: 400 }");
+      this.css.insert("#tduck input, #tduck label, #tduck select, #tduck textarea { font-family: Arial }")
+    }
+    
     if (this.config.increaseQuoteTextSize){
       this.css.insert(".quoted-tweet { font-size: 1em !important }");
     }
@@ -538,11 +542,13 @@ ${iconData.map(entry => `#tduck .icon-${entry[0]}:before{content:\"\\f0${entry[1
 
 .drawer .btn .icon, .app-header .btn .icon { line-height: 1em !important }
 .app-search-fake .icon { margin-top: -3px !important }
-#tduck .js-docked-compose .js-drawer-close { margin: 20px 0 0 !important }
 #tduck .search-input-control .icon { font-size: 20px !important; top: -4px !important }
+#tduck .js-docked-compose .js-drawer-close { margin: 20px 0 0 !important }
+#tduck .compose-media-bar-remove .icon-close, #tduck .compose-media-grid-remove .icon-close { padding: 3px 2px 1px !important }
 
 .js-column-header .column-type-icon { margin-top: 0 !important }
 .inline-reply .pull-left .Button--link { margin-top: 3px !important }
+.js-inline-compose-pop .icon-popout { font-size: 23px !important }
 
 .tweet-action-item .icon-favorite-toggle { font-size: 16px !important; }
 .tweet-action-item .heartsprite { top: -260% !important; left: -260% !important; transform: scale(0.4, 0.39) translateY(0.5px) !important; }
@@ -597,6 +603,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 { font-family: Arial, sans-serif; font-weight: 400 }
+` : ``}
+
 ${this.config.increaseQuoteTextSize ? `
 .quoted-tweet { font-size: 1em !important }
 ` : ``}
@@ -670,7 +680,12 @@ ready(){
 }
 
 configure(){
+  $TDP.readFileRoot(this.$token, "modal.html").then(contents => {
+    this.htmlModal = contents;
     new this.customDesignModal();
+  }).catch(err => {
+    $TD.alert("error", "Error loading the configuration dialog: "+err.message);
+  });
 }
 
 disabled(){

Resources/Plugins/edit-design/modal.html

@@ -41,6 +41,7 @@
               <option value="350px">Wide (350px)</option>
               <option value="400px">Extreme (400px)</option>
               <option value="custom-px">Custom</option>
+              <option value="change-custom-px">Change custom value...</option>
             </optgroup>
             <option disabled></option>
             <optgroup label="Dynamic width">
@@ -66,7 +67,12 @@
             <option value="15px">Large (15px)</option>
             <option value="16px">Largest (16px)</option>
             <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
@@ -167,12 +173,23 @@
   #edit-design-panel {
     width: 693px;
     height: 380px;
+    background-color: #FFF;
+    box-shadow: 0 0 10px rgba(17, 17, 17, 0.5);
+  }
+  
+  #edit-design-panel .mdl-header {
+    color: #8899A6;
   }
   
   #edit-design-panel .mdl-inner {
     padding-top: 0;
   }
   
+  #edit-design-panel .mdl-content {
+    border: 1px solid #CCD6DD;
+    background: #EAEAEA;
+  }
+  
   #edit-design-panel-inner-cols {
     padding: 0 6px;
   }

Resources/Plugins/edit-design/theme.black.css

@@ -117,7 +117,7 @@ html.dark .account-settings-bt{border-top:1px solid #e1e8ed}
 html.dark .account-settings-bb{border-bottom:1px solid #e1e8ed}
 html.dark .account-stats a{color:#66757f}
 html.dark .account-stats a:hover{color:#2b7bb9}
-html.dark .column{background-color:#222426}
+html.dark .column-panel{background-color:#222426}
 html.dark .column.is-focused{box-shadow:0 0 0 6px #7aa2c0}
 html.dark .column-background-fill{background-color:#F5F8FA}
 html.dark .more-tweets-glow{background-color:#55acee;background:radial-gradient(ellipse farthest-corner at 50% 100%,#55acee 0%,#55acee 25%,rgba(255,255,255,0) 75%)}
@@ -135,7 +135,6 @@ html.dark .column-header{background-color:#292F33}
 html.dark .is-inverted-dark .column-header{border-bottom:1px solid #ddd}
 html.dark .is-inverted-dark .column-title-edit-box{color:#111;background-color:#fff;border-color:#e1e8ed}
 html.dark .column-header{border-bottom:1px solid #222426}
-html.dark .column-header-temp{border-bottom:1px solid #ddd}
 html.dark .column-title-edit-box{color:#e1e8ed;background-color:#14171A;border-color:#111}
 html.dark .column-number{color:#66757f}
 html.dark .is-new .column-type-icon{color:#55acee}
@@ -428,8 +427,7 @@ html.dark .list-account .username{color:#8899a6}
 html.dark .list-listmember .username{color:#8899a6}
 html.dark .list-listmember .bio{color:#657786}
 html.dark .divider-bar{background-color:#ddd}
-html.dark select{background-color:#fff}
+html.dark input,html.dark textarea,html.dark select{color:#111;border:1px solid #e1e8ed;background-color:#fff}
-html.dark input,html.dark textarea,html.dark select{color:#111;border:1px solid #e1e8ed}
 html.dark input:disabled{background-color:#eaeaea;border-color:#e1e8ed}
 html.dark select:disabled{background-color:#f5f8fa}
 html.dark input:focus,html.dark select:focus,html.dark textarea:focus,html.dark .focus{border-color:rgba(80,165,230,0.8);box-shadow:inset 0 1px 3px rgba(17,17,17,0.1),0 0 8px rgba(80,165,230,0.6)}
@@ -804,3 +802,8 @@ html.dark .DrawerModal{color:#14171A}
 html.dark .app-search-fake{border-color:transparent}
 html.dark .spinner-small,html.dark .spinner-large{filter:grayscale(80%)brightness(93%)}
 html.dark .tweet>.color-twitter-blue{color:#8bd!important}
+html.dark .hw-card-container>div{border-color:#292F33;background:transparent}
+html.dark .hw-card-container>div>div{border-color:#292F33}
+html.dark .modal-content,html.dark .lst-group{color:#292F33}
+html.dark .lst-launcher a span{color:#657786!important}
+html.dark .social-proof-names a{color:#3b94d9}

Resources/Plugins/templates/modal.html

@@ -171,14 +171,14 @@
     }
     
     .template-editor-form input, .template-editor-form textarea {
-      color: #111;
+      color: #111 !important;
-      background-color: #fff;
+      background-color: #fff !important;
       border: none;
       border-radius: 0;
     }
     
     .template-editor-form input:focus, .template-editor-form textarea:focus {
-      box-shadow: inset 0 1px 3px rgba(17, 17, 17, 0.1), 0 0 8px rgba(80, 165, 230, 0.6);
+      box-shadow: inset 0 1px 3px rgba(17, 17, 17, 0.1), 0 0 8px rgba(80, 165, 230, 0.6) !important;
     }
     
     .template-editor-form textarea {

Resources/PostBuild.fsx

@@ -0,0 +1,249 @@
+open System
+open System.Collections.Generic
+open System.Diagnostics
+open System.IO
+open System.Text.RegularExpressions
+open System.Threading.Tasks
+
+// "$(DevEnvDir)CommonExtensions\Microsoft\FSharp\fsi.exe" "$(ProjectDir)Resources\PostBuild.fsx" --exec --nologo -- "$(TargetDir)\" "$(ProjectDir)\" "$(ConfigurationName)"
+// "$(ProjectDir)bld\post_build.exe" "$(TargetDir)\" "$(ProjectDir)\" "$(ConfigurationName)"
+
+exception ArgumentUsage of string
+
+#if !INTERACTIVE
+[<EntryPoint>]
+#endif
+let main (argv: string[]) =
+    try
+        if argv.Length < 2 then
+            #if INTERACTIVE
+            raise (ArgumentUsage "fsi.exe PostBuild.fsx --exec --nologo -- <TargetDir> <ProjectDir> [ConfigurationName] [VersionTag]")
+            #else
+            raise (ArgumentUsage "PostBuild.exe <TargetDir> <ProjectDir> [ConfigurationName] [VersionTag]")
+            #endif
+            
+        let _time name func =
+            let sw = Stopwatch.StartNew()
+            func()
+            sw.Stop()
+            printfn "[%s took %i ms]" name (int (Math.Round(sw.Elapsed.TotalMilliseconds)))
+            
+        let (+/) path1 path2 =
+            Path.Combine(path1, path2)
+            
+        let sw = Stopwatch.StartNew()
+        
+        // Setup
+        
+        let targetDir = argv.[0]
+        let projectDir = argv.[1]
+        
+        let configuration = if argv.Length >= 3 then argv.[2]
+                            else "Release"
+                            
+        let version = if argv.Length >= 4 then argv.[3]
+                      else ((targetDir +/ "TweetDuck.exe") |> FileVersionInfo.GetVersionInfo).FileVersion
+                      
+        printfn "--------------------------"
+        printfn "TweetDuck version %s" version
+        printfn "--------------------------"
+        
+        let localesDir = targetDir +/ "locales"
+        let scriptsDir = targetDir +/ "scripts"
+        let pluginsDir = targetDir +/ "plugins"
+        let importsDir = scriptsDir +/ "imports"
+        
+        // Functions (Strings)
+        
+        let filterNotEmpty =
+            Seq.filter (not << String.IsNullOrEmpty)
+            
+        let replaceRegex (pattern: string) (replacement: string) input =
+            Regex.Replace(input, pattern, replacement)
+            
+        let collapseLines separator (sequence: string seq) =
+            String.Join(separator, sequence)
+            
+        let trimStart (line: string) =
+            line.TrimStart()
+            
+        // Functions (File Management)
+        let copyFile source target =
+            File.Copy(source, target, true)
+            
+        let createDirectory path =
+            Directory.CreateDirectory(path) |> ignore
+            
+        let rec copyDirectoryContentsFiltered source target (filter: string -> bool) =
+            if not (Directory.Exists(target)) then
+                Directory.CreateDirectory(target) |> ignore
+                
+            let src = DirectoryInfo(source)
+            
+            for file in src.EnumerateFiles() do
+                if filter file.Name then
+                    file.CopyTo(target +/ file.Name) |> ignore
+                    
+            for dir in src.EnumerateDirectories() do
+                if filter dir.Name then
+                    copyDirectoryContentsFiltered dir.FullName (target +/ dir.Name) filter
+                    
+        let copyDirectoryContents source target =
+            copyDirectoryContentsFiltered source target (fun _ -> true)
+            
+        // Functions (File Processing)
+        
+        let byPattern path pattern =
+            Directory.EnumerateFiles(path, pattern, SearchOption.AllDirectories)
+            
+        let exceptEndingWith name =
+            Seq.filter (fun (file: string) -> not (file.EndsWith(name)))
+            
+        let iterateFiles (files: string seq) (func: string -> unit) =
+            Parallel.ForEach(files, func) |> ignore
+            
+        let readFile file = seq {
+            use stream = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, 0x1000, FileOptions.SequentialScan)
+            use reader = new StreamReader(stream)
+            let mutable cont = true
+            
+            while cont do
+                let line = reader.ReadLine()
+                
+                if line = null then
+                    cont <- false
+                else
+                    yield line
+        }
+        
+        let writeFile (fullPath: string) (lines: string seq) =
+            let relativePath = fullPath.[(targetDir.Length)..]
+            let includeVersion = relativePath.StartsWith(@"scripts\") && not (relativePath.StartsWith(@"scripts\imports\"))
+            let finalLines = if includeVersion then seq { yield "#" + version; yield! lines } else lines
+            
+            File.WriteAllLines(fullPath, finalLines |> filterNotEmpty |> Seq.toArray)
+            printfn "Processed %s" relativePath
+        
+        let processFiles (files: string seq) (extProcessors: IDictionary<string, (string seq -> string seq)>) =
+            let rec processFileContents file =
+                readFile file
+                |> extProcessors.[Path.GetExtension(file)]
+                |> Seq.map (fun line ->
+                    Regex.Replace(line, @"#import ""(.*?)""", (fun matchInfo ->
+                        processFileContents(importsDir +/ matchInfo.Groups.[1].Value.Trim())
+                        |> collapseLines (Environment.NewLine)
+                        |> (fun contents -> contents.TrimEnd())
+                    ))
+                )
+                
+            iterateFiles files (fun file ->
+                processFileContents file
+                |> (writeFile file)
+            )
+            
+        // Build
+            
+        copyFile (projectDir +/ "bld/Resources/LICENSES.txt") (targetDir +/ "LICENSES.txt")
+        
+        copyDirectoryContents (projectDir +/ "Resources/Scripts") scriptsDir
+        
+        createDirectory (pluginsDir +/ "official")
+        createDirectory (pluginsDir +/ "user")
+        
+        copyDirectoryContentsFiltered
+            (projectDir +/ "Resources/Plugins")
+            (pluginsDir +/ "official")
+            (fun name -> name <> ".debug" && name <> "emoji-instructions.txt")
+            
+        if configuration = "Debug" then
+            copyDirectoryContents
+                (projectDir +/ "Resources/Plugins/.debug")
+                (pluginsDir +/ "user/.debug")
+                
+        if Directory.Exists(localesDir) || configuration = "Release" then
+            Directory.EnumerateFiles(localesDir, "*.pak")
+            |> exceptEndingWith @"\en-US.pak"
+            |> Seq.iter (File.Delete)
+            
+        // Validation
+        
+        if File.ReadAllText(pluginsDir +/ "official/emoji-keyboard/emoji-ordering.txt").IndexOf('\r') <> -1 then
+            raise (FormatException("emoji-ordering.txt must not have any carriage return characters"))
+        else
+            printfn "Verified emoji-ordering.txt"
+            
+        // Processing
+        
+        let fileProcessors =
+            dict [
+                ".js", (fun (lines: string seq) ->
+                    lines
+                    |> Seq.map (fun line ->
+                        line
+                        |> trimStart
+                        |> replaceRegex @"^(.*?)((?<=^|[;{}()])\s?//(?:\s.*|$))?$" "$1"
+                        |> replaceRegex @"(?<!\w)(return|throw)(\s.*?)? if (.*?);" "if ($3)$1$2;"
+                    )
+                );
+                
+                ".css", (fun (lines: string seq) ->
+                    lines
+                    |> Seq.map (fun line ->
+                        line
+                        |> replaceRegex @"\s*/\*.*?\*/" ""
+                        |> replaceRegex @"^(\S.*) {$" "$1{"
+                        |> replaceRegex @"^\s+(.+?):\s*(.+?)(?:\s*(!important))?;$" "$1:$2$3;"
+                    )
+                    |> filterNotEmpty
+                    |> collapseLines " "
+                    |> replaceRegex @"([{};])\s" "$1"
+                    |> replaceRegex @";}" "}"
+                    |> Seq.singleton
+                );
+                
+                ".html", (fun (lines: string seq) ->
+                    lines
+                    |> Seq.map trimStart
+                );
+                
+                ".meta", (fun (lines: string seq) ->
+                    lines
+                    |> Seq.map (fun line -> line.Replace("{version}", version))
+                );
+            ]
+            
+        processFiles ((byPattern targetDir "*.js") |> exceptEndingWith @"\configuration.default.js") fileProcessors
+        processFiles (byPattern targetDir "*.css") fileProcessors
+        processFiles (byPattern targetDir "*.html") fileProcessors
+        processFiles (byPattern pluginsDir "*.meta") fileProcessors
+        
+        // Cleanup
+        
+        Directory.Delete(importsDir, true)
+        
+        // Finished
+        
+        sw.Stop()
+        printfn "------------------"
+        printfn "Finished in %i ms" (int (Math.Round(sw.Elapsed.TotalMilliseconds)))
+        printfn "------------------"
+        0
+        
+    with
+    | ArgumentUsage message ->
+        printfn ""
+        printfn "Build script usage:"
+        printfn "%s" message
+        printfn ""
+        1
+    | ex ->
+        printfn ""
+        printfn "Encountered an error while running PostBuild:"
+        printfn "%A" ex
+        printfn ""
+        1
+        
+#if INTERACTIVE
+printfn "Running PostBuild in interpreter..."
+main (fsi.CommandLineArgs |> Array.skip (1 + (fsi.CommandLineArgs |> Array.findIndex (fun arg -> arg = "--"))))
+#endif

Resources/PostBuild.ps1

@@ -1,166 +0,0 @@
-Param(
-  [Parameter(Mandatory = $True, Position = 1)][string] $targetDir,
-  [Parameter(Mandatory = $True, Position = 2)][string] $projectDir,
-  [Parameter(Position = 3)][string] $configuration = "Release",
-  [Parameter(Position = 4)][string] $version = ""
-)
-
-$ErrorActionPreference = "Stop"
-
-try{
-  $sw = [Diagnostics.Stopwatch]::StartNew()
-  
-  if ($version.Equals("")){
-    $version = (Get-Item (Join-Path $targetDir "TweetDuck.exe")).VersionInfo.FileVersion
-  }
-  
-  Write-Host "--------------------------"
-  Write-Host "TweetDuck version" $version
-  Write-Host "--------------------------"
-  
-  # Cleanup
-  
-  if (Test-Path (Join-Path $targetDir "locales")){
-    Remove-Item -Path (Join-Path $targetDir "locales\*.pak") -Exclude "en-US.pak"
-  }
-  
-  # Copy resources
-  
-  Copy-Item (Join-Path $projectDir "bld\Resources\LICENSES.txt") -Destination $targetDir -Force
-  
-  New-Item -ItemType directory -Path $targetDir -Name "scripts" | Out-Null
-  New-Item -ItemType directory -Path $targetDir -Name "plugins" | Out-Null
-  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\*") -Recurse -Destination (Join-Path $targetDir "scripts")
-  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\*") -Recurse -Destination (Join-Path $targetDir "plugins\user\.debug")
-  }
-  
-  # Helper functions
-  
-  function Remove-Empty-Lines{
-    Param([Parameter(Mandatory = $True, Position = 1)] $lines)
-    
-    foreach($line in $lines){
-      if ($line -ne ''){
-        $line
-      }
-    }
-  }
-  
-  function Check-Carriage-Return{
-    Param([Parameter(Mandatory = $True, Position = 1)] $file)
-    
-    if (!(Test-Path $file)){
-      Throw "$file does not exist"
-    }
-    
-    if ((Get-Content -Path $file -Raw).Contains("`r")){
-      Throw "$file must not have any carriage return characters"
-    }
-    
-    Write-Host "Verified" $file.Substring($targetDir.Length)
-  }
-  
-  function Rewrite-File{
-    Param([Parameter(Mandatory = $True, Position = 1)] $file,
-          [Parameter(Mandatory = $True, Position = 2)] $lines,
-          [Parameter(Mandatory = $True, Position = 3)] $imports)
-    
-    $lines = Remove-Empty-Lines($lines)
-    $relativePath = $file.FullName.Substring($targetDir.Length)
-    
-    foreach($line in $lines){
-      if ($line.Contains('#import ')){
-        $imports.Add($file.FullName)
-        break
-      }
-    }
-    
-    if ($relativePath.StartsWith("scripts\")){
-      $lines = (,("#" + $version) + $lines)
-    }
-    
-    [IO.File]::WriteAllLines($file.FullName, $lines)
-    Write-Host "Processed" $relativePath
-  }
-  
-  # Validation
-  
-  Check-Carriage-Return(Join-Path $targetDir "plugins\official\emoji-keyboard\emoji-ordering.txt")
-  
-  # Processing
-  
-  $imports = New-Object "System.Collections.Generic.List[string]"
-  
-  foreach($file in Get-ChildItem -Path $targetDir -Filter "*.js" -Exclude "configuration.default.js" -Recurse){
-    $lines = [IO.File]::ReadLines($file.FullName)
-    $lines = $lines | ForEach-Object { $_.TrimStart() }
-    $lines = $lines -Replace '^(.*?)((?<=^|[;{}()])\s?//(?:\s.*|$))?$', '$1'
-    $lines = $lines -Replace '(?<!\w)(return|throw)(\s.*?)? if (.*?);', 'if ($3)$1$2;'
-    Rewrite-File $file $lines $imports
-  }
-  
-  foreach($file in Get-ChildItem -Path $targetDir -Filter "*.css" -Recurse){
-    $lines = [IO.File]::ReadLines($file.FullName)
-    $lines = $lines -Replace '\s*/\*.*?\*/', ''
-    $lines = $lines -Replace '^(\S.*) {$', '$1{'
-    $lines = $lines -Replace '^\s+(.+?):\s*(.+?)(?:\s*(!important))?;$', '$1:$2$3;'
-    $lines = @((Remove-Empty-Lines($lines)) -Join ' ')
-    $lines = $lines -Replace '([{};])\s', '$1'
-    $lines = $lines -Replace ';}', '}'
-    Rewrite-File $file $lines $imports
-  }
-  
-  foreach($file in Get-ChildItem -Path $targetDir -Filter "*.html" -Recurse){
-    $lines = [IO.File]::ReadLines($file.FullName)
-    $lines = $lines | ForEach-Object { $_.TrimStart() }
-    Rewrite-File $file $lines $imports
-  }
-  
-  foreach($file in Get-ChildItem -Path (Join-Path $targetDir "plugins") -Filter "*.meta" -Recurse){
-    $lines = [IO.File]::ReadLines($file.FullName)
-    $lines = $lines -Replace '\{version\}', $version
-    Rewrite-File $file $lines $imports
-  }
-  
-  # Imports
-  
-  $importFolder = Join-Path $targetDir "scripts\imports"
-  
-  foreach($path in $imports){
-    $text = [IO.File]::ReadAllText($path)
-    $text = [Regex]::Replace($text, '#import "(.*?)"', {
-      $importPath = Join-Path $importFolder ($args[0].Groups[1].Value.Trim())
-      $importStr = [IO.File]::ReadAllText($importPath).TrimEnd()
-      
-      if ($importStr[0] -eq '#'){
-        $importStr = $importStr.Substring($importStr.IndexOf("`n") + 1)
-      }
-      
-      return $importStr
-    }, [System.Text.RegularExpressions.RegexOptions]::MultiLine)
-    
-    [IO.File]::WriteAllText($path, $text)
-    Write-Host "Resolved" $path.Substring($targetDir.Length)
-  }
-  
-  [IO.Directory]::Delete($importFolder, $True)
-  
-  # Finished
-  
-  $sw.Stop()
-  Write-Host "------------------"
-  Write-Host "Finished in" $([math]::Round($sw.Elapsed.TotalMilliseconds)) "ms"
-  Write-Host "------------------"
-  
-}catch{
-  Write-Host "Encountered an error while running PostBuild.ps1 on line" $_.InvocationInfo.ScriptLineNumber
-  Write-Host $_
-  Exit 1
-}

Resources/PostCefUpdate.ps1

@@ -10,10 +10,11 @@ try{
   $sharpMatch = Select-String -Path $mainProj '<Import Project="packages\\CefSharp\.Common\.(.*?)\\'
   $sharpVersion = $sharpMatch.Matches[0].Groups[1].Value
   
-  $propsFiles = "..\packages\CefSharp.Common.${sharpVersion}\build\CefSharp.Common.props",
+  $replaceWhenTag = "..\packages\CefSharp.Common.${sharpVersion}\build\CefSharp.Common.props",
-                "..\packages\CefSharp.WinForms.${sharpVersion}\build\CefSharp.WinForms.props"
+                    "..\packages\CefSharp.WinForms.${sharpVersion}\build\CefSharp.WinForms.props",
+                    "..\packages\CefSharp.WinForms.${sharpVersion}\build\CefSharp.WinForms.targets"
   
-  $targetFiles = "..\packages\CefSharp.Common.${sharpVersion}\build\CefSharp.Common.targets"
+  $replaceItemGroupTag = "..\packages\CefSharp.Common.${sharpVersion}\build\CefSharp.Common.targets"
   
   # Greetings
   
@@ -39,14 +40,14 @@ try{
   
   Write-Host "Removing x64 and AnyCPU from package files..."
   
-  foreach($file in $propsFiles){
+  foreach($file in $replaceWhenTag){
     $contents = [IO.File]::ReadAllText($file)
     $contents = $contents -Replace '(?<=<When Condition=")(''\$\(Platform\)'' == ''(AnyCPU|x64)'')(?=">)', 'false'
     
     [IO.File]::WriteAllText($file, $contents)
   }
   
-  foreach($file in $targetFiles){
+  foreach($file in $replaceItemGroupTag){
     $contents = [IO.File]::ReadAllText($file)
     $contents = $contents -Replace '(?<=<ItemGroup Condition=")(''\$\(Platform\)'' == ''(AnyCPU|x64)'')(?=">)', 'false'
     

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));
         }
@@ -87,7 +91,7 @@ namespace TweetDuck.Resources{
         #if DEBUG
         private static readonly string HotSwapProjectRoot = FixPathSlash(Path.GetFullPath(Path.Combine(Program.ProgramPath, "../../../")));
         private static readonly string HotSwapTargetDir = FixPathSlash(Path.Combine(HotSwapProjectRoot, "bin", "tmp"));
-        private static readonly string HotSwapRebuildScript = Path.Combine(HotSwapProjectRoot, "Resources", "PostBuild.ps1");
+        private static readonly string HotSwapRebuildScript = Path.Combine(HotSwapProjectRoot, "bld", "post_build.exe");
 
         static ScriptLoader(){
             if (File.Exists(HotSwapRebuildScript)){
@@ -110,8 +114,8 @@ namespace TweetDuck.Resources{
             Stopwatch sw = Stopwatch.StartNew();
 
             using(Process process = Process.Start(new ProcessStartInfo{
-                FileName = "powershell",
+                FileName = HotSwapRebuildScript,
-                Arguments = $"-ExecutionPolicy Unrestricted -File \"{HotSwapRebuildScript}\" \"{HotSwapTargetDir}\\\" \"{HotSwapProjectRoot}\\\" \"Debug\" \"{Program.VersionTag}\"",
+                Arguments = $"\"{HotSwapTargetDir}\\\" \"{HotSwapProjectRoot}\\\" \"Debug\" \"{Program.VersionTag}\"",
                 WindowStyle = ProcessWindowStyle.Hidden
             })){
                 // ReSharper disable once PossibleNullReferenceException
@@ -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
 

Resources/Scripts/code.js

@@ -1,14 +1,4 @@
 (function($TD, $TDX, $, TD){
-  //
-  // Variable: Current highlighted column jQuery & data objects.
-  //
-  let highlightedColumnEle, highlightedColumnObj;
-  
-  //
-  // Variable: Currently highlighted tweet jQuery & data objects.
-  //
-  let highlightedTweetEle, highlightedTweetObj;
-  
   //
   // Variable: Array of functions called after the website app is loaded.
   //
@@ -111,6 +101,53 @@
     }
   };
   
+  //
+  // Function: Returns an object containing data about the column below the cursor.
+  //
+  const getHoveredColumn = function(){
+    let hovered = document.querySelectorAll(":hover");
+    
+    for(let index = hovered.length-1; index >= 0; index--){
+      let ele = hovered[index];
+      
+      if (ele.tagName === "SECTION" && ele.classList.contains("js-column")){
+        let obj = TD.controller.columnManager.get(ele.getAttribute("data-column"));
+        
+        if (obj){
+          return { ele, obj };
+        }
+      }
+    }
+    
+    return null;
+  };
+  
+  //
+  // Function: Returns an object containing data about the tweet below the cursor.
+  //
+  const getHoveredTweet = function(){
+    let hovered = document.querySelectorAll(":hover");
+    
+    for(let index = hovered.length-1; index >= 0; index--){
+      let ele = hovered[index];
+      
+      if (ele.tagName === "ARTICLE" && ele.classList.contains("js-stream-item") && ele.hasAttribute("data-account-key")){
+        let column = getHoveredColumn();
+        
+        if (column){
+          let wrap = column.obj.findChirp(ele.getAttribute("data-key"));
+          let obj = column.obj.findChirp(ele.getAttribute("data-tweet-id")) || wrap;
+          
+          if (obj){
+            return { ele, obj, wrap, column };
+          }
+        }
+      }
+    }
+    
+    return null;
+  };
+  
   //
   // Function: Retrieves a property of an element with a specified class.
   //
@@ -208,6 +245,7 @@
       if (column.model.getHasNotification()){
         let sensitive = isSensitive(tweet);
         let previews = $TDX.notificationMediaPreviews && (!sensitive || TD.settings.getDisplaySensitiveMedia());
+        // TODO new cards don't have either previews or links
         
         let html = $(tweet.render({
           withFooter: false,
@@ -280,6 +318,7 @@
           html.children().first().addClass("td-notification-padded");
         }
         else if (type.includes("list_member")){
+          html.children().first().addClass("td-notification-padded td-notification-padded-alt");
           html.find(".activity-header").css("margin-top", "2px");
           html.find(".avatar").first().css("margin-bottom", "0");
         }
@@ -375,7 +414,7 @@
       let fontSizeName = TD.settings.getFontSize();
       let themeName = TD.settings.getTheme();
       
-      let columnBackground = getClassStyleProperty("column", "background-color");
+      let columnBackground = getClassStyleProperty("column-panel", "background-color");
       
       let tags = [
         "<html "+Array.prototype.map.call(document.documentElement.attributes, ele => `${ele.name}="${ele.value}"`).join(" ")+"><head>"
@@ -536,6 +575,31 @@
       data.setData("text/html", `<a href="${url}">${url}</a>`);
     });
     
+    if (ensurePropertyExists(TD, "services", "TwitterStatus", "prototype", "_generateHTMLText")){
+      TD.services.TwitterStatus.prototype._generateHTMLText = prependToFunction(TD.services.TwitterStatus.prototype._generateHTMLText, function(){
+        let card = this.card;
+        let entities = this.entities;
+        return if !(card && entities);
+        
+        let urls = entities.urls;
+        return if !(urls && urls.length);
+        
+        let shortUrl = card.url;
+        let urlObj = entities.urls.find(obj => obj.url === shortUrl && obj.expanded_url);
+        
+        if (urlObj){
+          let expandedUrl = urlObj.expanded_url;
+          card.url = expandedUrl;
+          
+          let values = card.binding_values;
+          
+          if (values && values.card_url){
+            values.card_url.string_value = expandedUrl;
+          }
+        }
+      });
+    }
+    
     if (ensurePropertyExists(TD, "services", "TwitterMedia", "prototype", "fromMediaEntity")){
       const prevFunc = TD.services.TwitterMedia.prototype.fromMediaEntity;
       
@@ -625,8 +689,11 @@
     $(document.body).delegate("a", "contextmenu", function(){
       let me = $(this)[0];
       
-      if (me.classList.contains("js-media-image-link") && highlightedTweetObj){
+      if (me.classList.contains("js-media-image-link")){
-        let tweet = highlightedTweetObj.hasMedia() ? highlightedTweetObj : highlightedTweetObj.quotedTweet;
+        let hovered = getHoveredTweet();
+        return if !hovered;
+        
+        let tweet = hovered.obj.hasMedia() ? hovered.obj : hovered.obj.quotedTweet;
         let media = tweet.getMedia().find(media => media.mediaId === me.getAttribute("data-media-entity-id"));
         
         if ((media.isVideo && media.service === "twitter") || media.isAnimatedGif){
@@ -639,7 +706,7 @@
       else if (me.classList.contains("js-gif-play")){
         $TD.setRightClickedLink("video", $(this).closest(".js-media-gif-container").find("video").attr("src"));
       }
-      else{
+      else if (me.hasAttribute("data-full-url")){
         $TD.setRightClickedLink("link", me.getAttribute("data-full-url"));
       }
     });
@@ -677,65 +744,37 @@
   };
   
   //
-  // Block: Update highlighted column and tweet for context menu and other functionality.
+  // Block: Add tweet-related options to the context menu.
   //
-  execSafe(function setupHighlightedColumn(){
+  execSafe(function setupTweetContextMenu(){
     throw 1 if !ensurePropertyExists(TD, "controller", "columnManager", "get");
     throw 2 if !ensurePropertyExists(TD, "services", "ChirpBase", "TWEET");
-    
+    throw 3 if !ensurePropertyExists(TD, "services", "TwitterActionFollow");
-    const updateHighlightedColumn = function(ele){
-      highlightedColumnEle = ele;
-      highlightedColumnObj = ele ? TD.controller.columnManager.get(ele.attr("data-column")) : null;
-      return !!highlightedColumnObj;
-    };
-    
-    const updateHighlightedTweet = function(ele, obj){
-      highlightedTweetEle = ele;
-      highlightedTweetObj = obj;
-    };
     
     const processMedia = function(chirp){
       return chirp.getMedia().filter(item => !item.isAnimatedGif).map(item => item.entity.media_url_https+":small").join(";");
     };
     
     app.delegate("section.js-column", {
-      mouseenter: function(){
-        if (!highlightedColumnObj){
-          updateHighlightedColumn($(this));
-        }
-      },
-      
-      mouseleave: function(){
-        updateHighlightedColumn(null);
-      },
-      
       contextmenu: function(){
-        let tweet = highlightedTweetObj;
+        let hovered = getHoveredTweet();
+        return if !hovered;
         
-        if (tweet && tweet.chirpType === TD.services.ChirpBase.TWEET){
+        let tweet = hovered.obj;
+        let quote = tweet.quotedTweet;
+        
+        if (tweet.chirpType === TD.services.ChirpBase.TWEET){
           let tweetUrl = tweet.getChirpURL();
-          let quoteUrl = tweet.quotedTweet ? tweet.quotedTweet.getChirpURL() : "";
+          let quoteUrl = quote && quote.getChirpURL();
-          let chirpAuthors = tweet.quotedTweet ? [ tweet.getMainUser().screenName, tweet.quotedTweet.getMainUser().screenName ].join(";") : tweet.getMainUser().screenName;
+          
-          let chirpImages = tweet.hasImage() ? processMedia(tweet) : tweet.quotedTweet && tweet.quotedTweet.hasImage() ? processMedia(tweet.quotedTweet) : "";
+          let chirpAuthors = quote ? [ tweet.getMainUser().screenName, quote.getMainUser().screenName ].join(";") : tweet.getMainUser().screenName;
+          let chirpImages = tweet.hasImage() ? processMedia(tweet) : quote && quote.hasImage() ? processMedia(quote) : "";
           
           $TD.setRightClickedChirp(tweetUrl || "", quoteUrl || "", chirpAuthors, chirpImages);
         }
+        else if (tweet instanceof TD.services.TwitterActionFollow){
+          $TD.setRightClickedLink("link", tweet.following.getProfileURL());
         }
-    });
-    
-    app.delegate("article.js-stream-item", {
-      mouseenter: function(){
-        let me = $(this);
-        return if !me[0].hasAttribute("data-account-key") || (!highlightedColumnObj && !updateHighlightedColumn(me.closest("section.js-column")));
-        
-        let tweet = highlightedColumnObj.findChirp(me.attr("data-tweet-id")) || highlightedColumnObj.findChirp(me.attr("data-key"));
-        return if !tweet;
-        
-        updateHighlightedTweet(me, tweet);
-      },
-      
-      mouseleave: function(){
-        updateHighlightedTweet(null, null);
       }
     });
   });
@@ -745,20 +784,20 @@
   //
   execSafe(function setupTweetScreenshot(){
     window.TDGF_triggerScreenshot = function(){
-      return if !highlightedTweetObj || !highlightedColumnObj;
+      let hovered = getHoveredTweet();
+      return if !hovered;
       
-      let chirp = highlightedColumnObj.findChirp(highlightedTweetEle.attr("data-key")) || highlightedTweetObj;
+      let columnWidth = $(hovered.column.ele).width();
+      let tweet = hovered.wrap || hovered.obj;
       
-      let columnWidth = highlightedColumnEle.width();
+      let html = $(tweet.render({
-      
-      let html = $(chirp.render({
         withFooter: false,
         withTweetActions: false,
         isInConvo: false,
         isFavorite: false,
         isRetweeted: false, // keeps retweet mark above tweet
         isPossiblySensitive: false,
-        mediaPreviewSize: highlightedColumnObj.getMediaPreviewSize()
+        mediaPreviewSize: hovered.column.obj.getMediaPreviewSize()
       }));
       
       html.find("footer").last().remove(); // apparently withTweetActions breaks for certain tweets, nice
@@ -786,12 +825,12 @@
       let gif = html.find(".js-media-gif-container");
       
       if (gif.length){
-        gif.css("background-image", 'url("'+chirp.getMedia()[0].small()+'")');
+        gif.css("background-image", 'url("'+tweet.getMedia()[0].small()+'")');
       }
       
-      let type = chirp.getChirpType();
+      let type = tweet.getChirpType();
       
-      if ((type.startsWith("favorite") || type.startsWith("retweet")) && chirp.isAboutYou()){
+      if ((type.startsWith("favorite") || type.startsWith("retweet")) && tweet.isAboutYou()){
         html.addClass("td-notification-padded");
       }
       
@@ -860,10 +899,11 @@
     };
     
     const tryCloseHighlightedColumn = function(){
-      if (highlightedColumnEle){
+      let column = getHoveredColumn();
-        let column = highlightedColumnEle.closest(".js-column");
+      return false if !column;
-        return (column.is(".is-shifted-2") && tryClickSelector(".js-tweet-social-proof-back", column)) || (column.is(".is-shifted-1") && tryClickSelector(".js-column-back", column));
+      
-      }
+      let ele = $(column.ele);
+      return ((ele.is(".is-shifted-2") && tryClickSelector(".js-tweet-social-proof-back", ele)) || (ele.is(".is-shifted-1") && tryClickSelector(".js-column-back", ele)));
     };
     
     window.TDGF_onMouseClickExtra = function(button){
@@ -879,8 +919,10 @@
         $(".is-shifted-1 .js-column-back").click();
       }
       else if (button === 2){ // forward button
-        if (highlightedTweetEle){
+        let hovered = getHoveredTweet();
-          highlightedTweetEle.children().first().click();
+        
+        if (hovered){
+          $(hovered.ele).children().first().click();
         }
       }
     };
@@ -1182,7 +1224,8 @@
         let src = !e.ctrlKey && getGifLink($(this).closest(".js-media-gif-container").find("video"));
         
         if (src){
-          window.TDGF_playVideo(src, getUsername(highlightedTweetObj));
+          let hovered = getHoveredTweet();
+          window.TDGF_playVideo(src, getUsername(hovered && hovered.obj));
         }
         else{
           $TD.openBrowser(getVideoTweetLink($(this)));
@@ -1469,15 +1512,52 @@
   //
   // Block: Fix DM notifications not showing if the conversation is open.
   //
-  if (ensurePropertyExists(TD, "services", "TwitterConversation", "prototype", "getUnreadChirps")){
+  if (ensurePropertyExists(TD, "vo", "Column", "prototype", "mergeMissingChirps")){
-    const prevFunc = TD.services.TwitterConversation.prototype.getUnreadChirps;
+    TD.vo.Column.prototype.mergeMissingChirps = prependToFunction(TD.vo.Column.prototype.mergeMissingChirps, function(e){
+      let model = this.model;
       
-    TD.services.TwitterConversation.prototype.getUnreadChirps = function(e){
+      if (model && model.state && model.state.type === "privateMe" && !this.notificationsDisabled && e.poller.feed.managed){
-      return (e && e.sortIndex && !e.id && !this.notificationsDisabled)
+        let unread = [];
-        ? this.messages.filter(t => t.chirpType === TD.services.ChirpBase.MESSAGE && !t.isOwnChirp() && !t.read && !t.belongsBelow(e)) // changed from belongsAbove
+        
-        : prevFunc.apply(this, arguments);
+        for(let chirp of e.chirps){
-    };
+          if (Array.isArray(chirp.messages)){
+            Array.prototype.push.apply(unread, chirp.messages.filter(message => message.read === false));
           }
+        }
+        
+        if (unread.length > 0){
+          if (ensurePropertyExists(TD, "util", "chirpReverseColumnSort")){
+            unread.sort(TD.util.chirpReverseColumnSort);
+          }
+          
+          for(let message of unread){
+            onNewTweet(this, message);
+          }
+          
+          // TODO sound notifications are borked as well
+          // TODO figure out what to do with missed notifications at startup
+        }
+      }
+    });
+  }
+  
+  //
+  // Block: Fix DMs not being marked as read when replying to them.
+  //
+  execSafe(function markRepliedDMsAsRead(){
+    throw 1 if !ensurePropertyExists(TD, "controller", "clients", "getClient");
+    throw 2 if !ensurePropertyExists(TD, "services", "Conversations", "prototype", "getConversation");
+    
+    $(document).on("dataDmSent", function(e, data){
+      let client = TD.controller.clients.getClient(data.request.accountKey);
+      return if !client;
+      
+      let conversation = client.conversations.getConversation(data.request.conversationId);
+      return if !conversation;
+      
+      conversation.markAsRead();
+    });
+  });
   
   //
   // Block: Limit amount of loaded DMs to avoid massive lag from re-opening them several times.
@@ -1555,79 +1635,12 @@
   // Block: Custom reload function with memory cleanup.
   //
   window.TDGF_reload = function(){
-    try{
-      let session = TD.storage.feedController.getAll()
-                      .filter(feed => !!feed.getTopSortIndex())
-                      .reduce((obj, feed) => (obj[feed.privateState.key] = feed.getTopSortIndex(), obj), {});
-      
-      $TD.setSessionData("gc", JSON.stringify(session)).then(() => {
     window.gc && window.gc();
     window.location.reload();
-      });
-    }catch(err){
-      $TD.crashDebug("Error saving session during a reload");
-      window.location.reload();
-    }
     
     window.TDGF_reload = function(){}; // redefine to prevent reloading multiple times
   };
   
-  if (window.TD_SESSION && window.TD_SESSION.gc){
-    let state;
-    
-    try{
-      state = JSON.parse(window.TD_SESSION.gc);
-    }catch(err){
-      $TD.crashDebug("Invalid session gc data: "+window.TD_SESSION.gc);
-      state = {};
-    }
-    
-    const showMissedNotifications = function(){
-      let tweets = [];
-      let columns = {};
-      
-      let tmp = new TD.services.ChirpBase;
-      
-      for(let column of Object.values(TD.controller.columnManager.getAll())){
-        for(let feed of column.getFeeds()){
-          if (feed.privateState.key in state){
-            tmp.sortIndex = state[feed.privateState.key];
-            
-            for(let tweet of [].concat.apply([], column.updateArray.map(function(chirp){
-              return chirp.getUnreadChirps(tmp);
-            }))){
-              tweets.push(tweet);
-              columns[tweet.id] = column;
-            }
-          }
-        }
-      }
-      
-      tweets.sort(TD.util.chirpReverseColumnSort);
-      
-      for(let tweet of tweets){
-        onNewTweet(columns[tweet.id], tweet);
-      }
-    };
-    
-    execSafe(function showMissedNotifications(){
-      throw 1 if !ensurePropertyExists(TD, "controller", "columnManager", "getAll");
-      
-      $(document).one("dataColumnsLoaded", function(){
-        let columns = Object.values(TD.controller.columnManager.getAll());
-        let remaining = columns.length;
-        
-        for(let column of columns){
-          column.ui.getChirpContainer().one("dataColumnFeedUpdated", () => {
-            if (--remaining === 0){
-              setTimeout(showMissedNotifications, 1);
-            }
-          });
-        }
-      });
-    });
-  }
-  
   //
   // Block: Disable default TweetDeck update notification.
   //
@@ -1662,8 +1675,6 @@
     onAppReady.forEach(func => execSafe(func));
     onAppReady = null;
     
-    delete window.TD_SESSION;
-    
     if (window.TD_PLUGINS){
       window.TD_PLUGINS.onReady();
     }

Resources/Scripts/notification.js

@@ -121,7 +121,6 @@
   //
   // Block: Setup a skip button.
   //
-  if (!document.body.hasAttribute("td-example-notification")){
   document.body.children[0].insertAdjacentHTML("beforeend", `
 <svg id="td-skip" width="10" height="17" viewBox="0 0 350 600">
   <path fill="#888" d="M0,151.656l102.208-102.22l247.777,247.775L102.208,544.986L0,442.758l145.546-145.547">
@@ -130,7 +129,6 @@
   document.getElementById("td-skip").addEventListener("click", function(){
     $TD.loadNextNotification();
   });
-  }
   
   //
   // Block: Setup a hover class on body.

Resources/Scripts/styles/browser.css

@@ -1,3 +1,11 @@
+/***********/
+/* General */
+/***********/
+
+body {
+  margin: 0;
+}
+
 /***********************/
 /* Redesign scrollbars */
 /***********************/
@@ -38,19 +46,23 @@
 /* Square-ify stuff */
 /********************/
 
-button, .btn, .mdl, .mdl-content, .popover, .lst-modal, .tooltip-inner {
+#tduck .compose-media-bar-remove .icon-close, #tduck .compose-media-grid-remove .icon-close {
+  border-radius: 2px !important;
+}
+
+button, .btn, .mdl, .mdl-content, .modal-content, .popover, .lst-modal, .tooltip-inner {
   border-radius: 1px !important;
 }
 
-.media-item, .media-preview, .media-image, .js-media-added .br--4, #tduck .compose-message-recipient img {
+.media-item, .media-preview, .media-image, .media-badge, .js-media-sensitive-overlay, .js-media-added .br--4, #tduck .compose-message-recipient img {
   border-radius: 1px !important;
 }
 
-.tweet-button, .app-search-fake, .app-search-input, .compose-text-container, .compose-reply-tweet, .compose-message-recipient-input-container, .compose-message-recipient, .compose-media-bar-holder, .media-grid-container, .js-quote-tweet-holder, .detail-view-inline-text {
+.tweet-button, .app-search-fake, .app-search-input, .compose-text-container, .compose-reply-tweet, .compose-message-recipient-input-container, .compose-message-recipient, .compose-media-bar-holder, .compose-media-bar-thumb, .media-grid-container, .js-add-image-description, .js-quote-tweet-holder, .detail-view-inline-text, .mdl-column-rhs {
   border-radius: 0 !important;
 }
 
-.dropdown-menu, .list-item-last, .quoted-tweet, input, textarea, select, .prf-header {
+.dropdown-menu, .list-item-last, .quoted-tweet, .hw-card-container > div, input, textarea, select, .prf-header {
   border-radius: 0 !important;
 }
 
@@ -174,23 +186,46 @@ html[data-td-theme='dark'] .stream-item:not(:hover) .js-user-actions-menu {
   opacity: 0.25;
 }
 
-.stream-item[data-key^="favorite"] .has-source-avatar .item-img, .stream-item[data-key^="retweet"] .has-source-avatar .item-img {
+.stream-item[data-key^="favorite"] .has-source-avatar .item-img,
+.stream-item[data-key^="retweet"] .has-source-avatar .item-img {
   position: absolute;
   left: 21px;
   top: 48px;
   width: 0 !important;
 }
 
-.stream-item[data-key^="favorite"] .has-source-avatar > .nbfc, .stream-item[data-key^="retweet"] .has-source-avatar > .nbfc {
+.stream-item[data-key^="favorite"] .has-source-avatar > .nbfc,
+.stream-item[data-key^="retweet"] .has-source-avatar > .nbfc {
   margin-left: 46px;
   line-height: unset !important;
 }
 
-.stream-item[data-key^="favorite"] .has-source-avatar > .nbfc > .avatar, .stream-item[data-key^="retweet"] .has-source-avatar > .nbfc > .avatar {
+.stream-item[data-key^="favorite"] .has-source-avatar > .nbfc > .avatar,
+.stream-item[data-key^="retweet"] .has-source-avatar > .nbfc > .avatar {
   position: absolute;
   margin-left: -34px;
 }
 
+.stream-item[data-key^="list_"] .activity-header .item-img {
+  position: relative;
+  left: 10px;
+  top: 2px;
+  width: 0 !important;
+}
+
+.stream-item[data-key^="list_"] .activity-header > .nbfc {
+  margin-left: 46px;
+  padding-bottom: 0 !important;
+  min-height: 30px !important;
+  line-height: unset !important;
+}
+
+.stream-item[data-key^="list_"] .activity-header > .nbfc > .avatar {
+  position: absolute;
+  margin-left: -34px;
+  padding-top: 1px;
+}
+
 /***********************/
 /* Tweaks for features */
 /***********************/
@@ -230,9 +265,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;
@@ -247,9 +282,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;
 }
 
@@ -361,7 +397,7 @@ a:not(.tweet-detail-action) .reply-triangle {
   display: none !important;
 }
 
-.column-message.is-actionable span:hover > .icon-small-valigned {
+.column-message.is-actionable > span:hover .icon {
   /* add a visual response when hovering individual filter icons; black theme uses a value of 20 */
   filter: saturate(10);
 }
@@ -386,6 +422,11 @@ a:not(.tweet-detail-action) .reply-triangle {
   border-width: 0 !important;
 }
 
+#actions-modal .mdl {
+  /* fix action dialog (RT, Add to List/Collection) width with small window size */
+  max-width: 100%;
+}
+
 /***************************************************************/
 /* Fix glaring visual issues that twitter hasn't fixed yet smh */
 /***************************************************************/
@@ -427,18 +468,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;
 }
 

Resources/Scripts/styles/notification.css

@@ -6,6 +6,7 @@ html, body {
   height: auto !important;
   overflow-x: hidden !important;
   overflow-y: auto !important;
+  margin: 0;
 }
 
 body::before {
@@ -36,7 +37,7 @@ body::before {
 /* Square-ify stuff */
 /********************/
 
-.media-item, .media-preview {
+.media-item, .media-preview, .media-badge {
   border-radius: 1px !important;
 }
 
@@ -122,6 +123,18 @@ html[data-td-font='smallest'] .fullname-badged:before, html[data-td-font='small'
   margin-left: -34px;
 }
 
+.td-notification-padded-alt .item-img {
+  /* td-notification-padded-alt is used alongside td-notification-padded to save space in the file */
+  position: relative;
+  left: 10px;
+  top: 2px;
+  width: 0 !important;
+}
+
+.td-notification-padded-alt .activity-header > .nbfc > .avatar {
+  padding-top: 1px;
+}
+
 /*********/
 /* Media */
 /*********/
@@ -159,6 +172,10 @@ html[data-td-font='smallest'] .fullname-badged:before, html[data-td-font='small'
   transition: opacity 0.15s ease;
 }
 
+.td-example #td-skip {
+  display: none;
+}
+
 .td-hover #td-skip {
   opacity: 0.75;
 }

TweetDuck.csproj

@@ -1,9 +1,9 @@
 <?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.67.0.0-CI2662\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.67.0.0-CI2662\build\CefSharp.WinForms.props')" />
+  <Import Project="packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.props')" />
-  <Import Project="packages\CefSharp.Common.67.0.0-CI2662\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.67.0.0-CI2662\build\CefSharp.Common.props')" />
+  <Import Project="packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.props')" />
-  <Import Project="packages\cef.redist.x86.3.3396.1777\build\cef.redist.x86.props" Condition="Exists('packages\cef.redist.x86.3.3396.1777\build\cef.redist.x86.props')" />
+  <Import Project="packages\cef.redist.x86.3.3396.1786\build\cef.redist.x86.props" Condition="Exists('packages\cef.redist.x86.3.3396.1786\build\cef.redist.x86.props')" />
-  <Import Project="packages\cef.redist.x64.3.3396.1777\build\cef.redist.x64.props" Condition="Exists('packages\cef.redist.x64.3.3396.1777\build\cef.redist.x64.props')" />
+  <Import Project="packages\cef.redist.x64.3.3396.1786\build\cef.redist.x64.props" Condition="Exists('packages\cef.redist.x64.3.3396.1786\build\cef.redist.x64.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -57,6 +57,7 @@
     <Compile Include="Configuration\Instance\FileConfigInstance.cs" />
     <Compile Include="Configuration\ConfigManager.cs" />
     <Compile Include="Configuration\Instance\IConfigInstance.cs" />
+    <Compile Include="Configuration\Instance\PluginConfigInstance.cs" />
     <Compile Include="Configuration\LockManager.cs" />
     <Compile Include="Configuration\SystemConfig.cs" />
     <Compile Include="Configuration\UserConfig.cs" />
@@ -95,7 +96,6 @@
     <Compile Include="Core\Handling\RequestHandlerBase.cs" />
     <Compile Include="Core\Handling\RequestHandlerBrowser.cs" />
     <Compile Include="Core\Handling\ResourceHandlerNotification.cs" />
-    <Compile Include="Core\Other\Interfaces\ITweetDeckBrowser.cs" />
     <Compile Include="Core\Management\ContextInfo.cs" />
     <Compile Include="Core\Notification\Example\FormNotificationExample.cs">
       <SubType>Form</SubType>
@@ -260,10 +260,11 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Plugins\Enums\PluginFolder.cs" />
+    <Compile Include="Plugins\IPluginConfig.cs" />
     <Compile Include="Plugins\Plugin.cs" />
     <Compile Include="Plugins\Events\PluginChangedStateEventArgs.cs" />
     <Compile Include="Plugins\PluginBridge.cs" />
-    <Compile Include="Plugins\PluginConfig.cs" />
+    <Compile Include="Configuration\PluginConfig.cs" />
     <Compile Include="Plugins\Enums\PluginEnvironment.cs" />
     <Compile Include="Plugins\Enums\PluginGroup.cs" />
     <Compile Include="Plugins\Events\PluginErrorEventArgs.cs" />
@@ -333,9 +334,9 @@
     <None Include="Resources\Images\icon-tray-new.ico" />
     <None Include="Resources\Images\icon-tray.ico" />
     <None Include="Resources\Images\spinner.apng" />
-    <None Include="Resources\PostBuild.ps1" />
     <None Include="Resources\Plugins\.debug\.meta" />
     <None Include="Resources\Plugins\.debug\browser.js" />
+    <None Include="Resources\Plugins\.debug\notification.js" />
     <None Include="Resources\Plugins\clear-columns\.meta" />
     <None Include="Resources\Plugins\clear-columns\browser.js" />
     <None Include="Resources\Plugins\edit-design\.meta" />
@@ -354,7 +355,10 @@
     <None Include="Resources\Plugins\templates\modal.html" />
     <None Include="Resources\Plugins\timeline-polls\.meta" />
     <None Include="Resources\Plugins\timeline-polls\browser.js" />
+    <None Include="Resources\PostBuild.fsx" />
+    <None Include="Resources\PostCefUpdate.ps1" />
     <None Include="Resources\Scripts\code.js" />
+    <None Include="Resources\Scripts\imports\markup\introduction.html" />
     <None Include="Resources\Scripts\imports\scripts\plugins.base.js" />
     <None Include="Resources\Scripts\imports\styles\introduction.css" />
     <None Include="Resources\Scripts\imports\styles\twitter.base.css" />
@@ -394,15 +398,22 @@ rmdir "$(ProjectDir)bin\Release"
 rmdir "$(TargetDir)scripts" /S /Q
 rmdir "$(TargetDir)plugins" /S /Q
 
-powershell -ExecutionPolicy Unrestricted -File "$(ProjectDir)Resources\PostBuild.ps1" "$(TargetDir)\" "$(ProjectDir)\" "$(ConfigurationName)"
+IF EXIST "$(ProjectDir)bld\post_build.exe" (
+  "$(ProjectDir)bld\post_build.exe" "$(TargetDir)\" "$(ProjectDir)\" "$(ConfigurationName)"
+) ELSE (
+  "$(DevEnvDir)CommonExtensions\Microsoft\FSharp\fsi.exe" "$(ProjectDir)Resources\PostBuild.fsx" --exec --nologo -- "$(TargetDir)\" "$(ProjectDir)\" "$(ConfigurationName)"
+)
 </PostBuildEvent>
   </PropertyGroup>
+  <Target Name="BeforeBuild" Condition="(!$([System.IO.File]::Exists(&quot;$(ProjectDir)\bld\post_build.exe&quot;)) OR ($([System.IO.File]::GetLastWriteTime(&quot;$(ProjectDir)\Resources\PostBuild.fsx&quot;).Ticks) &gt; $([System.IO.File]::GetLastWriteTime(&quot;$(ProjectDir)\bld\post_build.exe&quot;).Ticks)))">
+    <Exec Command="&quot;$(ProjectDir)bld\POST BUILD.bat&quot;" WorkingDirectory="$(ProjectDir)bld\" IgnoreExitCode="true" />
+  </Target>
   <Target Name="AfterBuild" Condition="$(ConfigurationName) == Release">
     <Exec Command="del &quot;$(TargetDir)*.pdb&quot;" />
     <Exec Command="del &quot;$(TargetDir)*.xml&quot;" />
     <Delete Files="$(TargetDir)CefSharp.BrowserSubprocess.exe" />
     <Delete Files="$(TargetDir)widevinecdmadapter.dll" />
-    <Exec Command="&quot;$(ProjectDir)bld\UPDATE ONLY.bat&quot;" WorkingDirectory="$(ProjectDir)bld\" IgnoreExitCode="true" />
+    <Exec Command="start &quot;&quot; /B &quot;ISCC.exe&quot; /Q &quot;$(ProjectDir)bld\gen_upd.iss&quot;" WorkingDirectory="$(ProjectDir)bld\" IgnoreExitCode="true" />
   </Target>
   <PropertyGroup>
     <PreBuildEvent>powershell Get-Process TweetDuck.Browser -ErrorAction SilentlyContinue ^| Where-Object {$_.Path -eq '$(TargetDir)TweetDuck.Browser.exe'} ^| Stop-Process; Exit 0</PreBuildEvent>
@@ -411,11 +422,13 @@ powershell -ExecutionPolicy Unrestricted -File "$(ProjectDir)Resources\PostBuild
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\cef.redist.x64.3.3396.1777\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.3.3396.1777\build\cef.redist.x64.props'))" />
+    <Error Condition="!Exists('packages\cef.redist.x64.3.3396.1786\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.3.3396.1786\build\cef.redist.x64.props'))" />
-    <Error Condition="!Exists('packages\cef.redist.x86.3.3396.1777\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.3.3396.1777\build\cef.redist.x86.props'))" />
+    <Error Condition="!Exists('packages\cef.redist.x86.3.3396.1786\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.3.3396.1786\build\cef.redist.x86.props'))" />
-    <Error Condition="!Exists('packages\CefSharp.Common.67.0.0-CI2662\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.67.0.0-CI2662\build\CefSharp.Common.props'))" />
+    <Error Condition="!Exists('packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.props'))" />
-    <Error Condition="!Exists('packages\CefSharp.Common.67.0.0-CI2662\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.67.0.0-CI2662\build\CefSharp.Common.targets'))" />
+    <Error Condition="!Exists('packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.targets'))" />
-    <Error Condition="!Exists('packages\CefSharp.WinForms.67.0.0-CI2662\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.67.0.0-CI2662\build\CefSharp.WinForms.props'))" />
+    <Error Condition="!Exists('packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.props'))" />
+    <Error Condition="!Exists('packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.targets'))" />
   </Target>
-  <Import Project="packages\CefSharp.Common.67.0.0-CI2662\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.67.0.0-CI2662\build\CefSharp.Common.targets')" />
+  <Import Project="packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.targets')" />
+  <Import Project="packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.targets" Condition="Exists('packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.targets')" />
 </Project>

Updates/UpdateHandler.cs

@@ -39,7 +39,7 @@ namespace TweetDuck.Updates{
 
             timer.Stop();
 
-            if (Program.UserConfig.EnableUpdateCheck){
+            if (Program.Config.User.EnableUpdateCheck){
                 DateTime now = DateTime.Now;
                 TimeSpan nextHour = now.AddSeconds(60*(60-now.Minute)-now.Second)-now;
 
@@ -53,7 +53,7 @@ namespace TweetDuck.Updates{
         }
 
         public int Check(bool force){
-            if (Program.UserConfig.EnableUpdateCheck || force){
+            if (Program.Config.User.EnableUpdateCheck || force){
                 int nextEventId = unchecked(++lastEventId);
                 Task<UpdateInfo> checkTask = client.Check();
 

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 => {

bld/POST BUILD.bat

@@ -0,0 +1,16 @@
+@ECHO OFF
+
+DEL "post_build.exe"
+
+SET fsc="%PROGRAMFILES(x86)%\Microsoft SDKs\F#\10.1\Framework\v4.0\fsc.exe"
+
+IF NOT EXIST %fsc% (
+  SET fsc="%PROGRAMFILES%\Microsoft SDKs\F#\10.1\Framework\v4.0\fsc.exe"
+)
+
+IF NOT EXIST %fsc% (
+  ECHO fsc.exe not found
+  EXIT 1
+)
+
+%fsc% --standalone --deterministic --preferreduilang:en-US --platform:x86 --target:exe --out:post_build.exe "%~dp0..\Resources\PostBuild.fsx"

bld/UPDATE ONLY.bat

@@ -1 +0,0 @@
-start "" /B "ISCC.exe" /Q "gen_upd.iss"

bld/gen_upd.iss

@@ -220,10 +220,19 @@ begin
 end;
 
 { Return whether the version of the installed libcef.dll library matches internal one. }
+{ TODO: Remove workaround that forces full installation for 1.15 and older eventually. }
 function TDIsMatchingCEFVersion: Boolean;
 var CEFVersion: String;
+var TDVersionMS: Cardinal;
+var TDVersionLS: Cardinal;
 
 begin
+  if (GetVersionNumbers(UpdatePath+'TweetDuck.exe', TDVersionMS, TDVersionLS)) and ((TDVersionMS and $FFFF) < 16) then
+  begin
+    Result := False
+    Exit
+  end;
+  
   Result := (GetVersionNumbersString(UpdatePath+'libcef.dll', CEFVersion) and (CompareStr(CEFVersion, '{#CefVersion}') = 0))
 end;
 

packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.redist.x64" version="3.3396.1777" targetFramework="net452" />
+  <package id="cef.redist.x64" version="3.3396.1786" targetFramework="net452" />
-  <package id="cef.redist.x86" version="3.3396.1777" targetFramework="net452" />
+  <package id="cef.redist.x86" version="3.3396.1786" targetFramework="net452" />
-  <package id="CefSharp.Common" version="67.0.0-CI2662" targetFramework="net452" />
+  <package id="CefSharp.Common" version="67.0.0-pre01" targetFramework="net452" />
-  <package id="CefSharp.WinForms" version="67.0.0-CI2662" targetFramework="net452" />
+  <package id="CefSharp.WinForms" version="67.0.0-pre01" targetFramework="net452" />
 </packages>

subprocess/TweetDuck.Browser.csproj

@@ -28,7 +28,7 @@
   <ItemGroup>
     <Reference Include="CefSharp.BrowserSubprocess.Core, Version=67.0.0.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\CefSharp.Common.67.0.0-CI2662\CefSharp\x86\CefSharp.BrowserSubprocess.Core.dll</HintPath>
+      <HintPath>..\packages\CefSharp.Common.67.0.0-pre01\CefSharp\x86\CefSharp.BrowserSubprocess.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>