Release 1.18.2

Closes #286

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+patreon: chylex
+ko_fi: chylex

Configuration/Arguments.cs

@@ -1,5 +1,5 @@
 using System;
-using TweetDuck.Data;
+using TweetLib.Core.Collections;
 
 namespace TweetDuck.Configuration{
     static class Arguments{
@@ -7,6 +7,7 @@ namespace TweetDuck.Configuration{
         public const string ArgDataFolder = "-datafolder";
         public const string ArgLogging = "-log";
         public const string ArgIgnoreGDPR = "-nogdpr";
+        public const string ArgFreeze = "-freeze";
 
         // internal args
         public const string ArgRestart = "-restart";
@@ -21,8 +22,8 @@ namespace TweetDuck.Configuration{
             return Current.HasFlag(flag);
         }
 
-        public static string GetValue(string key, string defaultValue){
-            return Current.GetValue(key, defaultValue);
+        public static string GetValue(string key){
+            return Current.GetValue(key);
         }
 
         public static CommandLineArgs GetCurrentClean(){

Configuration/ConfigManager.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections.Generic;
 using System.Drawing;
-using TweetDuck.Configuration.Instance;
-using TweetDuck.Core.Utils;
 using TweetDuck.Data;
-using TweetDuck.Data.Serialization;
+using TweetLib.Core.Features.Configuration;
+using TweetLib.Core.Features.Plugins.Config;
+using TweetLib.Core.Serialization.Converters;
+using TweetLib.Core.Utils;
 
 namespace TweetDuck.Configuration{
-    sealed class ConfigManager{
+    sealed class ConfigManager : IConfigManager{
         public UserConfig User { get; }
         public SystemConfig System { get; }
         public PluginConfig Plugins { get; }
@@ -16,7 +16,7 @@ namespace TweetDuck.Configuration{
 
         private readonly FileConfigInstance<UserConfig> infoUser;
         private readonly FileConfigInstance<SystemConfig> infoSystem;
-        private readonly PluginConfigInstance infoPlugins;
+        private readonly PluginConfigInstance<PluginConfig> infoPlugins;
 
         private readonly IConfigInstance<BaseConfig>[] infoList;
 
@@ -28,7 +28,7 @@ namespace TweetDuck.Configuration{
             infoList = new IConfigInstance<BaseConfig>[]{
                 infoUser = new FileConfigInstance<UserConfig>(Program.UserConfigFilePath, User, "program options"),
                 infoSystem = new FileConfigInstance<SystemConfig>(Program.SystemConfigFilePath, System, "system options"),
-                infoPlugins = new PluginConfigInstance(Program.PluginConfigFilePath, Plugins)
+                infoPlugins = new PluginConfigInstance<PluginConfig>(Program.PluginConfigFilePath, Plugins)
             };
 
             // TODO refactor further
@@ -70,59 +70,13 @@ namespace TweetDuck.Configuration{
             infoPlugins.Reload();
         }
 
-        private void TriggerProgramRestartRequested(){
+        void IConfigManager.TriggerProgramRestartRequested(){
             ProgramRestartRequested?.Invoke(this, EventArgs.Empty);
         }
 
-        private IConfigInstance<BaseConfig> GetInstanceInfo(BaseConfig instance){
+        IConfigInstance<BaseConfig> IConfigManager.GetInstanceInfo(BaseConfig instance){
             Type instanceType = instance.GetType();
             return Array.Find(infoList, info => info.Instance.GetType() == instanceType); // TODO handle null
         }
-
-        public abstract class BaseConfig{
-            private readonly ConfigManager configManager;
-
-            protected BaseConfig(ConfigManager configManager){
-                this.configManager = configManager;
-            }
-
-            // Management
-
-            public void Save(){
-                configManager.GetInstanceInfo(this).Save();
-            }
-
-            public void Reload(){
-                configManager.GetInstanceInfo(this).Reload();
-            }
-
-            public void Reset(){
-                configManager.GetInstanceInfo(this).Reset();
-            }
-
-            // Construction methods
-
-            public T ConstructWithDefaults<T>() where T : BaseConfig{
-                return ConstructWithDefaults(configManager) as T;
-            }
-
-            protected abstract BaseConfig ConstructWithDefaults(ConfigManager configManager);
-
-            // Utility methods
-
-            protected void UpdatePropertyWithEvent<T>(ref T field, T value, EventHandler eventHandler){
-                if (!EqualityComparer<T>.Default.Equals(field, value)){
-                    field = value;
-                    eventHandler?.Invoke(this, EventArgs.Empty);
-                }
-            }
-
-            protected void UpdatePropertyWithRestartRequest<T>(ref T field, T value){
-                if (!EqualityComparer<T>.Default.Equals(field, value)){
-                    field = value;
-                    configManager.TriggerProgramRestartRequested();
-                }
-            }
-        }
     }
 }

Configuration/Instance/PluginConfigInstance.cs

@@ -1,69 +0,0 @@
-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

@@ -1,21 +1,42 @@
 using System;
 using System.Collections.Generic;
-using TweetDuck.Plugins;
-using TweetDuck.Plugins.Events;
+using TweetLib.Core.Features.Configuration;
+using TweetLib.Core.Features.Plugins;
+using TweetLib.Core.Features.Plugins.Config;
+using TweetLib.Core.Features.Plugins.Events;
 
 namespace TweetDuck.Configuration{
-    sealed class PluginConfig : ConfigManager.BaseConfig, IPluginConfig{
+    sealed class PluginConfig : BaseConfig, IPluginConfig{
         private static readonly string[] DefaultDisabled = {
             "official/clear-columns",
             "official/reply-account"
         };
 
-        // CONFIGURATION
+        // CONFIGURATION DATA
 
-        public IEnumerable<string> DisabledPlugins => disabled;
+        private readonly HashSet<string> disabled = new HashSet<string>(DefaultDisabled);
+
+        // EVENTS
         
         public event EventHandler<PluginChangedStateEventArgs> PluginChangedState;
         
+        // END OF CONFIG
+
+        public PluginConfig(IConfigManager configManager) : base(configManager){}
+
+        protected override BaseConfig ConstructWithDefaults(IConfigManager configManager){
+            return new PluginConfig(configManager);
+        }
+
+        // INTERFACE IMPLEMENTATION
+
+        IEnumerable<string> IPluginConfig.DisabledPlugins => disabled;
+
+        void IPluginConfig.Reset(IEnumerable<string> newDisabledPlugins){
+            disabled.Clear();
+            disabled.UnionWith(newDisabledPlugins);
+        }
+
         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));
@@ -26,20 +47,5 @@ namespace TweetDuck.Configuration{
         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/SystemConfig.cs

@@ -1,5 +1,7 @@
-namespace TweetDuck.Configuration{
-    sealed class SystemConfig : ConfigManager.BaseConfig{
+using TweetLib.Core.Features.Configuration;
+
+namespace TweetDuck.Configuration{
+    sealed class SystemConfig : BaseConfig{
 
         // CONFIGURATION DATA
         
@@ -17,9 +19,9 @@
         
         // END OF CONFIG
 
-        public SystemConfig(ConfigManager configManager) : base(configManager){}
+        public SystemConfig(IConfigManager configManager) : base(configManager){}
 
-        protected override ConfigManager.BaseConfig ConstructWithDefaults(ConfigManager configManager){
+        protected override BaseConfig ConstructWithDefaults(IConfigManager configManager){
             return new SystemConfig(configManager);
         }
     }

Configuration/UserConfig.cs

@@ -1,13 +1,14 @@
 using System;
 using System.Drawing;
 using TweetDuck.Core.Controls;
-using TweetDuck.Core.Notification;
 using TweetDuck.Core.Other;
-using TweetDuck.Core.Utils;
 using TweetDuck.Data;
+using TweetLib.Core.Features.Configuration;
+using TweetLib.Core.Features.Notifications;
+using TweetLib.Core.Features.Twitter;
 
 namespace TweetDuck.Configuration{
-    sealed class UserConfig : ConfigManager.BaseConfig{
+    sealed class UserConfig : BaseConfig{
         
         // CONFIGURATION DATA
 
@@ -18,6 +19,7 @@ namespace TweetDuck.Configuration{
         public Size PluginsWindowSize    { get; set; } = Size.Empty;
 
         public bool ExpandLinksOnHover        { get; set; } = true;
+        public bool FocusDmInput              { get; set; } = true;
         public bool OpenSearchInFirstColumn   { get; set; } = true;
         public bool KeepLikeFollowDialogsOpen { get; set; } = true;
         public bool BestImageQuality          { get; set; } = true;
@@ -55,12 +57,12 @@ namespace TweetDuck.Configuration{
         public bool NotificationTimerCountDown { get; set; } = false;
         public int NotificationDurationValue   { get; set; } = 25;
 
-        public TweetNotification.Position NotificationPosition { get; set; } = TweetNotification.Position.TopRight;
+        public DesktopNotification.Position NotificationPosition { get; set; } = DesktopNotification.Position.TopRight;
         public Point CustomNotificationPosition                  { get; set; } = ControlExtensions.InvisibleLocation;
         public int NotificationDisplay                           { get; set; } = 0;
         public int NotificationEdgeDistance                      { get; set; } = 8;
 
-        public TweetNotification.Size NotificationSize { get; set; } = TweetNotification.Size.Auto;
+        public DesktopNotification.Size NotificationSize { get; set; } = DesktopNotification.Size.Auto;
         public Size CustomNotificationSize               { get; set; } = Size.Empty;
         public int NotificationScrollSpeed               { get; set; } = 100;
         
@@ -78,7 +80,7 @@ namespace TweetDuck.Configuration{
         public bool IsCustomNotificationSizeSet => CustomNotificationSize != Size.Empty;
         public bool IsCustomSoundNotificationSet => NotificationSoundPath != string.Empty;
 
-        public TwitterUtils.ImageQuality TwitterImageQuality => BestImageQuality ? TwitterUtils.ImageQuality.Orig : TwitterUtils.ImageQuality.Default;
+        public ImageQuality TwitterImageQuality => BestImageQuality ? ImageQuality.Best : ImageQuality.Default;
         
         public string NotificationSoundPath{
             get => _notificationSoundPath ?? string.Empty;
@@ -134,9 +136,9 @@ namespace TweetDuck.Configuration{
 
         // END OF CONFIG
         
-        public UserConfig(ConfigManager configManager) : base(configManager){}
+        public UserConfig(IConfigManager configManager) : base(configManager){}
 
-        protected override ConfigManager.BaseConfig ConstructWithDefaults(ConfigManager configManager){
+        protected override BaseConfig ConstructWithDefaults(IConfigManager configManager){
             return new UserConfig(configManager);
         }
     }

Core/Adapters/CefScriptExecutor.cs

@@ -0,0 +1,41 @@
+using System.IO;
+using CefSharp;
+using TweetLib.Core.Browser;
+
+namespace TweetDuck.Core.Adapters{
+    sealed class CefScriptExecutor : IScriptExecutor{
+        private readonly IWebBrowser browser;
+
+        public CefScriptExecutor(IWebBrowser browser){
+            this.browser = browser;
+        }
+
+        public void RunFunction(string name, params object[] args){
+            browser.ExecuteScriptAsync(name, args);
+        }
+
+        public void RunScript(string identifier, string script){
+            using IFrame frame = browser.GetMainFrame();
+            RunScript(frame, script, identifier);
+        }
+
+        public bool RunFile(string file){
+            using IFrame frame = browser.GetMainFrame();
+            return RunFile(frame, file);
+        }
+
+        // Helpers
+
+        public static void RunScript(IFrame frame, string script, string identifier){
+            if (script != null){
+                frame.ExecuteJavaScriptAsync(script, identifier, 1);
+            }
+        }
+
+        public static bool RunFile(IFrame frame, string file){
+            string script = Program.Resources.Load(file);
+            RunScript(frame, script, "root:" + Path.GetFileNameWithoutExtension(file));
+            return script != null;
+        }
+    }
+}

Core/Bridge/PropertyBridge.cs

@@ -8,8 +8,8 @@ namespace TweetDuck.Core.Bridge{
         }
 
         public static string GenerateScript(Environment environment){
-            string Bool(bool value) => value ? "true;" : "false;";
-            string Str(string value) => '"'+value+"\";";
+            static string Bool(bool value) => value ? "true;" : "false;";
+            static string Str(string value) => $"\"{value}\";";
 
             UserConfig config = Program.Config.User;
             StringBuilder build = new StringBuilder(128).Append("(function(x){");
@@ -17,6 +17,7 @@ namespace TweetDuck.Core.Bridge{
             build.Append("x.expandLinksOnHover=").Append(Bool(config.ExpandLinksOnHover));
             
             if (environment == Environment.Browser){
+                build.Append("x.focusDmInput=").Append(Bool(config.FocusDmInput));
                 build.Append("x.openSearchInFirstColumn=").Append(Bool(config.OpenSearchInFirstColumn));
                 build.Append("x.keepLikeFollowDialogsOpen=").Append(Bool(config.KeepLikeFollowDialogsOpen));
                 build.Append("x.muteNotifications=").Append(Bool(config.MuteNotifications));

Core/Bridge/TweetDeckBridge.cs

@@ -1,18 +1,18 @@
-using System.Windows.Forms;
+using System.Diagnostics.CodeAnalysis;
+using System.Windows.Forms;
 using TweetDuck.Core.Controls;
-using TweetDuck.Core.Management;
+using TweetDuck.Core.Handling;
 using TweetDuck.Core.Notification;
 using TweetDuck.Core.Other;
 using TweetDuck.Core.Utils;
+using TweetLib.Core.Features.Notifications;
 
 namespace TweetDuck.Core.Bridge{
+    [SuppressMessage("ReSharper", "UnusedMember.Global")]
     class TweetDeckBridge{
-        public static string FontSize { get; private set; }
-        public static string NotificationHeadLayout { get; private set; }
-        public static readonly ContextInfo ContextInfo = new ContextInfo();
-
         public static void ResetStaticProperties(){
-            FontSize = NotificationHeadLayout = null;
+            FormNotificationBase.FontSize = null;
+            FormNotificationBase.HeadLayout = null;
         }
 
         private readonly FormBrowser form;
@@ -44,17 +44,17 @@ namespace TweetDuck.Core.Bridge{
 
             public void LoadNotificationLayout(string fontSize, string headLayout){
                 form.InvokeAsyncSafe(() => {
-                    FontSize = fontSize;
-                    NotificationHeadLayout = headLayout;
+                    FormNotificationBase.FontSize = fontSize;
+                    FormNotificationBase.HeadLayout = headLayout;
                 });
             }
 
             public void SetRightClickedLink(string type, string url){
-                ContextInfo.SetLink(type, url);
+                ContextMenuBase.CurrentInfo.SetLink(type, url);
             }
 
             public void SetRightClickedChirp(string tweetUrl, string quoteUrl, string chirpAuthors, string chirpImages){
-                ContextInfo.SetChirp(tweetUrl, quoteUrl, chirpAuthors, chirpImages);
+                ContextMenuBase.CurrentInfo.SetChirp(tweetUrl, quoteUrl, chirpAuthors, chirpImages);
             }
 
             public void DisplayTooltip(string text){
@@ -85,7 +85,7 @@ namespace TweetDuck.Core.Bridge{
         public void OnTweetPopup(string columnId, string chirpId, string columnName, string tweetHtml, int tweetCharacters, string tweetUrl, string quoteUrl){
             notification.InvokeAsyncSafe(() => {
                 form.OnTweetNotification();
-                notification.ShowNotification(new TweetNotification(columnId, chirpId, columnName, tweetHtml, tweetCharacters, tweetUrl, quoteUrl));
+                notification.ShowNotification(new DesktopNotification(columnId, chirpId, columnName, tweetHtml, tweetCharacters, tweetUrl, quoteUrl));
             });
         }
 
@@ -117,14 +117,12 @@ namespace TweetDuck.Core.Bridge{
         }
 
         public void Alert(string type, string contents){
-            MessageBoxIcon icon;
-
-            switch(type){
-                case "error": icon = MessageBoxIcon.Error; break;
-                case "warning": icon = MessageBoxIcon.Warning; break;
-                case "info": icon = MessageBoxIcon.Information; break;
-                default: icon = MessageBoxIcon.None; break;
-            }
+            MessageBoxIcon icon = type switch{
+                "error"   => MessageBoxIcon.Error,
+                "warning" => MessageBoxIcon.Warning,
+                "info"    => MessageBoxIcon.Information,
+                _         => MessageBoxIcon.None
+            };
 
             FormMessage.Show("TweetDuck Browser Message", contents, icon, FormMessage.OK);
         }

Core/Bridge/UpdateBridge.cs

@@ -1,9 +1,11 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
-using TweetDuck.Updates;
+using TweetLib.Core.Features.Updates;
 
 namespace TweetDuck.Core.Bridge{
+    [SuppressMessage("ReSharper", "UnusedMember.Global")]
     class UpdateBridge{
         private readonly UpdateHandler updates;
         private readonly Control sync;
@@ -11,7 +13,6 @@ namespace TweetDuck.Core.Bridge{
         private UpdateInfo nextUpdate = null;
 
         public event EventHandler<UpdateInfo> UpdateAccepted;
-        public event EventHandler<UpdateInfo> UpdateDelayed;
         public event EventHandler<UpdateInfo> UpdateDismissed;
 
         public UpdateBridge(UpdateHandler updates, Control sync){
@@ -54,10 +55,6 @@ namespace TweetDuck.Core.Bridge{
             HandleInteractionEvent(UpdateAccepted);
         }
 
-        public void OnUpdateDelayed(){
-            HandleInteractionEvent(UpdateDelayed);
-        }
-
         public void OnUpdateDismissed(){
             HandleInteractionEvent(UpdateDismissed);
 

Core/Controls/ControlExtensions.cs

@@ -21,9 +21,8 @@ namespace TweetDuck.Core.Controls{
         }
 
         public static float GetDPIScale(this Control control){
-            using(Graphics graphics = control.CreateGraphics()){
-                return graphics.DpiY/96F;
-            }
+            using Graphics graphics = control.CreateGraphics();
+            return graphics.DpiY / 96F;
         }
 
         public static bool IsFullyOutsideView(this Form form){
@@ -31,17 +30,17 @@ namespace TweetDuck.Core.Controls{
         }
 
         public static void MoveToCenter(this Form targetForm, Form parentForm){
-            targetForm.Location = new Point(parentForm.Location.X+parentForm.Width/2-targetForm.Width/2, parentForm.Location.Y+parentForm.Height/2-targetForm.Height/2);
+            targetForm.Location = new Point(parentForm.Location.X + (parentForm.Width / 2) - (targetForm.Width / 2), parentForm.Location.Y + (parentForm.Height / 2) - (targetForm.Height / 2));
         }
 
         public static void SetValueInstant(this ProgressBar bar, int value){
             if (value == bar.Maximum){
                 bar.Value = value;
-                bar.Value = value-1;
+                bar.Value = value - 1;
                 bar.Value = value;
             }
             else{
-                bar.Value = value+1;
+                bar.Value = value + 1;
                 bar.Value = value;
             }
         }
@@ -60,10 +59,11 @@ namespace TweetDuck.Core.Controls{
 
         public static bool AlignValueToTick(this TrackBar trackBar){
             if (trackBar.Value % trackBar.SmallChange != 0){
-                trackBar.Value = trackBar.SmallChange*(int)Math.Floor(((double)trackBar.Value/trackBar.SmallChange)+0.5);
+                trackBar.Value = trackBar.SmallChange * (int)Math.Floor(((double)trackBar.Value / trackBar.SmallChange) + 0.5);
                 return false;
             }
-            else return true;
+
+            return true;
         }
 
         public static void EnableMultilineShortcuts(this TextBox textBox){

Core/Controls/FlatProgressBar.cs

@@ -23,7 +23,7 @@ namespace TweetDuck.Core.Controls{
             }
 
             Rectangle rect = e.ClipRectangle;
-            rect.Width = (int)(rect.Width*((double)Value/Maximum));
+            rect.Width = (int)(rect.Width * ((double)Value / Maximum));
             e.Graphics.FillRectangle(brush, rect);
         }
 

Core/Controls/FlowLayoutPanelNoHScroll.cs

@@ -1,13 +1,8 @@
 using System.Windows.Forms;
 using TweetDuck.Core.Utils;
 
-namespace TweetDuck.Plugins.Controls{
-    sealed class PluginListFlowLayout : FlowLayoutPanel{
-        public PluginListFlowLayout(){
-            FlowDirection = FlowDirection.TopDown;
-            WrapContents = false;
-        }
-
+namespace TweetDuck.Core.Controls{
+    sealed class FlowLayoutPanelNoHScroll : FlowLayoutPanel{
         protected override void WndProc(ref Message m){
             if (m.Msg == 0x85){ // WM_NCPAINT
                 NativeMethods.ShowScrollBar(Handle, NativeMethods.SB_HORZ, false); // basically fuck the horizontal scrollbar very much

Core/Controls/LabelVertical.cs

@@ -7,17 +7,16 @@ namespace TweetDuck.Core.Controls{
         public int LineHeight { get; set; }
 
         protected override void OnPaint(PaintEventArgs e){
-            int y = (int)Math.Floor((ClientRectangle.Height-Text.Length*LineHeight)/2F)-1;
+            int y = (int)Math.Floor((ClientRectangle.Height - Text.Length * LineHeight) / 2F) - 1;
+            using Brush brush = new SolidBrush(ForeColor);
 
-            using(Brush brush = new SolidBrush(ForeColor)){
             foreach(char chr in Text){
                 string str = chr.ToString();
-                    float x = (ClientRectangle.Width-e.Graphics.MeasureString(str, Font).Width)/2F;
+                float x = (ClientRectangle.Width - e.Graphics.MeasureString(str, Font).Width) / 2F;
 
                 e.Graphics.DrawString(str, Font, brush, x, y);
                 y += LineHeight;
             }
         }
     }
-    }
 }

Core/FormBrowser.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Diagnostics;
 using System.Drawing;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
 using TweetDuck.Core.Bridge;
@@ -13,10 +15,10 @@ using TweetDuck.Core.Other;
 using TweetDuck.Core.Other.Analytics;
 using TweetDuck.Core.Other.Settings.Dialogs;
 using TweetDuck.Core.Utils;
-using TweetDuck.Plugins;
-using TweetDuck.Plugins.Events;
-using TweetDuck.Resources;
 using TweetDuck.Updates;
+using TweetLib.Core.Features.Plugins;
+using TweetLib.Core.Features.Plugins.Events;
+using TweetLib.Core.Features.Updates;
 
 namespace TweetDuck.Core{
     sealed partial class FormBrowser : Form, AnalyticsFile.IProvider{
@@ -63,7 +65,7 @@ namespace TweetDuck.Core{
 
             Text = Program.BrandName;
             
-            this.plugins = new PluginManager(Program.Config.Plugins, Program.PluginPath);
+            this.plugins = new PluginManager(Program.Config.Plugins, Program.PluginPath, Program.PluginDataPath);
             this.plugins.Reloaded += plugins_Reloaded;
             this.plugins.Executed += plugins_Executed;
             this.plugins.Reload();
@@ -71,12 +73,11 @@ namespace TweetDuck.Core{
             this.notification = new FormNotificationTweet(this, plugins);
             this.notification.Show();
             
-            this.updates = new UpdateHandler(Program.InstallerPath);
+            this.updates = new UpdateHandler(new UpdateCheckClient(Program.InstallerPath), TaskScheduler.FromCurrentSynchronizationContext());
             this.updates.CheckFinished += updates_CheckFinished;
 
             this.updateBridge = new UpdateBridge(updates, this);
             this.updateBridge.UpdateAccepted += updateBridge_UpdateAccepted;
-            this.updateBridge.UpdateDelayed += updateBridge_UpdateDelayed;
             this.updateBridge.UpdateDismissed += updateBridge_UpdateDismissed;
 
             this.browser = new TweetDeckBrowser(this, plugins, new TweetDeckBridge.Browser(this, notification), updateBridge);
@@ -234,7 +235,9 @@ namespace TweetDuck.Core{
         
         private void plugins_Reloaded(object sender, PluginErrorEventArgs e){
             if (e.HasErrors){
-                FormMessage.Error("Error Loading Plugins", "The following plugins will not be available until the issues are resolved:\n\n"+string.Join("\n\n", e.Errors), FormMessage.OK);
+                this.InvokeAsyncSafe(() => { // TODO not needed but makes code consistent...
+                    FormMessage.Error("Error Loading Plugins", "The following plugins will not be available until the issues are resolved:\n\n" + string.Join("\n\n", e.Errors), FormMessage.OK);
+                });
             }
 
             if (isLoaded){
@@ -242,9 +245,11 @@ namespace TweetDuck.Core{
             }
         }
         
-        private static void plugins_Executed(object sender, PluginErrorEventArgs e){
+        private void plugins_Executed(object sender, PluginErrorEventArgs e){
             if (e.HasErrors){
-                FormMessage.Error("Error Executing Plugins", "Failed to execute the following plugins:\n\n"+string.Join("\n\n", e.Errors), FormMessage.OK);
+                this.InvokeAsyncSafe(() => {
+                    FormMessage.Error("Error Executing Plugins", "Failed to execute the following plugins:\n\n" + string.Join("\n\n", e.Errors), FormMessage.OK);
+                });
             }
         }
 
@@ -284,7 +289,7 @@ namespace TweetDuck.Core{
                     UpdateInstallerPath = update.InstallerPath;
                     ForceClose();
                 }
-                else if (status != UpdateDownloadStatus.Canceled && FormMessage.Error("Update Has Failed", "Could not automatically download the update: "+(update.DownloadError?.Message ?? "unknown error")+"\n\nWould you like to open the website and try downloading the update manually?", FormMessage.Yes, FormMessage.No)){
+                else if (status != UpdateDownloadStatus.Canceled && FormMessage.Error("Update Has Failed", "Could not automatically download the update: " + (update.DownloadError?.Message ?? "unknown error") + "\n\nWould you like to open the website and try downloading the update manually?", FormMessage.Yes, FormMessage.No)){
                     BrowserUtils.OpenExternalBrowser(Program.Website);
                     ForceClose();
                 }
@@ -317,10 +322,6 @@ namespace TweetDuck.Core{
             }
         }
 
-        private void updateBridge_UpdateDelayed(object sender, UpdateInfo update){
-            // stops the timer
-        }
-
         private void updateBridge_UpdateDismissed(object sender, UpdateInfo update){
             Config.DismissedUpdate = update.VersionTag;
             Config.Save();
@@ -328,7 +329,9 @@ namespace TweetDuck.Core{
 
         protected override void WndProc(ref Message m){
             if (isLoaded && m.Msg == Program.WindowRestoreMessage){
-                if (WindowsUtils.CurrentProcessID == m.WParam.ToInt32()){
+                using Process me = Process.GetCurrentProcess();
+
+                if (me.Id == m.WParam.ToInt32()){
                     trayIcon_ClickRestore(trayIcon, EventArgs.Empty);
                 }
 
@@ -365,14 +368,7 @@ namespace TweetDuck.Core{
         }
 
         public void ReloadToTweetDeck(){
-            #if DEBUG
-            ScriptLoader.HotSwap();
-            #else
-            if (ModifierKeys.HasFlag(Keys.Shift)){
-                ScriptLoader.ClearCache();
-            }
-            #endif
-
+            Program.Resources.OnReloadTriggered();
             ignoreUpdateCheckError = false;
             browser.ReloadToTweetDeck();
             AnalyticsFile.BrowserReloads.Trigger();
@@ -494,7 +490,7 @@ namespace TweetDuck.Core{
             FormManager.TryFind<FormSettings>()?.Close();
 
             using(DialogSettingsManage dialog = new DialogSettingsManage(plugins, true)){
-                if (dialog.ShowDialog() == DialogResult.OK && !dialog.IsRestarting){
+                if (!dialog.IsDisposed && dialog.ShowDialog() == DialogResult.OK && !dialog.IsRestarting){ // needs disposal check because the dialog may be closed in constructor
                     BrowserProcessHandler.UpdatePrefs();
                     FormManager.TryFind<FormPlugins>()?.Close();
                     plugins.Reload(); // also reloads the browser

Core/FormManager.cs

@@ -17,8 +17,6 @@ namespace TweetDuck.Core{
             else return false;
         }
 
-        public static bool HasAnyDialogs => Application.OpenForms.OfType<IAppDialog>().Any();
-        
         public static void CloseAllDialogs(){
             foreach(IAppDialog dialog in Application.OpenForms.OfType<IAppDialog>().Reverse()){
                 ((Form)dialog).Close();

Core/Handling/ContextMenuBase.cs

@@ -6,18 +6,20 @@ using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
 using System.Linq;
 using TweetDuck.Configuration;
-using TweetDuck.Core.Bridge;
+using TweetDuck.Core.Adapters;
 using TweetDuck.Core.Management;
 using TweetDuck.Core.Notification;
 using TweetDuck.Core.Other;
 using TweetDuck.Core.Other.Analytics;
-using TweetDuck.Resources;
+using TweetLib.Core.Features.Twitter;
+using TweetLib.Core.Utils;
 
 namespace TweetDuck.Core.Handling{
     abstract class ContextMenuBase : IContextMenuHandler{
-        protected static UserConfig Config => Program.Config.User;
+        public static ContextInfo CurrentInfo { get; } = new ContextInfo();
 
-        private static TwitterUtils.ImageQuality ImageQuality => Config.TwitterImageQuality;
+        protected static UserConfig Config => Program.Config.User;
+        private static ImageQuality ImageQuality => Config.TwitterImageQuality;
         
         private const CefMenuCommand MenuOpenLinkUrl     = (CefMenuCommand)26500;
         private const CefMenuCommand MenuCopyLinkUrl     = (CefMenuCommand)26501;
@@ -40,11 +42,11 @@ namespace TweetDuck.Core.Handling{
         }
 
         public virtual void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model){
-            if (!TwitterUtils.IsTweetDeckWebsite(frame) || browser.IsLoading){
-                Context = TweetDeckBridge.ContextInfo.Reset();
+            if (!TwitterUrls.IsTweetDeck(frame.Url) || browser.IsLoading){
+                Context = CurrentInfo.Reset();
             }
             else{
-                Context = TweetDeckBridge.ContextInfo.Create(parameters);
+                Context = CurrentInfo.Create(parameters);
             }
             
             if (parameters.TypeFlags.HasFlag(ContextMenuType.Selection) && !parameters.TypeFlags.HasFlag(ContextMenuType.Editable)){
@@ -54,12 +56,12 @@ namespace TweetDuck.Core.Handling{
                 model.AddSeparator();
             }
 
-            string TextOpen(string name) => "Open "+name+" in browser";
-            string TextCopy(string name) => "Copy "+name+" address";
-            string TextSave(string name) => "Save "+name+" as...";
+            static string TextOpen(string name) => "Open " + name + " in browser";
+            static string TextCopy(string name) => "Copy " + name + " address";
+            static string TextSave(string name) => "Save " + name + " as...";
             
             if (Context.Types.HasFlag(ContextInfo.ContextType.Link) && !Context.UnsafeLinkUrl.EndsWith("tweetdeck.twitter.com/#", StringComparison.Ordinal)){
-                if (TwitterUtils.RegexAccount.IsMatch(Context.UnsafeLinkUrl)){
+                if (TwitterUrls.RegexAccount.IsMatch(Context.UnsafeLinkUrl)){
                     model.AddItem(MenuOpenLinkUrl, TextOpen("account"));
                     model.AddItem(MenuCopyLinkUrl, TextCopy("account"));
                     model.AddItem(MenuCopyUsername, "Copy account username");
@@ -78,7 +80,7 @@ namespace TweetDuck.Core.Handling{
                 model.AddItem(MenuSaveMedia, TextSave("video"));
                 model.AddSeparator();
             }
-            else if (Context.Types.HasFlag(ContextInfo.ContextType.Image) && Context.MediaUrl != TweetNotification.AppLogo.Url){
+            else if (Context.Types.HasFlag(ContextInfo.ContextType.Image) && Context.MediaUrl != FormNotificationBase.AppLogo.Url){
                 model.AddItem(MenuViewImage, "View image in photo viewer");
                 model.AddItem(MenuOpenMediaUrl, TextOpen("image"));
                 model.AddItem(MenuCopyMediaUrl, TextCopy("image"));
@@ -106,7 +108,7 @@ namespace TweetDuck.Core.Handling{
 
                 case MenuCopyUsername: {
                     string url = Context.UnsafeLinkUrl;
-                    Match match = TwitterUtils.RegexAccount.Match(url);
+                    Match match = TwitterUrls.RegexAccount.Match(url);
 
                     SetClipboardText(control, match.Success ? match.Groups[1].Value : url);
                     control.InvokeAsyncSafe(analytics.AnalyticsFile.CopiedUsernames.Trigger);
@@ -114,11 +116,11 @@ namespace TweetDuck.Core.Handling{
                 }
 
                 case MenuOpenMediaUrl:
-                    OpenBrowser(control, TwitterUtils.GetMediaLink(Context.MediaUrl, ImageQuality));
+                    OpenBrowser(control, TwitterUrls.GetMediaLink(Context.MediaUrl, ImageQuality));
                     break;
 
                 case MenuCopyMediaUrl:
-                    SetClipboardText(control, TwitterUtils.GetMediaLink(Context.MediaUrl, ImageQuality));
+                    SetClipboardText(control, TwitterUrls.GetMediaLink(Context.MediaUrl, ImageQuality));
                     break;
 
                 case MenuViewImage: {
@@ -184,7 +186,7 @@ namespace TweetDuck.Core.Handling{
         }
 
         public virtual void OnContextMenuDismissed(IWebBrowser browserControl, IBrowser browser, IFrame frame){
-            Context = TweetDeckBridge.ContextInfo.Reset();
+            Context = CurrentInfo.Reset();
         }
 
         public virtual bool RunContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model, IRunContextMenuCallback callback){
@@ -192,7 +194,7 @@ namespace TweetDuck.Core.Handling{
         }
 
         protected static void DeselectAll(IFrame frame){
-            ScriptLoader.ExecuteScript(frame, "window.getSelection().removeAllRanges()", "gen:deselect");
+            CefScriptExecutor.RunScript(frame, "window.getSelection().removeAllRanges()", "gen:deselect");
         }
 
         protected static void OpenBrowser(Control control, string url){
@@ -204,7 +206,7 @@ namespace TweetDuck.Core.Handling{
         }
 
         protected static void InsertSelectionSearchItem(IMenuModel model, CefMenuCommand insertCommand, string insertLabel){
-            model.InsertItemAt(model.GetIndexOf(MenuSearchInBrowser)+1, insertCommand, insertLabel);
+            model.InsertItemAt(model.GetIndexOf(MenuSearchInBrowser) + 1, insertCommand, insertLabel);
         }
         
         protected static void AddDebugMenuItems(IMenuModel model){
@@ -215,13 +217,13 @@ namespace TweetDuck.Core.Handling{
         }
 
         protected static void RemoveSeparatorIfLast(IMenuModel model){
-            if (model.Count > 0 && model.GetTypeAt(model.Count-1) == MenuItemType.Separator){
-                model.RemoveAt(model.Count-1);
+            if (model.Count > 0 && model.GetTypeAt(model.Count - 1) == MenuItemType.Separator){
+                model.RemoveAt(model.Count - 1);
             }
         }
 
         protected static void AddSeparator(IMenuModel model){
-            if (model.Count > 0 && model.GetTypeAt(model.Count-1) != MenuItemType.Separator){ // do not add separators if there is nothing to separate
+            if (model.Count > 0 && model.GetTypeAt(model.Count - 1) != MenuItemType.Separator){ // do not add separators if there is nothing to separate
                 model.AddSeparator();
             }
         }

Core/Handling/ContextMenuBrowser.cs

@@ -2,7 +2,7 @@
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Management;
-using TweetDuck.Core.Utils;
+using TweetLib.Core.Features.Twitter;
 
 namespace TweetDuck.Core.Handling{
     sealed class ContextMenuBrowser : ContextMenuBase{
@@ -24,7 +24,7 @@ namespace TweetDuck.Core.Handling{
         private const string TitleMuteNotifications = "Mute notifications";
         private const string TitleSettings = "Options";
         private const string TitlePlugins = "Plugins";
-        private const string TitleAboutProgram = "About "+Program.BrandName;
+        private const string TitleAboutProgram = "About " + Program.BrandName;
 
         private readonly FormBrowser form;
         
@@ -53,7 +53,7 @@ namespace TweetDuck.Core.Handling{
 
             base.OnBeforeContextMenu(browserControl, browser, frame, parameters, model);
 
-            if (isSelecting && !isEditing && TwitterUtils.IsTweetDeckWebsite(frame)){
+            if (isSelecting && !isEditing && TwitterUrls.IsTweetDeck(frame.Url)){
                 InsertSelectionSearchItem(model, MenuSearchInColumn, "Search in a column");
             }
 

Core/Handling/Filters/ResponseFilterBase.cs

@@ -25,7 +25,7 @@ namespace TweetDuck.Core.Handling.Filters{
             int responseLength = responseData.Length;
 
             if (state == State.Reading){
-                int bytesToRead = Math.Min(responseLength-offset, (int)Math.Min(dataIn?.Length ?? 0, int.MaxValue));
+                int bytesToRead = Math.Min(responseLength - offset, (int)Math.Min(dataIn?.Length ?? 0, int.MaxValue));
                 
                 dataIn?.Read(responseData, offset, bytesToRead);
                 offset += bytesToRead;
@@ -42,7 +42,7 @@ namespace TweetDuck.Core.Handling.Filters{
                 return FilterStatus.NeedMoreData;
             }
             else if (state == State.Writing){
-                int bytesToWrite = Math.Min(responseLength-offset, (int)Math.Min(dataOut.Length, int.MaxValue));
+                int bytesToWrite = Math.Min(responseLength - offset, (int)Math.Min(dataOut.Length, int.MaxValue));
 
                 if (bytesToWrite > 0){
                     dataOut.Write(responseData, offset, bytesToWrite);

Core/Handling/General/BrowserProcessHandler.cs

@@ -11,13 +11,12 @@ namespace TweetDuck.Core.Handling.General{
 
         private static void UpdatePrefsInternal(){
             UserConfig config = Program.Config.User;
+            using IRequestContext ctx = Cef.GetGlobalRequestContext();
 
-            using(IRequestContext ctx = Cef.GetGlobalRequestContext()){
             ctx.SetPreference("browser.enable_spellchecking", config.EnableSpellCheck, out string _);
             ctx.SetPreference("spellcheck.dictionary", config.SpellCheckLanguage, out string _);
             ctx.SetPreference("settings.a11y.animation_policy", config.EnableAnimatedImages ? "allowed" : "none", out string _);
         }
-        }
 
         void IBrowserProcessHandler.OnContextInitialized(){
             UpdatePrefsInternal();

Core/Handling/General/FileDialogHandler.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
@@ -9,7 +8,7 @@ namespace TweetDuck.Core.Handling.General{
     sealed class FileDialogHandler : IDialogHandler{
         public bool OnFileDialog(IWebBrowser browserControl, IBrowser browser, CefFileDialogMode mode, CefFileDialogFlags flags, string title, string defaultFilePath, List<string> acceptFilters, int selectedAcceptFilter, IFileDialogCallback callback){
             if (mode == CefFileDialogMode.Open || mode == CefFileDialogMode.OpenMultiple){
-                string allFilters = string.Join(";", acceptFilters.Select(filter => "*"+filter));
+                string allFilters = string.Join(";", acceptFilters.SelectMany(ParseFileType).Where(filter => !string.IsNullOrEmpty(filter)).Select(filter => "*" + filter));
 
                 using(OpenFileDialog dialog = new OpenFileDialog{
                     AutoUpgradeEnabled = true,
@@ -19,8 +18,8 @@ namespace TweetDuck.Core.Handling.General{
                     Filter = $"All Supported Formats ({allFilters})|{allFilters}|All Files (*.*)|*.*"
                 }){
                     if (dialog.ShowDialog() == DialogResult.OK){
-                        string ext = Path.GetExtension(dialog.FileName);
-                        callback.Continue(acceptFilters.FindIndex(filter => filter.Equals(ext, StringComparison.OrdinalIgnoreCase)), dialog.FileNames.ToList());
+                        string ext = Path.GetExtension(dialog.FileName)?.ToLower();
+                        callback.Continue(acceptFilters.FindIndex(filter => ParseFileType(filter).Contains(ext)), dialog.FileNames.ToList());
                     }
                     else{
                         callback.Cancel();
@@ -36,5 +35,27 @@ namespace TweetDuck.Core.Handling.General{
                 return false;
             }
         }
+
+        private static IEnumerable<string> ParseFileType(string type){
+            if (string.IsNullOrEmpty(type)){
+                return new string[0];
+            }
+            
+            if (type[0] == '.'){
+                return new string[]{ type };
+            }
+
+            switch(type){
+                case "image/jpeg": return new string[]{ ".jpg", ".jpeg" };
+                case "image/png": return new string[]{ ".png" };
+                case "image/gif": return new string[]{ ".gif" };
+                case "image/webp": return new string[]{ ".webp" };
+                case "video/mp4": return new string[]{ ".mp4" };
+                case "video/quicktime": return new string[]{ ".mov", ".qt" };
+            }
+
+            System.Diagnostics.Debugger.Break();
+            return new string[0];
+        }
     }
 }

Core/Handling/General/JavaScriptDialogHandler.cs

@@ -12,15 +12,17 @@ namespace TweetDuck.Core.Handling.General{
             int pipe = text.IndexOf('|');
 
             if (pipe != -1){
-                switch(text.Substring(0, pipe)){
-                    case "error": icon = MessageBoxIcon.Error; break;
-                    case "warning": icon = MessageBoxIcon.Warning; break;
-                    case "info": icon = MessageBoxIcon.Information; break;
-                    case "question": icon = MessageBoxIcon.Question; break;
-                    default: return new FormMessage(caption, text, icon);
-                }
+                icon = text.Substring(0, pipe) switch{
+                    "error"    => MessageBoxIcon.Error,
+                    "warning"  => MessageBoxIcon.Warning,
+                    "info"     => MessageBoxIcon.Information,
+                    "question" => MessageBoxIcon.Question,
+                    _          => MessageBoxIcon.None
+                };
 
-                text = text.Substring(pipe+1);
+                if (icon != MessageBoxIcon.None){
+                    text = text.Substring(pipe + 1);
+                }
             }
 
             return new FormMessage(caption, text, icon);
@@ -51,13 +53,13 @@ namespace TweetDuck.Core.Handling.General{
                     input = new TextBox{
                         Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Bottom,
                         Font = SystemFonts.MessageBoxFont,
-                        Location = new Point(BrowserUtils.Scale(22+inputPad, dpiScale), form.ActionPanelY-BrowserUtils.Scale(46, dpiScale)),
-                        Size = new Size(form.ClientSize.Width-BrowserUtils.Scale(44+inputPad, dpiScale), BrowserUtils.Scale(23, dpiScale))
+                        Location = new Point(BrowserUtils.Scale(22 + inputPad, dpiScale), form.ActionPanelY - BrowserUtils.Scale(46, dpiScale)),
+                        Size = new Size(form.ClientSize.Width - BrowserUtils.Scale(44 + inputPad, dpiScale), BrowserUtils.Scale(23, dpiScale))
                     };
 
                     form.Controls.Add(input);
                     form.ActiveControl = input;
-                    form.Height += input.Size.Height+input.Margin.Vertical;
+                    form.Height += input.Size.Height + input.Margin.Vertical;
                 }
                 else{
                     callback.Continue(false);

Core/Handling/General/LifeSpanHandler.cs

@@ -4,11 +4,15 @@ using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Handling.General{
     sealed class LifeSpanHandler : ILifeSpanHandler{
+        private static bool IsPopupAllowed(string url){
+            return url.StartsWith("https://twitter.com/teams/authorize?");
+        }
+
         public static bool HandleLinkClick(IWebBrowser browserControl, WindowOpenDisposition targetDisposition, string targetUrl){
             switch(targetDisposition){
                 case WindowOpenDisposition.NewBackgroundTab:
                 case WindowOpenDisposition.NewForegroundTab:
-                case WindowOpenDisposition.NewPopup:
+                case WindowOpenDisposition.NewPopup when !IsPopupAllowed(targetUrl):
                 case WindowOpenDisposition.NewWindow:
                     browserControl.AsControl().InvokeAsyncSafe(() => BrowserUtils.OpenExternalBrowser(targetUrl));
                     return true;

Core/Handling/KeyboardHandlerBase.cs

@@ -0,0 +1,47 @@
+using System.Windows.Forms;
+using CefSharp;
+using TweetDuck.Core.Controls;
+using TweetDuck.Core.Other;
+using TweetDuck.Core.Utils;
+
+namespace TweetDuck.Core.Handling{
+    class KeyboardHandlerBase : IKeyboardHandler{
+        protected virtual bool HandleRawKey(IWebBrowser browserControl, IBrowser browser, Keys key, CefEventFlags modifiers){
+            if (modifiers == (CefEventFlags.ControlDown | CefEventFlags.ShiftDown) && key == Keys.I){
+                if (BrowserUtils.HasDevTools){
+                    browser.ShowDevTools();
+                }
+                else{
+                    browserControl.AsControl().InvokeSafe(() => {
+                        string extraMessage;
+                        
+                        if (Program.IsPortable){
+                            extraMessage = "Please download the portable installer, select the folder with your current installation of TweetDuck Portable, and tick 'Install dev tools' during the installation process.";
+                        }
+                        else{
+                            extraMessage = "Please download the installer, and tick 'Install dev tools' during the installation process. The installer will automatically find and update your current installation of TweetDuck.";
+                        }
+
+                        FormMessage.Information("Dev Tools", "You do not have dev tools installed. " + extraMessage, FormMessage.OK);
+                    });
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+
+        bool IKeyboardHandler.OnPreKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey, ref bool isKeyboardShortcut){
+            if (type == KeyType.RawKeyDown && !browser.FocusedFrame.Url.StartsWith("chrome-devtools://")){
+                return HandleRawKey(browserControl, browser, (Keys)windowsKeyCode, modifiers);
+            }
+
+            return false;
+        }
+
+        bool IKeyboardHandler.OnKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey){
+            return false;
+        }
+    }
+}

Core/Handling/KeyboardHandlerBrowser.cs

@@ -2,19 +2,19 @@
 using CefSharp;
 
 namespace TweetDuck.Core.Handling{
-    sealed class KeyboardHandlerBrowser : IKeyboardHandler{
+    sealed class KeyboardHandlerBrowser : KeyboardHandlerBase{
         private readonly FormBrowser form;
 
         public KeyboardHandlerBrowser(FormBrowser form){
             this.form = form;
         }
 
-        bool IKeyboardHandler.OnPreKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey, ref bool isKeyboardShortcut){
-            return type == KeyType.RawKeyDown && form.ProcessBrowserKey((Keys)windowsKeyCode);
+        protected override bool HandleRawKey(IWebBrowser browserControl, IBrowser browser, Keys key, CefEventFlags modifiers){
+            if (base.HandleRawKey(browserControl, browser, key, modifiers)){
+                return true;
             }
 
-        bool IKeyboardHandler.OnKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey){
-            return false;
+            return form.ProcessBrowserKey(key);
         }
     }
 }

Core/Handling/KeyboardHandlerNotification.cs

@@ -4,7 +4,7 @@ using TweetDuck.Core.Controls;
 using TweetDuck.Core.Notification;
 
 namespace TweetDuck.Core.Handling {
-    sealed class KeyboardHandlerNotification : IKeyboardHandler{
+    sealed class KeyboardHandlerNotification : KeyboardHandlerBase{
         private readonly FormNotificationBase notification;
 
         public KeyboardHandlerNotification(FormNotificationBase notification){
@@ -15,9 +15,12 @@ namespace TweetDuck.Core.Handling {
             notification.InvokeAsyncSafe(notification.AnalyticsFile.NotificationKeyboardShortcuts.Trigger);
         }
 
-        bool IKeyboardHandler.OnPreKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey, ref bool isKeyboardShortcut){
-            if (type == KeyType.RawKeyDown && !browser.FocusedFrame.Url.StartsWith("chrome-devtools://")){
-                switch((Keys)windowsKeyCode){
+        protected override bool HandleRawKey(IWebBrowser browserControl, IBrowser browser, Keys key, CefEventFlags modifiers){
+            if (base.HandleRawKey(browserControl, browser, key, modifiers)){
+                return true;
+            }
+
+            switch(key){
                 case Keys.Enter:
                     notification.InvokeAsyncSafe(notification.FinishCurrentNotification);
                     TriggerKeyboardShortcutAnalytics();
@@ -32,14 +35,10 @@ namespace TweetDuck.Core.Handling {
                     notification.InvokeAsyncSafe(() => notification.FreezeTimer = !notification.FreezeTimer);
                     TriggerKeyboardShortcutAnalytics();
                     return true;
-                }
-            }
 
+                default:
                     return false;
             }
-
-        bool IKeyboardHandler.OnKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey){
-            return false;
         }
     }
 }

Core/Handling/RequestHandlerBase.cs

@@ -1,11 +1,38 @@
-using System.Collections.Specialized;
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Text.RegularExpressions;
 using CefSharp;
 using CefSharp.Handler;
 using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Utils;
+using TweetLib.Core.Utils;
 
 namespace TweetDuck.Core.Handling{
     class RequestHandlerBase : DefaultRequestHandler{
+        private static readonly Regex TweetDeckResourceUrl = new Regex(@"/dist/(.*?)\.(.*?)\.(css|js)$");
+        private static readonly SortedList<string, string> TweetDeckHashes = new SortedList<string, string>(4);
+
+        public static void LoadResourceRewriteRules(string rules){
+            if (string.IsNullOrEmpty(rules)){
+                return;
+            }
+
+            TweetDeckHashes.Clear();
+
+            foreach(string rule in rules.Replace(" ", "").ToLower().Split(',')){
+                var (key, hash) = StringUtils.SplitInTwo(rule, '=') ?? throw new ArgumentException("A rule must have one '=' character: " + rule);
+
+                if (hash.All(chr => char.IsDigit(chr) || (chr >= 'a' && chr <= 'f'))){
+                    TweetDeckHashes.Add(key, hash);
+                }
+                else{
+                    throw new ArgumentException("Invalid hash characters: " + rule);
+                }
+            }
+        }
+
         private readonly bool autoReload;
 
         public RequestHandlerBase(bool autoReload){
@@ -26,6 +53,26 @@ namespace TweetDuck.Core.Handling{
             return base.OnBeforeResourceLoad(browserControl, browser, frame, request, callback);
         }
 
+        public override bool OnResourceResponse(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
+            if ((request.ResourceType == ResourceType.Script || request.ResourceType == ResourceType.Stylesheet) && TweetDeckHashes.Count > 0){
+                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){
+                        Program.Reporter.LogVerbose("[RequestHandlerBase] Accepting " + url);
+                    }
+                    else{
+                        Program.Reporter.LogVerbose("[RequestHandlerBase] Replacing " + url + " hash with " + hash);
+                        request.Url = TweetDeckResourceUrl.Replace(url, $"/dist/$1.{hash}.$3");
+                        return true;
+                    }
+                }
+            }
+
+            return base.OnResourceResponse(browserControl, browser, frame, request, response);
+        }
+        
         public override void OnRenderProcessTerminated(IWebBrowser browserControl, IBrowser browser, CefTerminationStatus status){
             if (autoReload){
                 browser.Reload();

Core/Handling/RequestHandlerBrowser.cs

@@ -1,27 +1,37 @@
-// Uncomment to force TweetDeck to load a predefined version of the vendor/bundle scripts
-// #define FREEZE_TWEETDECK_SCRIPTS
-
-using System.Collections.Specialized;
+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
+using TweetLib.Core.Features.Twitter;
 
 namespace TweetDuck.Core.Handling{
     sealed class RequestHandlerBrowser : RequestHandlerBase{
+        private const string UrlVendorResource = "/dist/vendor";
+        private const string UrlLoadingSpinner = "/backgrounds/spinner_blue";
+
         public string BlockNextUserNavUrl { get; set; }
 
         public RequestHandlerBrowser() : base(true){}
 
         public override CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback){
-            if (request.ResourceType == ResourceType.Script && request.Url.Contains("analytics.")){
+            if (request.ResourceType == ResourceType.MainFrame){
+                if (request.Url.EndsWith("//twitter.com/")){
+                    request.Url = TwitterUrls.TweetDeck; // redirect plain twitter.com requests, fixes bugs with login 2FA
+                }
+            }
+            else if (request.ResourceType == ResourceType.Script){
+                string url = request.Url;
+
+                if (url.Contains("analytics.")){
                     callback.Dispose();
                     return CefReturnValue.Cancel;
                 }
+                else if (url.Contains(UrlVendorResource)){
+                    NameValueCollection headers = request.Headers;
+                    headers["Accept-Encoding"] = "identity";
+                    request.Headers = headers;
+                }
+            }
 
             return base.OnBeforeResourceLoad(browserControl, browser, frame, request, callback);
         }
@@ -32,63 +42,26 @@ namespace TweetDuck.Core.Handling{
                 BlockNextUserNavUrl = string.Empty;
                 return block;
             }
+            else if (request.TransitionType.HasFlag(TransitionType.ForwardBack) && TwitterUrls.IsTweetDeck(frame.Url)){
+                return true;
+            }
 
             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")){
+            if (request.ResourceType == ResourceType.Image && request.Url.Contains(UrlLoadingSpinner)){
                 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);
         }
 
         public override IResponseFilter GetResourceResponseFilter(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
-            if (request.ResourceType == ResourceType.Script && request.Url.Contains("/dist/vendor")){
-                NameValueCollection headers = response.ResponseHeaders;
-
-                if (int.TryParse(headers["x-ton-expected-size"], out int totalBytes)){
+            if (request.ResourceType == ResourceType.Script && request.Url.Contains(UrlVendorResource) && int.TryParse(response.ResponseHeaders["Content-Length"], out int totalBytes)){
                 return new ResponseFilterVendor(totalBytes);
             }
-                #if DEBUG
-                else{
-                    System.Diagnostics.Debug.WriteLine($"Missing uncompressed size header in {request.Url}");
-
-                    foreach(string key in headers){
-                        System.Diagnostics.Debug.WriteLine($" {key}: {headers[key]}");
-                    }
-
-                    System.Diagnostics.Debugger.Break();
-                }
-                #endif
-            }
 
             return base.GetResourceResponseFilter(browserControl, browser, frame, request, response);
         }

Core/Handling/ResourceHandlerFactory.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Concurrent;
+using CefSharp;
+using TweetDuck.Data;
+
+namespace TweetDuck.Core.Handling{
+    sealed class ResourceHandlerFactory : IResourceHandlerFactory{
+        public bool HasHandlers => !handlers.IsEmpty;
+
+        private readonly ConcurrentDictionary<string, IResourceHandler> handlers = new ConcurrentDictionary<string, IResourceHandler>(StringComparer.OrdinalIgnoreCase);
+
+        public IResourceHandler GetResourceHandler(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request){
+            try{
+                return handlers.TryGetValue(request.Url, out IResourceHandler handler) ? handler : null;
+            }finally{
+                request.Dispose();
+            }
+        }
+
+        // registration
+
+        public bool RegisterHandler(string url, IResourceHandler handler){
+            if (Uri.TryCreate(url, UriKind.Absolute, out Uri uri)){
+                handlers.AddOrUpdate(uri.AbsoluteUri, handler, (key, prev) => handler);
+                return true;
+            }
+
+            return false;
+        }
+
+        public bool RegisterHandler(ResourceLink link){
+            return RegisterHandler(link.Url, link.Handler);
+        }
+
+        public bool UnregisterHandler(string url){
+            return handlers.TryRemove(url, out IResourceHandler _);
+        }
+
+        public bool UnregisterHandler(ResourceLink link){
+            return UnregisterHandler(link.Url);
+        }
+    }
+}

Core/Management/BrowserCache.cs

@@ -38,7 +38,7 @@ namespace TweetDuck.Core.Management{
                 AutoClearTimer = new Timer(state => {
                     if (AutoClearTimer != null){
                         try{
-                            if (CalculateCacheSize() >= Program.Config.System.ClearCacheThreshold*1024L*1024L){
+                            if (CalculateCacheSize() >= Program.Config.System.ClearCacheThreshold * 1024L * 1024L){
                                 SetClearOnExit();
                             }
                         }catch(Exception){
@@ -54,6 +54,14 @@ namespace TweetDuck.Core.Management{
             RefreshTimer();
         }
 
+        public static void TryClearNow(){
+            try{
+                Directory.Delete(CacheFolder, true);
+            }catch{
+                // welp, too bad
+            }
+        }
+
         public static void Exit(){
             if (AutoClearTimer != null){
                 AutoClearTimer.Dispose();
@@ -61,11 +69,7 @@ namespace TweetDuck.Core.Management{
             }
 
             if (ClearOnExit){
-                try{
-                    Directory.Delete(CacheFolder, true);
-                }catch{
-                    // welp, too bad
-                }
+                TryClearNow();
             }
         }
     }

Core/Management/ContextInfo.cs

@@ -1,6 +1,6 @@
 using System;
 using CefSharp;
-using TweetDuck.Core.Utils;
+using TweetLib.Core.Utils;
 
 namespace TweetDuck.Core.Management{
     sealed class ContextInfo{
@@ -107,7 +107,7 @@ namespace TweetDuck.Core.Management{
                 private string unsafeLinkUrl = string.Empty;
                 private string mediaUrl = string.Empty;
 
-                private ChirpInfo chirp = default(ChirpInfo);
+                private ChirpInfo chirp = default;
 
                 public void AddContext(IContextMenuParams parameters){
                     ContextMenuType flags = parameters.TypeFlags;

Core/Management/ProfileManager.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using TweetDuck.Core.Other;
-using TweetDuck.Data;
-using TweetDuck.Plugins;
-using TweetDuck.Plugins.Enums;
+using TweetLib.Core.Data;
+using TweetLib.Core.Features.Plugins;
+using TweetLib.Core.Features.Plugins.Enums;
 
 namespace TweetDuck.Core.Management{
     sealed class ProfileManager{
@@ -49,7 +49,7 @@ namespace TweetDuck.Core.Management{
                                 try{
                                     stream.WriteFile(new string[]{ "plugin.data", plugin.Identifier, path.Relative }, path.Full);
                                 }catch(ArgumentOutOfRangeException e){
-                                    FormMessage.Warning("Export Profile", "Could not include a plugin file in the export. "+e.Message, FormMessage.OK);
+                                    FormMessage.Warning("Export Profile", "Could not include a plugin file in the export. " + e.Message, FormMessage.OK);
                                 }
                             }
                         }
@@ -73,7 +73,7 @@ namespace TweetDuck.Core.Management{
             Items items = Items.None;
 
             try{
-                using(CombinedFileStream stream = new CombinedFileStream(new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.None))){
+                using CombinedFileStream stream = new CombinedFileStream(new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.None));
                 string key;
 
                 while((key = stream.SkipFile()) != null){
@@ -96,7 +96,6 @@ namespace TweetDuck.Core.Management{
                             break;
                     }
                 }
-                }
             }catch(Exception){
                 items = Items.None;
             }
@@ -140,7 +139,7 @@ namespace TweetDuck.Core.Management{
 
                                     entry.WriteToFile(Path.Combine(Program.PluginDataPath, value[0], value[1]), true);
 
-                                    if (!plugins.IsPluginInstalled(value[0])){
+                                    if (!plugins.Plugins.Any(plugin => plugin.Identifier.Equals(value[0]))){
                                         missingPlugins.Add(value[0]);
                                     }
                                 }
@@ -158,7 +157,7 @@ namespace TweetDuck.Core.Management{
                 }
 
                 if (missingPlugins.Count > 0){
-                    FormMessage.Information("Profile Import", "Detected missing plugins when importing plugin data:\n"+string.Join("\n", missingPlugins), FormMessage.OK);
+                    FormMessage.Information("Profile Import", "Detected missing plugins when importing plugin data:\n" + string.Join("\n", missingPlugins), FormMessage.OK);
                 }
 
                 return true;

Core/Management/VideoPlayer.cs

@@ -40,7 +40,7 @@ namespace TweetDuck.Core.Management{
 
                 if ((process = Process.Start(new ProcessStartInfo{
                     FileName = Path.Combine(Program.ProgramPath, "TweetDuck.Video.exe"),
-                    Arguments = $"{owner.Handle} {Config.VideoPlayerVolume} \"{url}\" \"{pipe.GenerateToken()}\"",
+                    Arguments = $"{owner.Handle} {(int)Math.Floor(100F * owner.GetDPIScale())} {Config.VideoPlayerVolume} \"{url}\" \"{pipe.GenerateToken()}\"",
                     UseShellExecute = false,
                     RedirectStandardOutput = true
                 })) != null){
@@ -135,7 +135,7 @@ namespace TweetDuck.Core.Management{
 
         private void process_OutputDataReceived(object sender, DataReceivedEventArgs e){
             if (!string.IsNullOrEmpty(e.Data)){
-                Program.Reporter.Log("[VideoPlayer] "+e.Data);
+                Program.Reporter.LogVerbose("[VideoPlayer] " + e.Data);
             }
         }
 

Core/Notification/Example/FormNotificationExample.cs

@@ -2,17 +2,17 @@
 using System.Windows.Forms;
 using CefSharp;
 using TweetDuck.Core.Controls;
-using TweetDuck.Plugins;
-using TweetDuck.Resources;
+using TweetLib.Core.Features.Notifications;
+using TweetLib.Core.Features.Plugins;
 
 namespace TweetDuck.Core.Notification.Example{
     sealed class FormNotificationExample : FormNotificationMain{
         public override bool RequiresResize => true;
-        protected override bool CanDragWindow => Config.NotificationPosition == TweetNotification.Position.Custom;
+        protected override bool CanDragWindow => Config.NotificationPosition == DesktopNotification.Position.Custom;
 
         protected override FormBorderStyle NotificationBorderStyle{
             get{
-                if (Config.NotificationSize == TweetNotification.Size.Custom){
+                if (Config.NotificationSize == DesktopNotification.Size.Custom){
                     switch(base.NotificationBorderStyle){
                         case FormBorderStyle.FixedSingle: return FormBorderStyle.Sizable;
                         case FormBorderStyle.FixedToolWindow: return FormBorderStyle.SizableToolWindow;
@@ -23,22 +23,22 @@ namespace TweetDuck.Core.Notification.Example{
             }
         }
 
-        protected override string BodyClasses => base.BodyClasses+" td-example";
+        protected override string BodyClasses => base.BodyClasses + " td-example";
 
         public event EventHandler Ready;
 
-        private readonly TweetNotification exampleNotification;
+        private readonly DesktopNotification exampleNotification;
 
         public FormNotificationExample(FormBrowser owner, PluginManager pluginManager) : base(owner, pluginManager, false){
             browser.LoadingStateChanged += browser_LoadingStateChanged;
 
-            string exampleTweetHTML = ScriptLoader.LoadResourceSilent("pages/example.html")?.Replace("{avatar}", TweetNotification.AppLogo.Url) ?? string.Empty;
+            string exampleTweetHTML = Program.Resources.LoadSilent("pages/example.html")?.Replace("{avatar}", AppLogo.Url) ?? string.Empty;
 
             #if DEBUG
             exampleTweetHTML = exampleTweetHTML.Replace("</p>", @"</p><div style='margin-top:256px'>Scrollbar test padding...</div>");
             #endif
 
-            exampleNotification = new TweetNotification(string.Empty, string.Empty, "Home", exampleTweetHTML, 176, string.Empty, string.Empty);
+            exampleNotification = new DesktopNotification(string.Empty, string.Empty, "Home", exampleTweetHTML, 176, string.Empty, string.Empty);
         }
 
         private void browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){

Core/Notification/FormNotificationBase.cs

@@ -1,28 +1,34 @@
 using CefSharp.WinForms;
 using System.Drawing;
 using System.Windows.Forms;
+using CefSharp;
 using TweetDuck.Configuration;
-using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling;
 using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Other.Analytics;
 using TweetDuck.Core.Utils;
+using TweetDuck.Data;
+using TweetLib.Core.Features.Notifications;
+using TweetLib.Core.Features.Twitter;
 
 namespace TweetDuck.Core.Notification{
     abstract partial class FormNotificationBase : Form, AnalyticsFile.IProvider{
+        public static readonly ResourceLink AppLogo = new ResourceLink("https://ton.twimg.com/tduck/avatar", ResourceHandler.FromByteArray(Properties.Resources.avatar, "image/png"));
+
+        public static string FontSize = null;
+        public static string HeadLayout = null;
+
         protected static UserConfig Config => Program.Config.User;
         
         protected static int FontSizeLevel{
-            get{
-                switch(TweetDeckBridge.FontSize){
-                    case "largest": return 4;
-                    case "large": return 3;
-                    case "small": return 1;
-                    case "smallest": return 0;
-                    default: return 2;
-                }
-            }
+            get => FontSize switch{
+                "largest"  => 4,
+                "large"    => 3,
+                "small"    => 1,
+                "smallest" => 0,
+                _          => 2
+            };
         }
 
         protected virtual Point PrimaryLocation{
@@ -30,7 +36,7 @@ namespace TweetDuck.Core.Notification{
                 Screen screen;
 
                 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);
@@ -39,21 +45,21 @@ namespace TweetDuck.Core.Notification{
                 int edgeDist = Config.NotificationEdgeDistance;
 
                 switch(Config.NotificationPosition){
-                    case TweetNotification.Position.TopLeft:
-                        return new Point(screen.WorkingArea.X+edgeDist, screen.WorkingArea.Y+edgeDist);
+                    case DesktopNotification.Position.TopLeft:
+                        return new Point(screen.WorkingArea.X + edgeDist, screen.WorkingArea.Y + edgeDist);
 
-                    case TweetNotification.Position.TopRight:
-                        return new Point(screen.WorkingArea.X+screen.WorkingArea.Width-edgeDist-Width, screen.WorkingArea.Y+edgeDist);
+                    case DesktopNotification.Position.TopRight:
+                        return new Point(screen.WorkingArea.X + screen.WorkingArea.Width - edgeDist - Width, screen.WorkingArea.Y + edgeDist);
 
-                    case TweetNotification.Position.BottomLeft:
-                        return new Point(screen.WorkingArea.X+edgeDist, screen.WorkingArea.Y+screen.WorkingArea.Height-edgeDist-Height);
+                    case DesktopNotification.Position.BottomLeft:
+                        return new Point(screen.WorkingArea.X + edgeDist, screen.WorkingArea.Y + screen.WorkingArea.Height - edgeDist - Height);
 
-                    case TweetNotification.Position.BottomRight:
-                        return new Point(screen.WorkingArea.X+screen.WorkingArea.Width-edgeDist-Width, screen.WorkingArea.Y+screen.WorkingArea.Height-edgeDist-Height);
+                    case DesktopNotification.Position.BottomRight:
+                        return new Point(screen.WorkingArea.X + screen.WorkingArea.Width - edgeDist - Width, screen.WorkingArea.Y + screen.WorkingArea.Height - edgeDist - Height);
 
-                    case TweetNotification.Position.Custom:
+                    case DesktopNotification.Position.Custom:
                         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();
                         }
 
@@ -94,14 +100,14 @@ namespace TweetDuck.Core.Notification{
         protected override bool ShowWithoutActivation => true;
         
         protected float DpiScale { get; }
-        protected double SizeScale => DpiScale*Config.ZoomLevel/100.0;
+        protected double SizeScale => DpiScale * Config.ZoomLevel / 100.0;
 
         protected readonly FormBrowser owner;
         protected readonly ChromiumWebBrowser browser;
         
         private readonly ResourceHandlerNotification resourceHandler = new ResourceHandlerNotification();
 
-        private TweetNotification currentNotification;
+        private DesktopNotification currentNotification;
         private int pauseCounter;
         
         public string CurrentTweetUrl => currentNotification?.TweetUrl;
@@ -121,18 +127,20 @@ namespace TweetDuck.Core.Notification{
             this.owner = owner;
             this.owner.FormClosed += owner_FormClosed;
 
+            ResourceHandlerFactory resourceHandlerFactory = new ResourceHandlerFactory();
+            resourceHandlerFactory.RegisterHandler(TwitterUrls.TweetDeck, this.resourceHandler);
+            resourceHandlerFactory.RegisterHandler(AppLogo);
+
             this.browser = new ChromiumWebBrowser("about:blank"){
                 MenuHandler = new ContextMenuNotification(this, enableContextMenu),
                 JsDialogHandler = new JavaScriptDialogHandler(),
                 LifeSpanHandler = new LifeSpanHandler(),
-                RequestHandler = new RequestHandlerBase(false)
+                RequestHandler = new RequestHandlerBase(false),
+                ResourceHandlerFactory = resourceHandlerFactory
             };
 
             this.browser.Dock = DockStyle.None;
             this.browser.ClientSize = ClientSize;
-            
-            this.browser.SetupResourceHandler(TwitterUtils.TweetDeckURL, this.resourceHandler);
-            this.browser.SetupResourceHandler(TweetNotification.AppLogo);
             this.browser.SetupZoomEvents();
 
             Controls.Add(browser);
@@ -186,13 +194,13 @@ namespace TweetDuck.Core.Notification{
             }
         }
 
-        protected abstract string GetTweetHTML(TweetNotification tweet);
+        protected abstract string GetTweetHTML(DesktopNotification tweet);
 
-        protected virtual void LoadTweet(TweetNotification tweet){
+        protected virtual void LoadTweet(DesktopNotification tweet){
             currentNotification = tweet;
             resourceHandler.SetHTML(GetTweetHTML(tweet));
 
-            browser.Load(TwitterUtils.TweetDeckURL);
+            browser.Load(TwitterUrls.TweetDeck);
             DisplayTooltip(null);
         }
 

Core/Notification/FormNotificationMain.cs

@@ -2,14 +2,16 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
+using TweetDuck.Core.Adapters;
 using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling;
 using TweetDuck.Core.Utils;
-using TweetDuck.Data;
 using TweetDuck.Plugins;
-using TweetDuck.Plugins.Enums;
-using TweetDuck.Resources;
+using TweetLib.Core.Data;
+using TweetLib.Core.Features.Notifications;
+using TweetLib.Core.Features.Plugins;
+using TweetLib.Core.Features.Plugins.Enums;
 
 namespace TweetDuck.Core.Notification{
     abstract partial class FormNotificationMain : FormNotificationBase{
@@ -44,32 +46,22 @@ namespace TweetDuck.Core.Notification{
         }
 
         private int BaseClientWidth{
-            get{
-                switch(Config.NotificationSize){
-                    default:
-                        return BrowserUtils.Scale(284, SizeScale*(1.0+0.05*FontSizeLevel));
-
-                    case TweetNotification.Size.Custom:
-                        return Config.CustomNotificationSize.Width;
-                }
-            }
+            get => Config.NotificationSize switch{
+                DesktopNotification.Size.Custom => Config.CustomNotificationSize.Width,
+                _ => BrowserUtils.Scale(284, SizeScale * (1.0 + 0.05 * FontSizeLevel))
+            };
         }
 
         private int BaseClientHeight{
-            get{
-                switch(Config.NotificationSize){
-                    default:
-                        return BrowserUtils.Scale(122, SizeScale*(1.0+0.08*FontSizeLevel));
-
-                    case TweetNotification.Size.Custom:
-                        return Config.CustomNotificationSize.Height;
-                }
-            }
+            get => Config.NotificationSize switch{
+                DesktopNotification.Size.Custom => Config.CustomNotificationSize.Height,
+                _ => BrowserUtils.Scale(122, SizeScale * (1.0 + 0.08 * FontSizeLevel))
+            };
         }
 
         protected virtual string BodyClasses => IsCursorOverBrowser ? "td-notification td-hover" : "td-notification";
         
-        public Size BrowserSize => Config.DisplayNotificationTimer ? new Size(ClientSize.Width, ClientSize.Height-timerBarHeight) : ClientSize;
+        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();
@@ -83,7 +75,7 @@ namespace TweetDuck.Core.Notification{
             browser.LoadingStateChanged += Browser_LoadingStateChanged;
             browser.FrameLoadEnd += Browser_FrameLoadEnd;
 
-            plugins.Register(browser, PluginEnvironment.Notification, this);
+            plugins.Register(PluginEnvironment.Notification, new PluginDispatcher(browser));
 
             mouseHookDelegate = MouseHookProc;
             Disposed += (sender, args) => StopMouseHook(true);
@@ -110,7 +102,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), Config.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)){
@@ -164,7 +156,7 @@ namespace TweetDuck.Core.Notification{
 
             if (frame.IsMain && browser.Address != "about:blank"){
                 frame.ExecuteJavaScriptAsync(PropertyBridge.GenerateScript(PropertyBridge.Environment.Notification));
-                ScriptLoader.ExecuteFile(frame, "notification.js", this);
+                CefScriptExecutor.RunFile(frame, "notification.js");
             }
         }
 
@@ -174,14 +166,23 @@ namespace TweetDuck.Core.Notification{
         }
 
         private void timerHideProgress_Tick(object sender, EventArgs e){
-            if (Bounds.Contains(Cursor.Position) || FreezeTimer || ContextMenuOpen){
+            bool isCursorInside = Bounds.Contains(Cursor.Position);
+
+            if (isCursorInside){
+                StartMouseHook();
+            }
+            else{
+                StopMouseHook(false);
+            }
+
+            if (isCursorInside || FreezeTimer || ContextMenuOpen){
                 return;
             }
 
             timeLeft -= timerProgress.Interval;
 
-            int value = BrowserUtils.Scale(progressBarTimer.Maximum+25, (totalTime-timeLeft)/(double)totalTime);
-            progressBarTimer.SetValueInstant(Config.NotificationTimerCountDown ? progressBarTimer.Maximum-value : value);
+            int value = BrowserUtils.Scale(progressBarTimer.Maximum + 25, (totalTime - timeLeft) / (double)totalTime);
+            progressBarTimer.SetValueInstant(Config.NotificationTimerCountDown ? progressBarTimer.Maximum - value : value);
 
             if (timeLeft <= 0){
                 FinishCurrentNotification();
@@ -190,7 +191,7 @@ namespace TweetDuck.Core.Notification{
 
         // notification methods
 
-        public virtual void ShowNotification(TweetNotification notification){
+        public virtual void ShowNotification(DesktopNotification notification){
             LoadTweet(notification);
         }
 
@@ -227,8 +228,8 @@ namespace TweetDuck.Core.Notification{
             }
         }
 
-        protected override string GetTweetHTML(TweetNotification tweet){
-            string html = tweet.GenerateHtml(BodyClasses, this);
+        protected override string GetTweetHTML(DesktopNotification tweet){
+            string html = tweet.GenerateHtml(BodyClasses, HeadLayout, Config.CustomNotificationCSS);
 
             foreach(InjectedHTML injection in plugins.NotificationInjections){
                 html = injection.InjectInto(html);
@@ -237,7 +238,7 @@ namespace TweetDuck.Core.Notification{
             return html;
         }
 
-        protected override void LoadTweet(TweetNotification tweet){
+        protected override void LoadTweet(DesktopNotification tweet){
             timerProgress.Stop();
             totalTime = timeLeft = tweet.GetDisplayDuration(Config.NotificationDurationValue);
             progressBarTimer.Value = Config.NotificationTimerCountDown ? progressBarTimer.Maximum : progressBarTimer.Minimum;
@@ -247,7 +248,7 @@ namespace TweetDuck.Core.Notification{
 
         protected override void SetNotificationSize(int width, int height){
             if (Config.DisplayNotificationTimer){
-                ClientSize = new Size(width, height+timerBarHeight);
+                ClientSize = new Size(width, height + timerBarHeight);
                 progressBarTimer.Visible = true;
             }
             else{
@@ -265,7 +266,6 @@ namespace TweetDuck.Core.Notification{
             }
             
             MoveToVisibleLocation();
-            StartMouseHook();
         }
 
         protected virtual void OnNotificationReady(){

Core/Notification/FormNotificationTweet.cs

@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using TweetDuck.Plugins;
 using System.Windows.Forms;
 using TweetDuck.Core.Utils;
+using TweetLib.Core.Features.Notifications;
+using TweetLib.Core.Features.Plugins;
 
 namespace TweetDuck.Core.Notification{
     sealed partial class FormNotificationTweet : FormNotificationMain{
@@ -25,7 +26,7 @@ namespace TweetDuck.Core.Notification{
             }
         }
 
-        private readonly Queue<TweetNotification> tweetQueue = new Queue<TweetNotification>(4);
+        private readonly Queue<DesktopNotification> tweetQueue = new Queue<DesktopNotification>(4);
         private bool needsTrim;
         private bool hasTemporarilyMoved;
 
@@ -81,7 +82,7 @@ namespace TweetDuck.Core.Notification{
 
         // notification methods
 
-        public override void ShowNotification(TweetNotification notification){
+        public override void ShowNotification(DesktopNotification notification){
             tweetQueue.Enqueue(notification);
             
             if (!IsPaused){
@@ -153,7 +154,7 @@ namespace TweetDuck.Core.Notification{
             base.UpdateTitle();
 
             if (tweetQueue.Count > 0){
-                Text = Text+" ("+tweetQueue.Count+" more left)";
+                Text = Text + " (" + tweetQueue.Count + " more left)";
             }
         }
 

Core/Notification/Screenshot/FormNotificationScreenshotable.cs

@@ -3,12 +3,13 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.Windows.Forms;
 using CefSharp;
+using TweetDuck.Core.Adapters;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Other;
 using TweetDuck.Core.Utils;
-using TweetDuck.Data;
-using TweetDuck.Plugins;
-using TweetDuck.Resources;
+using TweetLib.Core.Data;
+using TweetLib.Core.Features.Notifications;
+using TweetLib.Core.Features.Plugins;
 
 namespace TweetDuck.Core.Notification.Screenshot{
     sealed class FormNotificationScreenshotable : FormNotificationBase{
@@ -29,24 +30,23 @@ namespace TweetDuck.Core.Notification.Screenshot{
                     return;
                 }
 
-                string script = ScriptLoader.LoadResourceSilent("screenshot.js");
+                string script = Program.Resources.LoadSilent("screenshot.js");
                 
                 if (script == null){
                     this.InvokeAsyncSafe(callback);
                     return;
                 }
 
-                using(IFrame frame = args.Browser.MainFrame){
-                    ScriptLoader.ExecuteScript(frame, script.Replace("{width}", realWidth.ToString()).Replace("{frames}", TweetScreenshotManager.WaitFrames.ToString()), "gen:screenshot");
-                }
+                using IFrame frame = args.Browser.MainFrame;
+                CefScriptExecutor.RunScript(frame, script.Replace("{width}", realWidth.ToString()).Replace("{frames}", TweetScreenshotManager.WaitFrames.ToString()), "gen:screenshot");
             };
             
             SetNotificationSize(realWidth, 1024);
-            LoadTweet(new TweetNotification(string.Empty, string.Empty, string.Empty, html, 0, string.Empty, string.Empty));
+            LoadTweet(new DesktopNotification(string.Empty, string.Empty, string.Empty, html, 0, string.Empty, string.Empty));
         }
 
-        protected override string GetTweetHTML(TweetNotification tweet){
-            string html = tweet.GenerateHtml("td-screenshot", this);
+        protected override string GetTweetHTML(DesktopNotification tweet){
+            string html = tweet.GenerateHtml("td-screenshot", HeadLayout, Config.CustomNotificationCSS);
 
             foreach(InjectedHTML injection in plugins.NotificationInjections){
                 html = injection.InjectInto(html);

Core/Notification/Screenshot/ScreenshotBridge.cs

@@ -1,8 +1,10 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 
 namespace TweetDuck.Core.Notification.Screenshot{
+    [SuppressMessage("ReSharper", "UnusedMember.Global")]
     sealed class ScreenshotBridge{
         private readonly Control owner;
 

Core/Notification/Screenshot/TweetScreenshotManager.cs

@@ -9,7 +9,7 @@
 using System;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
-using TweetDuck.Plugins;
+using TweetLib.Core.Features.Plugins;
 
 #if GEN_SCREENSHOT_FRAMES
 using System.Drawing.Imaging;
@@ -134,9 +134,9 @@ namespace TweetDuck.Core.Notification.Screenshot{
         private void debugger_Tick(object sender, EventArgs e){
             if (frameCounter < 63 && screenshot.TakeScreenshot(true)){
                 try{
-                    Clipboard.GetImage()?.Save(Path.Combine(DebugScreenshotPath, "frame_"+(++frameCounter)+".png"), ImageFormat.Png);
+                    Clipboard.GetImage()?.Save(Path.Combine(DebugScreenshotPath, "frame_" + (++frameCounter) + ".png"), ImageFormat.Png);
                 }catch{
-                    System.Diagnostics.Debug.WriteLine("Failed generating frame "+frameCounter);
+                    System.Diagnostics.Debug.WriteLine("Failed generating frame " + frameCounter);
                 }
             }
             else{

Core/Notification/SoundNotification.cs

@@ -11,18 +11,16 @@ namespace TweetDuck.Core.Notification{
         public const string SupportedFormats = "*.wav;*.ogg;*.mp3;*.flac;*.opus;*.weba;*.webm";
         
         public static IResourceHandler CreateFileHandler(string path){
-            string mimeType;
-
-            switch(Path.GetExtension(path)){
-                case ".weba":
-                case ".webm": mimeType = "audio/webm"; break;
-                case ".wav": mimeType = "audio/wav"; break;
-                case ".ogg": mimeType = "audio/ogg"; break;
-                case ".mp3": mimeType = "audio/mp3"; break;
-                case ".flac": mimeType = "audio/flac"; break;
-                case ".opus": mimeType = "audio/ogg; codecs=opus"; break;
-                default: mimeType = null; break;
-            }
+            string mimeType = Path.GetExtension(path) switch{
+                ".weba" => "audio/webm",
+                ".webm" => "audio/webm",
+                ".wav"  => "audio/wav",
+                ".ogg"  => "audio/ogg",
+                ".mp3"  => "audio/mp3",
+                ".flac" => "audio/flac",
+                ".opus" => "audio/ogg; codecs=opus",
+                _       => null
+            };
 
             try{
                 return ResourceHandler.FromFilePath(path, mimeType);
@@ -30,12 +28,12 @@ namespace TweetDuck.Core.Notification{
                 FormBrowser browser = FormManager.TryFind<FormBrowser>();
 
                 browser?.InvokeAsyncSafe(() => {
-                    using(FormMessage form = new FormMessage("Sound Notification Error", "Could not find custom notification sound file:\n"+path, MessageBoxIcon.Error)){
+                    using(FormMessage form = new FormMessage("Sound Notification Error", "Could not find custom notification sound file:\n" + path, MessageBoxIcon.Error)){
                         form.AddButton(FormMessage.Ignore, ControlType.Cancel | ControlType.Focused);
                         
                         Button btnViewOptions = form.AddButton("View Options");
                         btnViewOptions.Width += 16;
-                        btnViewOptions.Location = new Point(btnViewOptions.Location.X-16, btnViewOptions.Location.Y);
+                        btnViewOptions.Location = new Point(btnViewOptions.Location.X - 16, btnViewOptions.Location.Y);
 
                         if (form.ShowDialog() == DialogResult.OK && form.ClickedButton == btnViewOptions){
                             browser.OpenSettings(typeof(TabSettingsSounds));

Core/Other/Analytics/AnalyticsFile.cs

@@ -2,7 +2,8 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
-using TweetDuck.Data.Serialization;
+using TweetLib.Core.Serialization;
+using TweetLib.Core.Serialization.Converters;
 
 namespace TweetDuck.Core.Other.Analytics{
     [SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Local")]

Core/Other/Analytics/AnalyticsManager.cs

@@ -8,7 +8,9 @@ using System.Threading.Tasks;
 using System.Timers;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
-using TweetDuck.Plugins;
+using TweetLib.Core;
+using TweetLib.Core.Features.Plugins;
+using TweetLib.Core.Utils;
 
 namespace TweetDuck.Core.Other.Analytics{
     sealed class AnalyticsManager : IDisposable{
@@ -80,7 +82,7 @@ namespace TweetDuck.Core.Other.Analytics{
         private void SetLastDataCollectionTime(DateTime dt, string message = null){
             File.LastDataCollection = new DateTime(dt.Year, dt.Month, dt.Day, dt.Hour, dt.Minute, 0, dt.Kind);
             File.LastCollectionVersion = Program.VersionTag;
-            File.LastCollectionMessage = message ?? dt.ToString("g", Program.Culture);
+            File.LastCollectionMessage = message ?? dt.ToString("g", Lib.Culture);
 
             File.Save();
             RestartTimer();
@@ -88,9 +90,9 @@ namespace TweetDuck.Core.Other.Analytics{
 
         private void RestartTimer(){
             TimeSpan diff = DateTime.Now.Subtract(File.LastDataCollection);
-            int minutesTillNext = (int)(CollectionInterval.TotalMinutes-Math.Floor(diff.TotalMinutes));
+            int minutesTillNext = (int)(CollectionInterval.TotalMinutes - Math.Floor(diff.TotalMinutes));
             
-            currentTimer.Interval = Math.Max(minutesTillNext, 2)*60000;
+            currentTimer.Interval = Math.Max(minutesTillNext, 2) * 60000;
             currentTimer.Start();
         }
 
@@ -117,7 +119,7 @@ namespace TweetDuck.Core.Other.Analytics{
                 System.Diagnostics.Debugger.Break();
                 #endif
 
-                BrowserUtils.CreateWebClient().UploadValues(CollectionUrl, "POST", report.ToNameValueCollection());
+                WebUtils.NewClient(BrowserUtils.UserAgentVanilla).UploadValues(CollectionUrl, "POST", report.ToNameValueCollection());
             }).ContinueWith(task => browser.InvokeAsyncSafe(() => {
                 if (task.Status == TaskStatus.RanToCompletion){
                     SetLastDataCollectionTime(DateTime.Now);
@@ -137,7 +139,7 @@ namespace TweetDuck.Core.Other.Analytics{
 
                             case WebExceptionStatus.ProtocolError:
                                 HttpWebResponse response = e.Response as HttpWebResponse;
-                                message = "HTTP Error "+(response != null ? $"{(int)response.StatusCode} ({response.StatusDescription})" : "(unknown code)");
+                                message = "HTTP Error " + (response != null ? $"{(int)response.StatusCode} ({response.StatusDescription})" : "(unknown code)");
                                 break;
                         }
 
@@ -150,7 +152,7 @@ namespace TweetDuck.Core.Other.Analytics{
                         #endif
                     }
 
-                    ScheduleReportIn(TimeSpan.FromHours(4), message ?? "Error: "+(task.Exception.InnerException?.Message ?? task.Exception.Message));
+                    ScheduleReportIn(TimeSpan.FromHours(4), message ?? "Error: " + (task.Exception.InnerException?.Message ?? task.Exception.Message));
                 }
             }));
         }

Core/Other/Analytics/AnalyticsReport.cs

@@ -47,7 +47,7 @@ namespace TweetDuck.Core.Other.Analytics{
                     build.AppendLine();
                 }
                 else{
-                    build.AppendLine(entry.Key+": "+entry.Value);
+                    build.AppendLine(entry.Key + ": " + entry.Value);
                 }
             }
 

Core/Other/Analytics/AnalyticsReportGenerator.cs

@@ -8,10 +8,12 @@ using TweetDuck.Configuration;
 using System.Linq;
 using System.Management;
 using System.Text.RegularExpressions;
-using TweetDuck.Core.Notification;
 using TweetDuck.Core.Utils;
-using TweetDuck.Plugins;
-using TweetDuck.Plugins.Enums;
+using TweetLib.Core;
+using TweetLib.Core.Features.Notifications;
+using TweetLib.Core.Features.Plugins;
+using TweetLib.Core.Features.Plugins.Enums;
+using TweetLib.Core.Utils;
 
 namespace TweetDuck.Core.Other.Analytics{
     static class AnalyticsReportGenerator{
@@ -27,7 +29,7 @@ namespace TweetDuck.Core.Other.Analytics{
                 { "System Edition"     , SystemEdition },
                 { "System Environment" , Environment.Is64BitOperatingSystem ? "64-bit" : "32-bit" },
                 { "System Build"       , SystemBuild },
-                { "System Locale"      , Program.Culture.Name.ToLower() },
+                { "System Locale"      , Lib.Culture.Name.ToLower() },
                 0,
                 { "RAM" , Exact(RamSize) },
                 { "GPU" , GpuVendor },
@@ -79,7 +81,7 @@ namespace TweetDuck.Core.Other.Analytics{
                 { "Custom Notification CSS" , RoundUp((UserConfig.CustomNotificationCSS ?? string.Empty).Length, 50) },
                 0,
                 { "Plugins All"     , List(plugins.Plugins.Select(Plugin)) },
-                { "Plugins Enabled" , List(plugins.Plugins.Where(plugin => plugins.Config.IsEnabled(plugin)).Select(Plugin)) },
+                { "Plugins Enabled" , List(plugins.Plugins.Where(plugins.Config.IsEnabled).Select(Plugin)) },
                 0,
                 { "Theme"               , Dict(editLayoutDesign, "_theme",                  "light/def") },
                 { "Column Width"        , Dict(editLayoutDesign, "columnWidth",             "310px/def") },
@@ -124,9 +126,9 @@ namespace TweetDuck.Core.Other.Analytics{
 
         private static string Bool(bool value) => value ? "on" : "off";
         private static string Exact(int value) => value.ToString();
-        private static string RoundUp(int value, int multiple) => (multiple*(int)Math.Ceiling((double)value/multiple)).ToString();
+        private static string RoundUp(int value, int multiple) => (multiple * (int)Math.Ceiling((double)value / multiple)).ToString();
         private static string LogRound(int value, int logBase) => (value <= 0 ? 0 : (int)Math.Pow(logBase, Math.Floor(Math.Log(value, logBase)))).ToString();
-        private static string Plugin(Plugin plugin) => plugin.Group.GetIdentifierPrefixShort()+plugin.Identifier.Substring(plugin.Group.GetIdentifierPrefix().Length);
+        private static string Plugin(Plugin plugin) => plugin.Group.GetIdentifierPrefixShort() + plugin.Identifier.Substring(plugin.Group.GetIdentifierPrefix().Length);
         private static string Dict(Dictionary<string, string> dict, string key, string def = "(unknown)") => dict.TryGetValue(key, out string value) ? value : def;
         private static string List(IEnumerable<string> list) => string.Join("|", list.DefaultIfEmpty("(none)"));
 
@@ -141,7 +143,8 @@ namespace TweetDuck.Core.Other.Analytics{
             string osName, osEdition, osBuild;
 
             try{
-                using(RegistryKey key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion", false)){
+                using RegistryKey key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion", false);
+
                 // ReSharper disable once PossibleNullReferenceException
                 osName = key.GetValue("ProductName") as string;
                 osBuild = key.GetValue("CurrentBuild") as string;
@@ -155,7 +158,6 @@ namespace TweetDuck.Core.Other.Analytics{
                         osEdition = match.Groups[2].Value;
                     }
                 }
-                }
             }catch{
                 osName = osEdition = osBuild = null;
             }
@@ -165,10 +167,10 @@ namespace TweetDuck.Core.Other.Analytics{
             SystemBuild = osBuild ?? "(unknown)";
 
             try{
-                using(ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT Capacity FROM Win32_PhysicalMemory")){
+                using ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT Capacity FROM Win32_PhysicalMemory");
+
                 foreach(ManagementBaseObject obj in searcher.Get()){
-                        RamSize += (int)((ulong)obj["Capacity"]/(1024L*1024L));
-                    }
+                    RamSize += (int)((ulong)obj["Capacity"] / (1024L * 1024L));
                 }
             }catch{
                 RamSize = 0;
@@ -177,7 +179,8 @@ namespace TweetDuck.Core.Other.Analytics{
             string gpu = null;
 
             try{
-                using(ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT Caption FROM Win32_VideoController")){
+                using ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT Caption FROM Win32_VideoController");
+
                 foreach(ManagementBaseObject obj in searcher.Get()){
                     string vendor = obj["Caption"] as string;
 
@@ -185,7 +188,6 @@ namespace TweetDuck.Core.Other.Analytics{
                         gpu = vendor;
                     }
                 }
-                }
             }catch{
                 // rip
             }
@@ -204,36 +206,30 @@ namespace TweetDuck.Core.Other.Analytics{
         }
 
         private static string TrayMode{
-            get{
-                switch(UserConfig.TrayBehavior){
-                    case TrayIcon.Behavior.DisplayOnly: return "icon";
-                    case TrayIcon.Behavior.MinimizeToTray: return "minimize";
-                    case TrayIcon.Behavior.CloseToTray: return "close";
-                    case TrayIcon.Behavior.Combined: return "combined";
-                    default: return "off";
-                }
-            }
+            get => UserConfig.TrayBehavior switch{
+                TrayIcon.Behavior.DisplayOnly    => "icon",
+                TrayIcon.Behavior.MinimizeToTray => "minimize",
+                TrayIcon.Behavior.CloseToTray    => "close",
+                TrayIcon.Behavior.Combined       => "combined",
+                _                                => "off"
+            };
         }
 
         private static string NotificationPosition{
-            get{
-                switch(UserConfig.NotificationPosition){
-                    case TweetNotification.Position.TopLeft: return "top left";
-                    case TweetNotification.Position.TopRight: return "top right";
-                    case TweetNotification.Position.BottomLeft: return "bottom left";
-                    case TweetNotification.Position.BottomRight: return "bottom right";
-                    default: return "custom";
-                }
-            }
+            get => UserConfig.NotificationPosition switch{
+                DesktopNotification.Position.TopLeft     => "top left",
+                DesktopNotification.Position.TopRight    => "top right",
+                DesktopNotification.Position.BottomLeft  => "bottom left",
+                DesktopNotification.Position.BottomRight => "bottom right",
+                _                                        => "custom"
+            };
         }
 
         private static string NotificationSize{
-            get{
-                switch(UserConfig.NotificationSize){
-                    case TweetNotification.Size.Auto: return "auto";
-                    default: return RoundUp(UserConfig.CustomNotificationSize.Width, 20)+"x"+RoundUp(UserConfig.CustomNotificationSize.Height, 20);
-                }
-            }
+            get => UserConfig.NotificationSize switch{
+                DesktopNotification.Size.Auto => "auto",
+                _ => RoundUp(UserConfig.CustomNotificationSize.Width, 20) + "x" + RoundUp(UserConfig.CustomNotificationSize.Height, 20)
+            };
         }
 
         private static string NotificationTimer{
@@ -289,7 +285,7 @@ namespace TweetDuck.Core.Other.Analytics{
                     }
 
                     string accType = matchType.Groups[1].Value == "#" ? matchType.Groups[2].Value : "account";
-                    return matchAdvanced.Success && !matchAdvanced.Value.Contains("false") ? "advanced/"+accType : accType;
+                    return matchAdvanced.Success && !matchAdvanced.Value.Contains("false") ? "advanced/" + accType : accType;
                 }catch{
                     return "(unknown)";
                 }
@@ -310,7 +306,7 @@ namespace TweetDuck.Core.Other.Analytics{
                     }
 
                     return new ExternalInfo{
-                        Resolution = screen.Bounds.Width+"x"+screen.Bounds.Height,
+                        Resolution = screen.Bounds.Width + "x" + screen.Bounds.Height,
                         DPI = dpi
                     };
                 }

Core/Other/FormAbout.cs

@@ -12,7 +12,7 @@ namespace TweetDuck.Core.Other{
         public FormAbout(){
             InitializeComponent();
 
-            Text = "About "+Program.BrandName+" "+Program.VersionTag;
+            Text = "About " + Program.BrandName + " " + Program.VersionTag;
 
             labelDescription.Text = "TweetDuck was created by chylex as a replacement to the discontinued official TweetDeck client for Windows.\n\nThe program is available for free under the open source MIT license.";
             

Core/Other/FormGuide.cs

@@ -7,8 +7,8 @@ using TweetDuck.Core.Handling;
 using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Utils;
 using System.Text.RegularExpressions;
+using TweetDuck.Core.Adapters;
 using TweetDuck.Data;
-using TweetDuck.Resources;
 
 namespace TweetDuck.Core.Other{
     sealed partial class FormGuide : Form, FormManager.IAppDialog{
@@ -37,7 +37,7 @@ namespace TweetDuck.Core.Other{
         }
 
         public static void Show(string hash = null){
-            string url = GuideUrl+(hash ?? string.Empty);
+            string url = GuideUrl + (hash ?? string.Empty);
             FormGuide guide = FormManager.TryFind<FormGuide>();
             
             if (guide == null){
@@ -60,15 +60,20 @@ namespace TweetDuck.Core.Other{
         private FormGuide(string url, FormBrowser owner){
             InitializeComponent();
 
-            Text = Program.BrandName+" Guide";
-            Size = new Size(owner.Size.Width*3/4, owner.Size.Height*3/4);
+            Text = Program.BrandName + " Guide";
+            Size = new Size(owner.Size.Width * 3 / 4, owner.Size.Height * 3 / 4);
             VisibleChanged += (sender, args) => this.MoveToCenter(owner);
 
+            ResourceHandlerFactory resourceHandlerFactory = new ResourceHandlerFactory();
+            resourceHandlerFactory.RegisterHandler(DummyPage);
+            
             this.browser = new ChromiumWebBrowser(url){
                 MenuHandler = new ContextMenuGuide(owner),
                 JsDialogHandler = new JavaScriptDialogHandler(),
+                KeyboardHandler = new KeyboardHandlerBase(),
                 LifeSpanHandler = new LifeSpanHandler(),
-                RequestHandler = new RequestHandlerBase(true)
+                RequestHandler = new RequestHandlerBase(true),
+                ResourceHandlerFactory = resourceHandlerFactory
             };
 
             browser.LoadingStateChanged += browser_LoadingStateChanged;
@@ -77,8 +82,6 @@ namespace TweetDuck.Core.Other{
             browser.BrowserSettings.BackgroundColor = (uint)BackColor.ToArgb();
             browser.Dock = DockStyle.None;
             browser.Location = ControlExtensions.InvisibleLocation;
-
-            browser.SetupResourceHandler(DummyPage);
             browser.SetupZoomEvents();
 
             Controls.Add(browser);
@@ -113,7 +116,7 @@ namespace TweetDuck.Core.Other{
         }
 
         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");
+            CefScriptExecutor.RunScript(e.Frame, "Array.prototype.forEach.call(document.getElementsByTagName('A'), ele => ele.addEventListener('click', e => { e.preventDefault(); window.open(ele.getAttribute('href')); }))", "gen:links");
         }
     }
 }

Core/Other/FormMessage.cs

@@ -133,7 +133,7 @@ namespace TweetDuck.Core.Other{
                 Font = SystemFonts.MessageBoxFont,
                 Location = new Point(0, 12),
                 Size = new Size(BrowserUtils.Scale(88, dpiScale), BrowserUtils.Scale(26, dpiScale)),
-                TabIndex = 256-buttonCount,
+                TabIndex = 256 - buttonCount,
                 Text = title,
                 UseVisualStyleBackColor = true
             };
@@ -171,17 +171,17 @@ namespace TweetDuck.Core.Other{
             
             control.Size = new Size(BrowserUtils.Scale(control.Width, dpiScale), BrowserUtils.Scale(control.Height, dpiScale));
 
-            minFormWidth += control.Width+control.Margin.Horizontal;
+            minFormWidth += control.Width + control.Margin.Horizontal;
             ClientWidth = Math.Max(realFormWidth, minFormWidth);
         }
         
         private void RecalculateButtonLocation(){
             int dist = ButtonDistance;
-            int start = ClientWidth-dist;
+            int start = ClientWidth - dist;
 
             for(int index = 0; index < buttonCount; index++){
                 Control control = panelActions.Controls[index];
-                control.Location = new Point(start-index*dist, control.Location.Y);
+                control.Location = new Point(start - index * dist, control.Location.Y);
             }
         }
 
@@ -194,17 +194,17 @@ namespace TweetDuck.Core.Other{
             int labelOffset = BrowserUtils.Scale(8, dpiScale);
 
             if (isMultiline && !wasLabelMultiline){
-                labelMessage.Location = new Point(labelMessage.Location.X, labelMessage.Location.Y-labelOffset);
+                labelMessage.Location = new Point(labelMessage.Location.X, labelMessage.Location.Y - labelOffset);
                 prevLabelHeight += labelOffset;
             }
             else if (!isMultiline && wasLabelMultiline){
-                labelMessage.Location = new Point(labelMessage.Location.X, labelMessage.Location.Y+labelOffset);
+                labelMessage.Location = new Point(labelMessage.Location.X, labelMessage.Location.Y + labelOffset);
                 prevLabelHeight -= labelOffset;
             }
 
-            realFormWidth = ClientWidth-(icon == null ? BrowserUtils.Scale(50, dpiScale) : 0)+labelMessage.Width-prevLabelWidth;
+            realFormWidth = ClientWidth - (icon == null ? BrowserUtils.Scale(50, dpiScale) : 0) + labelMessage.Width - prevLabelWidth;
             ClientWidth = Math.Max(realFormWidth, minFormWidth);
-            Height += labelMessage.Height-prevLabelHeight;
+            Height += labelMessage.Height - prevLabelHeight;
 
             prevLabelWidth = labelMessage.Width;
             prevLabelHeight = labelMessage.Height;
@@ -213,7 +213,7 @@ namespace TweetDuck.Core.Other{
 
         protected override void OnPaint(PaintEventArgs e){
             if (icon != null){
-                e.Graphics.DrawIcon(icon, BrowserUtils.Scale(25, dpiScale), 1+BrowserUtils.Scale(25, dpiScale));
+                e.Graphics.DrawIcon(icon, BrowserUtils.Scale(25, dpiScale), 1 + BrowserUtils.Scale(25, dpiScale));
             }
 
             base.OnPaint(e);

Core/Other/FormPlugins.Designer.cs

@@ -1,4 +1,6 @@
-namespace TweetDuck.Core.Other {
+using TweetDuck.Core.Controls;
+
+namespace TweetDuck.Core.Other {
     partial class FormPlugins {
         /// <summary>
         /// Required designer variable.
@@ -27,7 +29,7 @@
             this.btnClose = new System.Windows.Forms.Button();
             this.btnReload = new System.Windows.Forms.Button();
             this.btnOpenFolder = new System.Windows.Forms.Button();
-            this.flowLayoutPlugins = new TweetDuck.Plugins.Controls.PluginListFlowLayout();
+            this.flowLayoutPlugins = new FlowLayoutPanelNoHScroll();
             this.timerLayout = new System.Windows.Forms.Timer(this.components);
             this.SuspendLayout();
             // 
@@ -117,7 +119,7 @@
         private System.Windows.Forms.Button btnClose;
         private System.Windows.Forms.Button btnReload;
         private System.Windows.Forms.Button btnOpenFolder;
-        private Plugins.Controls.PluginListFlowLayout flowLayoutPlugins;
+        private FlowLayoutPanelNoHScroll flowLayoutPlugins;
         private System.Windows.Forms.Timer timerLayout;
     }
 }

Core/Other/FormPlugins.cs

@@ -1,11 +1,11 @@
 using System;
-using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
 using TweetDuck.Plugins;
-using TweetDuck.Plugins.Controls;
+using TweetLib.Core;
+using TweetLib.Core.Features.Plugins;
 
 namespace TweetDuck.Core.Other{
     sealed partial class FormPlugins : Form, FormManager.IAppDialog{
@@ -16,7 +16,7 @@ namespace TweetDuck.Core.Other{
         public FormPlugins(){
             InitializeComponent();
 
-            Text = Program.BrandName+" Plugins";
+            Text = Program.BrandName + " Plugins";
         }
 
         public FormPlugins(PluginManager pluginManager) : this(){
@@ -69,8 +69,8 @@ namespace TweetDuck.Core.Other{
             timerLayout.Stop();
             
             // stupid WinForms scrollbars and panels
-            Padding = new Padding(Padding.Left, Padding.Top, Padding.Right+1, Padding.Bottom+1);
-            Padding = new Padding(Padding.Left, Padding.Top, Padding.Right-1, Padding.Bottom-1);
+            Padding = new Padding(Padding.Left, Padding.Top, Padding.Right + 1, Padding.Bottom + 1);
+            Padding = new Padding(Padding.Left, Padding.Top, Padding.Right - 1, Padding.Bottom - 1);
         }
 
         public void flowLayoutPlugins_Resize(object sender, EventArgs e){
@@ -80,22 +80,22 @@ namespace TweetDuck.Core.Other{
                 return;
             }
 
-            bool showScrollBar = lastPlugin.Location.Y+lastPlugin.Height+1 >= flowLayoutPlugins.Height;
+            bool showScrollBar = lastPlugin.Location.Y + lastPlugin.Height + 1 >= flowLayoutPlugins.Height;
             int horizontalOffset = showScrollBar ? SystemInformation.VerticalScrollBarWidth : 0;
             
             flowLayoutPlugins.AutoScroll = showScrollBar;
             flowLayoutPlugins.VerticalScroll.Visible = showScrollBar;
 
             foreach(Control control in flowLayoutPlugins.Controls){
-                control.Width = flowLayoutPlugins.Width-control.Margin.Horizontal-horizontalOffset;
+                control.Width = flowLayoutPlugins.Width - control.Margin.Horizontal - horizontalOffset;
             }
             
-            flowLayoutPlugins.Controls[flowLayoutPlugins.Controls.Count-1].Visible = !showScrollBar;
+            flowLayoutPlugins.Controls[flowLayoutPlugins.Controls.Count - 1].Visible = !showScrollBar;
             flowLayoutPlugins.Focus();
         }
 
         private void btnOpenFolder_Click(object sender, EventArgs e){
-            using(Process.Start("explorer.exe", '"'+pluginManager.PathCustomPlugins+'"')){}
+            App.SystemHandler.OpenFileExplorer(pluginManager.PathCustomPlugins);
         }
 
         private void btnReload_Click(object sender, EventArgs e){

Core/Other/FormSettings.cs

@@ -9,8 +9,8 @@ using TweetDuck.Core.Other.Analytics;
 using TweetDuck.Core.Other.Settings;
 using TweetDuck.Core.Other.Settings.Dialogs;
 using TweetDuck.Core.Utils;
-using TweetDuck.Plugins;
-using TweetDuck.Updates;
+using TweetLib.Core.Features.Plugins;
+using TweetLib.Core.Features.Updates;
 
 namespace TweetDuck.Core.Other{
     sealed partial class FormSettings : Form, FormManager.IAppDialog{
@@ -27,7 +27,7 @@ namespace TweetDuck.Core.Other{
         public FormSettings(FormBrowser browser, PluginManager plugins, UpdateHandler updates, AnalyticsManager analytics, Type startTab){
             InitializeComponent();
 
-            Text = Program.BrandName+" Options";
+            Text = Program.BrandName + " Options";
 
             this.browser = browser;
             this.browser.PauseNotification();
@@ -110,7 +110,7 @@ namespace TweetDuck.Core.Other{
                 BackColor = SystemColors.Control,
                 FlatStyle = FlatStyle.Flat,
                 Font = SystemFonts.MessageBoxFont,
-                Location = new Point(0, (buttonHeight+1)*(panelButtons.Controls.Count/2)),
+                Location = new Point(0, (buttonHeight + 1) * (panelButtons.Controls.Count / 2)),
                 Margin = new Padding(0),
                 Size = new Size(panelButtons.Width, buttonHeight),
                 Text = title,
@@ -125,7 +125,7 @@ namespace TweetDuck.Core.Other{
 
             panelButtons.Controls.Add(new Panel{
                 BackColor = Color.DimGray,
-                Location = new Point(0, panelButtons.Controls[panelButtons.Controls.Count-1].Location.Y+buttonHeight),
+                Location = new Point(0, panelButtons.Controls[panelButtons.Controls.Count - 1].Location.Y + buttonHeight),
                 Margin = new Padding(0),
                 Size = new Size(panelButtons.Width, 1)
             });
@@ -157,8 +157,8 @@ namespace TweetDuck.Core.Other{
                     }
                 }
 
-                if (tab.Control.Height < panelContents.Height-2){
-                    tab.Control.Height = panelContents.Height-2; // fixes off-by-pixel error on high DPI
+                if (tab.Control.Height < panelContents.Height - 2){
+                    tab.Control.Height = panelContents.Height - 2; // fixes off-by-pixel error on high DPI
                 }
 
                 tab.Control.OnReady();
@@ -195,7 +195,7 @@ namespace TweetDuck.Core.Other{
         private sealed class SettingsTab{
             public Button Button { get; }
 
-            public BaseTabSettings Control => control ?? (control = constructor());
+            public BaseTabSettings Control => control ??= constructor();
             public bool IsInitialized => control != null;
 
             private readonly Func<BaseTabSettings> constructor;

Core/Other/Settings/BaseTabSettings.cs

@@ -9,7 +9,7 @@ namespace TweetDuck.Core.Other.Settings{
 
         public IEnumerable<Control> InteractiveControls{
             get{
-                IEnumerable<Control> FindInteractiveControls(Control parent){
+                static IEnumerable<Control> FindInteractiveControls(Control parent){
                     foreach(Control control in parent.Controls){
                         if (control is Panel subPanel){
                             foreach(Control subControl in FindInteractiveControls(subPanel)){

Core/Other/Settings/Dialogs/DialogSettingsAnalytics.cs

@@ -5,12 +5,10 @@ using TweetDuck.Core.Other.Analytics;
 
 namespace TweetDuck.Core.Other.Settings.Dialogs{
     sealed partial class DialogSettingsAnalytics : Form{
-        public string CefArgs => textBoxReport.Text;
-
         public DialogSettingsAnalytics(AnalyticsReport report){
             InitializeComponent();
             
-            Text = Program.BrandName+" Options - Analytics Report";
+            Text = Program.BrandName + " Options - Analytics Report";
             
             textBoxReport.EnableMultilineShortcuts();
             textBoxReport.Text = report.ToString().TrimEnd();

Core/Other/Settings/Dialogs/DialogSettingsCSS.cs

@@ -16,7 +16,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
         public DialogSettingsCSS(string browserCSS, string notificationCSS, Action<string> reinjectBrowserCSS, Action openDevTools){
             InitializeComponent();
             
-            Text = Program.BrandName+" Options - CSS";
+            Text = Program.BrandName + " Options - CSS";
 
             this.reinjectBrowserCSS = reinjectBrowserCSS;
             this.openDevTools = openDevTools;
@@ -64,21 +64,21 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                         }
                     }
                     
-                    if (!(deleteTo < text.Length-1 && text[deleteTo] == '\r' && text[deleteTo+1] == '\n')){
+                    if (!(deleteTo < text.Length - 1 && text[deleteTo] == '\r' && text[deleteTo + 1] == '\n')){
                         ++deleteTo;
                     }
 
-                    tb.Select(deleteTo, tb.SelectionLength+tb.SelectionStart-deleteTo);
+                    tb.Select(deleteTo, tb.SelectionLength + tb.SelectionStart - deleteTo);
                     tb.SelectedText = string.Empty;
                 }
             }
             else if (e.KeyCode == Keys.Back && e.Modifiers == Keys.None){
                 int deleteTo = tb.SelectionStart;
 
-                if (deleteTo > 1 && text[deleteTo-1] == ' ' && text[deleteTo-2] == ' '){
+                if (deleteTo > 1 && text[deleteTo - 1] == ' ' && text[deleteTo - 2] == ' '){
                     e.SuppressKeyPress = true;
 
-                    tb.Select(deleteTo-2, 2);
+                    tb.Select(deleteTo - 2, 2);
                     tb.SelectedText = string.Empty;
                 }
             }
@@ -89,28 +89,28 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                 if (insertAt == 0){
                     return;
                 }
-                else if (text[insertAt-1] == '{'){
-                    insertText = Environment.NewLine+"  ";
+                else if (text[insertAt - 1] == '{'){
+                    insertText = Environment.NewLine + "  ";
 
-                    int nextBracket = insertAt < text.Length ? text.IndexOfAny(new char[]{ '{', '}' }, insertAt+1) : -1;
+                    int nextBracket = insertAt < text.Length ? text.IndexOfAny(new char[]{ '{', '}' }, insertAt + 1) : -1;
 
                     if (nextBracket == -1 || text[nextBracket] == '{'){
-                        string insertExtra = Environment.NewLine+"}";
+                        string insertExtra = Environment.NewLine + "}";
                         insertText += insertExtra;
                         cursorOffset -= insertExtra.Length;
                     }
                 }
                 else{
-                    int lineStart = text.LastIndexOf('\n', tb.SelectionStart-1);
+                    int lineStart = text.LastIndexOf('\n', tb.SelectionStart - 1);
 
-                    Match match = Regex.Match(text.Substring(lineStart == -1 ? 0 : lineStart+1), "^([ \t]+)");
-                    insertText = match.Success ? Environment.NewLine+match.Groups[1].Value : null;
+                    Match match = Regex.Match(text.Substring(lineStart == -1 ? 0 : lineStart + 1), "^([ \t]+)");
+                    insertText = match.Success ? Environment.NewLine + match.Groups[1].Value : null;
                 }
 
                 if (!string.IsNullOrEmpty(insertText)){
                     e.SuppressKeyPress = true;
                     tb.Text = text.Insert(insertAt, insertText);
-                    tb.SelectionStart = insertAt+cursorOffset+insertText.Length;
+                    tb.SelectionStart = insertAt + cursorOffset + insertText.Length;
                 }
             }
         }

Core/Other/Settings/Dialogs/DialogSettingsCefArgs.cs

@@ -2,7 +2,7 @@
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
-using TweetDuck.Data;
+using TweetLib.Core.Collections;
 
 namespace TweetDuck.Core.Other.Settings.Dialogs{
     sealed partial class DialogSettingsCefArgs : Form{
@@ -13,7 +13,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
         public DialogSettingsCefArgs(string args){
             InitializeComponent();
             
-            Text = Program.BrandName+" Options - CEF Arguments";
+            Text = Program.BrandName + " Options - CEF Arguments";
             
             textBoxArgs.EnableMultilineShortcuts();
             textBoxArgs.Text = initialArgs = args ?? "";
@@ -32,7 +32,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
             }
 
             int count = CommandLineArgs.ReadCefArguments(CefArgs).Count;
-            string prompt = count == 0 && !string.IsNullOrWhiteSpace(initialArgs) ? "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

@@ -4,8 +4,8 @@ using System.IO;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
 using TweetDuck.Core.Management;
-using TweetDuck.Core.Utils;
-using TweetDuck.Plugins;
+using TweetLib.Core.Features.Plugins;
+using TweetLib.Core.Utils;
 
 namespace TweetDuck.Core.Other.Settings.Dialogs{
     sealed partial class DialogSettingsManage : Form{
@@ -33,6 +33,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
         
         private readonly PluginManager plugins;
         private readonly Dictionary<CheckBox, ProfileManager.Items> checkBoxMap = new Dictionary<CheckBox, ProfileManager.Items>(4);
+        private readonly bool openImportImmediately;
 
         private State currentState;
         private ProfileManager importManager;
@@ -51,6 +52,8 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
             this.checkBoxMap[cbSession] = ProfileManager.Items.Session;
             this.checkBoxMap[cbPluginData] = ProfileManager.Items.PluginData;
 
+            this.openImportImmediately = openImportImmediately;
+
             if (openImportImmediately){
                 radioImport.Checked = true;
                 btnContinue_Click(null, EventArgs.Empty);
@@ -88,6 +91,10 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                             Filter = "TweetDuck Profile (*.tdsettings)|*.tdsettings"
                         }){
                             if (dialog.ShowDialog() != DialogResult.OK){
+                                if (openImportImmediately){
+                                    Close();
+                                }
+
                                 return;
                             }
 
@@ -117,7 +124,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                     // Continue...
                     panelDecision.Visible = false;
                     panelSelection.Visible = true;
-                    Height += panelSelection.Height-panelDecision.Height;
+                    Height += panelSelection.Height - panelDecision.Height;
                     break;
 
                 case State.Reset:

Core/Other/Settings/Dialogs/DialogSettingsRestart.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
-using TweetDuck.Data;
+using TweetLib.Core.Collections;
 
 namespace TweetDuck.Core.Other.Settings.Dialogs{
     sealed partial class DialogSettingsRestart : Form{
@@ -18,13 +18,13 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                 tbDataFolder.Enabled = false;
             }
             else{
-                tbDataFolder.Text = currentArgs.GetValue(Arguments.ArgDataFolder, string.Empty);
+                tbDataFolder.Text = currentArgs.GetValue(Arguments.ArgDataFolder) ?? string.Empty;
                 tbDataFolder.TextChanged += control_Change;
             }
 
             control_Change(this, EventArgs.Empty);
 
-            Text = Program.BrandName+" Arguments";
+            Text = Program.BrandName + " Arguments";
         }
 
         private void control_Change(object sender, EventArgs e){

Core/Other/Settings/Dialogs/DialogSettingsSearchEngine.cs

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

Core/Other/Settings/TabSettingsAdvanced.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
@@ -7,6 +6,7 @@ using TweetDuck.Core.Controls;
 using TweetDuck.Core.Management;
 using TweetDuck.Core.Other.Settings.Dialogs;
 using TweetDuck.Core.Utils;
+using TweetLib.Core;
 
 namespace TweetDuck.Core.Other.Settings{
     sealed partial class TabSettingsAdvanced : BaseTabSettings{
@@ -36,7 +36,7 @@ namespace TweetDuck.Core.Other.Settings{
             numClearCacheThreshold.SetValueSafe(SysConfig.ClearCacheThreshold);
             
             BrowserCache.GetCacheSize(task => {
-                string text = task.Status == TaskStatus.RanToCompletion ? (int)Math.Ceiling(task.Result/(1024.0*1024.0))+" MB" : "unknown";
+                string text = task.Status == TaskStatus.RanToCompletion ? (int)Math.Ceiling(task.Result / (1024.0 * 1024.0)) + " MB" : "unknown";
                 this.InvokeSafe(() => btnClearCache.Text = $"Clear Cache ({text})");
             });
 
@@ -67,11 +67,11 @@ namespace TweetDuck.Core.Other.Settings{
         #region Application
         
         private void btnOpenAppFolder_Click(object sender, EventArgs e){
-            using(Process.Start("explorer.exe", "\""+Program.ProgramPath+"\"")){}
+            App.SystemHandler.OpenFileExplorer(Program.ProgramPath);
         }
 
         private void btnOpenDataFolder_Click(object sender, EventArgs e){
-            using(Process.Start("explorer.exe", "\""+Program.StoragePath+"\"")){}
+            App.SystemHandler.OpenFileExplorer(Program.StoragePath);
         }
 
         private void btnRestart_Click(object sender, EventArgs e){

Core/Other/Settings/TabSettingsFeedback.cs

@@ -3,7 +3,7 @@ using System.Windows.Forms;
 using TweetDuck.Core.Other.Analytics;
 using TweetDuck.Core.Other.Settings.Dialogs;
 using TweetDuck.Core.Utils;
-using TweetDuck.Plugins;
+using TweetLib.Core.Features.Plugins;
 
 namespace TweetDuck.Core.Other.Settings{
     sealed partial class TabSettingsFeedback : BaseTabSettings{
@@ -24,7 +24,7 @@ namespace TweetDuck.Core.Other.Settings{
 
             if (analytics != null){
                 string collectionTime = analyticsFile.LastCollectionMessage;
-                labelDataCollectionMessage.Text = string.IsNullOrEmpty(collectionTime) ? "No collection yet" : "Last collection: "+collectionTime;
+                labelDataCollectionMessage.Text = string.IsNullOrEmpty(collectionTime) ? "No collection yet" : "Last collection: " + collectionTime;
             }
         }
 

Core/Other/Settings/TabSettingsGeneral.Designer.cs

@@ -39,6 +39,7 @@
             this.checkAnimatedAvatars = new System.Windows.Forms.CheckBox();
             this.labelUpdates = new System.Windows.Forms.Label();
             this.flowPanelLeft = new System.Windows.Forms.FlowLayoutPanel();
+            this.checkFocusDmInput = new System.Windows.Forms.CheckBox();
             this.checkKeepLikeFollowDialogsOpen = new System.Windows.Forms.CheckBox();
             this.labelTray = new System.Windows.Forms.Label();
             this.comboBoxTrayType = new System.Windows.Forms.ComboBox();
@@ -82,11 +83,11 @@
             // 
             this.checkUpdateNotifications.AutoSize = true;
             this.checkUpdateNotifications.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 393);
+            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 409);
             this.checkUpdateNotifications.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkUpdateNotifications.Name = "checkUpdateNotifications";
             this.checkUpdateNotifications.Size = new System.Drawing.Size(182, 19);
-            this.checkUpdateNotifications.TabIndex = 13;
+            this.checkUpdateNotifications.TabIndex = 14;
             this.checkUpdateNotifications.Text = "Check Updates Automatically";
             this.checkUpdateNotifications.UseVisualStyleBackColor = true;
             // 
@@ -94,12 +95,12 @@
             // 
             this.btnCheckUpdates.AutoSize = true;
             this.btnCheckUpdates.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.btnCheckUpdates.Location = new System.Drawing.Point(5, 417);
+            this.btnCheckUpdates.Location = new System.Drawing.Point(5, 433);
             this.btnCheckUpdates.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnCheckUpdates.Name = "btnCheckUpdates";
             this.btnCheckUpdates.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.btnCheckUpdates.Size = new System.Drawing.Size(128, 25);
-            this.btnCheckUpdates.TabIndex = 14;
+            this.btnCheckUpdates.TabIndex = 15;
             this.btnCheckUpdates.Text = "Check Updates Now";
             this.btnCheckUpdates.UseVisualStyleBackColor = true;
             // 
@@ -119,11 +120,11 @@
             // 
             this.checkBestImageQuality.AutoSize = true;
             this.checkBestImageQuality.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkBestImageQuality.Location = new System.Drawing.Point(6, 98);
+            this.checkBestImageQuality.Location = new System.Drawing.Point(6, 122);
             this.checkBestImageQuality.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkBestImageQuality.Name = "checkBestImageQuality";
             this.checkBestImageQuality.Size = new System.Drawing.Size(125, 19);
-            this.checkBestImageQuality.TabIndex = 4;
+            this.checkBestImageQuality.TabIndex = 5;
             this.checkBestImageQuality.Text = "Best Image Quality";
             this.checkBestImageQuality.UseVisualStyleBackColor = true;
             // 
@@ -131,11 +132,11 @@
             // 
             this.checkOpenSearchInFirstColumn.AutoSize = true;
             this.checkOpenSearchInFirstColumn.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkOpenSearchInFirstColumn.Location = new System.Drawing.Point(6, 50);
+            this.checkOpenSearchInFirstColumn.Location = new System.Drawing.Point(6, 74);
             this.checkOpenSearchInFirstColumn.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkOpenSearchInFirstColumn.Name = "checkOpenSearchInFirstColumn";
             this.checkOpenSearchInFirstColumn.Size = new System.Drawing.Size(245, 19);
-            this.checkOpenSearchInFirstColumn.TabIndex = 2;
+            this.checkOpenSearchInFirstColumn.TabIndex = 3;
             this.checkOpenSearchInFirstColumn.Text = "Add Search Columns Before First Column";
             this.checkOpenSearchInFirstColumn.UseVisualStyleBackColor = true;
             // 
@@ -158,11 +159,11 @@
             // 
             this.labelZoom.AutoSize = true;
             this.labelZoom.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
-            this.labelZoom.Location = new System.Drawing.Point(3, 155);
+            this.labelZoom.Location = new System.Drawing.Point(3, 179);
             this.labelZoom.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelZoom.Name = "labelZoom";
             this.labelZoom.Size = new System.Drawing.Size(39, 15);
-            this.labelZoom.TabIndex = 6;
+            this.labelZoom.TabIndex = 7;
             this.labelZoom.Text = "Zoom";
             // 
             // zoomUpdateTimer
@@ -185,21 +186,21 @@
             // 
             this.panelZoom.Controls.Add(this.trackBarZoom);
             this.panelZoom.Controls.Add(this.labelZoomValue);
-            this.panelZoom.Location = new System.Drawing.Point(0, 171);
+            this.panelZoom.Location = new System.Drawing.Point(0, 195);
             this.panelZoom.Margin = new System.Windows.Forms.Padding(0, 1, 0, 0);
             this.panelZoom.Name = "panelZoom";
             this.panelZoom.Size = new System.Drawing.Size(300, 35);
-            this.panelZoom.TabIndex = 7;
+            this.panelZoom.TabIndex = 8;
             // 
             // checkAnimatedAvatars
             // 
             this.checkAnimatedAvatars.AutoSize = true;
             this.checkAnimatedAvatars.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkAnimatedAvatars.Location = new System.Drawing.Point(6, 122);
+            this.checkAnimatedAvatars.Location = new System.Drawing.Point(6, 146);
             this.checkAnimatedAvatars.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkAnimatedAvatars.Name = "checkAnimatedAvatars";
             this.checkAnimatedAvatars.Size = new System.Drawing.Size(158, 19);
-            this.checkAnimatedAvatars.TabIndex = 5;
+            this.checkAnimatedAvatars.TabIndex = 6;
             this.checkAnimatedAvatars.Text = "Enable Animated Avatars";
             this.checkAnimatedAvatars.UseVisualStyleBackColor = true;
             // 
@@ -207,11 +208,11 @@
             // 
             this.labelUpdates.AutoSize = true;
             this.labelUpdates.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
-            this.labelUpdates.Location = new System.Drawing.Point(0, 367);
-            this.labelUpdates.Margin = new System.Windows.Forms.Padding(0, 30, 0, 1);
+            this.labelUpdates.Location = new System.Drawing.Point(0, 383);
+            this.labelUpdates.Margin = new System.Windows.Forms.Padding(0, 27, 0, 1);
             this.labelUpdates.Name = "labelUpdates";
             this.labelUpdates.Size = new System.Drawing.Size(69, 19);
-            this.labelUpdates.TabIndex = 12;
+            this.labelUpdates.TabIndex = 13;
             this.labelUpdates.Text = "UPDATES";
             // 
             // flowPanelLeft
@@ -220,6 +221,7 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.flowPanelLeft.Controls.Add(this.labelUI);
             this.flowPanelLeft.Controls.Add(this.checkExpandLinks);
+            this.flowPanelLeft.Controls.Add(this.checkFocusDmInput);
             this.flowPanelLeft.Controls.Add(this.checkOpenSearchInFirstColumn);
             this.flowPanelLeft.Controls.Add(this.checkKeepLikeFollowDialogsOpen);
             this.flowPanelLeft.Controls.Add(this.checkBestImageQuality);
@@ -240,15 +242,27 @@
             this.flowPanelLeft.TabIndex = 0;
             this.flowPanelLeft.WrapContents = false;
             // 
+            // checkFocusDmInput
+            // 
+            this.checkFocusDmInput.AutoSize = true;
+            this.checkFocusDmInput.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.checkFocusDmInput.Location = new System.Drawing.Point(6, 50);
+            this.checkFocusDmInput.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
+            this.checkFocusDmInput.Name = "checkFocusDmInput";
+            this.checkFocusDmInput.Size = new System.Drawing.Size(282, 19);
+            this.checkFocusDmInput.TabIndex = 2;
+            this.checkFocusDmInput.Text = "Focus Input Field When Opening Direct Message";
+            this.checkFocusDmInput.UseVisualStyleBackColor = true;
+            // 
             // checkKeepLikeFollowDialogsOpen
             // 
             this.checkKeepLikeFollowDialogsOpen.AutoSize = true;
             this.checkKeepLikeFollowDialogsOpen.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkKeepLikeFollowDialogsOpen.Location = new System.Drawing.Point(6, 74);
+            this.checkKeepLikeFollowDialogsOpen.Location = new System.Drawing.Point(6, 98);
             this.checkKeepLikeFollowDialogsOpen.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkKeepLikeFollowDialogsOpen.Name = "checkKeepLikeFollowDialogsOpen";
             this.checkKeepLikeFollowDialogsOpen.Size = new System.Drawing.Size(190, 19);
-            this.checkKeepLikeFollowDialogsOpen.TabIndex = 3;
+            this.checkKeepLikeFollowDialogsOpen.TabIndex = 4;
             this.checkKeepLikeFollowDialogsOpen.Text = "Keep Like/Follow Dialogs Open";
             this.checkKeepLikeFollowDialogsOpen.UseVisualStyleBackColor = true;
             // 
@@ -256,11 +270,11 @@
             // 
             this.labelTray.AutoSize = true;
             this.labelTray.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
-            this.labelTray.Location = new System.Drawing.Point(0, 236);
-            this.labelTray.Margin = new System.Windows.Forms.Padding(0, 30, 0, 1);
+            this.labelTray.Location = new System.Drawing.Point(0, 255);
+            this.labelTray.Margin = new System.Windows.Forms.Padding(0, 25, 0, 1);
             this.labelTray.Name = "labelTray";
             this.labelTray.Size = new System.Drawing.Size(99, 19);
-            this.labelTray.TabIndex = 8;
+            this.labelTray.TabIndex = 9;
             this.labelTray.Text = "SYSTEM TRAY";
             // 
             // comboBoxTrayType
@@ -268,32 +282,32 @@
             this.comboBoxTrayType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBoxTrayType.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.comboBoxTrayType.FormattingEnabled = true;
-            this.comboBoxTrayType.Location = new System.Drawing.Point(5, 260);
+            this.comboBoxTrayType.Location = new System.Drawing.Point(5, 279);
             this.comboBoxTrayType.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.comboBoxTrayType.Name = "comboBoxTrayType";
             this.comboBoxTrayType.Size = new System.Drawing.Size(144, 23);
-            this.comboBoxTrayType.TabIndex = 9;
+            this.comboBoxTrayType.TabIndex = 10;
             // 
             // labelTrayIcon
             // 
             this.labelTrayIcon.AutoSize = true;
             this.labelTrayIcon.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
-            this.labelTrayIcon.Location = new System.Drawing.Point(3, 295);
+            this.labelTrayIcon.Location = new System.Drawing.Point(3, 314);
             this.labelTrayIcon.Margin = new System.Windows.Forms.Padding(3, 9, 3, 0);
             this.labelTrayIcon.Name = "labelTrayIcon";
             this.labelTrayIcon.Size = new System.Drawing.Size(56, 15);
-            this.labelTrayIcon.TabIndex = 10;
+            this.labelTrayIcon.TabIndex = 11;
             this.labelTrayIcon.Text = "Tray Icon";
             // 
             // checkTrayHighlight
             // 
             this.checkTrayHighlight.AutoSize = true;
             this.checkTrayHighlight.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkTrayHighlight.Location = new System.Drawing.Point(6, 316);
+            this.checkTrayHighlight.Location = new System.Drawing.Point(6, 335);
             this.checkTrayHighlight.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkTrayHighlight.Name = "checkTrayHighlight";
             this.checkTrayHighlight.Size = new System.Drawing.Size(114, 19);
-            this.checkTrayHighlight.TabIndex = 11;
+            this.checkTrayHighlight.TabIndex = 12;
             this.checkTrayHighlight.Text = "Enable Highlight";
             this.checkTrayHighlight.UseVisualStyleBackColor = true;
             // 
@@ -548,5 +562,6 @@
         private System.Windows.Forms.Label labelTranslationTarget;
         private System.Windows.Forms.ComboBox comboBoxTranslationTarget;
         private System.Windows.Forms.CheckBox checkHardwareAcceleration;
+        private System.Windows.Forms.CheckBox checkFocusDmInput;
     }
 }

Core/Other/Settings/TabSettingsGeneral.cs

@@ -6,7 +6,8 @@ using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Other.Settings.Dialogs;
 using TweetDuck.Core.Utils;
-using TweetDuck.Updates;
+using TweetLib.Core.Features.Updates;
+using TweetLib.Core.Utils;
 
 namespace TweetDuck.Core.Other.Settings{
     sealed partial class TabSettingsGeneral : BaseTabSettings{
@@ -34,6 +35,7 @@ namespace TweetDuck.Core.Other.Settings{
             // user interface
 
             toolTip.SetToolTip(checkExpandLinks, "Expands links inside the tweets. If disabled,\r\nthe full links show up in a tooltip instead.");
+            toolTip.SetToolTip(checkFocusDmInput, "Places cursor into Direct Message input\r\nfield when opening a conversation.");
             toolTip.SetToolTip(checkOpenSearchInFirstColumn, "By default, TweetDeck adds Search columns at the end.\r\nThis option makes them appear before the first column instead.");
             toolTip.SetToolTip(checkKeepLikeFollowDialogsOpen, "Allows liking and following from multiple accounts at once,\r\ninstead of automatically closing the dialog after taking an action.");
             toolTip.SetToolTip(checkBestImageQuality, "When right-clicking a tweet image, the context menu options\r\nwill use links to the original image size (:orig in the URL).");
@@ -42,13 +44,14 @@ namespace TweetDuck.Core.Other.Settings{
             toolTip.SetToolTip(trackBarZoom, toolTip.GetToolTip(labelZoomValue));
 
             checkExpandLinks.Checked = Config.ExpandLinksOnHover;
+            checkFocusDmInput.Checked = Config.FocusDmInput;
             checkOpenSearchInFirstColumn.Checked = Config.OpenSearchInFirstColumn;
             checkKeepLikeFollowDialogsOpen.Checked = Config.KeepLikeFollowDialogsOpen;
             checkBestImageQuality.Checked = Config.BestImageQuality;
             checkAnimatedAvatars.Checked = Config.EnableAnimatedImages;
             
             trackBarZoom.SetValueSafe(Config.ZoomLevel);
-            labelZoomValue.Text = trackBarZoom.Value+"%";
+            labelZoomValue.Text = trackBarZoom.Value + "%";
 
             // system tray
             
@@ -60,7 +63,7 @@ namespace TweetDuck.Core.Other.Settings{
             comboBoxTrayType.Items.Add("Minimize to Tray");
             comboBoxTrayType.Items.Add("Close to Tray");
             comboBoxTrayType.Items.Add("Combined");
-            comboBoxTrayType.SelectedIndex = Math.Min(Math.Max((int)Config.TrayBehavior, 0), comboBoxTrayType.Items.Count-1);
+            comboBoxTrayType.SelectedIndex = Math.Min(Math.Max((int)Config.TrayBehavior, 0), comboBoxTrayType.Items.Count - 1);
 
             checkTrayHighlight.Enabled = Config.TrayBehavior.ShouldDisplayIcon();
             checkTrayHighlight.Checked = Config.EnableTrayHighlight;
@@ -127,6 +130,7 @@ namespace TweetDuck.Core.Other.Settings{
 
         public override void OnReady(){
             checkExpandLinks.CheckedChanged += checkExpandLinks_CheckedChanged;
+            checkFocusDmInput.CheckedChanged += checkFocusDmInput_CheckedChanged;
             checkOpenSearchInFirstColumn.CheckedChanged += checkOpenSearchInFirstColumn_CheckedChanged;
             checkKeepLikeFollowDialogsOpen.CheckedChanged += checkKeepLikeFollowDialogsOpen_CheckedChanged;
             checkBestImageQuality.CheckedChanged += checkBestImageQuality_CheckedChanged;
@@ -160,6 +164,10 @@ namespace TweetDuck.Core.Other.Settings{
             Config.ExpandLinksOnHover = checkExpandLinks.Checked;
         }
 
+        private void checkFocusDmInput_CheckedChanged(object sender, EventArgs e){
+            Config.FocusDmInput = checkFocusDmInput.Checked;
+        }
+
         private void checkOpenSearchInFirstColumn_CheckedChanged(object sender, EventArgs e){
             Config.OpenSearchInFirstColumn = checkOpenSearchInFirstColumn.Checked;
         }
@@ -181,7 +189,7 @@ namespace TweetDuck.Core.Other.Settings{
             if (trackBarZoom.AlignValueToTick()){
                 zoomUpdateTimer.Stop();
                 zoomUpdateTimer.Start();
-                labelZoomValue.Text = trackBarZoom.Value+"%";
+                labelZoomValue.Text = trackBarZoom.Value + "%";
             }
         }
 

Core/Other/Settings/TabSettingsNotifications.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
-using TweetDuck.Core.Notification;
 using TweetDuck.Core.Notification.Example;
+using TweetLib.Core.Features.Notifications;
 
 namespace TweetDuck.Core.Other.Settings{
     sealed partial class TabSettingsNotifications : BaseTabSettings{
@@ -59,31 +59,31 @@ namespace TweetDuck.Core.Other.Settings{
             checkTimerCountDown.Checked = Config.NotificationTimerCountDown;
 
             trackBarDuration.SetValueSafe(Config.NotificationDurationValue);
-            labelDurationValue.Text = Config.NotificationDurationValue+" ms/c";
+            labelDurationValue.Text = Config.NotificationDurationValue + " ms/c";
 
             // location
 
             toolTip.SetToolTip(radioLocCustom, "Drag the example notification window to the desired location.");
             
             switch(Config.NotificationPosition){
-                case TweetNotification.Position.TopLeft: radioLocTL.Checked = true; break;
-                case TweetNotification.Position.TopRight: radioLocTR.Checked = true; break;
-                case TweetNotification.Position.BottomLeft: radioLocBL.Checked = true; break;
-                case TweetNotification.Position.BottomRight: radioLocBR.Checked = true; break;
-                case TweetNotification.Position.Custom: radioLocCustom.Checked = true; break;
+                case DesktopNotification.Position.TopLeft: radioLocTL.Checked = true; break;
+                case DesktopNotification.Position.TopRight: radioLocTR.Checked = true; break;
+                case DesktopNotification.Position.BottomLeft: radioLocBL.Checked = true; break;
+                case DesktopNotification.Position.BottomRight: radioLocBR.Checked = true; break;
+                case DesktopNotification.Position.Custom: radioLocCustom.Checked = true; break;
             }
 
             comboBoxDisplay.Enabled = trackBarEdgeDistance.Enabled = !radioLocCustom.Checked;
             comboBoxDisplay.Items.Add("(Same as TweetDuck)");
 
             foreach(Screen screen in Screen.AllScreens){
-                comboBoxDisplay.Items.Add(screen.DeviceName.TrimStart('\\', '.')+" ("+screen.Bounds.Width+"x"+screen.Bounds.Height+")");
+                comboBoxDisplay.Items.Add($"{screen.DeviceName.TrimStart('\\', '.')} ({screen.Bounds.Width}x{screen.Bounds.Height})");
             }
 
-            comboBoxDisplay.SelectedIndex = Math.Min(comboBoxDisplay.Items.Count-1, Config.NotificationDisplay);
+            comboBoxDisplay.SelectedIndex = Math.Min(comboBoxDisplay.Items.Count - 1, Config.NotificationDisplay);
 
             trackBarEdgeDistance.SetValueSafe(Config.NotificationEdgeDistance);
-            labelEdgeDistanceValue.Text = trackBarEdgeDistance.Value+" px";
+            labelEdgeDistanceValue.Text = trackBarEdgeDistance.Value + " px";
 
             // size
 
@@ -91,12 +91,12 @@ namespace TweetDuck.Core.Other.Settings{
             toolTip.SetToolTip(radioSizeCustom, "Resize the example notification window to the desired size.");
 
             switch(Config.NotificationSize){
-                case TweetNotification.Size.Auto: radioSizeAuto.Checked = true; break;
-                case TweetNotification.Size.Custom: radioSizeCustom.Checked = true; break;
+                case DesktopNotification.Size.Auto: radioSizeAuto.Checked = true; break;
+                case DesktopNotification.Size.Custom: radioSizeCustom.Checked = true; break;
             }
 
             trackBarScrollSpeed.SetValueSafe(Config.NotificationScrollSpeed);
-            labelScrollSpeedValue.Text = trackBarScrollSpeed.Value+"%";
+            labelScrollSpeedValue.Text = trackBarScrollSpeed.Value + "%";
         }
 
         public override void OnReady(){
@@ -195,7 +195,7 @@ namespace TweetDuck.Core.Other.Settings{
             durationUpdateTimer.Start();
 
             Config.NotificationDurationValue = trackBarDuration.Value;
-            labelDurationValue.Text = Config.NotificationDurationValue+" ms/c";
+            labelDurationValue.Text = Config.NotificationDurationValue + " ms/c";
         }
 
         private void btnDurationShort_Click(object sender, EventArgs e){
@@ -219,10 +219,10 @@ namespace TweetDuck.Core.Other.Settings{
         #region Location
 
         private void radioLoc_CheckedChanged(object sender, EventArgs e){
-            if (radioLocTL.Checked)Config.NotificationPosition = TweetNotification.Position.TopLeft;
-            else if (radioLocTR.Checked)Config.NotificationPosition = TweetNotification.Position.TopRight;
-            else if (radioLocBL.Checked)Config.NotificationPosition = TweetNotification.Position.BottomLeft;
-            else if (radioLocBR.Checked)Config.NotificationPosition = TweetNotification.Position.BottomRight;
+            if (radioLocTL.Checked)Config.NotificationPosition = DesktopNotification.Position.TopLeft;
+            else if (radioLocTR.Checked)Config.NotificationPosition = DesktopNotification.Position.TopRight;
+            else if (radioLocBL.Checked)Config.NotificationPosition = DesktopNotification.Position.BottomLeft;
+            else if (radioLocBR.Checked)Config.NotificationPosition = DesktopNotification.Position.BottomRight;
 
             comboBoxDisplay.Enabled = trackBarEdgeDistance.Enabled = true;
             notification.ShowExampleNotification(false);
@@ -233,18 +233,18 @@ namespace TweetDuck.Core.Other.Settings{
                 Config.CustomNotificationPosition = notification.Location;
             }
 
-            Config.NotificationPosition = TweetNotification.Position.Custom;
+            Config.NotificationPosition = DesktopNotification.Position.Custom;
 
             comboBoxDisplay.Enabled = trackBarEdgeDistance.Enabled = false;
             notification.ShowExampleNotification(false);
 
             if (notification.IsFullyOutsideView() && FormMessage.Question("Notification is Outside View", "The notification seems to be outside of view, would you like to reset its position?", FormMessage.Yes, FormMessage.No)){
-                Config.NotificationPosition = TweetNotification.Position.TopRight;
+                Config.NotificationPosition = DesktopNotification.Position.TopRight;
                 notification.MoveToVisibleLocation();
 
                 Config.CustomNotificationPosition = notification.Location;
 
-                Config.NotificationPosition = TweetNotification.Position.Custom;
+                Config.NotificationPosition = DesktopNotification.Position.Custom;
                 notification.MoveToVisibleLocation();
             }
         }
@@ -255,7 +255,7 @@ namespace TweetDuck.Core.Other.Settings{
         }
 
         private void trackBarEdgeDistance_ValueChanged(object sender, EventArgs e){
-            labelEdgeDistanceValue.Text = trackBarEdgeDistance.Value+" px";
+            labelEdgeDistanceValue.Text = trackBarEdgeDistance.Value + " px";
             Config.NotificationEdgeDistance = trackBarEdgeDistance.Value;
             notification.ShowExampleNotification(false);
         }
@@ -265,7 +265,7 @@ namespace TweetDuck.Core.Other.Settings{
 
         private void radioSize_CheckedChanged(object sender, EventArgs e){
             if (radioSizeAuto.Checked){
-                Config.NotificationSize = TweetNotification.Size.Auto;
+                Config.NotificationSize = DesktopNotification.Size.Auto;
             }
             
             notification.ShowExampleNotification(false);
@@ -276,13 +276,13 @@ namespace TweetDuck.Core.Other.Settings{
                 Config.CustomNotificationSize = notification.BrowserSize;
             }
 
-            Config.NotificationSize = TweetNotification.Size.Custom;
+            Config.NotificationSize = DesktopNotification.Size.Custom;
             notification.ShowExampleNotification(false);
         }
 
         private void trackBarScrollSpeed_ValueChanged(object sender, EventArgs e){
             if (trackBarScrollSpeed.AlignValueToTick()){
-                labelScrollSpeedValue.Text = trackBarScrollSpeed.Value+"%";
+                labelScrollSpeedValue.Text = trackBarScrollSpeed.Value + "%";
                 Config.NotificationScrollSpeed = trackBarScrollSpeed.Value;
             }
         }

Core/Other/Settings/TabSettingsSounds.cs

@@ -20,7 +20,7 @@ namespace TweetDuck.Core.Other.Settings{
             toolTip.SetToolTip(tbCustomSound, "When empty, the default TweetDeck sound notification is used.");
             
             trackBarVolume.SetValueSafe(Config.NotificationSoundVolume);
-            labelVolumeValue.Text = trackBarVolume.Value+"%";
+            labelVolumeValue.Text = trackBarVolume.Value + "%";
 
             tbCustomSound.Text = Config.NotificationSoundPath;
             tbCustomSound_TextChanged(tbCustomSound, EventArgs.Empty);
@@ -83,7 +83,7 @@ namespace TweetDuck.Core.Other.Settings{
         private void trackBarVolume_ValueChanged(object sender, EventArgs e){
             volumeUpdateTimer.Stop();
             volumeUpdateTimer.Start();
-            labelVolumeValue.Text = trackBarVolume.Value+"%";
+            labelVolumeValue.Text = trackBarVolume.Value + "%";
         }
 
         private void volumeUpdateTimer_Tick(object sender, EventArgs e){

Core/TweetDeckBrowser.cs

@@ -5,6 +5,7 @@ using System.Windows.Forms;
 using CefSharp;
 using CefSharp.WinForms;
 using TweetDuck.Configuration;
+using TweetDuck.Core.Adapters;
 using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling;
@@ -12,13 +13,18 @@ using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Notification;
 using TweetDuck.Core.Utils;
 using TweetDuck.Plugins;
-using TweetDuck.Plugins.Enums;
-using TweetDuck.Resources;
+using TweetLib.Core.Features.Plugins;
+using TweetLib.Core.Features.Plugins.Enums;
+using TweetLib.Core.Features.Twitter;
+using TweetLib.Core.Utils;
 
 namespace TweetDuck.Core{
     sealed class TweetDeckBrowser : IDisposable{
         private static UserConfig Config => Program.Config.User;
 
+        private const string ErrorUrl = "http://td/error";
+        private const string TwitterStyleUrl = "https://abs.twimg.com/tduck/css";
+
         public bool Ready { get; private set; }
 
         public bool Enabled{
@@ -32,27 +38,31 @@ namespace TweetDuck.Core{
                     return false;
                 }
 
-                using(IFrame frame = browser.GetBrowser().MainFrame){
-                    return TwitterUtils.IsTweetDeckWebsite(frame);
-                }
+                using IFrame frame = browser.GetBrowser().MainFrame;
+                return TwitterUrls.IsTweetDeck(frame.Url);
             }
         }
         
         private readonly ChromiumWebBrowser browser;
+        private readonly ResourceHandlerFactory resourceHandlerFactory = new ResourceHandlerFactory();
 
         private string prevSoundNotificationPath = null;
 
         public TweetDeckBrowser(FormBrowser owner, PluginManager plugins, TweetDeckBridge tdBridge, UpdateBridge updateBridge){
+            resourceHandlerFactory.RegisterHandler(FormNotificationBase.AppLogo);
+            resourceHandlerFactory.RegisterHandler(TwitterUtils.LoadingSpinner);
+
             RequestHandlerBrowser requestHandler = new RequestHandlerBrowser();
             
-            this.browser = new ChromiumWebBrowser(TwitterUtils.TweetDeckURL){
+            this.browser = new ChromiumWebBrowser(TwitterUrls.TweetDeck){
                 DialogHandler = new FileDialogHandler(),
                 DragHandler = new DragHandlerBrowser(requestHandler),
                 MenuHandler = new ContextMenuBrowser(owner),
                 JsDialogHandler = new JavaScriptDialogHandler(),
                 KeyboardHandler = new KeyboardHandlerBrowser(owner),
                 LifeSpanHandler = new LifeSpanHandler(),
-                RequestHandler = requestHandler
+                RequestHandler = requestHandler,
+                ResourceHandlerFactory = resourceHandlerFactory
             };
 
             this.browser.LoadingStateChanged += browser_LoadingStateChanged;
@@ -66,13 +76,10 @@ namespace TweetDuck.Core{
             this.browser.BrowserSettings.BackgroundColor = (uint)TwitterUtils.BackgroundColor.ToArgb();
             this.browser.Dock = DockStyle.None;
             this.browser.Location = ControlExtensions.InvisibleLocation;
-
-            this.browser.SetupResourceHandler(TweetNotification.AppLogo);
-            this.browser.SetupResourceHandler(TwitterUtils.LoadingSpinner);
             this.browser.SetupZoomEvents();
             
             owner.Controls.Add(browser);
-            plugins.Register(browser, PluginEnvironment.Browser, owner, true);
+            plugins.Register(PluginEnvironment.Browser, new PluginDispatcher(browser));
             
             Config.MuteToggled += Config_MuteToggled;
             Config.SoundNotificationChanged += Config_SoundNotificationInfoChanged;
@@ -116,21 +123,29 @@ namespace TweetDuck.Core{
             IFrame frame = e.Frame;
 
             if (frame.IsMain){
-                if (TwitterUtils.IsTwitterWebsite(frame)){
-                    ScriptLoader.ExecuteFile(frame, "twitter.js", browser);
+                string url = frame.Url;
+
+                if (TwitterUrls.IsTwitter(url)){
+                    string css = Program.Resources.Load("styles/twitter.css");
+                    resourceHandlerFactory.RegisterHandler(TwitterStyleUrl, ResourceHandler.FromString(css, mimeType: "text/css"));
+
+                    CefScriptExecutor.RunFile(frame, "twitter.js");
                 }
                 
+                if (!TwitterUrls.IsTwitterLogin2Factor(url)){
                     frame.ExecuteJavaScriptAsync(TwitterUtils.BackgroundColorOverride);
                 }
             }
+        }
 
         private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
             IFrame frame = e.Frame;
+            string url = frame.Url;
 
             if (frame.IsMain){
-                if (TwitterUtils.IsTweetDeckWebsite(frame)){
+                if (TwitterUrls.IsTweetDeck(url)){
                     UpdateProperties();
-                    ScriptLoader.ExecuteFile(frame, "code.js", browser);
+                    CefScriptExecutor.RunFile(frame, "code.js");
 
                     InjectBrowserCSS();
                     ReinjectCustomCSS(Config.CustomBrowserCSS);
@@ -139,15 +154,19 @@ namespace TweetDuck.Core{
                     TweetDeckBridge.ResetStaticProperties();
 
                     if (Arguments.HasFlag(Arguments.ArgIgnoreGDPR)){
-                        ScriptLoader.ExecuteScript(frame, "TD.storage.Account.prototype.requiresConsent = function(){ return false; }", "gen:gdpr");
+                        CefScriptExecutor.RunScript(frame, "TD.storage.Account.prototype.requiresConsent = function(){ return false; }", "gen:gdpr");
                     }
 
                     if (Config.FirstRun){
-                        ScriptLoader.ExecuteFile(frame, "introduction.js", browser);
+                        CefScriptExecutor.RunFile(frame, "introduction.js");
                     }
                 }
 
-                ScriptLoader.ExecuteFile(frame, "update.js", browser);
+                CefScriptExecutor.RunFile(frame, "update.js");
+            }
+
+            if (url == ErrorUrl){
+                resourceHandlerFactory.UnregisterHandler(ErrorUrl);
             }
         }
 
@@ -157,10 +176,14 @@ namespace TweetDuck.Core{
             }
 
             if (!e.FailedUrl.StartsWith("http://td/", StringComparison.Ordinal)){
-                string errorPage = ScriptLoader.LoadResourceSilent("pages/error.html");
+                string errorPage = Program.Resources.LoadSilent("pages/error.html");
 
                 if (errorPage != null){
-                    browser.LoadHtml(errorPage.Replace("{err}", BrowserUtils.GetErrorName(e.ErrorCode)), "http://td/error");
+                    string errorName = Enum.GetName(typeof(CefErrorCode), e.ErrorCode);
+                    string errorTitle = StringUtils.ConvertPascalCaseToScreamingSnakeCase(errorName ?? string.Empty);
+
+                    resourceHandlerFactory.RegisterHandler(ErrorUrl, ResourceHandler.FromString(errorPage.Replace("{err}", errorTitle)));
+                    browser.Load(ErrorUrl);
                 }
             }
         }
@@ -176,8 +199,14 @@ namespace TweetDuck.Core{
             string newNotificationPath = Config.NotificationSoundPath;
             
             if (prevSoundNotificationPath != newNotificationPath){
-                browser.SetupResourceHandler(soundUrl, hasCustomSound ? SoundNotification.CreateFileHandler(newNotificationPath) : null);
                 prevSoundNotificationPath = newNotificationPath;
+
+                if (hasCustomSound){
+                    resourceHandlerFactory.RegisterHandler(soundUrl, SoundNotification.CreateFileHandler(newNotificationPath));
+                }
+                else{
+                    resourceHandlerFactory.UnregisterHandler(soundUrl);
+                }
             }
 
             browser.ExecuteScriptAsync("TDGF_setSoundNotificationData", hasCustomSound, Config.NotificationSoundVolume);
@@ -196,7 +225,7 @@ namespace TweetDuck.Core{
         // javascript calls
 
         public void ReloadToTweetDeck(){
-            browser.ExecuteScriptAsync($"if(window.TDGF_reload)window.TDGF_reload();else window.location.href='{TwitterUtils.TweetDeckURL}'");
+            browser.ExecuteScriptAsync($"if(window.TDGF_reload)window.TDGF_reload();else window.location.href='{TwitterUrls.TweetDeck}'");
         }
 
         public void UpdateProperties(){
@@ -204,7 +233,7 @@ namespace TweetDuck.Core{
         }
 
         public void InjectBrowserCSS(){
-            browser.ExecuteScriptAsync("TDGF_injectBrowserCSS", ScriptLoader.LoadResource("styles/browser.css", browser)?.TrimEnd() ?? string.Empty);
+            browser.ExecuteScriptAsync("TDGF_injectBrowserCSS", Program.Resources.Load("styles/browser.css")?.TrimEnd() ?? string.Empty);
         }
 
         public void ReinjectCustomCSS(string css){

Core/Utils/BrowserUtils.cs

@@ -3,17 +3,16 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Net;
 using System.Windows.Forms;
 using CefSharp.WinForms;
 using TweetDuck.Configuration;
 using TweetDuck.Core.Other;
-using TweetDuck.Data;
+using TweetLib.Core.Features.Twitter;
 
 namespace TweetDuck.Core.Utils{
     static class BrowserUtils{
-        public static string UserAgentVanilla => Program.BrandName+" "+Application.ProductVersion;
-        public static string UserAgentChrome => "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/"+Cef.ChromiumVersion+" Safari/537.36";
+        public static string UserAgentVanilla => Program.BrandName + " " + Application.ProductVersion;
+        public static string UserAgentChrome => "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/" + Cef.ChromiumVersion + " Safari/537.36";
 
         public static readonly bool HasDevTools = File.Exists(Path.Combine(Program.ProgramPath, "devtools_resources.pak"));
 
@@ -30,7 +29,7 @@ namespace TweetDuck.Core.Utils{
                 args["disable-threaded-scrolling"] = "1";
 
                 if (args.TryGetValue("disable-features", out string disabledFeatures)){
-                    args["disable-features"] = "TouchpadAndWheelScrollLatching,"+disabledFeatures;
+                    args["disable-features"] = "TouchpadAndWheelScrollLatching," + disabledFeatures;
                 }
                 else{
                     args["disable-features"] = "TouchpadAndWheelScrollLatching";
@@ -49,7 +48,7 @@ namespace TweetDuck.Core.Utils{
             args["enable-system-flash"] = "0";
 
             if (args.TryGetValue("js-flags", out string jsFlags)){
-                args["js-flags"] = "--expose-gc "+jsFlags;
+                args["js-flags"] = "--expose-gc " + jsFlags;
             }
             else{
                 args["js-flags"] = "--expose-gc";
@@ -60,24 +59,13 @@ namespace TweetDuck.Core.Utils{
             return (ChromiumWebBrowser)browserControl;
         }
 
-        public static void SetupResourceHandler(this ChromiumWebBrowser browser, string url, IResourceHandler handler){
-            DefaultResourceHandlerFactory factory = (DefaultResourceHandlerFactory)browser.ResourceHandlerFactory;
-
-            if (handler == null){
-                factory.UnregisterHandler(url);
-            }
-            else{
-                factory.RegisterHandler(url, handler);
-            }
-        }
-
-        public static void SetupResourceHandler(this ChromiumWebBrowser browser, ResourceLink resource){
-            browser.SetupResourceHandler(resource.Url, resource.Handler);
-        }
-
         public static void SetupZoomEvents(this ChromiumWebBrowser browser){
+            static void SetZoomLevel(IBrowserHost host, int percentage){
+                host.SetZoomLevel(Math.Log(percentage / 100.0, 1.2));
+            }
+
             void UpdateZoomLevel(object sender, EventArgs args){
-                SetZoomLevel(browser.GetBrowser(), Config.ZoomLevel);
+                SetZoomLevel(browser.GetBrowserHost(), Config.ZoomLevel);
             }
 
             Config.ZoomLevelChanged += UpdateZoomLevel;
@@ -85,34 +73,16 @@ namespace TweetDuck.Core.Utils{
 
             browser.FrameLoadStart += (sender, args) => {
                 if (args.Frame.IsMain && Config.ZoomLevel != 100){
-                    SetZoomLevel(args.Browser, Config.ZoomLevel);
+                    SetZoomLevel(args.Browser.GetHost(), Config.ZoomLevel);
                 }
             };
         }
 
-        private const string TwitterTrackingUrl = "t.co";
-
-        public enum UrlCheckResult{
-            Invalid, Tracking, Fine
-        }
-
-        public static UrlCheckResult CheckUrl(string url){
-            if (Uri.TryCreate(url, UriKind.Absolute, out Uri uri)){
-                string scheme = uri.Scheme;
-
-                if (scheme == Uri.UriSchemeHttps || scheme == Uri.UriSchemeHttp || scheme == Uri.UriSchemeFtp || scheme == Uri.UriSchemeMailto){
-                    return uri.Host == TwitterTrackingUrl ? UrlCheckResult.Tracking : UrlCheckResult.Fine;
-                }
-            }
-
-            return UrlCheckResult.Invalid;
-        }
-
         public static void OpenExternalBrowser(string url){
             if (string.IsNullOrWhiteSpace(url))return;
 
-            switch(CheckUrl(url)){
-                case UrlCheckResult.Fine:
+            switch(TwitterUrls.Check(url)){
+                case TwitterUrls.UrlType.Fine:
                     if (FormGuide.CheckGuideUrl(url, out string hash)){
                         FormGuide.Show(hash);
                     }
@@ -133,12 +103,12 @@ namespace TweetDuck.Core.Utils{
 
                     break;
 
-                case UrlCheckResult.Tracking:
+                case TwitterUrls.UrlType.Tracking:
                     if (Config.IgnoreTrackingUrlWarning){
-                        goto case UrlCheckResult.Fine;
+                        goto case TwitterUrls.UrlType.Fine;
                     }
 
-                    using(FormMessage form = new FormMessage("Blocked URL", "TweetDuck has blocked a tracking url due to privacy concerns. Do you want to visit it anyway?\n"+url, MessageBoxIcon.Warning)){
+                    using(FormMessage form = new FormMessage("Blocked URL", "TweetDuck has blocked a tracking url due to privacy concerns. Do you want to visit it anyway?\n" + url, MessageBoxIcon.Warning)){
                         form.AddButton(FormMessage.No, DialogResult.No, ControlType.Cancel | ControlType.Focused);
                         form.AddButton(FormMessage.Yes, DialogResult.Yes, ControlType.Accept);
                         form.AddButton("Always Visit", DialogResult.Ignore);
@@ -151,20 +121,22 @@ namespace TweetDuck.Core.Utils{
                         }
 
                         if (result == DialogResult.Ignore || result == DialogResult.Yes){
-                            goto case UrlCheckResult.Fine;
+                            goto case TwitterUrls.UrlType.Fine;
                         }
                     }
 
                     break;
 
-                case UrlCheckResult.Invalid:
-                    FormMessage.Warning("Blocked URL", "A potentially malicious URL was blocked from opening:\n"+url, FormMessage.OK);
+                case TwitterUrls.UrlType.Invalid:
+                    FormMessage.Warning("Blocked URL", "A potentially malicious URL was blocked from opening:\n" + url, FormMessage.OK);
                     break;
             }
         }
 
         public static void OpenExternalSearch(string query){
-            if (string.IsNullOrWhiteSpace(query))return;
+            if (string.IsNullOrWhiteSpace(query)){
+                return;
+            }
             
             string searchUrl = Config.SearchEngineUrl;
             
@@ -186,60 +158,12 @@ namespace TweetDuck.Core.Utils{
                 }
             }
             else{
-                OpenExternalBrowser(searchUrl+Uri.EscapeUriString(query));
+                OpenExternalBrowser(searchUrl + Uri.EscapeUriString(query));
             }
         }
 
-        public static string GetFileNameFromUrl(string url){
-            string file = Path.GetFileName(new Uri(url).AbsolutePath);
-            return string.IsNullOrEmpty(file) ? null : file;
-        }
-
-        public static string GetErrorName(CefErrorCode code){
-            return StringUtils.ConvertPascalCaseToScreamingSnakeCase(Enum.GetName(typeof(CefErrorCode), code) ?? string.Empty);
-        }
-
-        public static WebClient CreateWebClient(){
-            WindowsUtils.EnsureTLS12();
-
-            WebClient client = new WebClient{ Proxy = null };
-            client.Headers[HttpRequestHeader.UserAgent] = UserAgentVanilla;
-            return client;
-        }
-
-        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{
-                        File.Delete(target);
-                    }catch{
-                        // didn't want it deleted anyways
-                    }
-                }
-                else if (args.Error != null){
-                    onFailure?.Invoke(args.Error);
-                }
-                else{
-                    onSuccess?.Invoke();
-                }
-            };
-
-            client.DownloadFileAsync(new Uri(url), target);
-            return client;
-        }
-
         public static int Scale(int baseValue, double scaleFactor){
-            return (int)Math.Round(baseValue*scaleFactor);
-        }
-
-        public static void SetZoomLevel(IBrowser browser, int percentage){
-            browser.GetHost().SetZoomLevel(Math.Log(percentage/100.0, 1.2));
+            return (int)Math.Round(baseValue * scaleFactor);
         }
     }
 }

Core/Utils/NativeMethods.cs

@@ -133,7 +133,7 @@ namespace TweetDuck.Core.Utils{
                 ticks = (uint)Environment.TickCount;
             }
 
-            int seconds = (int)Math.Floor(TimeSpan.FromMilliseconds(ticks-info.dwTime).TotalSeconds);
+            int seconds = (int)Math.Floor(TimeSpan.FromMilliseconds(ticks - info.dwTime).TotalSeconds);
             return Math.Max(0, seconds); // ignore rollover after several weeks of uptime
         }
 

Core/Utils/TwitterUtils.cs

@@ -2,96 +2,50 @@
 using CefSharp;
 using System.Drawing;
 using System.IO;
-using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using TweetDuck.Core.Management;
 using TweetDuck.Core.Other;
 using TweetDuck.Data;
 using System.Linq;
+using System.Net;
 using System.Threading.Tasks;
+using TweetLib.Core.Features.Twitter;
+using TweetLib.Core.Utils;
 using Cookie = CefSharp.Cookie;
 
 namespace TweetDuck.Core.Utils{
     static class TwitterUtils{
-        public const string TweetDeckURL = "https://tweetdeck.twitter.com";
-
         public static readonly Color BackgroundColor = Color.FromArgb(28, 99, 153);
-        public const string BackgroundColorOverride = "setTimeout(function f(){let h=document.head;if(!h){setTimeout(f,5);return;}let e=document.createElement('style');e.innerHTML='body,body::before{background:#1c6399!important}';h.appendChild(e);},1)";
+        public const string BackgroundColorOverride = "setTimeout(function f(){let h=document.head;if(!h){setTimeout(f,5);return;}let e=document.createElement('style');e.innerHTML='body,body::before{background:#1c6399!important;margin:0}';h.appendChild(e);},1)";
 
         public static readonly ResourceLink LoadingSpinner = new ResourceLink("https://ton.twimg.com/tduck/spinner", ResourceHandler.FromByteArray(Properties.Resources.spinner, "image/apng"));
         
-        private static readonly Lazy<Regex> RegexAccountLazy = new Lazy<Regex>(() => new Regex(@"^https?://twitter\.com/(?!signup$|tos$|privacy$|search$|search-)([^/?]+)/?$", RegexOptions.Compiled), false);
-        public static Regex RegexAccount => RegexAccountLazy.Value;
-
         public static readonly string[] DictionaryWords = {
             "tweetdeck", "TweetDeck", "tweetduck", "TweetDuck", "TD"
         };
 
-        public static readonly string[] ValidImageExtensions = {
-            ".jpg", ".jpeg", ".png", ".gif"
-        };
-
-        public enum ImageQuality{
-            Default, Orig
-        }
-
-        public static bool IsTweetDeckWebsite(IFrame frame){
-            return frame.Url.Contains("//tweetdeck.twitter.com/");
-        }
-
-        public static bool IsTwitterWebsite(IFrame frame){
-            return frame.Url.Contains("//twitter.com/");
-        }
-
-        private static string ExtractMediaBaseLink(string url){
-            int slash = url.LastIndexOf('/');
-            return slash == -1 ? url : StringUtils.ExtractBefore(url, ':', slash);
-        }
-
-        public static string GetMediaLink(string url, ImageQuality quality){
-            if (quality == ImageQuality.Orig){
-                string result = ExtractMediaBaseLink(url);
-
-                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";
-                }
-
-                return result;
-            }
-            else{
-                return url;
-            }
-        }
-
-        public static string GetImageFileName(string url){
-            return BrowserUtils.GetFileNameFromUrl(ExtractMediaBaseLink(url));
-        }
-
         public static void ViewImage(string url, ImageQuality quality){
-            void ViewImageInternal(string path){
+            static void ViewImageInternal(string path){
                 string ext = Path.GetExtension(path);
 
-                if (ValidImageExtensions.Contains(ext)){
+                if (ImageUrl.ValidExtensions.Contains(ext)){
                     WindowsUtils.OpenAssociatedProgram(path);
                 }
                 else{
-                    FormMessage.Error("Image Download", "Invalid file extension "+ext, FormMessage.OK);
+                    FormMessage.Error("Image Download", "Invalid file extension " + ext, FormMessage.OK);
                 }
             }
 
-            string file = Path.Combine(BrowserCache.CacheFolder, GetImageFileName(url) ?? Path.GetRandomFileName());
+            string file = Path.Combine(BrowserCache.CacheFolder, TwitterUrls.GetImageFileName(url) ?? Path.GetRandomFileName());
             
-            if (WindowsUtils.FileExistsAndNotEmpty(file)){
+            if (FileUtils.FileExistsAndNotEmpty(file)){
                 ViewImageInternal(file);
             }
             else{
-                DownloadFileAuth(GetMediaLink(url, quality), file, () => {
+                DownloadFileAuth(TwitterUrls.GetMediaLink(url, quality), file, () => {
                     ViewImageInternal(file);
                 }, ex => {
-                    FormMessage.Error("Image Download", "An error occurred while downloading the image: "+ex.Message, FormMessage.OK);
+                    FormMessage.Error("Image Download", "An error occurred while downloading the image: " + ex.Message, FormMessage.OK);
                 });
             }
         }
@@ -105,22 +59,22 @@ namespace TweetDuck.Core.Utils{
                 return;
             }
 
-            string firstImageLink = GetMediaLink(urls[0], quality);
+            string firstImageLink = TwitterUrls.GetMediaLink(urls[0], quality);
             int qualityIndex = firstImageLink.IndexOf(':', firstImageLink.LastIndexOf('/'));
 
-            string filename = GetImageFileName(firstImageLink);
+            string filename = TwitterUrls.GetImageFileName(firstImageLink);
             string ext = Path.GetExtension(filename); // includes dot
             
             using(SaveFileDialog dialog = new SaveFileDialog{
                 AutoUpgradeEnabled = true,
                 OverwritePrompt = urls.Length == 1,
                 Title = "Save Image",
-                FileName = qualityIndex == -1 ? filename : $"{username} {Path.ChangeExtension(filename, null)} {firstImageLink.Substring(qualityIndex+1)}".Trim()+ext,
-                Filter = (urls.Length == 1 ? "Image" : "Images")+(string.IsNullOrEmpty(ext) ? " (unknown)|*.*" : $" (*{ext})|*{ext}")
+                FileName = qualityIndex == -1 ? filename : $"{username} {Path.ChangeExtension(filename, null)} {firstImageLink.Substring(qualityIndex + 1)}".Trim() + ext,
+                Filter = (urls.Length == 1 ? "Image" : "Images") + (string.IsNullOrEmpty(ext) ? " (unknown)|*.*" : $" (*{ext})|*{ext}")
             }){
                 if (dialog.ShowDialog() == DialogResult.OK){
-                    void OnFailure(Exception ex){
-                        FormMessage.Error("Image Download", "An error occurred while downloading the image: "+ex.Message, FormMessage.OK);
+                    static void OnFailure(Exception ex){
+                        FormMessage.Error("Image Download", "An error occurred while downloading the image: " + ex.Message, FormMessage.OK);
                     }
 
                     if (urls.Length == 1){
@@ -131,7 +85,7 @@ namespace TweetDuck.Core.Utils{
                         string pathExt = Path.GetExtension(dialog.FileName);
 
                         for(int index = 0; index < urls.Length; index++){
-                            DownloadFileAuth(GetMediaLink(urls[index], quality), $"{pathBase} {index+1}{pathExt}", null, OnFailure);
+                            DownloadFileAuth(TwitterUrls.GetMediaLink(urls[index], quality), $"{pathBase} {index + 1}{pathExt}", null, OnFailure);
                         }
                     }
                 }
@@ -139,7 +93,7 @@ namespace TweetDuck.Core.Utils{
         }
 
         public static void DownloadVideo(string url, string username){
-            string filename = BrowserUtils.GetFileNameFromUrl(url);
+            string filename = TwitterUrls.GetFileNameFromUrl(url);
             string ext = Path.GetExtension(filename);
 
             using(SaveFileDialog dialog = new SaveFileDialog{
@@ -147,11 +101,11 @@ namespace TweetDuck.Core.Utils{
                 OverwritePrompt = true,
                 Title = "Save Video",
                 FileName = string.IsNullOrEmpty(username) ? filename : $"{username} {filename}".TrimStart(),
-                Filter = "Video"+(string.IsNullOrEmpty(ext) ? " (unknown)|*.*" : $" (*{ext})|*{ext}")
+                Filter = "Video" + (string.IsNullOrEmpty(ext) ? " (unknown)|*.*" : $" (*{ext})|*{ext}")
             }){
                 if (dialog.ShowDialog() == DialogResult.OK){
                     DownloadFileAuth(url, dialog.FileName, null, ex => {
-                        FormMessage.Error("Video Download", "An error occurred while downloading the video: "+ex.Message, FormMessage.OK);
+                        FormMessage.Error("Video Download", "An error occurred while downloading the video: " + ex.Message, FormMessage.OK);
                     });
                 }
             }
@@ -174,7 +128,10 @@ namespace TweetDuck.Core.Utils{
                         }
                     }
 
-                    BrowserUtils.DownloadFileAsync(url, target, cookieStr, onSuccess, onFailure);
+                    WebClient client = WebUtils.NewClient(BrowserUtils.UserAgentChrome);
+                    client.Headers[HttpRequestHeader.Cookie] = cookieStr;
+                    client.DownloadFileCompleted += WebUtils.FileDownloadCallback(target, onSuccess, onFailure);
+                    client.DownloadFileAsync(new Uri(url), target);
                 }, scheduler);
             }
         }

Core/Utils/WindowsUtils.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
-using System.Net;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -12,66 +11,17 @@ using Microsoft.Win32;
 
 namespace TweetDuck.Core.Utils{
     static class WindowsUtils{
+        private static readonly bool IsWindows8OrNewer = OSVersionEquals(major: 6, minor: 2); // windows 8/10
+
+        public static bool ShouldAvoidToolWindow { get; } = IsWindows8OrNewer;
+        public static bool IsAeroEnabled => IsWindows8OrNewer || (NativeMethods.DwmIsCompositionEnabled(out bool isCompositionEnabled) == 0 && isCompositionEnabled);
+
         private static readonly Lazy<Regex> RegexStripHtmlStyles = new Lazy<Regex>(() => new Regex(@"\s?(?:style|class)="".*?"""), false);
         private static readonly Lazy<Regex> RegexOffsetClipboardHtml = new Lazy<Regex>(() => new Regex(@"(?<=EndHTML:|EndFragment:)(\d+)"), false);
 
-        private static readonly bool IsWindows8OrNewer;
-        private static bool HasMicrosoftBeenBroughtTo2008Yet;
-
-        public static int CurrentProcessID { get; }
-        public static bool ShouldAvoidToolWindow { get; }
-        public static bool IsAeroEnabled => IsWindows8OrNewer || (NativeMethods.DwmIsCompositionEnabled(out bool isCompositionEnabled) == 0 && isCompositionEnabled);
-
-        static WindowsUtils(){
-            using(Process me = Process.GetCurrentProcess()){
-                CurrentProcessID = me.Id;
-            }
-
+        private static bool OSVersionEquals(int major, int minor){
             Version ver = Environment.OSVersion.Version;
-            IsWindows8OrNewer = ver.Major == 6 && ver.Minor == 2; // windows 8/10
-
-            ShouldAvoidToolWindow = IsWindows8OrNewer;
-        }
-        
-        public static void EnsureTLS12(){
-            if (!HasMicrosoftBeenBroughtTo2008Yet){
-                ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12;
-                ServicePointManager.SecurityProtocol &= ~(SecurityProtocolType.Ssl3 | SecurityProtocolType.Tls | SecurityProtocolType.Tls11);
-                HasMicrosoftBeenBroughtTo2008Yet = true;
-            }
-        }
-
-        public static void CreateDirectoryForFile(string file){
-            string dir = Path.GetDirectoryName(file);
-
-            if (dir == null){
-                throw new ArgumentException("Invalid file path: "+file);
-            }
-            else if (dir.Length > 0){
-                Directory.CreateDirectory(dir);
-            }
-        }
-
-        public static bool CheckFolderWritePermission(string path){
-            string testFile = Path.Combine(path, ".test");
-
-            try{
-                Directory.CreateDirectory(path);
-
-                using(File.Create(testFile)){}
-                File.Delete(testFile);
-                return true;
-            }catch{
-                return false;
-            }
-        }
-
-        public static bool FileExistsAndNotEmpty(string path){
-            try{
-                return new FileInfo(path).Length > 0;
-            }catch{
-                return false;
-            }
+            return ver.Major == major && ver.Minor == minor;
         }
 
         public static bool OpenAssociatedProgram(string file, string arguments = "", bool runElevated = false){
@@ -87,7 +37,7 @@ namespace TweetDuck.Core.Utils{
             }catch(Win32Exception e) when (e.NativeErrorCode == 0x000004C7){ // operation canceled by the user
                 return false;
             }catch(Exception e){
-                Program.Reporter.HandleException("Error Opening Program", "Could not open the associated program for "+file, true, e);
+                Program.Reporter.HandleException("Error Opening Program", "Could not open the associated program for " + file, true, e);
                 return false;
             }
         }
@@ -129,8 +79,8 @@ namespace TweetDuck.Core.Utils{
 
             string updatedHtml = RegexStripHtmlStyles.Value.Replace(originalHtml, string.Empty);
 
-            int removed = originalHtml.Length-updatedHtml.Length;
-            updatedHtml = RegexOffsetClipboardHtml.Value.Replace(updatedHtml, match => (int.Parse(match.Value)-removed).ToString().PadLeft(match.Value.Length, '0'));
+            int removed = originalHtml.Length - updatedHtml.Length;
+            updatedHtml = RegexOffsetClipboardHtml.Value.Replace(updatedHtml, match => (int.Parse(match.Value) - removed).ToString().PadLeft(match.Value.Length, '0'));
             
             DataObject obj = new DataObject();
             obj.SetText(originalText, TextDataFormat.UnicodeText);
@@ -157,16 +107,18 @@ namespace TweetDuck.Core.Utils{
         }
 
         public static IEnumerable<Browser> FindInstalledBrowsers(){
-            IEnumerable<Browser> ReadBrowsersFromKey(RegistryHive hive){
-                using(RegistryKey root = RegistryKey.OpenBaseKey(hive, RegistryView.Default))
-                using(RegistryKey browserList = root.OpenSubKey(@"SOFTWARE\Clients\StartMenuInternet", false)){
+            static IEnumerable<Browser> ReadBrowsersFromKey(RegistryHive hive){
+                using RegistryKey root = RegistryKey.OpenBaseKey(hive, RegistryView.Default);
+                using RegistryKey browserList = root.OpenSubKey(@"SOFTWARE\Clients\StartMenuInternet", false);
+
                 if (browserList == null){
                     yield break;
                 }
 
                 foreach(string sub in browserList.GetSubKeyNames()){
-                        using(RegistryKey browserKey = browserList.OpenSubKey(sub, false))
-                        using(RegistryKey shellKey = browserKey?.OpenSubKey(@"shell\open\command")){
+                    using RegistryKey browserKey = browserList.OpenSubKey(sub, false);
+                    using RegistryKey shellKey = browserKey?.OpenSubKey(@"shell\open\command");
+
                     if (shellKey == null){
                         continue;
                     }
@@ -178,15 +130,13 @@ namespace TweetDuck.Core.Utils{
                         continue;
                     }
 
-                            if (browserPath[0] == '"' && browserPath[browserPath.Length-1] == '"'){
-                                browserPath = browserPath.Substring(1, browserPath.Length-2);
+                    if (browserPath[0] == '"' && browserPath[browserPath.Length - 1] == '"'){
+                        browserPath = browserPath.Substring(1, browserPath.Length - 2);
                     }
 
                     yield return new Browser(browserName, browserPath);
                 }
             }
-                }
-            }
 
             HashSet<Browser> browsers = new HashSet<Browser>();
             

Data/Serialization/ITypeConverter.cs

@@ -1,8 +0,0 @@
-using System;
-
-namespace TweetDuck.Data.Serialization{
-    interface ITypeConverter{
-        bool TryWriteType(Type type, object value, out string converted);
-        bool TryReadType(Type type, string value, out object converted);
-    }
-}

Data/WindowState.cs

@@ -1,8 +1,8 @@
 using System.Drawing;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
-using TweetDuck.Core.Utils;
-using TweetDuck.Data.Serialization;
+using TweetLib.Core.Serialization.Converters;
+using TweetLib.Core.Utils;
 
 namespace TweetDuck.Data{
     sealed class WindowState{

Impl/LockHandler.cs

@@ -0,0 +1,58 @@
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using TweetDuck.Core.Utils;
+using TweetLib.Core.Application;
+
+namespace TweetDuck.Impl{
+    class LockHandler : IAppLockHandler{
+        private const int WaitRetryDelay = 250;
+        private const int RestoreFailTimeout = 2000;
+        private const int CloseNaturallyTimeout = 10000;
+        private const int CloseKillTimeout = 5000;
+
+        bool IAppLockHandler.RestoreProcess(Process process){
+            if (process.MainWindowHandle == IntPtr.Zero){ // restore if the original process is in tray
+                NativeMethods.BroadcastMessage(Program.WindowRestoreMessage, (uint)process.Id, 0);
+
+                if (WindowsUtils.TrySleepUntil(() => CheckProcessExited(process) || (process.MainWindowHandle != IntPtr.Zero && process.Responding), RestoreFailTimeout, WaitRetryDelay)){
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        bool IAppLockHandler.CloseProcess(Process process){
+            try{
+                if (process.CloseMainWindow()){
+                    // ReSharper disable once AccessToDisposedClosure
+                    WindowsUtils.TrySleepUntil(() => CheckProcessExited(process), CloseNaturallyTimeout, WaitRetryDelay);
+                }
+
+                if (!process.HasExited){
+                    process.Kill();
+                    // ReSharper disable once AccessToDisposedClosure
+                    WindowsUtils.TrySleepUntil(() => CheckProcessExited(process), CloseKillTimeout, WaitRetryDelay);
+                }
+
+                if (process.HasExited){
+                    process.Dispose();
+                    return true;
+                }
+                else{
+                    return false;
+                }
+            }catch(Exception ex) when (ex is InvalidOperationException || ex is Win32Exception){
+                bool hasExited = CheckProcessExited(process);
+                process.Dispose();
+                return hasExited;
+            }
+        }
+
+        private static bool CheckProcessExited(Process process){
+            process.Refresh();
+            return process.HasExited;
+        }
+    }
+}

Impl/SystemHandler.cs

@@ -0,0 +1,16 @@
+using System.Diagnostics;
+using System.IO;
+using TweetLib.Core.Application;
+
+namespace TweetDuck.Impl{
+    class SystemHandler : IAppSystemHandler{
+        void IAppSystemHandler.OpenFileExplorer(string path){
+            if (File.Exists(path)){
+                using(Process.Start("explorer.exe", "/select,\"" + path.Replace('/', '\\') + "\"")){}
+            }
+            else if (Directory.Exists(path)){
+                using(Process.Start("explorer.exe", '"' + path.Replace('/', '\\') + '"')){}
+            }
+        }
+    }
+}

Plugins/Enums/PluginEnvironment.cs

@@ -1,88 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-
-namespace TweetDuck.Plugins.Enums{
-    [Flags]
-    enum PluginEnvironment{
-        None = 0,
-        Browser = 1,
-        Notification = 2
-    }
-
-    static class PluginEnvironmentExtensions{
-        public static IEnumerable<PluginEnvironment> Values{
-            get{
-                yield return PluginEnvironment.Browser;
-                yield return PluginEnvironment.Notification;
-            }
-        }
-
-        public static bool IncludesDisabledPlugins(this PluginEnvironment environment){
-            return environment == PluginEnvironment.Browser;
-        }
-
-        public static string GetPluginScriptFile(this PluginEnvironment environment){
-            switch(environment){
-                case PluginEnvironment.Browser: return "browser.js";
-                case PluginEnvironment.Notification: return "notification.js";
-                default: return null;
-            }
-        }
-
-        public static string GetPluginScriptVariables(this PluginEnvironment environment){
-            switch(environment){
-                case PluginEnvironment.Browser: return "$,$TD,$TDP,TD";
-                case PluginEnvironment.Notification: return "$TD,$TDP";
-                default: return string.Empty;
-            }
-        }
-
-        public static IReadOnlyDictionary<PluginEnvironment, T> Map<T>(T forNone, T forBrowser, T forNotification){
-            return new PluginEnvironmentDictionary<T>(forNone, forBrowser, forNotification);
-        }
-
-        [SuppressMessage("ReSharper", "MemberHidesStaticFromOuterClass")]
-        private sealed class PluginEnvironmentDictionary<T> : IReadOnlyDictionary<PluginEnvironment, T>{
-            private const int TotalKeys = 3;
-
-            public IEnumerable<PluginEnvironment> Keys => Enum.GetValues(typeof(PluginEnvironment)).Cast<PluginEnvironment>();
-            public IEnumerable<T> Values => data;
-            public int Count => TotalKeys;
-
-            public T this[PluginEnvironment key] => data[(int)key];
-
-            private readonly T[] data;
-
-            public PluginEnvironmentDictionary(T forNone, T forBrowser, T forNotification){
-                this.data = new T[TotalKeys];
-                this.data[(int)PluginEnvironment.None] = forNone;
-                this.data[(int)PluginEnvironment.Browser] = forBrowser;
-                this.data[(int)PluginEnvironment.Notification] = forNotification;
-            }
-
-            public bool ContainsKey(PluginEnvironment key){
-                return key >= 0 && (int)key < TotalKeys;
-            }
-
-            public bool TryGetValue(PluginEnvironment key, out T value){
-                if (ContainsKey(key)){
-                    value = this[key];
-                    return true;
-                }
-                else{
-                    value = default(T);
-                    return false;
-                }
-            }
-
-            public IEnumerator<KeyValuePair<PluginEnvironment, T>> GetEnumerator(){
-                return Keys.Select(key => new KeyValuePair<PluginEnvironment, T>(key, this[key])).GetEnumerator();
-            }
-
-            IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-        }
-    }
-}

Plugins/Enums/PluginFolder.cs

@@ -1,5 +0,0 @@
-namespace TweetDuck.Plugins.Enums{
-    enum PluginFolder{
-        Root, Data
-    }
-}

Plugins/Enums/PluginGroup.cs

@@ -1,23 +0,0 @@
-namespace TweetDuck.Plugins.Enums{
-    enum PluginGroup{
-        Official, Custom
-    }
-
-    static class PluginGroupExtensions{
-        public static string GetIdentifierPrefix(this PluginGroup group){
-            switch(group){
-                case PluginGroup.Official: return "official/";
-                case PluginGroup.Custom: return "custom/";
-                default: return "unknown/";
-            }
-        }
-
-        public static string GetIdentifierPrefixShort(this PluginGroup group){
-            switch(group){
-                case PluginGroup.Official: return "o/";
-                case PluginGroup.Custom: return "c/";
-                default: return "?/";
-            }
-        }
-    }
-}

Plugins/PluginBridge.cs

@@ -1,127 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using TweetDuck.Core.Utils;
-using TweetDuck.Data;
-using TweetDuck.Plugins.Enums;
-using TweetDuck.Plugins.Events;
-
-namespace TweetDuck.Plugins{
-    sealed class PluginBridge{
-        private static string SanitizeCacheKey(string key){
-            return key.Replace('\\', '/').Trim();
-        }
-
-        private readonly PluginManager manager;
-        private readonly TwoKeyDictionary<int, string, string> fileCache = new TwoKeyDictionary<int, string, string>(4, 2);
-        private readonly TwoKeyDictionary<int, string, InjectedHTML> notificationInjections = new TwoKeyDictionary<int, string, InjectedHTML>(4, 1);
-
-        public IEnumerable<InjectedHTML> NotificationInjections => notificationInjections.InnerValues;
-        public HashSet<Plugin> WithConfigureFunction { get; } = new HashSet<Plugin>();
-
-        public PluginBridge(PluginManager manager){
-            this.manager = manager;
-            this.manager.Reloaded += manager_Reloaded;
-            this.manager.Config.PluginChangedState += Config_PluginChangedState;
-        }
-
-        // Event handlers
-
-        private void manager_Reloaded(object sender, PluginErrorEventArgs e){
-            fileCache.Clear();
-        }
-
-        private void Config_PluginChangedState(object sender, PluginChangedStateEventArgs e){
-            if (!e.IsEnabled){
-                int token = manager.GetTokenFromPlugin(e.Plugin);
-
-                fileCache.Remove(token);
-                notificationInjections.Remove(token);
-            }
-        }
-
-        // Utility methods
-
-        private string GetFullPathOrThrow(int token, PluginFolder folder, string path){
-            Plugin plugin = manager.GetPluginFromToken(token);
-            string fullPath = plugin == null ? string.Empty : plugin.GetFullPathIfSafe(folder, path);
-
-            if (fullPath.Length == 0){
-                switch(folder){
-                    case PluginFolder.Data: throw new ArgumentException("File path has to be relative to the plugin data folder.");
-                    case PluginFolder.Root: throw new ArgumentException("File path has to be relative to the plugin root folder.");
-                    default: throw new ArgumentException("Invalid folder type "+folder+", this is a TweetDuck error.");
-                }
-            }
-            else{
-                return fullPath;
-            }
-        }
-
-        private string ReadFileUnsafe(int token, string cacheKey, string fullPath, bool readCached){
-            cacheKey = SanitizeCacheKey(cacheKey);
-            
-            if (readCached && fileCache.TryGetValue(token, cacheKey, out string cachedContents)){
-                return cachedContents;
-            }
-
-            try{
-                return fileCache[token, cacheKey] = File.ReadAllText(fullPath, Encoding.UTF8);
-            }catch(FileNotFoundException){
-                throw new FileNotFoundException("File not found.");
-            }catch(DirectoryNotFoundException){
-                throw new DirectoryNotFoundException("Directory not found.");
-            }
-        }
-
-        // Public methods
-
-        public void WriteFile(int token, string path, string contents){
-            string fullPath = GetFullPathOrThrow(token, PluginFolder.Data, path);
-
-            WindowsUtils.CreateDirectoryForFile(fullPath);
-            File.WriteAllText(fullPath, contents, Encoding.UTF8);
-            fileCache[token, SanitizeCacheKey(path)] = contents;
-        }
-
-        public string ReadFile(int token, string path, bool cache){
-            return ReadFileUnsafe(token, path, GetFullPathOrThrow(token, PluginFolder.Data, path), cache);
-        }
-
-        public void DeleteFile(int token, string path){
-            string fullPath = GetFullPathOrThrow(token, PluginFolder.Data, path);
-
-            fileCache.Remove(token, SanitizeCacheKey(path));
-            File.Delete(fullPath);
-        }
-
-        public bool CheckFileExists(int token, string path){
-            return File.Exists(GetFullPathOrThrow(token, PluginFolder.Data, path));
-        }
-
-        public string ReadFileRoot(int token, string path){
-            return ReadFileUnsafe(token, "root*"+path, GetFullPathOrThrow(token, PluginFolder.Root, path), true);
-        }
-
-        public bool CheckFileExistsRoot(int token, string path){
-            return File.Exists(GetFullPathOrThrow(token, PluginFolder.Root, path));
-        }
-
-        public void InjectIntoNotificationsBefore(int token, string key, string search, string html){
-            notificationInjections[token, key] = new InjectedHTML(InjectedHTML.Position.Before, search, html);
-        }
-
-        public void InjectIntoNotificationsAfter(int token, string key, string search, string html){
-            notificationInjections[token, key] = new InjectedHTML(InjectedHTML.Position.After, search, html);
-        }
-
-        public void SetConfigurable(int token){
-            Plugin plugin = manager.GetPluginFromToken(token);
-
-            if (plugin != null){
-                WithConfigureFunction.Add(plugin);
-            }
-        }
-    }
-}

Plugins/PluginControl.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Plugins.Controls {
+namespace TweetDuck.Plugins {
     partial class PluginControl {
         /// <summary> 
         /// Required designer variable.

Plugins/PluginControl.cs

@@ -3,9 +3,10 @@ using System.Drawing;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
-using TweetDuck.Plugins.Enums;
+using TweetLib.Core.Features.Plugins;
+using TweetLib.Core.Features.Plugins.Enums;
 
-namespace TweetDuck.Plugins.Controls{
+namespace TweetDuck.Plugins{
     sealed partial class PluginControl : UserControl{
         private readonly PluginManager pluginManager;
         private readonly Plugin plugin;
@@ -26,7 +27,7 @@ namespace TweetDuck.Plugins.Controls{
             float dpiScale = this.GetDPIScale();
 
             if (dpiScale > 1F){
-                Size = MaximumSize = new Size(MaximumSize.Width, MaximumSize.Height+3);
+                Size = MaximumSize = new Size(MaximumSize.Width, MaximumSize.Height + 3);
             }
             
             this.labelName.Text = plugin.Name;
@@ -55,19 +56,19 @@ namespace TweetDuck.Plugins.Controls{
         private void panelDescription_Resize(object sender, EventArgs e){
             SuspendLayout();
             
-            int maxWidth = panelDescription.Width-(panelDescription.VerticalScroll.Visible ? SystemInformation.VerticalScrollBarWidth : 0);
+            int maxWidth = panelDescription.Width - (panelDescription.VerticalScroll.Visible ? SystemInformation.VerticalScrollBarWidth : 0);
             labelDescription.MaximumSize = new Size(maxWidth, int.MaxValue);
 
             Font font = labelDescription.Font;
-            int descriptionLines = TextRenderer.MeasureText(labelDescription.Text, font, new Size(maxWidth, int.MaxValue), TextFormatFlags.WordBreak).Height/(font.Height-1);
+            int descriptionLines = TextRenderer.MeasureText(labelDescription.Text, font, new Size(maxWidth, int.MaxValue), TextFormatFlags.WordBreak).Height / (font.Height - 1);
             
-            int requiredLines = Math.Max(descriptionLines, 1+(string.IsNullOrEmpty(labelVersion.Text) ? 0 : 1)+(isConfigurable ? 1 : 0));
+            int requiredLines = Math.Max(descriptionLines, 1 + (string.IsNullOrEmpty(labelVersion.Text) ? 0 : 1) + (isConfigurable ? 1 : 0));
             
-            switch(requiredLines){
-                case 1: nextHeight = MaximumSize.Height-2*(font.Height-1); break;
-                case 2: nextHeight = MaximumSize.Height-(font.Height-1); break;
-                default: nextHeight = MaximumSize.Height; break;
-            }
+            nextHeight = requiredLines switch{
+                1 => MaximumSize.Height - 2 * (font.Height - 1),
+                2 => MaximumSize.Height - 1 * (font.Height - 1),
+                _ => MaximumSize.Height
+            };
 
             if (nextHeight != Height){
                 timerLayout.Start();

Plugins/PluginDispatcher.cs

@@ -0,0 +1,34 @@
+using System;
+using CefSharp;
+using TweetDuck.Core.Adapters;
+using TweetLib.Core.Browser;
+using TweetLib.Core.Features.Plugins;
+using TweetLib.Core.Features.Plugins.Events;
+using TweetLib.Core.Features.Twitter;
+
+namespace TweetDuck.Plugins{
+    sealed class PluginDispatcher : IPluginDispatcher{
+        public event EventHandler<PluginDispatchEventArgs> Ready;
+
+        private readonly IWebBrowser browser;
+        private readonly IScriptExecutor executor;
+
+        public PluginDispatcher(IWebBrowser browser){
+            this.browser = browser;
+            this.browser.FrameLoadEnd += browser_FrameLoadEnd;
+            this.executor = new CefScriptExecutor(browser);
+        }
+
+        void IPluginDispatcher.AttachBridge(string name, object bridge){
+            browser.RegisterAsyncJsObject(name, bridge);
+        }
+
+        private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
+            IFrame frame = e.Frame;
+
+            if (frame.IsMain && TwitterUrls.IsTweetDeck(frame.Url)){
+                Ready?.Invoke(this, new PluginDispatchEventArgs(executor));
+            }
+        }
+    }
+}

Plugins/PluginLoader.cs

@@ -1,70 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Text;
-using TweetDuck.Plugins.Enums;
-
-namespace TweetDuck.Plugins{
-    static class PluginLoader{
-        private static readonly string[] EndTag = { "[END]" };
-
-        public static Plugin FromFolder(string path, PluginGroup group){
-            string name = Path.GetFileName(path);
-
-            if (string.IsNullOrEmpty(name)){
-                throw new ArgumentException("Could not extract directory name from path: "+path);
-            }
-            
-            Plugin.Builder builder = new Plugin.Builder(group, name, path, Path.Combine(Program.PluginDataPath, group.GetIdentifierPrefix(), name));
-
-            foreach(string file in Directory.EnumerateFiles(path, "*.js", SearchOption.TopDirectoryOnly).Select(Path.GetFileName)){
-                builder.AddEnvironment(PluginEnvironmentExtensions.Values.FirstOrDefault(env => file.Equals(env.GetPluginScriptFile(), StringComparison.Ordinal)));
-            }
-
-            string metaFile = Path.Combine(path, ".meta");
-
-            if (!File.Exists(metaFile)){
-                throw new ArgumentException("Plugin is missing a .meta file");
-            }
-            
-            string currentTag = null, currentContents = string.Empty;
-
-            foreach(string line in File.ReadAllLines(metaFile, Encoding.UTF8).Concat(EndTag).Select(line => line.TrimEnd()).Where(line => line.Length > 0)){
-                if (line[0] == '[' && line[line.Length-1] == ']'){
-                    if (currentTag != null){
-                        SetProperty(builder, currentTag, currentContents);
-                    }
-
-                    currentTag = line.Substring(1, line.Length-2).ToUpper();
-                    currentContents = string.Empty;
-
-                    if (line.Equals(EndTag[0])){
-                        break;
-                    }
-                }
-                else if (currentTag != null){
-                    currentContents = currentContents.Length == 0 ? line : currentContents+Environment.NewLine+line;
-                }
-                else{
-                    throw new FormatException("Missing metadata tag before value: "+line);
-                }
-            }
-
-            return builder.BuildAndSetup();
-        }
-
-        private static void SetProperty(Plugin.Builder builder, string tag, string value){
-            switch(tag){
-                case "NAME":          builder.Name = value; break;
-                case "DESCRIPTION":   builder.Description = value; break;
-                case "AUTHOR":        builder.Author = value; break;
-                case "VERSION":       builder.Version = value; break;
-                case "WEBSITE":       builder.Website = value; break;
-                case "CONFIGFILE":    builder.ConfigFile = value; break;
-                case "CONFIGDEFAULT": builder.ConfigDefault = value; break;
-                case "REQUIRES":      builder.RequiredVersion = Version.TryParse(value, out Version version) ? version : throw new FormatException("Invalid required minimum version: "+value); break;
-                default: throw new FormatException("Invalid metadata tag: "+tag);
-            }
-        }
-    }
-}

Plugins/PluginManager.cs

@@ -1,183 +0,0 @@
-using CefSharp;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Windows.Forms;
-using TweetDuck.Core.Utils;
-using TweetDuck.Data;
-using TweetDuck.Plugins.Enums;
-using TweetDuck.Plugins.Events;
-using TweetDuck.Resources;
-
-namespace TweetDuck.Plugins{
-    sealed class PluginManager{
-        private static readonly IReadOnlyDictionary<PluginEnvironment, string> PluginSetupScriptNames = PluginEnvironmentExtensions.Map(null, "plugins.browser.js", "plugins.notification.js");
-
-        public string PathOfficialPlugins => Path.Combine(rootPath, "official");
-        public string PathCustomPlugins => Path.Combine(rootPath, "user");
-
-        public IEnumerable<Plugin> Plugins => plugins;
-        public IEnumerable<InjectedHTML> NotificationInjections => bridge.NotificationInjections;
-
-        public IPluginConfig Config { get; }
-        
-        public event EventHandler<PluginErrorEventArgs> Reloaded;
-        public event EventHandler<PluginErrorEventArgs> Executed;
-        
-        private readonly string rootPath;
-        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 IWebBrowser mainBrowser;
-
-        public PluginManager(IPluginConfig config, string rootPath){
-            this.Config = config;
-            this.Config.PluginChangedState += Config_PluginChangedState;
-
-            this.rootPath = rootPath;
-            this.bridge = new PluginBridge(this);
-        }
-
-        public void Register(IWebBrowser browser, PluginEnvironment environment, Control sync, bool asMainBrowser = false){
-            browser.FrameLoadEnd += (sender, args) => {
-                IFrame frame = args.Frame;
-
-                if (frame.IsMain && TwitterUtils.IsTweetDeckWebsite(frame)){
-                    ExecutePlugins(frame, environment, sync);
-                }
-            };
-
-            browser.RegisterAsyncJsObject("$TDP", bridge);
-
-            if (asMainBrowser){
-                mainBrowser = browser;
-            }
-        }
-
-        private void Config_PluginChangedState(object sender, PluginChangedStateEventArgs e){
-            mainBrowser?.ExecuteScriptAsync("TDPF_setPluginState", e.Plugin, e.IsEnabled);
-        }
-
-        public bool IsPluginInstalled(string identifier){
-            return plugins.Any(plugin => plugin.Identifier.Equals(identifier));
-        }
-
-        public bool HasAnyPlugin(PluginEnvironment environment){
-            return plugins.Any(plugin => plugin.Environments.HasFlag(environment));
-        }
-
-        public bool IsPluginConfigurable(Plugin plugin){
-            return plugin.HasConfig || bridge.WithConfigureFunction.Contains(plugin);
-        }
-
-        public void ConfigurePlugin(Plugin plugin){
-            if (bridge.WithConfigureFunction.Contains(plugin)){
-                mainBrowser?.ExecuteScriptAsync("TDPF_configurePlugin", plugin);
-            }
-            else if (plugin.HasConfig){
-                if (File.Exists(plugin.ConfigPath)){
-                    using(Process.Start("explorer.exe", "/select,\""+plugin.ConfigPath.Replace('/', '\\')+"\"")){}
-                }
-                else{
-                    using(Process.Start("explorer.exe", '"'+plugin.GetPluginFolder(PluginFolder.Data).Replace('/', '\\')+'"')){}
-                }
-            }
-        }
-
-        public int GetTokenFromPlugin(Plugin plugin){
-            foreach(KeyValuePair<int, Plugin> kvp in tokens){
-                if (kvp.Value.Equals(plugin)){
-                    return kvp.Key;
-                }
-            }
-
-            int token, attempts = 1000;
-
-            do{
-                token = rand.Next();
-            }while(tokens.ContainsKey(token) && --attempts >= 0);
-            
-            if (attempts < 0){
-                token = -tokens.Count-1;
-            }
-
-            tokens[token] = plugin;
-            return token;
-        }
-
-        public Plugin GetPluginFromToken(int token){
-            return tokens.TryGetValue(token, out Plugin plugin) ? plugin : null;
-        }
-
-        public void Reload(){
-            plugins.Clear();
-            tokens.Clear();
-
-            List<string> loadErrors = new List<string>(2);
-
-            IEnumerable<Plugin> LoadPluginsFrom(string path, PluginGroup group){
-                if (!Directory.Exists(path)){
-                    yield break;
-                }
-
-                foreach(string fullDir in Directory.EnumerateDirectories(path, "*", SearchOption.TopDirectoryOnly)){
-                    Plugin plugin;
-
-                    try{
-                        plugin = PluginLoader.FromFolder(fullDir, group);
-                    }catch(Exception e){
-                        loadErrors.Add(group.GetIdentifierPrefix()+Path.GetFileName(fullDir)+": "+e.Message);
-                        continue;
-                    }
-
-                    yield return plugin;
-                }
-            }
-            
-            plugins.UnionWith(LoadPluginsFrom(PathOfficialPlugins, PluginGroup.Official));
-            plugins.UnionWith(LoadPluginsFrom(PathCustomPlugins, PluginGroup.Custom));
-
-            Reloaded?.Invoke(this, new PluginErrorEventArgs(loadErrors));
-        }
-
-        private void ExecutePlugins(IFrame frame, PluginEnvironment environment, Control sync){
-            if (!HasAnyPlugin(environment) || !ScriptLoader.ExecuteFile(frame, PluginSetupScriptNames[environment], sync)){
-                return;
-            }
-            
-            bool includeDisabled = environment.IncludesDisabledPlugins();
-
-            if (includeDisabled){
-                ScriptLoader.ExecuteScript(frame, PluginScriptGenerator.GenerateConfig(Config), "gen:pluginconfig");
-            }
-
-            List<string> failedPlugins = new List<string>(1);
-
-            foreach(Plugin plugin in Plugins){
-                string path = plugin.GetScriptPath(environment);
-
-                if (string.IsNullOrEmpty(path) || (!includeDisabled && !Config.IsEnabled(plugin)) || !plugin.CanRun){
-                    continue;
-                }
-
-                string script;
-
-                try{
-                    script = File.ReadAllText(path);
-                }catch(Exception e){
-                    failedPlugins.Add(plugin.Identifier+" ("+Path.GetFileName(path)+"): "+e.Message);
-                    continue;
-                }
-                
-                ScriptLoader.ExecuteScript(frame, PluginScriptGenerator.GeneratePlugin(plugin.Identifier, script, GetTokenFromPlugin(plugin), environment), "plugin:"+plugin);
-            }
-
-            Executed?.Invoke(this, new PluginErrorEventArgs(failedPlugins));
-        }
-    }
-}

Program.cs

@@ -2,25 +2,29 @@ using CefSharp;
 using CefSharp.WinForms;
 using System;
 using System.Diagnostics;
-using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Threading;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
 using TweetDuck.Core;
+using TweetDuck.Core.Handling;
 using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Other;
 using TweetDuck.Core.Management;
 using TweetDuck.Core.Utils;
-using TweetDuck.Data;
+using TweetDuck.Impl;
+using TweetDuck.Resources;
+using TweetLib.Core;
+using TweetLib.Core.Application.Helpers;
+using TweetLib.Core.Collections;
+using TweetLib.Core.Utils;
 
 namespace TweetDuck{
     static class Program{
-        public const string BrandName = "TweetDuck";
-        public const string Website = "https://tweetduck.chylex.com";
+        public const string BrandName = Lib.BrandName;
+        public const string VersionTag = Lib.VersionTag;
 
-        public const string VersionTag = "1.16.1";
+        public const string Website = "https://tweetduck.chylex.com";
 
         public static readonly string ProgramPath = AppDomain.CurrentDomain.BaseDirectory;
         public static readonly bool IsPortable = File.Exists(Path.Combine(ProgramPath, "makeportable"));
@@ -47,23 +51,28 @@ namespace TweetDuck{
         private static readonly LockManager LockManager = new LockManager(Path.Combine(StoragePath, ".lock"));
         private static bool HasCleanedUp;
         
-        public static CultureInfo Culture { get; }
         public static Reporter Reporter { get; }
         public static ConfigManager Config { get; }
+        public static ScriptLoader Resources { get; }
 
         static Program(){
-            Culture = CultureInfo.CurrentCulture;
-            Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
-            CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture;
-
-            #if DEBUG
-            CultureInfo.DefaultThreadCurrentUICulture = Thread.CurrentThread.CurrentUICulture = new CultureInfo("en-us"); // force english exceptions
-            #endif
-
             Reporter = new Reporter(ErrorLogFilePath);
             Reporter.SetupUnhandledExceptionHandler("TweetDuck Has Failed :(");
 
             Config = new ConfigManager();
+
+            #if DEBUG
+            Resources = new ScriptLoaderDebug();
+            #else
+            Resources = new ScriptLoader();
+            #endif
+
+            Lib.Initialize(new App.Builder{
+                ErrorHandler = Reporter,
+                LockHandler = new LockHandler(),
+                SystemHandler = new SystemHandler(),
+                ResourceHandler = Resources
+            });
         }
 
         [STAThread]
@@ -74,8 +83,8 @@ namespace TweetDuck{
             
             WindowRestoreMessage = NativeMethods.RegisterWindowMessage("TweetDuckRestore");
 
-            if (!WindowsUtils.CheckFolderWritePermission(StoragePath)){
-                FormMessage.Warning("Permission Error", "TweetDuck does not have write permissions to the storage folder: "+StoragePath, FormMessage.OK);
+            if (!FileUtils.CheckFolderWritePermission(StoragePath)){
+                FormMessage.Warning("Permission Error", "TweetDuck does not have write permissions to the storage folder: " + StoragePath, FormMessage.OK);
                 return;
             }
             
@@ -98,15 +107,17 @@ namespace TweetDuck{
                 LockManager.Result lockResult = LockManager.Lock();
                 
                 if (lockResult == LockManager.Result.HasProcess){
-                    if (!LockManager.RestoreLockingProcess(2000) && FormMessage.Error("TweetDuck is Already Running", "Another instance of TweetDuck is already running.\nDo you want to close it?", FormMessage.Yes, FormMessage.No)){
-                        if (!LockManager.CloseLockingProcess(10000, 5000)){
+                    if (!LockManager.RestoreLockingProcess() && FormMessage.Error("TweetDuck is Already Running", "Another instance of TweetDuck is already running.\nDo you want to close it?", FormMessage.Yes, FormMessage.No)){
+                        if (!LockManager.CloseLockingProcess()){
                             FormMessage.Error("TweetDuck Has Failed :(", "Could not close the other process.", FormMessage.OK);
                             return;
                         }
 
                         lockResult = LockManager.Lock();
                     }
-                    else return;
+                    else{
+                        return;
+                    }
                 }
 
                 if (lockResult != LockManager.Result.Success){
@@ -126,6 +137,14 @@ namespace TweetDuck{
 
             if (Arguments.HasFlag(Arguments.ArgUpdated)){
                 WindowsUtils.TryDeleteFolderWhenAble(InstallerPath, 8000);
+                BrowserCache.TryClearNow();
+            }
+            
+            try{
+                RequestHandlerBase.LoadResourceRewriteRules(Arguments.GetValue(Arguments.ArgFreeze));
+            }catch(Exception e){
+                FormMessage.Error("Resource Freeze", "Error parsing resource rewrite rules: " + e.Message, FormMessage.OK);
+                return;
             }
 
             BrowserCache.RefreshTimer();
@@ -135,7 +154,7 @@ namespace TweetDuck{
 
             CefSettings settings = new CefSettings{
                 UserAgent = BrowserUtils.UserAgentChrome,
-                BrowserSubprocessPath = BrandName+".Browser.exe",
+                BrowserSubprocessPath = BrandName + ".Browser.exe",
                 CachePath = StoragePath,
                 UserDataPath = CefDataPath,
                 LogFile = ConsoleLogFilePath,
@@ -152,14 +171,15 @@ namespace TweetDuck{
             Application.ApplicationExit += (sender, args) => ExitCleanup();
             
             FormBrowser mainForm = new FormBrowser();
+            Resources.Initialize(mainForm);
             Application.Run(mainForm);
 
             if (mainForm.UpdateInstallerPath != null){
                 ExitCleanup();
 
                 // ProgramPath has a trailing backslash
-                string updaterArgs = "/SP- /SILENT /FORCECLOSEAPPLICATIONS /UPDATEPATH=\""+ProgramPath+"\" /RUNARGS=\""+Arguments.GetCurrentForInstallerCmd()+"\""+(IsPortable ? " /PORTABLE=1" : "");
-                bool runElevated = !IsPortable || !WindowsUtils.CheckFolderWritePermission(ProgramPath);
+                string updaterArgs = "/SP- /SILENT /FORCECLOSEAPPLICATIONS /UPDATEPATH=\"" + ProgramPath + "\" /RUNARGS=\"" + Arguments.GetCurrentForInstallerCmd() + "\"" + (IsPortable ? " /PORTABLE=1" : "");
+                bool runElevated = !IsPortable || !FileUtils.CheckFolderWritePermission(ProgramPath);
 
                 if (WindowsUtils.OpenAssociatedProgram(mainForm.UpdateInstallerPath, updaterArgs, runElevated)){
                     Application.Exit();
@@ -171,14 +191,14 @@ namespace TweetDuck{
         }
 
         private static string GetDataStoragePath(){
-            string custom = Arguments.GetValue(Arguments.ArgDataFolder, null);
+            string custom = Arguments.GetValue(Arguments.ArgDataFolder);
 
             if (custom != null && (custom.Contains(Path.DirectorySeparatorChar) || custom.Contains(Path.AltDirectorySeparatorChar))){
                 if (Path.GetInvalidPathChars().Any(custom.Contains)){
-                    Reporter.HandleEarlyFailure("Data Folder Invalid", "The data folder contains invalid characters:\n"+custom);
+                    Reporter.HandleEarlyFailure("Data Folder Invalid", "The data folder contains invalid characters:\n" + custom);
                 }
                 else if (!Path.IsPathRooted(custom)){
-                    Reporter.HandleEarlyFailure("Data Folder Invalid", "The data folder has to be either a simple folder name, or a full path:\n"+custom);
+                    Reporter.HandleEarlyFailure("Data Folder Invalid", "The data folder has to be either a simple folder name, or a full path:\n" + custom);
                 }
 
                 return Environment.ExpandEnvironmentVariables(custom);

Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace TweetDuck.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {

README.md

@@ -1,30 +1,28 @@
 # Support
 
-[Follow TweetDuck on Twitter](https://twitter.com/TryMyAwesomeApp)  |  [Support via PayPal](https://paypal.me/chylex)  |  [Support via Patreon](https://www.patreon.com/chylex)
+[Follow TweetDuck on Twitter](https://twitter.com/TryMyAwesomeApp)  |  [Support via Ko-fi](https://ko-fi.com/chylex)  |  [Support via Patreon](https://www.patreon.com/chylex)
 
 # Build Instructions
 
 ### Setup
 
-The program was built using Visual Studio 2017. Before opening the solution, please make sure you have the following workloads and components installed (optional components that are not listed can be deselected to save space):
+The program can be built using Visual Studio 2019. Before opening the solution, please make sure you have the following workloads and components installed (optional components that are not listed can be deselected to save space):
 * **.NET desktop development**
-  * .NET Framework 4 – 4.6 development tools
+  * .NET Framework 4.7.2 SDK
   * F# desktop language support
 * **Desktop development with C++**
-  * VC++ 2017 latest v141 tools
+  * MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20)
 
 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-pre01
+PM> Install-Package CefSharp.WinForms -Version 67.0.0
 ```
 
-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.
-
 ### Debug
 
 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 `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`
+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.
 
 ### Release
 
@@ -44,18 +42,13 @@ If you decide to publicly release a custom version, please make it clear that it
 - 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
 
-#### Error: The "EmbedAllSources" parameter is not supported by the "Csc" task
-1. Open `C:\Program Files (x86)\Visual Studio\2017\<edition>\MSBuild\15.0\Bin\Microsoft.CSharp.CurrentVersion.targets` in a text editor
-2. Remove line that says `EmbedAllSources="$(EmbedAllSources)"`
-3. Hope the next Visual Studio update fixes it...
-
 ### Installers
 
-TweetDuck uses **Inno Setup** for installers and updates. First, download and install [InnoSetup QuickStart Pack](http://www.jrsoftware.org/isdl.php) (non-unicode; editor and encryption support not required) and the [Inno Download Plugin](https://code.google.com/archive/p/inno-download-plugin).
+TweetDuck uses **Inno Setup** for installers and updates. First, download and install [InnoSetup 5.6.1](http://files.jrsoftware.org/is/5/innosetup-5.6.1.exe) (with Preprocessor support) and the [Inno Download Plugin 1.5.0](https://drive.google.com/folderview?id=0Bzw1xBVt0mokSXZrUEFIanV4azA&usp=sharing#list).
 
-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.
+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 and Visual Studio for the change to take place.
 
-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!
+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 first!
 
 After the window closes, three installers will be generated inside the `bld/Output` folder:
 * **TweetDuck.exe**

Reporter.cs

@@ -4,10 +4,13 @@ using System.Drawing;
 using System.IO;
 using System.Text;
 using System.Windows.Forms;
+using TweetDuck.Configuration;
 using TweetDuck.Core.Other;
+using TweetLib.Core;
+using TweetLib.Core.Application;
 
 namespace TweetDuck{
-    sealed class Reporter{
+    sealed class Reporter : IAppErrorHandler{
         private readonly string logFile;
 
         public Reporter(string logFile){
@@ -16,15 +19,23 @@ namespace TweetDuck{
 
         public void SetupUnhandledExceptionHandler(string caption){
             AppDomain.CurrentDomain.UnhandledException += (sender, args) => {
-                if (args.ExceptionObject is Exception ex) {
+                if (args.ExceptionObject is Exception ex){
                     HandleException(caption, "An unhandled exception has occurred.", false, ex);
                 }
             };
         }
 
-        public bool Log(string data){
+        public bool LogVerbose(string data){
+            return Arguments.HasFlag(Arguments.ArgLogging) && LogImportant(data);
+        }
+
+        public bool LogImportant(string data){
+            return ((IAppErrorHandler)this).Log(data);
+        }
+
+        bool IAppErrorHandler.Log(string text){
             #if DEBUG
-            Debug.WriteLine(data);
+            Debug.WriteLine(text);
             #endif
 
             StringBuilder build = new StringBuilder();
@@ -33,8 +44,8 @@ namespace TweetDuck{
                 build.Append("Please, report all issues to: https://github.com/chylex/TweetDuck/issues\r\n\r\n");
             }
 
-            build.Append("[").Append(DateTime.Now.ToString("G", Program.Culture)).Append("]\r\n");
-            build.Append(data).Append("\r\n\r\n");
+            build.Append("[").Append(DateTime.Now.ToString("G", Lib.Culture)).Append("]\r\n");
+            build.Append(text).Append("\r\n\r\n");
 
             try{
                 File.AppendAllText(logFile, build.ToString(), Encoding.UTF8);
@@ -45,10 +56,10 @@ namespace TweetDuck{
         }
 
         public void HandleException(string caption, string message, bool canIgnore, Exception e){
-            bool loggedSuccessfully = Log(e.ToString());
+            bool loggedSuccessfully = LogImportant(e.ToString());
             
-            string exceptionText = e is ExpandedLogException ? e.Message+"\n\nDetails with potentially sensitive information are in the Error Log." : e.Message;
-            FormMessage form = new FormMessage(caption, message+"\nError: "+exceptionText, canIgnore ? MessageBoxIcon.Warning : MessageBoxIcon.Error);
+            string exceptionText = e is ExpandedLogException ? e.Message + "\n\nDetails with potentially sensitive information are in the Error Log." : e.Message;
+            FormMessage form = new FormMessage(caption, message + "\nError: " + exceptionText, canIgnore ? MessageBoxIcon.Warning : MessageBoxIcon.Error);
             
             Button btnExit = form.AddButton(FormMessage.Exit);
             Button btnIgnore = form.AddButton(FormMessage.Ignore, DialogResult.Ignore, ControlType.Cancel);
@@ -104,7 +115,7 @@ namespace TweetDuck{
                 this.details = details;
             }
 
-            public override string ToString() => base.ToString()+"\r\n"+details;
+            public override string ToString() => base.ToString() + "\r\n" + details;
         }
     }
 }

Resources/Plugins/clear-columns/browser.js

@@ -87,9 +87,9 @@ enabled(){
   // update UI
   
   this.btnClearAllHTML = `
-<a class="clear-columns-btn-all-parent js-header-action link-clean cf app-nav-link padding-h--10" data-title="Clear columns (hold Shift to restore)" data-action="td-clearcolumns-doall">
+<a class="clear-columns-btn-all-parent js-header-action link-clean cf app-nav-link padding-h--16 padding-v--2" data-title="Clear columns (hold Shift to restore)" data-action="td-clearcolumns-doall">
   <div class="obj-left margin-l--2"><i class="icon icon-medium icon-clear-timeline"></i></div>
-  <div class="clear-columns-btn-all nbfc padding-ts hide-condensed txt-size--16 app-nav-link-text">Clear columns</div>
+  <div class="clear-columns-btn-all nbfc padding-ts hide-condensed txt-size--14 app-nav-link-text">Clear columns</div>
 </a>`;
   
   this.btnClearOneHTML = `
@@ -110,18 +110,28 @@ 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-navigator-overflow .clear-columns-btn-all-parent { display: none !important; }");
   this.css.insert(".column-navigator-overflow { bottom: 224px !important; }");
+  this.css.insert(".app-navigator .clear-columns-btn-all-parent { font-weight: 700; }");
   
   this.css.insert(".column-header-links { min-width: 51px !important; }");
   this.css.insert(".column[data-td-icon='icon-message'] .column-header-links { min-width: 110px !important; }");
   this.css.insert(".btn-options-tray[data-action='clear'] { display: none !important; }");
   
-  this.css.insert(".column[data-td-icon='icon-schedule'] a[data-action='td-clearcolumns-dosingle'] { display: none; }");
-  this.css.insert(".column[data-td-icon='icon-custom-timeline'] a[data-action='td-clearcolumns-dosingle'] { display: none; }");
+  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

@@ -8,6 +8,7 @@ enabled(){
     _theme: "light",
     themeOverride: false,
     columnWidth: "310px",
+    composerWidth: "default",
     fontSize: "12px",
     hideTweetActions: true,
     moveTweetActionsToRight: true,
@@ -255,7 +256,7 @@ enabled(){
       
       setTimeout(function(){
         if (theme != TD.settings.getTheme()){
-          $(document).trigger("uiToggleTheme");
+          TD.settings.setTheme(theme);
         }
         
         me.saveConfig();
@@ -380,8 +381,15 @@ enabled(){
     this.css.insert("#general_settings .cf { display: none !important }");
     this.css.insert("#settings-modal .js-setting-list li:nth-child(3) { border-bottom: 1px solid #ccd6dd }");
     
-    this.css.insert("html[data-td-font] { font-size: "+this.config.fontSize+" !important }");
-    this.css.insert(".avatar { border-radius: "+this.config.avatarRadius+"% !important }");
+    this.css.insert(`html[data-td-font] { font-size: ${this.config.fontSize} !important }`);
+    this.css.insert(`.avatar { border-radius: ${this.config.avatarRadius}% !important }`);
+    
+    if (this.config.composerWidth !== "default"){
+      const width = this.config.composerWidth;
+      this.css.insert(`.js-app-content.is-open { margin-right: ${width} !important; transform: translateX(${width}) !important }`);
+      this.css.insert(`#tduck .js-app-content.tduck-is-opening { margin-right: 0 !important }`);
+      this.css.insert(`.js-drawer { width: ${width} !important; left: -${width} !important }`);
+    }
     
     let currentTheme = TD.settings.getTheme();
     
@@ -432,7 +440,8 @@ enabled(){
     }
     
     if (this.config.forceArialFont){
-      this.css.insert("#tduck .system-font-stack { font-family: Arial, sans-serif; font-weight: 400 }");
+      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){
@@ -541,11 +550,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; }
@@ -567,7 +578,7 @@ ${iconData.map(entry => `#tduck .icon-${entry[0]}:before{content:\"\\f0${entry[1
       let cols = this.config.columnWidth.slice(1);
       
       this.css.insert(".column { width: calc((100vw - 205px) / "+cols+" - 6px) !important; min-width: 160px }");
-      this.css.insert(".is-condensed .column { width: calc((100vw - 55px) / "+cols+" - 6px) !important }");
+      this.css.insert(".is-condensed .column { width: calc((100vw - 65px) / "+cols+" - 6px) !important }");
     }
     else{
       this.css.insert(".column { width: "+this.config.columnWidth+" !important }");
@@ -601,7 +612,7 @@ html[data-td-font] { font-size: ${this.config.fontSize} !important }
 .avatar { border-radius: ${this.config.avatarRadius}% !important }
 
 ${this.config.forceArialFont ? `
-#tduck .system-font-stack { font-family: Arial, sans-serif; font-weight: 400 }
+#tduck { font-family: Arial, sans-serif; font-weight: 400 }
 ` : ``}
 
 ${this.config.increaseQuoteTextSize ? `
@@ -635,6 +646,13 @@ ${notificationScrollbarColor ? `
       $(".js-dropdown.pos-r").toggleClass("pos-r pos-l");
     }
   };
+  
+  this.uiDrawerActiveEvent = (e, data) => {
+    return if data.activeDrawer === null || this.config.composerWidth === "default";
+    
+    const ele = $(".js-app-content").addClass("tduck-is-opening");
+    setTimeout(() => ele.removeClass("tduck-is-opening"), 250);
+  };
 }
 
 ready(){
@@ -644,6 +662,7 @@ ready(){
   
   // layout events
   $(document).on("uiShowActionsMenu", this.uiShowActionsMenuEvent);
+  $(document).on("uiDrawerActive", this.uiDrawerActiveEvent);
   
   // modal
   $("[data-action='settings-menu']").on("click", this.onSettingsMenuClickedEvent);
@@ -706,10 +725,12 @@ disabled(){
     window.clearTimeout(this.optimizationTimer);
   }
   
-  $(document).off("uiShowActionsMenu", this.uiShowActionsMenuEvent);
   $(window).off("focus", this.onWindowFocusEvent);
   $(window).off("blur", this.onWindowBlurEvent);
   
+  $(document).off("uiShowActionsMenu", this.uiShowActionsMenuEvent);
+  $(document).off("uiDrawerActive", this.uiDrawerActiveEvent);
+  
   TD.components.GlobalSettings.prototype.getInfo = this.prevFuncSettingsGetInfo;
   TD.components.GlobalSettings.prototype.switchTab = this.prevFuncSettingsSwitchTab;
   

Resources/Plugins/edit-design/modal.html

@@ -55,6 +55,20 @@
             <option disabled></option>
           </select>
           
+          <!-- COMPOSER SIZE -->
+          
+          <label class="txt-uppercase touch-larger-label">
+            <b>New Tweet panel</b>
+          </label>
+          <select data-td-key="composerWidth">
+            <option value="default">Default</option>
+            <option value="270px">Narrow (270px)</option>
+            <option value="310px">Medium (310px)</option>
+            <option value="350px">Wide (350px)</option>
+            <option value="custom-px">Custom</option>
+            <option value="change-custom-px">Change custom value...</option>
+          </select>
+          
           <!-- FONT SIZE -->
           
           <label class="txt-uppercase touch-larger-label">
@@ -69,10 +83,6 @@
             <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
@@ -116,6 +126,10 @@
             <input data-td-key="themeColorTweaks" class="js-theme-checkbox touch-larger-label" type="checkbox">
             Theme color tweaks
           </label>
+          <label class="checkbox">
+            <input data-td-key="forceArialFont" class="js-theme-checkbox touch-larger-label" type="checkbox">
+            Use Arial as default font
+          </label>
           
           <!-- ADVANCED -->
           
@@ -172,13 +186,24 @@
   
   #edit-design-panel {
     width: 693px;
-    height: 380px;
+    height: 424px;
+    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;
   }
@@ -206,7 +231,7 @@
   
   #edit-design-panel-content label.radio {
     display: inline-block;
-    margin: 0 16px 5px 4px;
+    margin: 0 16px 0 4px;
     cursor: pointer;
   }
   

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}
+html.dark input,html.dark textarea,html.dark select{color:#111;border:1px solid #e1e8ed;background-color:#fff}
 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)}
@@ -508,18 +506,6 @@ html.dark .lst-group .selected a:hover{background:#55acee}
 html.dark .lst-group .selected .fullname,html.dark .lst-group .selected .inner strong,html.dark .lst-group .selected .list-link,html.dark .lst-group .selected .list-twitter-list,html.dark .lst-group .selected .list-subtitle,html.dark .lst-group .selected .list-account,html.dark .lst-group .selected .list-listmember,html.dark .lst-group .selected .txt-ellipsis{color:#F5F8FA}
 html.dark .lst-group .selected .username,html.dark .lst-group .selected .bytext,html.dark .lst-group .selected .subtitle,html.dark .lst-group .selected .icon-protected{color:#eef3f7}
 html.dark .itm-remove{border-top:1px solid #ddd}
-html.dark .caret-outer{border-bottom:7px solid rgba(17,17,17,0.1)}
-html.dark .caret-inner{border-bottom:6px solid #fff}
-html.dark .drp-h-divider{border-bottom:1px solid #ddd}
-html.dark .dropdown-menu .typeahead-item,html.dark .dropdown-menu [data-action]{color:#292F33}
-html.dark .dropdown-menu .is-selected{background:#55acee;color:#fff}
-html.dark .dropdown-menu .is-selected [data-action]{color:#fff}
-html.dark .dropdown-menu .is-selected a:not(:hover):not(:focus){color:#fff}
-html.dark .dropdown-menu a:not(:hover):not(:focus){color:#292F33}
-html.dark .dropdown-menu-old li:hover{background:#55acee}
-html.dark .dropdown-menu-old li:hover a{color:#fff}
-html.dark .dropdown-menu-old li:hover .attribution{color:#fff}
-html.dark .non-selectable-item{color:#292F33}
 html.dark .update-available-item:before{background-color:#FFAD1F}
 html.dark .is-selected .update-available-item:before{background-color:rgba(41,47,51,0.2)}
 html.dark .popover{background-color:#fff;box-shadow:0 0 10px rgba(17,17,17,0.7)}
@@ -802,5 +788,12 @@ html.dark .NotificationList .Notification-body{color:#14171A}
 html.dark .DrawerModal{color:#14171A}
 /* fixes */
 html.dark .app-search-fake{border-color:transparent}
-html.dark .spinner-small,html.dark .spinner-large{filter:grayscale(80%)brightness(93%)}
+html.dark .spinner-small,html.dark .spinner-large{filter:grayscale(85%)brightness(117%)}
 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,html.dark #actions-modal{color:#292F33}
+html.dark #actions-modal .account-link{color:#38444d}
+html.dark .mdl-accent{background-color:transparent}
+html.dark .lst-launcher a span{color:#657786!important}
+html.dark .social-proof-names a{color:#3b94d9}

Resources/Plugins/emoji-keyboard/browser.js

@@ -56,11 +56,13 @@ enabled(){
   this.prevComposeMustache = TD.mustaches["compose/docked_compose.mustache"];
   window.TDPF_injectMustache("compose/docked_compose.mustache", "append", '<div class="cf margin-t--12 margin-b--30">', buttonHTML);
   
-  let maybeDockedComposePanel = $(".js-docked-compose");
+  this.getDrawerInput = () => {
+    return $(".js-compose-text", me.composeDrawer);
+  };
   
-  if (maybeDockedComposePanel.length){
-    maybeDockedComposePanel.find(".cf.margin-t--12.margin-b--30").first().append(buttonHTML);
-  }
+  this.getDrawerScroller = () => {
+    return $(".js-compose-scroller > .scroll-v", me.composeDrawer);
+  };
   
   // keyboard generation
   
@@ -79,12 +81,12 @@ enabled(){
     
     this.currentKeywords = [];
     
-    this.composePanelScroller.trigger("scroll");
+    this.getDrawerScroller().trigger("scroll");
     
     $(".emoji-keyboard-popup-btn").removeClass("is-selected");
     
     if (refocus){
-      this.composeInput.focus();
+      this.getDrawerInput().focus();
       
       if (lastEmojiKeyword && lastEmojiPosition === 0){
         document.execCommand("insertText", false, lastEmojiKeyword);
@@ -229,16 +231,16 @@ enabled(){
     this.currentSpanner.style.height = ($(this.currentKeyboard).height()-10)+"px";
     $(".emoji-keyboard-popup-btn").parent().after(this.currentSpanner);
     
-    this.composePanelScroller.trigger("scroll");
+    this.getDrawerScroller().trigger("scroll");
   };
   
   const getKeyboardTop = () => {
     let button = $(".emoji-keyboard-popup-btn");
-    return button.offset().top+button.outerHeight()+me.composePanelScroller.scrollTop()+8;
+    return button.offset().top + button.outerHeight() + me.getDrawerScroller().scrollTop() + 8;
   };
   
   const insertEmoji = (src, alt) => {
-    let input = this.composeInput;
+    let input = this.getDrawerInput();
     
     let val = input.val();
     let posStart = input[0].selectionStart;
@@ -378,6 +380,11 @@ enabled(){
     hideKeyboard();
   };
   
+  this.composerActiveEvent = function(e){
+    $(".emoji-keyboard-popup-btn", me.composeDrawer).on("click", me.emojiKeyboardButtonClickEvent);
+    $(".js-docked-compose .js-compose-scroller > .scroll-v", me.composeDrawer).on("scroll", me.composerScrollEvent);
+  };
+  
   this.documentClickEvent = function(e){
     if (me.currentKeyboard && $(e.target).closest(".compose-text-container").length === 0){
       hideKeyboard();
@@ -396,20 +403,26 @@ enabled(){
       me.currentKeyboard.style.top = getKeyboardTop()+"px";
     }
   };
+  
+  // re-enabling
+  
+  let maybeDockedComposePanel = $(".js-docked-compose");
+  
+  if (maybeDockedComposePanel.length){
+    maybeDockedComposePanel.find(".cf.margin-t--12.margin-b--30").first().append(buttonHTML);
+    this.composerActiveEvent();
+  }
 }
 
 ready(){
-  this.composeDrawer = $("[data-drawer='compose']");
-  this.composeInput = $(".js-compose-text", ".js-docked-compose");
+  this.composeDrawer = $(".js-drawer[data-drawer='compose']");
   this.composeSelector = ".js-compose-text,.js-reply-tweetbox";
   
-  this.composePanelScroller = $(".js-compose-scroller", ".js-docked-compose").first().children().first();
-  this.composePanelScroller.on("scroll", this.composerScrollEvent);
-  
-  $(".emoji-keyboard-popup-btn").on("click", this.emojiKeyboardButtonClickEvent);
   $(document).on("click", this.documentClickEvent);
   $(document).on("keydown", this.documentKeyEvent);
+  $(document).on("tduckOldComposerActive", this.composerActiveEvent);
   $(document).on("uiComposeImageAdded", this.uploadFilesEvent);
+  
   this.composeDrawer.on("uiComposeTweetSending", this.composerSendingEvent);
   
   $(document).on("keydown", this.composeSelector, this.composeInputKeyDownEvent);
@@ -529,14 +542,13 @@ disabled(){
     $(this.currentSpanner).remove();
   }
   
-  this.composePanelScroller.off("scroll", this.composerScrollEvent);
-  
-  $(".emoji-keyboard-popup-btn").off("click", this.emojiKeyboardButtonClickEvent);
   $(".emoji-keyboard-popup-btn").remove();
   
   $(document).off("click", this.documentClickEvent);
   $(document).off("keydown", this.documentKeyEvent);
+  $(document).off("tduckOldComposerActive", this.composerActiveEvent);
   $(document).off("uiComposeImageAdded", this.uploadFilesEvent);
+  
   this.composeDrawer.off("uiComposeTweetSending", this.composerSendingEvent);
   
   $(document).off("keydown", this.composeSelector, this.composeInputKeyDownEvent);

Resources/Plugins/templates/browser.js

@@ -376,22 +376,25 @@ enabled(){
   };
   
   this.drawerToggleEvent = function(e, data){
-    if (data.activeDrawer === null){
+    if (typeof data === "undefined" || data.activeDrawer !== "compose"){
       hideTemplateModal();
     }
   };
 }
 
 ready(){
-  $(".manage-templates-btn").on("click", this.manageTemplatesButtonClickEvent);
+  $(".js-drawer[data-drawer='compose']").on("click", ".manage-templates-btn", this.manageTemplatesButtonClickEvent);
   $(document).on("uiDrawerActive", this.drawerToggleEvent);
+  $(document).on("click", ".js-new-composer-opt-in", this.drawerToggleEvent);
 }
 
 disabled(){
   $(".manage-templates-btn").remove();
   $("#templates-modal-wrap").remove();
   
+  $(".js-drawer[data-drawer='compose']").off("click", ".manage-templates-btn", this.manageTemplatesButtonClickEvent);
   $(document).off("uiDrawerActive", this.drawerToggleEvent);
+  $(document).off("click", ".js-new-composer-opt-in", this.drawerToggleEvent);
   
   TD.mustaches["compose/docked_compose.mustache"] = this.prevComposeMustache;
 }

Resources/Plugins/templates/modal.html

@@ -171,14 +171,14 @@
     }
     
     .template-editor-form input, .template-editor-form textarea {
-      color: #111;
-      background-color: #fff;
+      color: #111 !important;
+      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/ScriptLoader.cs

@@ -1,45 +1,55 @@
-using CefSharp;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Other;
-
-#if DEBUG
-using System.Diagnostics;
-using System.Reflection;
-using TweetDuck.Core;
-using TweetDuck.Plugins;
-#endif
+using TweetLib.Core.Application;
 
 namespace TweetDuck.Resources{
-    static class ScriptLoader{
-        private static readonly Dictionary<string, string> CachedData = new Dictionary<string, string>(16);
+    class ScriptLoader : IAppResourceHandler{
+        private readonly Dictionary<string, string> cache = new Dictionary<string, string>(16);
+        private Control sync;
 
-        public static string LoadResourceSilent(string name){
-            return LoadResource(name, null);
+        public void Initialize(Control sync){
+            this.sync = sync;
         }
 
-        public static string LoadResource(string name, Control sync){
-            if (CachedData.TryGetValue(name, out string resourceData)){
+        protected void ClearCache(){
+            cache.Clear();
+        }
+
+        public virtual void OnReloadTriggered(){
+            if (Control.ModifierKeys.HasFlag(Keys.Shift)){
+                ClearCache();
+            }
+        }
+
+        public string Load(string path)       => LoadInternal(path, silent: false);
+        public string LoadSilent(string path) => LoadInternal(path, silent: true);
+
+        protected virtual string LocateFile(string path){
+            return Path.Combine(Program.ScriptPath, path);
+        }
+
+        private string LoadInternal(string path, bool silent){
+            if (sync == null){
+                throw new InvalidOperationException("Cannot use ScriptLoader before initialization.");
+            }
+            else if (sync.IsDisposed){
+                return null; // better than crashing I guess...?
+            }
+
+            if (cache.TryGetValue(path, out string resourceData)){
                 return resourceData;
             }
 
-            string path = Program.ScriptPath;
-
-            #if DEBUG
-            if (Directory.Exists(HotSwapTargetDir)){
-                path = Path.Combine(HotSwapTargetDir, "scripts");
-                Debug.WriteLine("Hot swap active, redirecting "+name);
-            }
-            #endif
-
+            string location = LocateFile(path);
             string resource;
 
             try{
-                string contents = File.ReadAllText(Path.Combine(path, name), Encoding.UTF8);
+                string contents = File.ReadAllText(location, Encoding.UTF8);
                 int separator;
 
                 // first line can be either:
@@ -47,120 +57,29 @@ namespace TweetDuck.Resources{
                 // #<version>\n
 
                 if (contents[0] != '#'){
-                    ShowLoadError(sync, $"File {name} appears to be corrupted, please try reinstalling the app.");
+                    ShowLoadError(silent ? null : sync, $"File {path} appears to be corrupted, please try reinstalling the app.");
                     separator = 0;
                 }
                 else{
                     separator = contents.IndexOf('\n');
-                    string fileVersion = contents.Substring(1, separator-1).TrimEnd();
+                    string fileVersion = contents.Substring(1, separator - 1).TrimEnd();
 
                     if (fileVersion != Program.VersionTag){
-                        ShowLoadError(sync, $"File {name} is made for a different version of TweetDuck ({fileVersion}) and may not function correctly in this version, please try reinstalling the app.");
+                        ShowLoadError(silent ? null : sync, $"File {path} is made for a different version of TweetDuck ({fileVersion}) and may not function correctly in this version, please try reinstalling the app.");
                     }
                 }
 
                 resource = contents.Substring(separator).TrimStart();
             }catch(Exception ex){
-                ShowLoadError(sync, $"Could not load {name}. The program will continue running with limited functionality.\n\n{ex.Message}");
+                ShowLoadError(silent ? null : sync, $"Could not load {path}. The program will continue running with limited functionality.\n\n{ex.Message}");
                 resource = null;
             }
 
-            return CachedData[name] = resource;
-        }
-
-        public static bool ExecuteFile(IFrame frame, string file, Control sync){
-            string script = LoadResource(file, sync);
-            ExecuteScript(frame, script, "root:"+Path.GetFileNameWithoutExtension(file));
-            return script != null;
-        }
-
-        public static void ExecuteScript(IFrame frame, string script, string identifier){
-            if (script != null){
-                frame.ExecuteJavaScriptAsync(script, identifier, 1);
-            }
-        }
-
-        public static void ClearCache(){
-            CachedData.Clear();
+            return cache[path] = resource;
         }
 
         private static void ShowLoadError(Control sync, string message){
             sync?.InvokeSafe(() => FormMessage.Error("Resource Error", message, FormMessage.OK));
         }
-        
-        #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, "bld", "post_build.exe");
-
-        static ScriptLoader(){
-            if (File.Exists(HotSwapRebuildScript)){
-                Debug.WriteLine("Activating resource hot swap...");
-
-                ResetHotSwap();
-                Application.ApplicationExit += (sender, args) => ResetHotSwap();
-            }
-        }
-
-        public static void HotSwap(){
-            if (!File.Exists(HotSwapRebuildScript)){
-                Debug.WriteLine("Failed resource hot swap, missing rebuild script: "+HotSwapRebuildScript);
-                return;
-            }
-            
-            ResetHotSwap();
-            Directory.CreateDirectory(HotSwapTargetDir);
-
-            Stopwatch sw = Stopwatch.StartNew();
-
-            using(Process process = Process.Start(new ProcessStartInfo{
-                FileName = HotSwapRebuildScript,
-                Arguments = $"\"{HotSwapTargetDir}\\\" \"{HotSwapProjectRoot}\\\" \"Debug\" \"{Program.VersionTag}\"",
-                WindowStyle = ProcessWindowStyle.Hidden
-            })){
-                // ReSharper disable once PossibleNullReferenceException
-                if (!process.WaitForExit(8000)){
-                    Debug.WriteLine("Failed resource hot swap, script did not finish in time");
-                    return;
-                }
-                else if (process.ExitCode != 0){
-                    Debug.WriteLine("Failed resource hot swap, script exited with code "+process.ExitCode);
-                    return;
-                }
-            }
-
-            sw.Stop();
-            Debug.WriteLine("Finished rebuild script in "+sw.ElapsedMilliseconds+" ms");
-
-            ClearCache();
-
-            // Force update plugin manager setup scripts
-
-            string newPluginRoot = Path.Combine(HotSwapTargetDir, "plugins");
-            
-            const BindingFlags flagsInstance = BindingFlags.Instance | BindingFlags.NonPublic;
-
-            Type typePluginManager = typeof(PluginManager);
-            Type typeFormBrowser = typeof(FormBrowser);
-
-            // ReSharper disable PossibleNullReferenceException
-            object instPluginManager = typeFormBrowser.GetField("plugins", flagsInstance).GetValue(FormManager.TryFind<FormBrowser>());
-            typePluginManager.GetField("rootPath", flagsInstance).SetValue(instPluginManager, newPluginRoot);
-
-            Debug.WriteLine("Reloading hot swapped plugins...");
-            ((PluginManager)instPluginManager).Reload();
-            // ReSharper restore PossibleNullReferenceException
-        }
-
-        private static void ResetHotSwap(){
-            try{
-                Directory.Delete(HotSwapTargetDir, true);
-            }catch(DirectoryNotFoundException){}
-        }
-
-        private static string FixPathSlash(string path){
-            return path.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)+'\\';
-        }
-        #endif
     }
 }

Resources/ScriptLoaderDebug.cs

@@ -0,0 +1,100 @@
+#if DEBUG
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Windows.Forms;
+using TweetDuck.Core;
+using TweetLib.Core.Features.Plugins;
+
+namespace TweetDuck.Resources{
+    sealed class ScriptLoaderDebug : ScriptLoader{
+        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, "bld", "post_build.exe");
+        
+        private static string FixPathSlash(string path){
+            return path.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar) + '\\';
+        }
+
+        public ScriptLoaderDebug(){
+            if (File.Exists(HotSwapRebuildScript)){
+                Debug.WriteLine("Activating resource hot swap...");
+
+                ResetHotSwap();
+                Application.ApplicationExit += (sender, args) => ResetHotSwap();
+            }
+        }
+
+        public override void OnReloadTriggered(){
+            HotSwap();
+        }
+
+        protected override string LocateFile(string path){
+            if (Directory.Exists(HotSwapTargetDir)){
+                Debug.WriteLine($"Hot swap active, redirecting {path}");
+                return Path.Combine(HotSwapTargetDir, "scripts", path);
+            }
+
+            return base.LocateFile(path);
+        }
+
+        private void HotSwap(){
+            if (!File.Exists(HotSwapRebuildScript)){
+                Debug.WriteLine($"Failed resource hot swap, missing rebuild script: {HotSwapRebuildScript}");
+                return;
+            }
+            
+            ResetHotSwap();
+            Directory.CreateDirectory(HotSwapTargetDir);
+
+            Stopwatch sw = Stopwatch.StartNew();
+
+            using(Process process = Process.Start(new ProcessStartInfo{
+                FileName = HotSwapRebuildScript,
+                Arguments = $"\"{HotSwapTargetDir}\\\" \"{HotSwapProjectRoot}\\\" \"Debug\" \"{Program.VersionTag}\"",
+                WindowStyle = ProcessWindowStyle.Hidden
+            })){
+                // ReSharper disable once PossibleNullReferenceException
+                if (!process.WaitForExit(8000)){
+                    Debug.WriteLine("Failed resource hot swap, script did not finish in time");
+                    return;
+                }
+                else if (process.ExitCode != 0){
+                    Debug.WriteLine($"Failed resource hot swap, script exited with code {process.ExitCode}");
+                    return;
+                }
+            }
+
+            sw.Stop();
+            Debug.WriteLine($"Finished rebuild script in {sw.ElapsedMilliseconds} ms");
+
+            ClearCache();
+
+            // Force update plugin manager setup scripts
+
+            string newPluginRoot = Path.Combine(HotSwapTargetDir, "plugins");
+            
+            const BindingFlags flagsInstance = BindingFlags.Instance | BindingFlags.NonPublic;
+
+            Type typePluginManager = typeof(PluginManager);
+            Type typeFormBrowser = typeof(FormBrowser);
+
+            // ReSharper disable PossibleNullReferenceException
+            object instPluginManager = typeFormBrowser.GetField("plugins", flagsInstance).GetValue(FormManager.TryFind<FormBrowser>());
+            typePluginManager.GetField("pluginFolder", flagsInstance).SetValue(instPluginManager, newPluginRoot);
+
+            Debug.WriteLine("Reloading hot swapped plugins...");
+            ((PluginManager)instPluginManager).Reload();
+            // ReSharper restore PossibleNullReferenceException
+        }
+
+        private void ResetHotSwap(){
+            try{
+                Directory.Delete(HotSwapTargetDir, true);
+            }catch(DirectoryNotFoundException){}
+        }
+    }
+}
+
+#endif

Resources/Scripts/code.js

@@ -245,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,
@@ -413,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>"
@@ -476,6 +477,19 @@
     });
   });
   
+  //
+  // Block: Hook into composer event.
+  //
+  execSafe(function hookComposerEvents(){
+    $(document).on("uiDrawerActive uiRwebComposerOptOut", function(e, data){
+      return if e.type === "uiDrawerActive" && data.activeDrawer !== "compose";
+      
+      setTimeout(function(){
+        $(document).trigger("tduckOldComposerActive");
+      }, 0);
+    });
+  });
+  
   //
   // Block: Add TweetDuck buttons to the settings menu.
   //
@@ -574,6 +588,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;
       
@@ -784,7 +823,7 @@
       html.addClass($(document.documentElement).attr("class"));
       html.addClass($(document.body).attr("class"));
       
-      html.css("background-color", getClassStyleProperty("column", "background-color"));
+      html.css("background-color", getClassStyleProperty("stream-item", "background-color"));
       html.css("border", "none");
       
       for(let selector of [ ".js-quote-detail", ".js-media-preview-container", ".js-media" ]){
@@ -1013,14 +1052,16 @@
   // Block: Refocus the textbox after switching accounts.
   //
   onAppReady.push(function setupAccountSwitchRefocus(){
-    const composeInput = $$(".js-compose-text", ".js-docked-compose");
-    
     const refocusInput = function(){
-      composeInput.focus();
+      $$(".js-compose-text", ".js-docked-compose").focus();
     };
     
-    $$(".js-account-list", ".js-docked-compose").delegate(".js-account-item", "click", function(e){
+    const accountItemClickEvent = function(e){
       setTimeout(refocusInput, 0);
+    };
+    
+    $(document).on("tduckOldComposerActive", function(e){
+      $$(".js-account-list", ".js-docked-compose").delegate(".js-account-item", "click", accountItemClickEvent);
     });
   });
   
@@ -1172,6 +1213,8 @@
   //
   execSafe(function setupVideoPlayer(){
     window.TDGF_playVideo = function(url, username){
+      return if !url;
+      
       $('<div id="td-video-player-overlay" class="ovl" style="display:block"></div>').on("click contextmenu", function(){
         $TD.playVideo(null, null);
       }).appendTo(app);
@@ -1255,6 +1298,31 @@
     };
   });
   
+  //
+  // Block: Fix DM image previews and GIF thumbnails not loading due to new URLs.
+  //
+  if (ensurePropertyExists(TD, "services", "TwitterMedia", "prototype", "getTwitterPreviewUrl")){
+    const prevFunc = TD.services.TwitterMedia.prototype.getTwitterPreviewUrl;
+    
+    TD.services.TwitterMedia.prototype.getTwitterPreviewUrl = function(){
+      const url = prevFunc.apply(this, arguments);
+      
+      if (url.startsWith("https://ton.twitter.com/1.1/ton/data/dm/") || url.startsWith("https://pbs.twimg.com/tweet_video_thumb/")){
+        const format = url.match(/\?.*format=(\w+)/);
+        
+        if (format && format.length === 2){
+          const fix = `.${format[1]}?`;
+          
+          if (!url.includes(fix)){
+            return url.replace("?", fix);
+          }
+        }
+      }
+      
+      return url;
+    };
+  }
+  
   //
   // Block: Fix youtu.be previews not showing up for https links.
   //
@@ -1274,14 +1342,9 @@
   //
   // Block: Add a pin icon to make tweet compose drawer stay open.
   //
-  onAppReady.push(function setupStayOpenPin(){
-    let ele = $(`
-<svg id="td-compose-drawer-pin" viewBox="0 0 24 24" class="icon js-show-tip" data-original-title="Stay open" data-tooltip-position="left">
- <path d="M9.884,16.959l3.272,0.001l-0.82,4.568l-1.635,0l-0.817,-4.569Z"/>
- <rect x="8.694" y="7.208" width="5.652" height="7.445"/>
- <path d="M16.877,17.448c0,-1.908 -1.549,-3.456 -3.456,-3.456l-3.802,0c-1.907,0 -3.456,1.548 -3.456,3.456l10.714,0Z"/>
- <path d="M6.572,5.676l2.182,2.183l5.532,0l2.182,-2.183l0,-1.455l-9.896,0l0,1.455Z"/>
-</svg>`).appendTo(".js-docked-compose .js-compose-header");
+  execSafe(function setupStayOpenPin(){
+    $(document).on("tduckOldComposerActive", function(e){
+      let ele = $(`#import "markup/pin.html"`).appendTo(".js-docked-compose .js-compose-header");
       
       ele.click(function(){
         if (TD.settings.getComposeStayOpen()){
@@ -1298,6 +1361,7 @@
         ele.css("transform", "rotate(90deg)");
       }
     });
+  });
   
   //
   // Block: Make temporary search column appear as the first one and clear the input box.
@@ -1393,6 +1457,24 @@
     };
   }
   
+  //
+  // Block: Add missing languages for Bing Translator (Bengali, Icelandic, Tagalog, Tamil, Telugu, Urdu).
+  //
+  if (ensurePropertyExists(TD, "languages", "getSupportedTranslationSourceLanguages")){
+    const newCodes = [ "bn", "is", "tl", "ta", "te", "ur" ];
+    const codeSet = new Set(TD.languages.getSupportedTranslationSourceLanguages());
+    
+    for(const lang of newCodes){
+      codeSet.add(lang);
+    }
+    
+    const codeList = [...codeSet];
+    
+    TD.languages.getSupportedTranslationSourceLanguages = function(){
+      return codeList;
+    };
+  }
+  
   //
   // Block: Setup global function to refresh all columns.
   //
@@ -1477,6 +1559,8 @@
   //
   if (ensurePropertyExists(TD, "components", "ConversationDetailView", "prototype", "showChirp")){
     TD.components.ConversationDetailView.prototype.showChirp = appendToFunction(TD.components.ConversationDetailView.prototype.showChirp, function(){
+      return if !$TDX.focusDmInput;
+      
       setTimeout(function(){
         $(".js-reply-tweetbox").first().focus();
       }, 100);
@@ -1551,7 +1635,7 @@
   }
   
   //
-  // Block: Fix broken horizontal scrolling of column container when holding Shift. TODO Fix broken smooth scrolling.
+  // Block: Fix broken horizontal scrolling of column container when holding Shift.
   //
   if (ensurePropertyExists(TD, "ui", "columns", "setupColumnScrollListeners")){
     TD.ui.columns.setupColumnScrollListeners = appendToFunction(TD.ui.columns.setupColumnScrollListeners, function(column){
@@ -1559,9 +1643,7 @@
       return if !ele.length;
       
       ele.off("onmousewheel").on("mousewheel", ".scroll-v", function(e){
-        if (e.shiftKey){
         e.stopImmediatePropagation();
-        }
       });
       
       window.TDGF_prioritizeNewestEvent(ele[0], "mousewheel");

Resources/Scripts/imports/markup/pin.html

@@ -0,0 +1,6 @@
+<svg id="td-compose-drawer-pin" viewBox="0 0 24 24" class="icon js-show-tip" data-original-title="Stay open" data-tooltip-position="left">
+  <path d="M9.884,16.959l3.272,0.001l-0.82,4.568l-1.635,0l-0.817,-4.569Z"/>
+  <rect x="8.694" y="7.208" width="5.652" height="7.445"/>
+  <path d="M16.877,17.448c0,-1.908 -1.549,-3.456 -3.456,-3.456l-3.802,0c-1.907,0 -3.456,1.548 -3.456,3.456l10.714,0Z"/>
+  <path d="M6.572,5.676l2.182,2.183l5.532,0l2.182,-2.183l0,-1.455l-9.896,0l0,1.455Z"/>
+</svg>

Resources/Scripts/imports/styles/introduction.css

@@ -7,19 +7,30 @@
   min-width: 515px;
   max-width: 835px;
   height: 328px;
+  background-color: #fff;
 }
 
-#td-introduction-modal .mdl-inner {
-  padding-top: 0;
+#td-introduction-modal .mdl-header {
+  color: #8899a6;
 }
 
 #td-introduction-modal .mdl-header-title {
   cursor: default;
 }
 
+#td-introduction-modal .mdl-dismiss {
+  color: #292f33;
+}
+
+#td-introduction-modal .mdl-inner {
+  padding-top: 0;
+}
+
 #td-introduction-modal .mdl-content {
   padding: 4px 16px 0;
   overflow-y: auto;
+  border-color: #ccd6dd;
+  background: #eaeaea;
 }
 
 #td-introduction-modal p {

Resources/Scripts/imports/styles/twitter.logout.css

@@ -1,38 +0,0 @@
-/*****************************/
-/* Fix min width and margins */
-/*****************************/
-
-.page-canvas {
-  width: auto !important;
-  max-width: 888px;
-}
-
-.signout-wrapper {
-  width: auto !important;
-  margin: 0 auto !important;
-}
-
-.signout {
-  margin: 60px 0 54px !important;
-}
-
-.buttons {
-  padding-bottom: 0 !important;
-}
-
-/*******************/
-/* General styling */
-/*******************/
-
-.aside {
-  /* hide elements around dialog */
-  display: none;
-}
-
-.buttons button, .buttons a {
-  /* style buttons */
-  display: inline-block;
-  margin: 0 4px !important;
-  border: 1px solid rgba(0, 0, 0, 0.3) !important;
-  border-radius: 0 !important;
-}