Fix typo from refactoring breaking context menu for some links

Happens when someone accidentally or through dev tools gets to
twitter.com and tries downloading an image.

Configuration/UserConfig.cs

@@ -37,13 +37,11 @@ namespace TweetDuck.Configuration{
 
         public bool FirstRun            { get; set; } = true;
         public bool AllowDataCollection { get; set; } = false;
-        public bool ShowFollowNotification { get; set; } = true;
 
         public WindowState BrowserWindow { get; set; } = new WindowState();
         public WindowState PluginsWindow { get; set; } = new WindowState();
 
         public bool ExpandLinksOnHover        { get; set; } = true;
-        public bool SwitchAccountSelectors    { get; set; } = true;
         public bool OpenSearchInFirstColumn   { get; set; } = true;
         public bool KeepLikeFollowDialogsOpen { get; set; } = true;
         public bool BestImageQuality          { get; set; } = true;

Core/Bridge/PropertyBridge.cs

@@ -15,7 +15,6 @@ namespace TweetDuck.Core.Bridge{
             build.Append("x.expandLinksOnHover=").Append(Bool(Program.UserConfig.ExpandLinksOnHover));
             
             if (environment == Environment.Browser){
-                build.Append("x.switchAccountSelectors=").Append(Bool(Program.UserConfig.SwitchAccountSelectors));
                 build.Append("x.openSearchInFirstColumn=").Append(Bool(Program.UserConfig.OpenSearchInFirstColumn));
                 build.Append("x.keepLikeFollowDialogsOpen=").Append(Bool(Program.UserConfig.KeepLikeFollowDialogsOpen));
                 build.Append("x.muteNotifications=").Append(Bool(Program.UserConfig.MuteNotifications));

Core/Bridge/TweetDeckBridge.cs

@@ -3,7 +3,7 @@ using System.Text;
 using System.Windows.Forms;
 using CefSharp;
 using TweetDuck.Core.Controls;
-using TweetDuck.Core.Handling;
+using TweetDuck.Core.Management;
 using TweetDuck.Core.Notification;
 using TweetDuck.Core.Other;
 using TweetDuck.Core.Utils;
@@ -13,20 +13,12 @@ namespace TweetDuck.Core.Bridge{
     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 string LastHighlightedTweetUrl = string.Empty;
-        public static string LastHighlightedQuoteUrl = string.Empty;
-        private static string LastHighlightedTweetAuthors = string.Empty;
-        private static string LastHighlightedTweetImages = string.Empty;
-
-        public static string[] LastHighlightedTweetAuthorsArray => LastHighlightedTweetAuthors.Split(';');
-        public static string[] LastHighlightedTweetImagesArray => LastHighlightedTweetImages.Split(';');
 
         private static readonly Dictionary<string, string> SessionData = new Dictionary<string, string>(2);
 
         public static void ResetStaticProperties(){
             FontSize = NotificationHeadLayout = null;
-            LastHighlightedTweetUrl = LastHighlightedQuoteUrl = LastHighlightedTweetAuthors = LastHighlightedTweetImages = string.Empty;
         }
 
         public static void RestoreSessionData(IFrame frame){
@@ -72,13 +64,8 @@ namespace TweetDuck.Core.Bridge{
                 });
             }
 
-            public void SetLastHighlightedTweet(string tweetUrl, string quoteUrl, string authors, string imageList){
+            public void SetRightClickedChirp(string tweetUrl, string quoteUrl, string chirpAuthors, string chirpImages){
-                form.InvokeAsyncSafe(() => {
+                ContextInfo.SetChirp(tweetUrl, quoteUrl, chirpAuthors, chirpImages);
-                    LastHighlightedTweetUrl = tweetUrl;
-                    LastHighlightedQuoteUrl = quoteUrl;
-                    LastHighlightedTweetAuthors = authors;
-                    LastHighlightedTweetImages = imageList;
-                });
             }
 
             public void DisplayTooltip(string text){
@@ -112,8 +99,8 @@ namespace TweetDuck.Core.Bridge{
 
         // Global
 
-        public void SetLastRightClickInfo(string type, string link){
+        public void SetLastRightClickInfo(string type, string url){
-            form.InvokeAsyncSafe(() => ContextMenuBase.SetContextInfo(type, link));
+            ContextInfo.SetLink(type, url);
         }
 
         public void OnTweetPopup(string columnId, string chirpId, string columnName, string tweetHtml, int tweetCharacters, string tweetUrl, string quoteUrl){

Core/FormBrowser.cs

@@ -12,11 +12,12 @@ using TweetDuck.Core.Other;
 using TweetDuck.Core.Other.Analytics;
 using TweetDuck.Core.Utils;
 using TweetDuck.Plugins;
+using TweetDuck.Plugins.Enums;
 using TweetDuck.Plugins.Events;
 using TweetDuck.Updates;
 
 namespace TweetDuck.Core{
-    sealed partial class FormBrowser : Form{
+    sealed partial class FormBrowser : Form, AnalyticsFile.IProvider{
         private static UserConfig Config => Program.UserConfig;
 
         public bool IsWaiting{
@@ -38,6 +39,9 @@ namespace TweetDuck.Core{
 
         public string UpdateInstallerPath { get; private set; }
 
+        public PluginManager PluginManager => plugins;
+        public AnalyticsFile AnalyticsFile => analytics?.File ?? AnalyticsFile.Dummy;
+
         private readonly TweetDeckBrowser browser;
         private readonly PluginManager plugins;
         private readonly UpdateHandler updates;
@@ -64,9 +68,11 @@ namespace TweetDuck.Core{
             this.notification = new FormNotificationTweet(this, plugins);
             this.notification.Show();
             
-            this.browser = new TweetDeckBrowser(this, plugins, new TweetDeckBridge.Browser(this, notification));
+            this.browser = new TweetDeckBrowser(this, new TweetDeckBridge.Browser(this, notification));
             this.contextMenu = ContextMenuBrowser.CreateMenu(this);
 
+            this.plugins.Register(browser, PluginEnvironment.Browser, true);
+
             Controls.Add(new MenuStrip{ Visible = false }); // fixes Alt freezing the program in Win 10 Anniversary Update
 
             Disposed += (sender, args) => {
@@ -89,7 +95,7 @@ namespace TweetDuck.Core{
 
             UpdateTrayIcon();
 
-            this.updates = browser.CreateUpdateHandler(updaterSettings);
+            this.updates = new UpdateHandler(browser, updaterSettings);
             this.updates.UpdateAccepted += updates_UpdateAccepted;
             this.updates.UpdateDismissed += updates_UpdateDismissed;
 
@@ -193,7 +199,7 @@ namespace TweetDuck.Core{
         }
 
         private void Config_MuteToggled(object sender, EventArgs e){
-            TriggerAnalyticsEvent(AnalyticsFile.Event.MuteNotification);
+            AnalyticsFile.NotificationMutes.Trigger();
         }
 
         private void Config_TrayBehaviorChanged(object sender, EventArgs e){
@@ -217,7 +223,7 @@ namespace TweetDuck.Core{
             }
 
             if (isLoaded){
-                ReloadToTweetDeck();
+                browser.ReloadToTweetDeck();
             }
         }
         
@@ -268,7 +274,7 @@ namespace TweetDuck.Core{
                 }
                 else{
                     browser.OnMouseClickExtra(m.WParam);
-                    TriggerAnalyticsEvent(AnalyticsFile.Event.BrowserExtraMouseButton);
+                    AnalyticsFile.BrowserExtraMouseButtons.Trigger();
                 }
 
                 return;
@@ -293,6 +299,7 @@ namespace TweetDuck.Core{
 
         public void ReloadToTweetDeck(){
             browser.ReloadToTweetDeck();
+            AnalyticsFile.BrowserReloads.Trigger();
         }
 
         public void TriggerTweetScreenshot(){
@@ -309,10 +316,7 @@ namespace TweetDuck.Core{
 
         public void ApplyROT13(){
             browser.ApplyROT13();
-        }
+            AnalyticsFile.UsedROT13.Trigger();
-
-        public void TriggerAnalyticsEvent(AnalyticsFile.Event e){
-            analytics?.TriggerEvent(e);
         }
 
         // callback handlers
@@ -320,7 +324,6 @@ namespace TweetDuck.Core{
         public void OnIntroductionClosed(bool showGuide, bool allowDataCollection){
             if (Config.FirstRun){
                 Config.FirstRun = false;
-                Config.ShowFollowNotification = false;
                 Config.AllowDataCollection = allowDataCollection;
                 Config.Save();
 
@@ -328,10 +331,6 @@ namespace TweetDuck.Core{
                     analytics = new AnalyticsManager(this, plugins, Program.AnalyticsFilePath);
                 }
             }
-            else if (Config.ShowFollowNotification){
-                Config.ShowFollowNotification = false;
-                Config.Save();
-            }
 
             if (showGuide){
                 FormGuide.Show();
@@ -388,21 +387,21 @@ namespace TweetDuck.Core{
                     form.Dispose();
                 };
                 
-                TriggerAnalyticsEvent(AnalyticsFile.Event.OpenOptions);
+                AnalyticsFile.OpenOptions.Trigger();
                 ShowChildForm(form);
             }
         }
 
         public void OpenAbout(){
             if (!FormManager.TryBringToFront<FormAbout>()){
-                TriggerAnalyticsEvent(AnalyticsFile.Event.OpenAbout);
+                AnalyticsFile.OpenAbout.Trigger();
                 ShowChildForm(new FormAbout());
             }
         }
 
         public void OpenPlugins(){
             if (!FormManager.TryBringToFront<FormPlugins>()){
-                TriggerAnalyticsEvent(AnalyticsFile.Event.OpenPlugins);
+                AnalyticsFile.OpenPlugins.Trigger();
                 ShowChildForm(new FormPlugins(plugins));
             }
         }
@@ -414,7 +413,7 @@ namespace TweetDuck.Core{
         }
 
         public void OnTweetSound(){
-            TriggerAnalyticsEvent(AnalyticsFile.Event.SoundNotification);
+            AnalyticsFile.SoundNotifications.Trigger();
         }
 
         public void PlayVideo(string url, string username){
@@ -432,7 +431,7 @@ namespace TweetDuck.Core{
             }
             
             videoPlayer.Launch(url, username);
-            TriggerAnalyticsEvent(AnalyticsFile.Event.VideoPlay);
+            AnalyticsFile.VideoPlays.Trigger();
         }
 
         public bool ProcessBrowserKey(Keys key){
@@ -454,7 +453,7 @@ namespace TweetDuck.Core{
 
             notification.FinishCurrentNotification();
             browser.ShowTweetDetail(columnId, chirpId, fallbackUrl);
-            TriggerAnalyticsEvent(AnalyticsFile.Event.TweetDetail);
+            AnalyticsFile.TweetDetails.Trigger();
         }
 
         public void OnTweetScreenshotReady(string html, int width, int height){
@@ -463,7 +462,7 @@ namespace TweetDuck.Core{
             }
 
             notificationScreenshotManager.Trigger(html, width, height);
-            TriggerAnalyticsEvent(AnalyticsFile.Event.TweetScreenshot);
+            AnalyticsFile.TweetScreenshots.Trigger();
         }
 
         public void DisplayTooltip(string text){

Core/Handling/ContextMenuBase.cs

@@ -3,14 +3,14 @@ using System.IO;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using CefSharp;
-using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
-using System.Collections.Generic;
 using System.Linq;
+using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Management;
 using TweetDuck.Core.Notification;
 using TweetDuck.Core.Other;
+using TweetDuck.Core.Other.Analytics;
 
 namespace TweetDuck.Core.Handling{
     abstract class ContextMenuBase : IContextMenuHandler{
@@ -18,19 +18,6 @@ namespace TweetDuck.Core.Handling{
 
         private static TwitterUtils.ImageQuality ImageQuality => Program.UserConfig.TwitterImageQuality;
 
-        private static KeyValuePair<string, string> ContextInfo;
-        private static bool IsLink => ContextInfo.Key == "link";
-        private static bool IsImage => ContextInfo.Key == "image";
-        private static bool IsVideo => ContextInfo.Key == "video";
-
-        public static void SetContextInfo(string type, string link){
-            ContextInfo = new KeyValuePair<string, string>(string.IsNullOrEmpty(link) ? null : type, link);
-        }
-
-        private static string GetMediaLink(IContextMenuParams parameters){
-            return IsImage || IsVideo ? ContextInfo.Value : parameters.SourceUrl;
-        }
-
         private const CefMenuCommand MenuOpenLinkUrl     = (CefMenuCommand)26500;
         private const CefMenuCommand MenuCopyLinkUrl     = (CefMenuCommand)26501;
         private const CefMenuCommand MenuCopyUsername    = (CefMenuCommand)26502;
@@ -41,22 +28,32 @@ namespace TweetDuck.Core.Handling{
         private const CefMenuCommand MenuSaveTweetImages = (CefMenuCommand)26507;
         private const CefMenuCommand MenuOpenDevTools    = (CefMenuCommand)26599;
         
-        private string[] lastHighlightedTweetAuthors;
+        protected ContextInfo.LinkInfo LastLink { get; private set; }
-        private string[] lastHighlightedTweetImageList;
+        protected ContextInfo.ChirpInfo LastChirp { get; private set; }
+
+        private readonly AnalyticsFile.IProvider analytics;
+
+        protected ContextMenuBase(AnalyticsFile.IProvider analytics){
+            this.analytics = analytics;
+        }
+
+        private void ResetContextInfo(){
+            LastLink = default(ContextInfo.LinkInfo);
+            LastChirp = default(ContextInfo.ChirpInfo);
+            TweetDeckBridge.ContextInfo.Reset();
+        }
 
         public virtual void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model){
             if (!TwitterUtils.IsTweetDeckWebsite(frame) || browser.IsLoading){
-                lastHighlightedTweetAuthors = StringUtils.EmptyArray;
+                ResetContextInfo();
-                lastHighlightedTweetImageList = StringUtils.EmptyArray;
-                ContextInfo = default(KeyValuePair<string, string>);
             }
             else{
-                lastHighlightedTweetAuthors = TweetDeckBridge.LastHighlightedTweetAuthorsArray;
+                LastLink = TweetDeckBridge.ContextInfo.Link;
-                lastHighlightedTweetImageList = TweetDeckBridge.LastHighlightedTweetImagesArray;
+                LastChirp = TweetDeckBridge.ContextInfo.Chirp;
             }
 
-            bool hasTweetImage = IsImage;
+            bool hasTweetImage = LastLink.IsImage;
-            bool hasTweetVideo = IsVideo;
+            bool hasTweetVideo = LastLink.IsVideo;
 
             string TextOpen(string name) => "Open "+name+" in browser";
             string TextCopy(string name) => "Copy "+name+" address";
@@ -82,13 +79,13 @@ namespace TweetDuck.Core.Handling{
                 model.AddItem(MenuSaveMedia, TextSave("video"));
                 model.AddSeparator();
             }
-            else if (((parameters.TypeFlags.HasFlag(ContextMenuType.Media) && parameters.HasImageContents) || hasTweetImage) && parameters.SourceUrl != TweetNotification.AppLogoLink){
+            else if (((parameters.TypeFlags.HasFlag(ContextMenuType.Media) && parameters.HasImageContents) || hasTweetImage) && parameters.SourceUrl != TweetNotification.AppLogo.Url){
                 model.AddItem(MenuViewImage, "View image in photo viewer");
                 model.AddItem(MenuOpenMediaUrl, TextOpen("image"));
                 model.AddItem(MenuCopyMediaUrl, TextCopy("image"));
                 model.AddItem(MenuSaveMedia, TextSave("image"));
 
-                if (lastHighlightedTweetImageList.Length > 1){
+                if (LastChirp.Images.Length > 1){
                     model.AddItem(MenuSaveTweetImages, TextSave("all images"));
                 }
 
@@ -97,48 +94,55 @@ namespace TweetDuck.Core.Handling{
         }
 
         public virtual bool OnContextMenuCommand(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, CefMenuCommand commandId, CefEventFlags eventFlags){
+            Control control = browserControl.AsControl();
+
             switch(commandId){
                 case MenuOpenLinkUrl:
-                    OpenBrowser(browserControl.AsControl(), IsLink ? ContextInfo.Value : parameters.LinkUrl);
+                    OpenBrowser(control, LastLink.GetUrl(parameters, true));
                     break;
 
                 case MenuCopyLinkUrl:
-                    SetClipboardText(browserControl.AsControl(), IsLink ? ContextInfo.Value : parameters.UnfilteredLinkUrl);
+                    SetClipboardText(control, LastLink.GetUrl(parameters, false));
                     break;
 
                 case MenuCopyUsername:
                     Match match = TwitterUtils.RegexAccount.Match(parameters.UnfilteredLinkUrl);
-                    SetClipboardText(browserControl.AsControl(), match.Success ? match.Groups[1].Value : parameters.UnfilteredLinkUrl);
+                    SetClipboardText(control, match.Success ? match.Groups[1].Value : parameters.UnfilteredLinkUrl);
+                    control.InvokeAsyncSafe(analytics.AnalyticsFile.CopiedUsernames.Trigger);
                     break;
 
                 case MenuOpenMediaUrl:
-                    OpenBrowser(browserControl.AsControl(), TwitterUtils.GetMediaLink(GetMediaLink(parameters), ImageQuality));
+                    OpenBrowser(control, TwitterUtils.GetMediaLink(LastLink.GetMediaSource(parameters), ImageQuality));
                     break;
 
                 case MenuCopyMediaUrl:
-                    SetClipboardText(browserControl.AsControl(), TwitterUtils.GetMediaLink(GetMediaLink(parameters), ImageQuality));
+                    SetClipboardText(control, TwitterUtils.GetMediaLink(LastLink.GetMediaSource(parameters), ImageQuality));
                     break;
 
                 case MenuViewImage:
-                    string url = GetMediaLink(parameters);
+                    void ViewImage(string path){
-                    string file = Path.Combine(BrowserCache.CacheFolder, TwitterUtils.GetImageFileName(url));
+                        string ext = Path.GetExtension(path);
-
-                    void ViewFile(){
-                        string ext = Path.GetExtension(file);
 
                         if (TwitterUtils.ValidImageExtensions.Contains(ext)){
-                            WindowsUtils.OpenAssociatedProgram(file);
+                            WindowsUtils.OpenAssociatedProgram(path);
                         }
                         else{
                             FormMessage.Error("Image Download", "Invalid file extension "+ext, FormMessage.OK);
                         }
                     }
 
+                    string url = LastLink.GetMediaSource(parameters);
+                    string file = Path.Combine(BrowserCache.CacheFolder, TwitterUtils.GetImageFileName(url));
+
                     if (File.Exists(file)){
-                        ViewFile();
+                        ViewImage(file);
                     }
                     else{
-                        BrowserUtils.DownloadFileAsync(TwitterUtils.GetMediaLink(url, ImageQuality), file, ViewFile, ex => {
+                        control.InvokeAsyncSafe(analytics.AnalyticsFile.ViewedImages.Trigger);
+
+                        BrowserUtils.DownloadFileAsync(TwitterUtils.GetMediaLink(url, ImageQuality), file, () => {
+                            ViewImage(file);
+                        }, ex => {
                             FormMessage.Error("Image Download", "An error occurred while downloading the image: "+ex.Message, FormMessage.OK);
                         });
                     }
@@ -146,17 +150,20 @@ namespace TweetDuck.Core.Handling{
                     break;
 
                 case MenuSaveMedia:
-                    if (IsVideo){
+                    if (LastLink.IsVideo){
-                        TwitterUtils.DownloadVideo(GetMediaLink(parameters), lastHighlightedTweetAuthors.LastOrDefault());
+                        control.InvokeAsyncSafe(analytics.AnalyticsFile.DownloadedVideos.Trigger);
+                        TwitterUtils.DownloadVideo(LastLink.GetMediaSource(parameters), LastChirp.Authors.LastOrDefault());
                     }
                     else{
-                        TwitterUtils.DownloadImage(GetMediaLink(parameters), lastHighlightedTweetAuthors.LastOrDefault(), ImageQuality);
+                        control.InvokeAsyncSafe(analytics.AnalyticsFile.DownloadedImages.Trigger);
+                        TwitterUtils.DownloadImage(LastLink.GetMediaSource(parameters), LastChirp.Authors.LastOrDefault(), ImageQuality);
                     }
 
                     break;
 
                 case MenuSaveTweetImages:
-                    TwitterUtils.DownloadImages(lastHighlightedTweetImageList, lastHighlightedTweetAuthors.LastOrDefault(), ImageQuality);
+                    control.InvokeAsyncSafe(analytics.AnalyticsFile.DownloadedImages.Trigger);
+                    TwitterUtils.DownloadImages(LastChirp.Images, LastChirp.Authors.LastOrDefault(), ImageQuality);
                     break;
                     
                 case MenuOpenDevTools:
@@ -168,7 +175,7 @@ namespace TweetDuck.Core.Handling{
         }
 
         public virtual void OnContextMenuDismissed(IWebBrowser browserControl, IBrowser browser, IFrame frame){
-            ContextInfo = default(KeyValuePair<string, string>);
+            ResetContextInfo();
         }
 
         public virtual bool RunContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model, IRunContextMenuCallback callback){

Core/Handling/ContextMenuBrowser.cs

@@ -1,9 +1,6 @@
 using CefSharp;
 using System.Windows.Forms;
-using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
-using TweetDuck.Core.Other.Analytics;
-using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Handling{
     sealed class ContextMenuBrowser : ContextMenuBase{
@@ -28,10 +25,7 @@ namespace TweetDuck.Core.Handling{
 
         private readonly FormBrowser form;
         
-        private string lastHighlightedTweetUrl;
+        public ContextMenuBrowser(FormBrowser form) : base(form){
-        private string lastHighlightedQuoteUrl;
-
-        public ContextMenuBrowser(FormBrowser form){
             this.form = form;
         }
 
@@ -53,20 +47,12 @@ namespace TweetDuck.Core.Handling{
 
             base.OnBeforeContextMenu(browserControl, browser, frame, parameters, model);
 
-            lastHighlightedTweetUrl = TweetDeckBridge.LastHighlightedTweetUrl;
+            if (!string.IsNullOrEmpty(LastChirp.TweetUrl) && (parameters.TypeFlags & (ContextMenuType.Editable | ContextMenuType.Selection)) == 0){
-            lastHighlightedQuoteUrl = TweetDeckBridge.LastHighlightedQuoteUrl;
-
-            if (!TwitterUtils.IsTweetDeckWebsite(frame) || browser.IsLoading){
-                lastHighlightedTweetUrl = string.Empty;
-                lastHighlightedQuoteUrl = string.Empty;
-            }
-
-            if (!string.IsNullOrEmpty(lastHighlightedTweetUrl) && (parameters.TypeFlags & (ContextMenuType.Editable | ContextMenuType.Selection)) == 0){
                 model.AddItem(MenuOpenTweetUrl, "Open tweet in browser");
                 model.AddItem(MenuCopyTweetUrl, "Copy tweet address");
                 model.AddItem(MenuScreenshotTweet, "Screenshot tweet to clipboard");
 
-                if (!string.IsNullOrEmpty(lastHighlightedQuoteUrl)){
+                if (!string.IsNullOrEmpty(LastChirp.QuoteUrl)){
                     model.AddSeparator();
                     model.AddItem(MenuOpenQuotedTweetUrl, "Open quoted tweet in browser");
                     model.AddItem(MenuCopyQuotedTweetUrl, "Copy quoted tweet address");
@@ -97,7 +83,7 @@ namespace TweetDuck.Core.Handling{
 
             RemoveSeparatorIfLast(model);
             
-            form.InvokeAsyncSafe(() => form.TriggerAnalyticsEvent(AnalyticsFile.Event.BrowserContextMenu));
+            form.InvokeAsyncSafe(form.AnalyticsFile.BrowserContextMenus.Trigger);
         }
 
         public override bool OnContextMenuCommand(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, CefMenuCommand commandId, CefEventFlags eventFlags){
@@ -127,11 +113,11 @@ namespace TweetDuck.Core.Handling{
                     return true;
 
                 case MenuOpenTweetUrl:
-                    OpenBrowser(form, lastHighlightedTweetUrl);
+                    OpenBrowser(form, LastChirp.TweetUrl);
                     return true;
 
                 case MenuCopyTweetUrl:
-                    SetClipboardText(form, lastHighlightedTweetUrl);
+                    SetClipboardText(form, LastChirp.TweetUrl);
                     return true;
 
                 case MenuScreenshotTweet:
@@ -139,11 +125,11 @@ namespace TweetDuck.Core.Handling{
                     return true;
 
                 case MenuOpenQuotedTweetUrl:
-                    OpenBrowser(form, lastHighlightedQuoteUrl);
+                    OpenBrowser(form, LastChirp.QuoteUrl);
                     return true;
 
                 case MenuCopyQuotedTweetUrl:
-                    SetClipboardText(form, lastHighlightedQuoteUrl);
+                    SetClipboardText(form, LastChirp.QuoteUrl);
                     return true;
 
                 case MenuInputApplyROT13:
@@ -166,7 +152,7 @@ namespace TweetDuck.Core.Handling{
 
             menu.Popup += (sender, args) => {
                 menu.MenuItems[1].Checked = Program.UserConfig.MuteNotifications;
-                form.TriggerAnalyticsEvent(AnalyticsFile.Event.BrowserContextMenu);
+                form.AnalyticsFile.BrowserContextMenus.Trigger();
             };
 
             return menu;

Core/Handling/ContextMenuGuide.cs

@@ -1,7 +1,10 @@
 using CefSharp;
+using TweetDuck.Core.Other.Analytics;
 
 namespace TweetDuck.Core.Handling{
     sealed class ContextMenuGuide : ContextMenuBase{
+        public ContextMenuGuide(AnalyticsFile.IProvider analytics) : base(analytics){}
+
         public override void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model){
             model.Clear();
             base.OnBeforeContextMenu(browserControl, browser, frame, parameters, model);

Core/Handling/ContextMenuNotification.cs

@@ -1,7 +1,6 @@
 using CefSharp;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Notification;
-using TweetDuck.Core.Other.Analytics;
 
 namespace TweetDuck.Core.Handling{
     sealed class ContextMenuNotification : ContextMenuBase{
@@ -14,7 +13,7 @@ namespace TweetDuck.Core.Handling{
         private readonly FormNotificationBase form;
         private readonly bool enableCustomMenu;
 
-        public ContextMenuNotification(FormNotificationBase form, bool enableCustomMenu){
+        public ContextMenuNotification(FormNotificationBase form, bool enableCustomMenu) : base(form){
             this.form = form;
             this.enableCustomMenu = enableCustomMenu;
         }
@@ -57,7 +56,7 @@ namespace TweetDuck.Core.Handling{
 
             form.InvokeAsyncSafe(() => {
                 form.ContextMenuOpen = true;
-                form.TriggerAnalyticsEvent(AnalyticsFile.Event.NotificationContextMenu);
+                form.AnalyticsFile.NotificationContextMenus.Trigger();
             });
         }
 

Core/Handling/KeyboardHandlerNotification.cs

@@ -2,7 +2,6 @@
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Notification;
-using TweetDuck.Core.Other.Analytics;
 
 namespace TweetDuck.Core.Handling {
     sealed class KeyboardHandlerNotification : IKeyboardHandler{
@@ -13,7 +12,7 @@ namespace TweetDuck.Core.Handling {
         }
 
         private void TriggerKeyboardShortcutAnalytics(){
-            notification.InvokeAsyncSafe(() => notification.TriggerAnalyticsEvent(AnalyticsFile.Event.NotificationKeyboardShortcut));
+            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){

Core/Handling/RequestHandlerBase.cs

@@ -1,4 +1,5 @@
-using CefSharp;
+using System.Collections.Specialized;
+using CefSharp;
 using CefSharp.Handler;
 using TweetDuck.Core.Handling.General;
 
@@ -7,5 +8,15 @@ namespace TweetDuck.Core.Handling{
         public override bool OnOpenUrlFromTab(IWebBrowser browserControl, IBrowser browser, IFrame frame, string targetUrl, WindowOpenDisposition targetDisposition, bool userGesture){
             return LifeSpanHandler.HandleLinkClick(browserControl, targetDisposition, targetUrl);
         }
+
+        public override CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback){
+            if (ContextMenuBase.HasDevTools){
+                NameValueCollection headers = request.Headers;
+                headers.Remove("x-devtools-emulate-network-conditions-client-id");
+                request.Headers = headers;
+            }
+
+            return base.OnBeforeResourceLoad(browserControl, browser, frame, request, callback);
+        }
     }
 }

Core/Handling/RequestHandlerBrowser.cs

@@ -1,4 +1,5 @@
 using CefSharp;
+using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Handling{
     sealed class RequestHandlerBrowser : RequestHandlerBase{
@@ -8,10 +9,20 @@ namespace TweetDuck.Core.Handling{
 
         public override CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback){
             if (request.ResourceType == ResourceType.Script && request.Url.Contains("analytics.")){
+                callback.Dispose();
                 return CefReturnValue.Cancel;
             }
 
-            return CefReturnValue.Continue;
+            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.Image && request.Url.Contains("backgrounds/spinner_blue")){
+                request.Url = TwitterUtils.LoadingSpinner.Url;
+                return true;
+            }
+
+            return base.OnResourceResponse(browserControl, browser, frame, request, response);
         }
     }
 }

Core/ITweetDeckBrowser.cs

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

Core/Management/ContextInfo.cs

@@ -0,0 +1,68 @@
+using CefSharp;
+using TweetDuck.Core.Utils;
+
+namespace TweetDuck.Core.Management{
+    sealed class ContextInfo{
+        public LinkInfo Link { get; private set; }
+        public ChirpInfo Chirp { get; private set; }
+        
+        public ContextInfo(){
+            Reset();
+        }
+        
+        public void SetLink(string type, string url){
+            Link = new LinkInfo(string.IsNullOrEmpty(url) ? null : type, url);
+        }
+
+        public void SetChirp(string tweetUrl, string quoteUrl, string chirpAuthors, string chirpImages){
+            Chirp = new ChirpInfo(tweetUrl, quoteUrl, chirpAuthors, chirpImages);
+        }
+
+        public void Reset(){
+            Link = new LinkInfo();
+            Chirp = new ChirpInfo();
+        }
+
+        // Data structures
+
+        public struct LinkInfo{
+            public bool IsLink => type == "link";
+            public bool IsImage => type == "image";
+            public bool IsVideo => type == "video";
+
+            public string GetUrl(IContextMenuParams parameters, bool safe){
+                return IsLink ? url : (safe ? parameters.LinkUrl : parameters.UnfilteredLinkUrl);
+            }
+
+            public string GetMediaSource(IContextMenuParams parameters){
+                return IsImage || IsVideo ? url : parameters.SourceUrl;
+            }
+
+            private readonly string type;
+            private readonly string url;
+
+            public LinkInfo(string type, string url){
+                this.type = type;
+                this.url = url;
+            }
+        }
+
+        public struct ChirpInfo{
+            public string TweetUrl { get; }
+            public string QuoteUrl { get; }
+
+            public string[] Authors => chirpAuthors?.Split(';') ?? StringUtils.EmptyArray;
+            public string[] Images => chirpImages?.Split(';') ?? StringUtils.EmptyArray;
+            
+            private readonly string chirpAuthors;
+            private readonly string chirpImages;
+
+            public ChirpInfo(string tweetUrl, string quoteUrl, string chirpAuthors, string chirpImages){
+                this.TweetUrl = tweetUrl;
+                this.QuoteUrl = quoteUrl;
+                this.chirpAuthors = chirpAuthors;
+                this.chirpImages = chirpImages;
+            }
+        }
+    }
+}

Core/Management/ProfileManager.cs

@@ -16,7 +16,7 @@ namespace TweetDuck.Core.Management{
         public enum Items{
             None = 0,
             UserConfig = 1,
-            SystemConfig = 2, // TODO implement later
+            SystemConfig = 2,
             Session = 4,
             PluginData = 8,
             All = UserConfig|SystemConfig|Session|PluginData
@@ -210,4 +210,10 @@ namespace TweetDuck.Core.Management{
             public string Relative { get; set; }
         }
     }
+
+    static class ProfileManagerExtensions{
+        public static bool NeedsRestart(this ProfileManager.Items items){
+            return items.HasFlag(ProfileManager.Items.SystemConfig) || items.HasFlag(ProfileManager.Items.Session);
+        }
+    }
 }

Core/Management/VideoPlayer.cs

@@ -22,7 +22,7 @@ namespace TweetDuck.Core.Management{
 
         public event EventHandler ProcessExited;
 
-        private readonly Form owner;
+        private readonly FormBrowser owner;
         private string lastUrl;
         private string lastUsername;
 
@@ -30,7 +30,7 @@ namespace TweetDuck.Core.Management{
         private DuplexPipe.Server currentPipe;
         private bool isClosing;
 
-        public VideoPlayer(Form owner){
+        public VideoPlayer(FormBrowser owner){
             this.owner = owner;
             this.owner.FormClosing += owner_FormClosing;
         }
@@ -83,6 +83,7 @@ namespace TweetDuck.Core.Management{
                         break;
 
                     case "download":
+                        owner.AnalyticsFile.DownloadedVideos.Trigger();
                         TwitterUtils.DownloadVideo(lastUrl, lastUsername);
                         break;
 

Core/Notification/Example/FormNotificationExample.cs

@@ -24,7 +24,7 @@ namespace TweetDuck.Core.Notification.Example{
         private readonly TweetNotification exampleNotification;
 
         public FormNotificationExample(FormBrowser owner, PluginManager pluginManager) : base(owner, pluginManager, false){
-            string exampleTweetHTML = ScriptLoader.LoadResource("pages/example.html", true).Replace("{avatar}", TweetNotification.AppLogoLink);
+            string exampleTweetHTML = ScriptLoader.LoadResource("pages/example.html", true).Replace("{avatar}", TweetNotification.AppLogo.Url);
 
             #if DEBUG
             exampleTweetHTML = exampleTweetHTML.Replace("</p>", @"</p><div style='margin-top:256px'>Scrollbar test padding...</div>");

Core/Notification/FormNotificationBase.cs

@@ -12,7 +12,7 @@ using TweetDuck.Core.Other.Analytics;
 using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Notification{
-    partial class FormNotificationBase : Form{
+    partial class FormNotificationBase : Form, AnalyticsFile.IProvider{
         protected static int FontSizeLevel{
             get{
                 switch(TweetDeckBridge.FontSize){
@@ -90,6 +90,8 @@ namespace TweetDuck.Core.Notification{
             }
         }
 
+        public AnalyticsFile AnalyticsFile => owner.AnalyticsFile;
+        
         protected override bool ShowWithoutActivation => true;
         
         protected float DpiScale { get; }
@@ -133,14 +135,8 @@ namespace TweetDuck.Core.Notification{
             this.browser.ClientSize = ClientSize;
             this.browser.IsBrowserInitializedChanged += browser_IsBrowserInitializedChanged;
             
-            #if DEBUG
-            this.browser.ConsoleMessage += BrowserUtils.HandleConsoleMessage;
-            #endif
-
-            DpiScale = this.GetDPIScale();
-
             browser.SetupResourceHandler(TwitterUtils.TweetDeckURL, this.resourceHandler);
-            browser.SetupResourceHandler(TweetNotification.AppLogoLink, TweetNotification.AppLogoHandler);
+            browser.SetupResourceHandler(TweetNotification.AppLogo);
 
             Controls.Add(browser);
 
@@ -149,6 +145,8 @@ namespace TweetDuck.Core.Notification{
                 this.owner.FormClosed -= owner_FormClosed;
             };
 
+            DpiScale = this.GetDPIScale();
+
             // ReSharper disable once VirtualMemberCallInContructor
             UpdateTitle();
         }
@@ -161,10 +159,6 @@ namespace TweetDuck.Core.Notification{
             base.WndProc(ref m);
         }
 
-        public void TriggerAnalyticsEvent(AnalyticsFile.Event e){
-            owner.TriggerAnalyticsEvent(e);
-        }
-
         // event handlers
 
         private void owner_FormClosed(object sender, FormClosedEventArgs e){

Core/Notification/FormNotificationMain.cs

@@ -5,7 +5,6 @@ using System.Windows.Forms;
 using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling;
-using TweetDuck.Core.Other.Analytics;
 using TweetDuck.Core.Utils;
 using TweetDuck.Data;
 using TweetDuck.Plugins;
@@ -13,7 +12,7 @@ using TweetDuck.Plugins.Enums;
 using TweetDuck.Resources;
 
 namespace TweetDuck.Core.Notification{
-    abstract partial class FormNotificationMain : FormNotificationBase{
+    abstract partial class FormNotificationMain : FormNotificationBase, ITweetDeckBrowser{
         private const string NotificationScriptFile = "notification.js";
 
         private static readonly string NotificationScriptIdentifier = ScriptLoader.GetRootIdentifier(NotificationScriptFile);
@@ -82,17 +81,39 @@ namespace TweetDuck.Core.Notification{
             this.timerBarHeight = BrowserUtils.Scale(4, DpiScale);
             
             browser.KeyboardHandler = new KeyboardHandlerNotification(this);
-            
             browser.RegisterAsyncJsObject("$TD", new TweetDeckBridge.Notification(owner, this));
-            browser.RegisterAsyncJsObject("$TDP", plugins.Bridge);
 
             browser.LoadingStateChanged += Browser_LoadingStateChanged;
             browser.FrameLoadEnd += Browser_FrameLoadEnd;
 
+            plugins.Register(this, PluginEnvironment.Notification);
+
             mouseHookDelegate = MouseHookProc;
             Disposed += (sender, args) => StopMouseHook(true);
         }
 
+        // implementation of ITweetDeckBrowser
+
+        bool ITweetDeckBrowser.IsTweetDeckWebsite => IsNotificationVisible;
+
+        void ITweetDeckBrowser.RegisterBridge(string name, object obj){
+            browser.RegisterAsyncJsObject(name, obj);
+        }
+
+        void ITweetDeckBrowser.OnFrameLoaded(Action<IFrame> callback){
+            browser.FrameLoadEnd += (sender, args) => {
+                IFrame frame = args.Frame;
+
+                if (frame.IsMain && NotificationJS != null && browser.Address != "about:blank"){
+                    callback(frame);
+                }
+            };
+        }
+
+        void ITweetDeckBrowser.ExecuteFunction(string name, params object[] args){
+            browser.ExecuteScriptAsync(name, args);
+        }
+
         // mouse wheel hook
 
         private void StartMouseHook(){
@@ -128,7 +149,7 @@ namespace TweetDuck.Core.Notification{
                     }
                     
                     blockXButtonUp = true;
-                    this.InvokeAsyncSafe(() => TriggerAnalyticsEvent(AnalyticsFile.Event.NotificationExtraMouseButton));
+                    this.InvokeAsyncSafe(AnalyticsFile.NotificationExtraMouseButtons.Trigger);
                     return NativeMethods.HOOK_HANDLED;
                 }
                 else if (eventType == NativeMethods.WM_XBUTTONUP && blockXButtonUp){
@@ -167,7 +188,6 @@ namespace TweetDuck.Core.Notification{
             if (e.Frame.IsMain && NotificationJS != null && browser.Address != "about:blank"){
                 e.Frame.ExecuteJavaScriptAsync(PropertyBridge.GenerateScript(PropertyBridge.Environment.Notification));
                 ScriptLoader.ExecuteScript(e.Frame, NotificationJS, NotificationScriptIdentifier);
-                plugins.ExecutePlugins(e.Frame, PluginEnvironment.Notification);
             }
         }
 
@@ -233,7 +253,7 @@ namespace TweetDuck.Core.Notification{
         protected override string GetTweetHTML(TweetNotification tweet){
             string html = base.GetTweetHTML(tweet);
 
-            foreach(InjectedHTML injection in plugins.Bridge.NotificationInjections){
+            foreach(InjectedHTML injection in plugins.NotificationInjections){
                 html = injection.Inject(html);
             }
 

Core/Notification/FormNotificationTweet.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Drawing;
 using TweetDuck.Plugins;
 using System.Windows.Forms;
-using TweetDuck.Core.Other.Analytics;
 using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Notification{
@@ -94,7 +93,7 @@ namespace TweetDuck.Core.Notification{
             }
 
             needsTrim |= tweetQueue.Count >= TrimMinimum;
-            TriggerAnalyticsEvent(AnalyticsFile.Event.DesktopNotification);
+            AnalyticsFile.DesktopNotifications.Trigger();
         }
 
         public override void HideNotification(){

Core/Notification/Screenshot/FormNotificationScreenshotable.cs

@@ -33,7 +33,7 @@ namespace TweetDuck.Core.Notification.Screenshot{
         protected override string GetTweetHTML(TweetNotification tweet){
             string html = tweet.GenerateHtml("td-screenshot", false);
 
-            foreach(InjectedHTML injection in plugins.Bridge.NotificationInjections){
+            foreach(InjectedHTML injection in plugins.NotificationInjections){
                 html = injection.Inject(html);
             }
 

Core/Notification/SoundNotification.cs

@@ -8,7 +8,7 @@ using TweetDuck.Core.Other.Settings;
 
 namespace TweetDuck.Core.Notification{
     static class SoundNotification{
-        public const string SupportedFormats = "*.wav;*.ogg;*.flac;*.opus;*.weba;*.webm"; // TODO add mp3 when supported
+        public const string SupportedFormats = "*.wav;*.ogg;*.mp3;*.flac;*.opus;*.weba;*.webm";
         
         public static IResourceHandler CreateFileHandler(string path){
             string mimeType;
@@ -18,25 +18,19 @@ namespace TweetDuck.Core.Notification{
                 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;
-                case ".mp3": TryShowError("MP3 sound notifications are temporarily unsupported, please convert the file to another format, such as .ogg, .wav, or .flac."); return null;
                 default: mimeType = null; break;
             }
 
             try{
                 return ResourceHandler.FromFilePath(path, mimeType);
             }catch{
-                TryShowError("Could not find custom notification sound file:\n"+path);
-                return null;
-            }
-        }
-
-        private static void TryShowError(string message){
                 FormBrowser browser = FormManager.TryFind<FormBrowser>();
 
                 browser?.InvokeAsyncSafe(() => {
-                using(FormMessage form = new FormMessage("Sound Notification Error", message, 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");
@@ -48,6 +42,9 @@ namespace TweetDuck.Core.Notification{
                         }
                     }
                 });
+                
+                return null;
+            }
         }
     }
 }

Core/Notification/TweetNotification.cs

@@ -2,15 +2,14 @@
 using System.Text;
 using CefSharp;
 using TweetDuck.Core.Bridge;
+using TweetDuck.Data;
 using TweetDuck.Resources;
 
 namespace TweetDuck.Core.Notification{
     sealed class TweetNotification{
         private const string DefaultHeadLayout = @"<html id='tduck' class='os-windows txt-size--14' data-td-font='medium' data-td-theme='dark'><head><meta charset='utf-8'><meta http-equiv='X-UA-Compatible' content='chrome=1'><link rel='stylesheet' href='https://ton.twimg.com/tweetdeck-web/web/css/font.5ef884f9f9.css'><link rel='stylesheet' href='https://ton.twimg.com/tweetdeck-web/web/css/app-dark.5631e0dd42.css'><style type='text/css'>body{background:#222426}</style>";
         private static readonly string CustomCSS = ScriptLoader.LoadResource("styles/notification.css");
-
+        public static readonly ResourceLink AppLogo = new ResourceLink("https://ton.twimg.com/tduck/avatar", ResourceHandler.FromByteArray(Properties.Resources.avatar, "image/png"));
-        public const string AppLogoLink = "https://ton.twimg.com/tduck/avatar";
-        public static readonly IResourceHandler AppLogoHandler = ResourceHandler.FromByteArray(Properties.Resources.avatar, "image/png");
 
         public static TweetNotification Example(string html, int characters){
             return new TweetNotification(string.Empty, string.Empty, "Home", html, characters, string.Empty, string.Empty, true);

Core/Other/Analytics/AnalyticsFile.cs

@@ -1,7 +1,11 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Reflection;
 using TweetDuck.Data.Serialization;
 
 namespace TweetDuck.Core.Other.Analytics{
+    [SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Local")]
     sealed class AnalyticsFile{
         private static readonly FileSerializer<AnalyticsFile> Serializer = new FileSerializer<AnalyticsFile>();
 
@@ -10,15 +14,14 @@ namespace TweetDuck.Core.Other.Analytics{
                 ConvertToString = value => value.ToBinary().ToString(),
                 ConvertToObject = value => DateTime.FromBinary(long.Parse(value))
             });
+
+            Serializer.RegisterTypeConverter(typeof(Counter), new SingleTypeConverter<Counter>{
+                ConvertToString = value => value.Value.ToString(),
+                ConvertToObject = value => int.Parse(value)
+            });
         }
 
-        public enum Event{
+        public static readonly AnalyticsFile Dummy = new AnalyticsFile(null);
-            OpenOptions, OpenPlugins, OpenAbout, OpenGuide,
-            DesktopNotification, SoundNotification, MuteNotification,
-            BrowserContextMenu, BrowserExtraMouseButton,
-            NotificationContextMenu, NotificationExtraMouseButton, NotificationKeyboardShortcut,
-            TweetScreenshot, TweetDetail, VideoPlay
-        }
 
         // STATE PROPERTIES
         
@@ -28,57 +31,57 @@ namespace TweetDuck.Core.Other.Analytics{
 
         // USAGE DATA
 
-        public int CountOpenOptions { get; private set; } = 0;
+        public Counter OpenOptions { get; private set; } = 0;
-        public int CountOpenPlugins { get; private set; } = 0;
+        public Counter OpenPlugins { get; private set; } = 0;
-        public int CountOpenAbout   { get; private set; } = 0;
+        public Counter OpenAbout   { get; private set; } = 0;
-        public int CountOpenGuide   { get; private set; } = 0;
+        public Counter OpenGuide   { get; private set; } = 0;
 
-        public int CountDesktopNotifications { get; private set; } = 0;
+        public Counter DesktopNotifications { get; private set; } = 0;
-        public int CountSoundNotifications   { get; private set; } = 0;
+        public Counter SoundNotifications   { get; private set; } = 0;
-        public int CountMuteNotifications    { get; private set; } = 0;
+        public Counter NotificationMutes    { get; private set; } = 0;
         
-        public int CountBrowserContextMenus           { get; private set; } = 0;
+        public Counter BrowserContextMenus           { get; private set; } = 0;
-        public int CountBrowserExtraMouseButtons      { get; private set; } = 0;
+        public Counter BrowserExtraMouseButtons      { get; private set; } = 0;
-        public int CountNotificationContextMenus      { get; private set; } = 0;
+        public Counter NotificationContextMenus      { get; private set; } = 0;
-        public int CountNotificationExtraMouseButtons { get; private set; } = 0;
+        public Counter NotificationExtraMouseButtons { get; private set; } = 0;
-        public int CountNotificationKeyboardShortcuts { get; private set; } = 0;
+        public Counter NotificationKeyboardShortcuts { get; private set; } = 0;
 
-        public int CountTweetScreenshots { get; private set; } = 0;
+        public Counter BrowserReloads   { get; private set; } = 0;
-        public int CountTweetDetails     { get; private set; } = 0;
+        public Counter CopiedUsernames  { get; private set; } = 0;
-        public int CountVideoPlays       { get; private set; } = 0;
+        public Counter ViewedImages     { get; private set; } = 0;
+        public Counter DownloadedImages { get; private set; } = 0;
+        public Counter DownloadedVideos { get; private set; } = 0;
+        public Counter UsedROT13        { get; private set; } = 0;
+
+        public Counter TweetScreenshots { get; private set; } = 0;
+        public Counter TweetDetails     { get; private set; } = 0;
+        public Counter VideoPlays       { get; private set; } = 0;
 
         // END OF DATA
 
+        public event EventHandler PropertyChanged;
+        
         private readonly string file;
         
         private AnalyticsFile(string file){
             this.file = file;
         }
 
-        public void TriggerEvent(Event e){
+        private void SetupProperties(){
-            switch(e){
+            foreach(Counter counter in GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public).Where(prop => prop.PropertyType == typeof(Counter)).Select(prop => (Counter)prop.GetValue(this))){
-                case Event.OpenOptions: ++CountOpenOptions; break;
+                counter.SetOwner(this);
-                case Event.OpenPlugins: ++CountOpenPlugins; break;
-                case Event.OpenAbout: ++CountOpenAbout; break;
-                case Event.OpenGuide: ++CountOpenGuide; break;
-
-                case Event.DesktopNotification: ++CountDesktopNotifications; break;
-                case Event.SoundNotification: ++CountSoundNotifications; break;
-                case Event.MuteNotification: ++CountMuteNotifications; break;
-
-                case Event.BrowserContextMenu: ++CountBrowserContextMenus; break;
-                case Event.BrowserExtraMouseButton: ++CountBrowserExtraMouseButtons; break;
-                case Event.NotificationContextMenu: ++CountNotificationContextMenus; break;
-                case Event.NotificationExtraMouseButton: ++CountNotificationExtraMouseButtons; break;
-                case Event.NotificationKeyboardShortcut: ++CountNotificationKeyboardShortcuts; break;
-
-                case Event.TweetScreenshot: ++CountTweetScreenshots; break;
-                case Event.TweetDetail: ++CountTweetDetails; break;
-                case Event.VideoPlay: ++CountVideoPlays; break;
             }
         }
 
+        public void OnPropertyChanged(){
+            PropertyChanged?.Invoke(this, EventArgs.Empty);
+        }
+
         public void Save(){
+            if (file == null){
+                return;
+            }
+
             try{
                 Serializer.Write(file, this);
             }catch(Exception e){
@@ -95,7 +98,34 @@ namespace TweetDuck.Core.Other.Analytics{
                 Program.Reporter.HandleException("Analytics File Error", "Could not open the analytics file.", true, e);
             }
             
+            config.SetupProperties();
             return config;
         }
+
+        public interface IProvider{
+            AnalyticsFile AnalyticsFile { get; }
+        }
+
+        public sealed class Counter{
+            public int Value { get; private set; }
+
+            private AnalyticsFile owner;
+
+            public Counter(int value){
+                this.Value = value;
+            }
+
+            public void SetOwner(AnalyticsFile owner){
+                this.owner = owner;
+            }
+
+            public void Trigger(){
+                ++Value;
+                owner?.OnPropertyChanged();
+            }
+
+            public static implicit operator int(Counter counter) => counter.Value;
+            public static implicit operator Counter(int value) => new Counter(value);
+        }
     }
 }

Core/Other/Analytics/AnalyticsManager.cs

@@ -1,4 +1,8 @@
-using System;
+// Uncomment to debug reports locally
+// #define ANALYTICS_LOCALHOST
+// #define ANALYTICS_INSTANT
+
+using System;
 using System.Net;
 using System.Threading.Tasks;
 using System.Timers;
@@ -8,8 +12,15 @@ using TweetDuck.Plugins;
 
 namespace TweetDuck.Core.Other.Analytics{
     sealed class AnalyticsManager : IDisposable{
-        private static readonly TimeSpan CollectionInterval = TimeSpan.FromDays(7);
+        private static readonly TimeSpan CollectionInterval = TimeSpan.FromDays(14);
-        private static readonly Uri CollectionUrl = new Uri("https://tweetduck.chylex.com/breadcrumb/report");
+
+        private static readonly Uri CollectionUrl = new Uri(
+            #if (DEBUG && ANALYTICS_LOCALHOST)
+            "http://localhost/newhome/tweetduck/~breadcrumb/request.php?type=report"
+            #else
+            "https://tweetduck.chylex.com/breadcrumb/report"
+            #endif
+            );
         
         public AnalyticsFile File { get; }
 
@@ -20,7 +31,9 @@ namespace TweetDuck.Core.Other.Analytics{
         public AnalyticsManager(FormBrowser browser, PluginManager plugins, string file){
             this.browser = browser;
             this.plugins = plugins;
+
             this.File = AnalyticsFile.Load(file);
+            this.File.PropertyChanged += File_PropertyChanged;
 
             this.currentTimer = new Timer{ SynchronizingObject = browser };
             this.currentTimer.Elapsed += currentTimer_Elapsed;
@@ -29,14 +42,20 @@ namespace TweetDuck.Core.Other.Analytics{
             this.saveTimer.Elapsed += saveTimer_Elapsed;
 
             if (this.File.LastCollectionVersion != Program.VersionTag){
-                ScheduleReportIn(TimeSpan.FromHours(12), string.Empty);
+                ScheduleReportIn(TimeSpan.FromHours(8), string.Empty);
             }
             else{
                 RestartTimer();
             }
+
+            #if (DEBUG && ANALYTICS_INSTANT)
+            SendReport();
+            #endif
         }
 
         public void Dispose(){
+            File.PropertyChanged -= File_PropertyChanged;
+
             if (saveTimer.Enabled){
                 File.Save();
             }
@@ -45,8 +64,7 @@ namespace TweetDuck.Core.Other.Analytics{
             saveTimer.Dispose();
         }
 
-        public void TriggerEvent(AnalyticsFile.Event e){
+        private void File_PropertyChanged(object sender, EventArgs e){
-            File.TriggerEvent(e);
             saveTimer.Enabled = true;
         }
 
@@ -72,7 +90,7 @@ namespace TweetDuck.Core.Other.Analytics{
             TimeSpan diff = DateTime.Now.Subtract(File.LastDataCollection);
             int minutesTillNext = (int)(CollectionInterval.TotalMinutes-Math.Floor(diff.TotalMinutes));
             
-            currentTimer.Interval = Math.Max(minutesTillNext, 1)*60000;
+            currentTimer.Interval = Math.Max(minutesTillNext, 2)*60000;
             currentTimer.Start();
         }
 
@@ -95,7 +113,7 @@ namespace TweetDuck.Core.Other.Analytics{
             Task.Factory.StartNew(() => {
                 AnalyticsReport report = AnalyticsReportGenerator.Create(File, info, plugins);
 
-                #if DEBUG
+                #if (DEBUG && !ANALYTICS_INSTANT)
                 System.Diagnostics.Debugger.Break();
                 #endif
 
@@ -122,6 +140,14 @@ namespace TweetDuck.Core.Other.Analytics{
                                 message = "HTTP Error "+(response != null ? $"{(int)response.StatusCode} ({response.StatusDescription})" : "(unknown code)");
                                 break;
                         }
+
+                        #if DEBUG
+                        System.IO.Stream responseStream = e.Response.GetResponseStream();
+
+                        if (responseStream != null){
+                            System.Diagnostics.Debug.WriteLine(new System.IO.StreamReader(responseStream).ReadToEnd());
+                        }
+                        #endif
                     }
 
                     ScheduleReportIn(TimeSpan.FromHours(4), message ?? "Error: "+(task.Exception.InnerException?.Message ?? task.Exception.Message));

Core/Other/Analytics/AnalyticsReportGenerator.cs

@@ -12,6 +12,7 @@ using TweetDuck.Core.Handling;
 using TweetDuck.Core.Notification;
 using TweetDuck.Core.Utils;
 using TweetDuck.Plugins;
+using TweetDuck.Plugins.Enums;
 
 namespace TweetDuck.Core.Other.Analytics{
     static class AnalyticsReportGenerator{
@@ -37,15 +38,24 @@ namespace TweetDuck.Core.Other.Analytics{
                 { "Screen DPI"        , info.DPI != null ? Exact(info.DPI.Value) : "(unknown)" },
                 0,
                 { "Hardware Acceleration"     , Bool(SysConfig.HardwareAcceleration) },
+                { "Clear Cache Automatically" , Bool(SysConfig.ClearCacheAutomatically) },
+                { "Clear Cache Threshold"     , Exact(SysConfig.ClearCacheThreshold) },
                 0,
                 { "Expand Links"                  , Bool(UserConfig.ExpandLinksOnHover) },
-                { "Switch Account Selectors"      , Bool(UserConfig.SwitchAccountSelectors) },
+                { "Switch Account Selectors"      , Bool(false) }, // TODO remove in next major update
                 { "Search In First Column"        , Bool(UserConfig.OpenSearchInFirstColumn) },
                 { "Keep Like Follow Dialogs Open" , Bool(UserConfig.KeepLikeFollowDialogsOpen) },
                 { "Best Image Quality"            , Bool(UserConfig.BestImageQuality) },
-                { "Spell Check"                   , Bool(UserConfig.EnableSpellCheck) },
+                { "Animated Images"               , Bool(UserConfig.EnableAnimatedImages) },
+                0,
+                { "Smooth Scrolling" , Bool(UserConfig.EnableSmoothScrolling) },
+                { "Custom Browser"   , CustomBrowser },
                 { "Zoom"             , Exact(UserConfig.ZoomLevel) },
                 0,
+                { "Spell Check"                 , Bool(UserConfig.EnableSpellCheck) },
+                { "Spell Check Language"        , UserConfig.SpellCheckLanguage.ToLower() },
+                { "Translation Target Language" , UserConfig.TranslationTarget },
+                0,
                 { "Updates"          , Bool(UserConfig.EnableUpdateCheck) },
                 { "Update Dismissed" , Bool(!string.IsNullOrEmpty(UserConfig.DismissedUpdate)) },
                 0,
@@ -70,8 +80,8 @@ namespace TweetDuck.Core.Other.Analytics{
                 { "Custom Browser CSS"      , RoundUp((UserConfig.CustomBrowserCSS ?? string.Empty).Length, 50) },
                 { "Custom Notification CSS" , RoundUp((UserConfig.CustomNotificationCSS ?? string.Empty).Length, 50) },
                 0,
-                { "Plugins All"     , List(plugins.Plugins.Select(plugin => plugin.Identifier)) },
+                { "Plugins All"     , List(plugins.Plugins.Select(Plugin)) },
-                { "Plugins Enabled" , List(plugins.Plugins.Where(plugin => plugins.Config.IsEnabled(plugin)).Select(plugin => plugin.Identifier)) },
+                { "Plugins Enabled" , List(plugins.Plugins.Where(plugin => plugins.Config.IsEnabled(plugin)).Select(Plugin)) },
                 0,
                 { "Theme"               , Dict(editLayoutDesign, "_theme",                  "light/def") },
                 { "Column Width"        , Dict(editLayoutDesign, "columnWidth",             "310px/def") },
@@ -87,21 +97,27 @@ namespace TweetDuck.Core.Other.Analytics{
                 { "Reply Account Mode"  , ReplyAccountConfigFromPlugin },
                 { "Template Count"      , Exact(TemplateCountFromPlugin) },
                 0,
-                { "Opened Options"                   , LogRound(file.CountOpenOptions, 4) },
+                { "Opened Options"                   , LogRound(file.OpenOptions, 4) },
-                { "Opened Plugins"                   , LogRound(file.CountOpenPlugins, 4) },
+                { "Opened Plugins"                   , LogRound(file.OpenPlugins, 4) },
-                { "Opened About"                     , LogRound(file.CountOpenAbout, 4) },
+                { "Opened About"                     , LogRound(file.OpenAbout, 4) },
-                { "Opened Guide"                     , LogRound(file.CountOpenGuide, 4) },
+                { "Opened Guide"                     , LogRound(file.OpenGuide, 4) },
-                { "Desktop Notifications"            , LogRound(file.CountDesktopNotifications, 5) },
+                { "Desktop Notifications"            , LogRound(file.DesktopNotifications, 5) },
-                { "Sound Notifications"              , LogRound(file.CountSoundNotifications, 5) },
+                { "Sound Notifications"              , LogRound(file.SoundNotifications, 5) },
-                { "Mute Notifications"               , LogRound(file.CountMuteNotifications, 2) },
+                { "Notification Mutes"               , LogRound(file.NotificationMutes, 2) },
-                { "Browser Context Menus"            , LogRound(file.CountBrowserContextMenus, 2) },
+                { "Browser Context Menus"            , LogRound(file.BrowserContextMenus, 2) },
-                { "Browser Extra Mouse Buttons"      , LogRound(file.CountBrowserExtraMouseButtons, 2) },
+                { "Browser Extra Mouse Buttons"      , LogRound(file.BrowserExtraMouseButtons, 2) },
-                { "Notification Context Menus"       , LogRound(file.CountNotificationContextMenus, 2) },
+                { "Notification Context Menus"       , LogRound(file.NotificationContextMenus, 2) },
-                { "Notification Extra Mouse Buttons" , LogRound(file.CountNotificationExtraMouseButtons, 2) },
+                { "Notification Extra Mouse Buttons" , LogRound(file.NotificationExtraMouseButtons, 2) },
-                { "Notification Keyboard Shortcuts"  , LogRound(file.CountNotificationKeyboardShortcuts, 2) },
+                { "Notification Keyboard Shortcuts"  , LogRound(file.NotificationKeyboardShortcuts, 2) },
-                { "Tweet Screenshots"                , LogRound(file.CountTweetScreenshots, 2) },
+                { "Browser Reloads"                  , LogRound(file.BrowserReloads, 2) },
-                { "Tweet Details"                    , LogRound(file.CountTweetDetails, 2) },
+                { "Copied Usernames"                 , LogRound(file.CopiedUsernames, 2) },
-                { "Video Plays"                      , LogRound(file.CountVideoPlays, 4) }
+                { "Viewed Images"                    , LogRound(file.ViewedImages, 2) },
+                { "Downloaded Images"                , LogRound(file.DownloadedImages, 2) },
+                { "Downloaded Videos"                , LogRound(file.DownloadedVideos, 2) },
+                { "Used ROT13"                       , LogRound(file.UsedROT13, 2) },
+                { "Tweet Screenshots"                , LogRound(file.TweetScreenshots, 2) },
+                { "Tweet Details"                    , LogRound(file.TweetDetails, 2) },
+                { "Video Plays"                      , LogRound(file.VideoPlays, 4) }
             }.FinalizeReport();
         }
 
@@ -112,6 +128,7 @@ namespace TweetDuck.Core.Other.Analytics{
         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 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 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)"));
 
@@ -182,6 +199,12 @@ namespace TweetDuck.Core.Other.Analytics{
             ProgramArguments = args.Keys.Select(key => key.TrimStart('-')).ToArray();
         }
 
+        private static string CustomBrowser{
+            get{
+                return Path.GetFileName(UserConfig.BrowserPath) ?? string.Empty;
+            }
+        }
+
         private static string TrayMode{
             get{
                 switch(UserConfig.TrayBehavior){

Core/Other/FormGuide.cs

@@ -6,7 +6,6 @@ using CefSharp.WinForms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling;
 using TweetDuck.Core.Handling.General;
-using TweetDuck.Core.Other.Analytics;
 using TweetDuck.Core.Utils;
 using System.Text.RegularExpressions;
 using TweetDuck.Resources;
@@ -43,7 +42,7 @@ namespace TweetDuck.Core.Other{
                 FormBrowser owner = FormManager.TryFind<FormBrowser>();
 
                 if (owner != null){
-                    owner.TriggerAnalyticsEvent(AnalyticsFile.Event.OpenGuide);
+                    owner.AnalyticsFile.OpenGuide.Trigger();
                     new FormGuide(url, owner).Show(owner);
                 }
             }
@@ -55,7 +54,7 @@ namespace TweetDuck.Core.Other{
 
         private readonly ChromiumWebBrowser browser;
 
-        private FormGuide(string url, Form owner){
+        private FormGuide(string url, FormBrowser owner){
             InitializeComponent();
 
             Text = Program.BrandName+" Guide";
@@ -66,7 +65,7 @@ namespace TweetDuck.Core.Other{
             }
             
             this.browser = new ChromiumWebBrowser(url){
-                MenuHandler = new ContextMenuGuide(),
+                MenuHandler = new ContextMenuGuide(owner),
                 JsDialogHandler = new JavaScriptDialogHandler(),
                 LifeSpanHandler = new LifeSpanHandler(),
                 RequestHandler = new RequestHandlerBrowser()

Core/Other/FormPlugins.cs

@@ -76,7 +76,7 @@ namespace TweetDuck.Core.Other{
         }
 
         private void btnOpenFolder_Click(object sender, EventArgs e){
-            using(Process.Start("explorer.exe", "\""+pluginManager.PathCustomPlugins+"\"")){}
+            using(Process.Start("explorer.exe", '"'+pluginManager.PathCustomPlugins+'"')){}
         }
 
         private void btnReload_Click(object sender, EventArgs e){

Core/Other/FormSettings.cs

@@ -67,10 +67,13 @@ namespace TweetDuck.Core.Other{
                 FormClosing -= FormSettings_FormClosing;
 
                 if (dialog.ShowDialog() == DialogResult.OK){
+                    if (!dialog.IsRestarting){
                         browser.ResumeNotification();
                     
                         BrowserProcessHandler.UpdatePrefs();
                         ShouldReloadBrowser = dialog.ShouldReloadBrowser;
+                    }
+
                     Close();
                 }
                 else{

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

@@ -26,16 +26,17 @@
             this.components = new System.ComponentModel.Container();
             this.btnCancel = new System.Windows.Forms.Button();
             this.btnContinue = new System.Windows.Forms.Button();
-            this.cbConfig = new System.Windows.Forms.CheckBox();
+            this.cbProgramConfig = new System.Windows.Forms.CheckBox();
             this.cbSession = new System.Windows.Forms.CheckBox();
             this.cbPluginData = new System.Windows.Forms.CheckBox();
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.panelExport = new System.Windows.Forms.Panel();
+            this.cbSystemConfig = new System.Windows.Forms.CheckBox();
-            this.panelDecision = new System.Windows.Forms.Panel();
+            this.panelSelection = new System.Windows.Forms.FlowLayoutPanel();
-            this.radioReset = new System.Windows.Forms.RadioButton();
+            this.panelDecision = new System.Windows.Forms.FlowLayoutPanel();
-            this.radioExport = new System.Windows.Forms.RadioButton();
             this.radioImport = new System.Windows.Forms.RadioButton();
-            this.panelExport.SuspendLayout();
+            this.radioExport = new System.Windows.Forms.RadioButton();
+            this.radioReset = new System.Windows.Forms.RadioButton();
+            this.panelSelection.SuspendLayout();
             this.panelDecision.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -56,95 +57,92 @@
             this.btnContinue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnContinue.AutoSize = true;
             this.btnContinue.Enabled = false;
-            this.btnContinue.Location = new System.Drawing.Point(125, 97);
+            this.btnContinue.Location = new System.Drawing.Point(119, 97);
             this.btnContinue.Name = "btnContinue";
             this.btnContinue.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnContinue.Size = new System.Drawing.Size(45, 23);
+            this.btnContinue.Size = new System.Drawing.Size(51, 23);
             this.btnContinue.TabIndex = 3;
             this.btnContinue.Text = "Next";
             this.btnContinue.UseVisualStyleBackColor = true;
             this.btnContinue.Click += new System.EventHandler(this.btnContinue_Click);
             // 
-            // cbConfig
+            // cbProgramConfig
             // 
-            this.cbConfig.AutoSize = true;
+            this.cbProgramConfig.AutoSize = true;
-            this.cbConfig.Location = new System.Drawing.Point(0, 3);
+            this.cbProgramConfig.Location = new System.Drawing.Point(3, 3);
-            this.cbConfig.Name = "cbConfig";
+            this.cbProgramConfig.Name = "cbProgramConfig";
-            this.cbConfig.Size = new System.Drawing.Size(104, 17);
+            this.cbProgramConfig.Size = new System.Drawing.Size(104, 17);
-            this.cbConfig.TabIndex = 0;
+            this.cbProgramConfig.TabIndex = 0;
-            this.cbConfig.Text = "Program Options";
+            this.cbProgramConfig.Text = "Program Options";
-            this.toolTip.SetToolTip(this.cbConfig, "Interface, notification, and update options.");
+            this.toolTip.SetToolTip(this.cbProgramConfig, "Interface, notification, and update options.");
-            this.cbConfig.UseVisualStyleBackColor = true;
+            this.cbProgramConfig.UseVisualStyleBackColor = true;
-            this.cbConfig.CheckedChanged += new System.EventHandler(this.cbConfig_CheckedChanged);
+            this.cbProgramConfig.CheckedChanged += new System.EventHandler(this.checkBoxSelection_CheckedChanged);
             // 
             // cbSession
             // 
             this.cbSession.AutoSize = true;
-            this.cbSession.Location = new System.Drawing.Point(0, 27);
+            this.cbSession.Location = new System.Drawing.Point(3, 49);
             this.cbSession.Name = "cbSession";
             this.cbSession.Size = new System.Drawing.Size(92, 17);
-            this.cbSession.TabIndex = 1;
+            this.cbSession.TabIndex = 2;
             this.cbSession.Text = "Login Session";
             this.toolTip.SetToolTip(this.cbSession, "A token that allows logging into the\r\ncurrent TweetDeck account.");
             this.cbSession.UseVisualStyleBackColor = true;
-            this.cbSession.CheckedChanged += new System.EventHandler(this.cbSession_CheckedChanged);
+            this.cbSession.CheckedChanged += new System.EventHandler(this.checkBoxSelection_CheckedChanged);
             // 
             // cbPluginData
             // 
             this.cbPluginData.AutoSize = true;
-            this.cbPluginData.Location = new System.Drawing.Point(0, 51);
+            this.cbPluginData.Location = new System.Drawing.Point(3, 72);
             this.cbPluginData.Name = "cbPluginData";
             this.cbPluginData.Size = new System.Drawing.Size(81, 17);
-            this.cbPluginData.TabIndex = 2;
+            this.cbPluginData.TabIndex = 3;
             this.cbPluginData.Text = "Plugin Data";
             this.toolTip.SetToolTip(this.cbPluginData, "Data files generated by plugins.\r\nDoes not include the plugins themselves.");
             this.cbPluginData.UseVisualStyleBackColor = true;
-            this.cbPluginData.CheckedChanged += new System.EventHandler(this.cbPluginData_CheckedChanged);
+            this.cbPluginData.CheckedChanged += new System.EventHandler(this.checkBoxSelection_CheckedChanged);
             // 
-            // panelExport
+            // cbSystemConfig
             // 
-            this.panelExport.Controls.Add(this.cbConfig);
+            this.cbSystemConfig.AutoSize = true;
-            this.panelExport.Controls.Add(this.cbPluginData);
+            this.cbSystemConfig.Location = new System.Drawing.Point(3, 26);
-            this.panelExport.Controls.Add(this.cbSession);
+            this.cbSystemConfig.Name = "cbSystemConfig";
-            this.panelExport.Location = new System.Drawing.Point(12, 12);
+            this.cbSystemConfig.Size = new System.Drawing.Size(99, 17);
-            this.panelExport.Name = "panelExport";
+            this.cbSystemConfig.TabIndex = 1;
-            this.panelExport.Size = new System.Drawing.Size(220, 79);
+            this.cbSystemConfig.Text = "System Options";
-            this.panelExport.TabIndex = 5;
+            this.toolTip.SetToolTip(this.cbSystemConfig, "Hardware acceleration and cache options.");
-            this.panelExport.Visible = false;
+            this.cbSystemConfig.UseVisualStyleBackColor = true;
+            this.cbSystemConfig.CheckedChanged += new System.EventHandler(this.checkBoxSelection_CheckedChanged);
+            // 
+            // panelSelection
+            // 
+            this.panelSelection.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelSelection.Controls.Add(this.cbProgramConfig);
+            this.panelSelection.Controls.Add(this.cbSystemConfig);
+            this.panelSelection.Controls.Add(this.cbSession);
+            this.panelSelection.Controls.Add(this.cbPluginData);
+            this.panelSelection.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
+            this.panelSelection.Location = new System.Drawing.Point(12, 12);
+            this.panelSelection.Name = "panelSelection";
+            this.panelSelection.Size = new System.Drawing.Size(220, 89);
+            this.panelSelection.TabIndex = 2;
+            this.panelSelection.Visible = false;
+            this.panelSelection.WrapContents = false;
             // 
             // panelDecision
             // 
-            this.panelDecision.Controls.Add(this.radioReset);
+            this.panelDecision.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            this.panelDecision.Controls.Add(this.radioExport);
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.panelDecision.Controls.Add(this.radioImport);
+            this.panelDecision.Controls.Add(this.radioExport);
+            this.panelDecision.Controls.Add(this.radioReset);
+            this.panelDecision.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.panelDecision.Location = new System.Drawing.Point(12, 12);
             this.panelDecision.Name = "panelDecision";
-            this.panelDecision.Size = new System.Drawing.Size(220, 79);
+            this.panelDecision.Size = new System.Drawing.Size(220, 71);
-            this.panelDecision.TabIndex = 6;
+            this.panelDecision.TabIndex = 0;
-            // 
+            this.panelDecision.WrapContents = false;
-            // radioReset
-            // 
-            this.radioReset.AutoSize = true;
-            this.radioReset.Location = new System.Drawing.Point(3, 49);
-            this.radioReset.Name = "radioReset";
-            this.radioReset.Size = new System.Drawing.Size(104, 17);
-            this.radioReset.TabIndex = 2;
-            this.radioReset.TabStop = true;
-            this.radioReset.Text = "Restore Defaults";
-            this.radioReset.UseVisualStyleBackColor = true;
-            this.radioReset.CheckedChanged += new System.EventHandler(this.radioDecision_CheckedChanged);
-            // 
-            // radioExport
-            // 
-            this.radioExport.AutoSize = true;
-            this.radioExport.Location = new System.Drawing.Point(3, 26);
-            this.radioExport.Name = "radioExport";
-            this.radioExport.Size = new System.Drawing.Size(87, 17);
-            this.radioExport.TabIndex = 1;
-            this.radioExport.TabStop = true;
-            this.radioExport.Text = "Export Profile";
-            this.radioExport.UseVisualStyleBackColor = true;
-            this.radioExport.CheckedChanged += new System.EventHandler(this.radioDecision_CheckedChanged);
             // 
             // radioImport
             // 
@@ -158,25 +156,49 @@
             this.radioImport.UseVisualStyleBackColor = true;
             this.radioImport.CheckedChanged += new System.EventHandler(this.radioDecision_CheckedChanged);
             // 
+            // radioExport
+            // 
+            this.radioExport.AutoSize = true;
+            this.radioExport.Location = new System.Drawing.Point(3, 26);
+            this.radioExport.Name = "radioExport";
+            this.radioExport.Size = new System.Drawing.Size(87, 17);
+            this.radioExport.TabIndex = 1;
+            this.radioExport.TabStop = true;
+            this.radioExport.Text = "Export Profile";
+            this.radioExport.UseVisualStyleBackColor = true;
+            this.radioExport.CheckedChanged += new System.EventHandler(this.radioDecision_CheckedChanged);
+            // 
+            // radioReset
+            // 
+            this.radioReset.AutoSize = true;
+            this.radioReset.Location = new System.Drawing.Point(3, 49);
+            this.radioReset.Name = "radioReset";
+            this.radioReset.Size = new System.Drawing.Size(104, 17);
+            this.radioReset.TabIndex = 2;
+            this.radioReset.TabStop = true;
+            this.radioReset.Text = "Restore Defaults";
+            this.radioReset.UseVisualStyleBackColor = true;
+            this.radioReset.CheckedChanged += new System.EventHandler(this.radioDecision_CheckedChanged);
+            // 
             // DialogSettingsManage
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(244, 132);
-            this.Controls.Add(this.panelDecision);
-            this.Controls.Add(this.panelExport);
             this.Controls.Add(this.btnContinue);
             this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.panelDecision);
+            this.Controls.Add(this.panelSelection);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
-            this.MinimumSize = new System.Drawing.Size(200, 170);
+            this.MinimumSize = new System.Drawing.Size(260, 170);
             this.Name = "DialogSettingsManage";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "Manage Options";
-            this.panelExport.ResumeLayout(false);
+            this.panelSelection.ResumeLayout(false);
-            this.panelExport.PerformLayout();
+            this.panelSelection.PerformLayout();
             this.panelDecision.ResumeLayout(false);
             this.panelDecision.PerformLayout();
             this.ResumeLayout(false);
@@ -188,12 +210,13 @@
 
         private System.Windows.Forms.Button btnCancel;
         private System.Windows.Forms.Button btnContinue;
-        private System.Windows.Forms.CheckBox cbConfig;
+        private System.Windows.Forms.CheckBox cbProgramConfig;
+        private System.Windows.Forms.CheckBox cbSystemConfig;
         private System.Windows.Forms.CheckBox cbSession;
         private System.Windows.Forms.CheckBox cbPluginData;
         private System.Windows.Forms.ToolTip toolTip;
-        private System.Windows.Forms.Panel panelExport;
+        private System.Windows.Forms.FlowLayoutPanel panelSelection;
-        private System.Windows.Forms.Panel panelDecision;
+        private System.Windows.Forms.FlowLayoutPanel panelDecision;
         private System.Windows.Forms.RadioButton radioReset;
         private System.Windows.Forms.RadioButton radioExport;
         private System.Windows.Forms.RadioButton radioImport;

Core/Other/Settings/Dialogs/DialogSettingsManage.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
@@ -16,15 +17,17 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
 
             set{
                 // this will call events and SetFlag, which also updates the UI
-                cbConfig.Checked = value.HasFlag(ProfileManager.Items.UserConfig);
+                foreach(KeyValuePair<CheckBox, ProfileManager.Items> kvp in checkBoxMap){
-                cbSession.Checked = value.HasFlag(ProfileManager.Items.Session);
+                    kvp.Key.Checked = value.HasFlag(kvp.Value);
-                cbPluginData.Checked = value.HasFlag(ProfileManager.Items.PluginData);
+                }
             }
         }
         
+        public bool IsRestarting { get; private set; }
         public bool ShouldReloadBrowser { get; private set; }
         
         private readonly PluginManager plugins;
+        private readonly Dictionary<CheckBox, ProfileManager.Items> checkBoxMap = new Dictionary<CheckBox, ProfileManager.Items>(4);
 
         private State currentState;
         private ProfileManager importManager;
@@ -36,22 +39,20 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
 
             this.plugins = plugins;
             this.currentState = State.Deciding;
+
+            this.checkBoxMap[cbProgramConfig] = ProfileManager.Items.UserConfig;
+            this.checkBoxMap[cbSystemConfig] = ProfileManager.Items.SystemConfig;
+            this.checkBoxMap[cbSession] = ProfileManager.Items.Session;
+            this.checkBoxMap[cbPluginData] = ProfileManager.Items.PluginData;
         }
 
         private void radioDecision_CheckedChanged(object sender, EventArgs e){
             btnContinue.Enabled = true;
         }
 
-        private void cbConfig_CheckedChanged(object sender, EventArgs e){
+        private void checkBoxSelection_CheckedChanged(object sender, EventArgs e){
-            SetFlag(ProfileManager.Items.UserConfig, cbConfig.Checked);
+            CheckBox cb = (CheckBox)sender;
-        }
+            SetFlag(checkBoxMap[cb], cb.Checked);
-
-        private void cbSession_CheckedChanged(object sender, EventArgs e){
-            SetFlag(ProfileManager.Items.Session, cbSession.Checked);
-        }
-
-        private void cbPluginData_CheckedChanged(object sender, EventArgs e){
-            SetFlag(ProfileManager.Items.PluginData, cbPluginData.Checked);
         }
 
         private void btnContinue_Click(object sender, EventArgs e){
@@ -88,9 +89,9 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                         Text = "Import Profile";
                         SelectedItems = importManager.FindImportItems();
 
-                        cbConfig.Enabled = cbConfig.Checked;
+                        foreach(CheckBox cb in checkBoxMap.Keys){
-                        cbSession.Enabled = cbSession.Checked;
+                            cb.Enabled = cb.Checked;
-                        cbPluginData.Enabled = cbPluginData.Checked;
+                        }
                     }
 
                     // Export
@@ -99,12 +100,13 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
 
                         Text = "Export Profile";
                         btnContinue.Text = "Export Profile";
-                        SelectedItems = ProfileManager.Items.All & ~ProfileManager.Items.Session;
+                        SelectedItems = ProfileManager.Items.UserConfig | ProfileManager.Items.PluginData;
                     }
                     
                     // Continue...
                     panelDecision.Visible = false;
-                    panelExport.Visible = true;
+                    panelSelection.Visible = true;
+                    Height += panelSelection.Height-panelDecision.Height;
                     break;
 
                 case State.Reset:
@@ -131,10 +133,10 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                         }
 
                         if (SelectedItems.HasFlag(ProfileManager.Items.Session)){
-                            Program.Restart(Arguments.ArgDeleteCookies);
+                            RestartProgram(Arguments.ArgDeleteCookies);
                         }
                         else if (SelectedItems.HasFlag(ProfileManager.Items.SystemConfig)){
-                            Program.Restart();
+                            RestartProgram();
                         }
                         else{
                             ShouldReloadBrowser = true;
@@ -152,10 +154,10 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
 
                         if (importManager.IsRestarting){
                             if (SelectedItems.HasFlag(ProfileManager.Items.Session)){
-                                Program.Restart(Arguments.ArgImportCookies);
+                                RestartProgram(Arguments.ArgImportCookies);
                             }
                             else if (SelectedItems.HasFlag(ProfileManager.Items.SystemConfig)){
-                                Program.Restart();
+                                RestartProgram();
                             }
                         }
                         else{
@@ -212,11 +214,16 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
             btnContinue.Enabled = _selectedItems != ProfileManager.Items.None;
             
             if (currentState == State.Import){
-                btnContinue.Text = _selectedItems.HasFlag(ProfileManager.Items.Session) ? "Import && Restart" : "Import Profile";
+                btnContinue.Text = _selectedItems.NeedsRestart() ? "Import && Restart" : "Import Profile";
             }
             else if (currentState == State.Reset){
-                btnContinue.Text = _selectedItems.HasFlag(ProfileManager.Items.Session) ? "Restore && Restart" : "Restore Defaults";
+                btnContinue.Text = _selectedItems.NeedsRestart() ? "Restore && Restart" : "Restore Defaults";
-            }
+            }
+        }
+
+        private void RestartProgram(params string[] extraArgs){
+            IsRestarting = true;
+            Program.Restart(extraArgs);
         }
     }
 }

Core/Other/Settings/TabSettingsGeneral.Designer.cs

@@ -29,7 +29,6 @@
             this.checkUpdateNotifications = new System.Windows.Forms.CheckBox();
             this.btnCheckUpdates = new System.Windows.Forms.Button();
             this.labelZoomValue = new System.Windows.Forms.Label();
-            this.checkSwitchAccountSelectors = new System.Windows.Forms.CheckBox();
             this.checkBestImageQuality = new System.Windows.Forms.CheckBox();
             this.checkOpenSearchInFirstColumn = new System.Windows.Forms.CheckBox();
             this.trackBarZoom = new System.Windows.Forms.TrackBar();
@@ -64,7 +63,7 @@
             // checkUpdateNotifications
             // 
             this.checkUpdateNotifications.AutoSize = true;
-            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 386);
+            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 363);
             this.checkUpdateNotifications.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
             this.checkUpdateNotifications.Name = "checkUpdateNotifications";
             this.checkUpdateNotifications.Size = new System.Drawing.Size(165, 17);
@@ -74,7 +73,7 @@
             // 
             // btnCheckUpdates
             // 
-            this.btnCheckUpdates.Location = new System.Drawing.Point(5, 409);
+            this.btnCheckUpdates.Location = new System.Drawing.Point(5, 386);
             this.btnCheckUpdates.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnCheckUpdates.Name = "btnCheckUpdates";
             this.btnCheckUpdates.Size = new System.Drawing.Size(144, 23);
@@ -93,21 +92,10 @@
             this.labelZoomValue.Text = "100%";
             this.labelZoomValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
             // 
-            // checkSwitchAccountSelectors
-            // 
-            this.checkSwitchAccountSelectors.AutoSize = true;
-            this.checkSwitchAccountSelectors.Location = new System.Drawing.Point(6, 49);
-            this.checkSwitchAccountSelectors.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
-            this.checkSwitchAccountSelectors.Name = "checkSwitchAccountSelectors";
-            this.checkSwitchAccountSelectors.Size = new System.Drawing.Size(172, 17);
-            this.checkSwitchAccountSelectors.TabIndex = 2;
-            this.checkSwitchAccountSelectors.Text = "Shift Selects Multiple Accounts";
-            this.checkSwitchAccountSelectors.UseVisualStyleBackColor = true;
-            // 
             // checkBestImageQuality
             // 
             this.checkBestImageQuality.AutoSize = true;
-            this.checkBestImageQuality.Location = new System.Drawing.Point(6, 118);
+            this.checkBestImageQuality.Location = new System.Drawing.Point(6, 95);
             this.checkBestImageQuality.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkBestImageQuality.Name = "checkBestImageQuality";
             this.checkBestImageQuality.Size = new System.Drawing.Size(114, 17);
@@ -118,7 +106,7 @@
             // checkOpenSearchInFirstColumn
             // 
             this.checkOpenSearchInFirstColumn.AutoSize = true;
-            this.checkOpenSearchInFirstColumn.Location = new System.Drawing.Point(6, 72);
+            this.checkOpenSearchInFirstColumn.Location = new System.Drawing.Point(6, 49);
             this.checkOpenSearchInFirstColumn.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkOpenSearchInFirstColumn.Name = "checkOpenSearchInFirstColumn";
             this.checkOpenSearchInFirstColumn.Size = new System.Drawing.Size(219, 17);
@@ -144,7 +132,7 @@
             // labelZoom
             // 
             this.labelZoom.AutoSize = true;
-            this.labelZoom.Location = new System.Drawing.Point(3, 291);
+            this.labelZoom.Location = new System.Drawing.Point(3, 268);
             this.labelZoom.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelZoom.Name = "labelZoom";
             this.labelZoom.Size = new System.Drawing.Size(34, 13);
@@ -172,7 +160,7 @@
             this.panelZoom.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelZoom.Controls.Add(this.trackBarZoom);
             this.panelZoom.Controls.Add(this.labelZoomValue);
-            this.panelZoom.Location = new System.Drawing.Point(0, 304);
+            this.panelZoom.Location = new System.Drawing.Point(0, 281);
             this.panelZoom.Margin = new System.Windows.Forms.Padding(0);
             this.panelZoom.Name = "panelZoom";
             this.panelZoom.Size = new System.Drawing.Size(322, 36);
@@ -181,7 +169,7 @@
             // checkAnimatedAvatars
             // 
             this.checkAnimatedAvatars.AutoSize = true;
-            this.checkAnimatedAvatars.Location = new System.Drawing.Point(6, 141);
+            this.checkAnimatedAvatars.Location = new System.Drawing.Point(6, 118);
             this.checkAnimatedAvatars.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkAnimatedAvatars.Name = "checkAnimatedAvatars";
             this.checkAnimatedAvatars.Size = new System.Drawing.Size(145, 17);
@@ -193,7 +181,7 @@
             // 
             this.labelUpdates.AutoSize = true;
             this.labelUpdates.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelUpdates.Location = new System.Drawing.Point(0, 360);
+            this.labelUpdates.Location = new System.Drawing.Point(0, 337);
             this.labelUpdates.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
             this.labelUpdates.Name = "labelUpdates";
             this.labelUpdates.Size = new System.Drawing.Size(70, 20);
@@ -207,7 +195,6 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.flowPanel.Controls.Add(this.labelUI);
             this.flowPanel.Controls.Add(this.checkExpandLinks);
-            this.flowPanel.Controls.Add(this.checkSwitchAccountSelectors);
             this.flowPanel.Controls.Add(this.checkOpenSearchInFirstColumn);
             this.flowPanel.Controls.Add(this.checkKeepLikeFollowDialogsOpen);
             this.flowPanel.Controls.Add(this.checkBestImageQuality);
@@ -224,14 +211,14 @@
             this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.flowPanel.Location = new System.Drawing.Point(9, 9);
             this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(322, 438);
+            this.flowPanel.Size = new System.Drawing.Size(322, 415);
             this.flowPanel.TabIndex = 0;
             this.flowPanel.WrapContents = false;
             // 
             // checkKeepLikeFollowDialogsOpen
             // 
             this.checkKeepLikeFollowDialogsOpen.AutoSize = true;
-            this.checkKeepLikeFollowDialogsOpen.Location = new System.Drawing.Point(6, 95);
+            this.checkKeepLikeFollowDialogsOpen.Location = new System.Drawing.Point(6, 72);
             this.checkKeepLikeFollowDialogsOpen.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkKeepLikeFollowDialogsOpen.Name = "checkKeepLikeFollowDialogsOpen";
             this.checkKeepLikeFollowDialogsOpen.Size = new System.Drawing.Size(176, 17);
@@ -243,7 +230,7 @@
             // 
             this.labelBrowserSettings.AutoSize = true;
             this.labelBrowserSettings.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelBrowserSettings.Location = new System.Drawing.Point(0, 181);
+            this.labelBrowserSettings.Location = new System.Drawing.Point(0, 158);
             this.labelBrowserSettings.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
             this.labelBrowserSettings.Name = "labelBrowserSettings";
             this.labelBrowserSettings.Size = new System.Drawing.Size(130, 20);
@@ -253,7 +240,7 @@
             // checkSmoothScrolling
             // 
             this.checkSmoothScrolling.AutoSize = true;
-            this.checkSmoothScrolling.Location = new System.Drawing.Point(6, 207);
+            this.checkSmoothScrolling.Location = new System.Drawing.Point(6, 184);
             this.checkSmoothScrolling.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
             this.checkSmoothScrolling.Name = "checkSmoothScrolling";
             this.checkSmoothScrolling.Size = new System.Drawing.Size(105, 17);
@@ -264,7 +251,7 @@
             // labelBrowserPath
             // 
             this.labelBrowserPath.AutoSize = true;
-            this.labelBrowserPath.Location = new System.Drawing.Point(3, 239);
+            this.labelBrowserPath.Location = new System.Drawing.Point(3, 216);
             this.labelBrowserPath.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelBrowserPath.Name = "labelBrowserPath";
             this.labelBrowserPath.Size = new System.Drawing.Size(95, 13);
@@ -275,7 +262,7 @@
             // 
             this.comboBoxBrowserPath.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBoxBrowserPath.FormattingEnabled = true;
-            this.comboBoxBrowserPath.Location = new System.Drawing.Point(5, 255);
+            this.comboBoxBrowserPath.Location = new System.Drawing.Point(5, 232);
             this.comboBoxBrowserPath.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.comboBoxBrowserPath.Name = "comboBoxBrowserPath";
             this.comboBoxBrowserPath.Size = new System.Drawing.Size(173, 21);
@@ -287,7 +274,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.flowPanel);
             this.Name = "TabSettingsGeneral";
-            this.Size = new System.Drawing.Size(340, 456);
+            this.Size = new System.Drawing.Size(340, 433);
             ((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).EndInit();
             this.panelZoom.ResumeLayout(false);
             this.flowPanel.ResumeLayout(false);
@@ -306,7 +293,6 @@
         private System.Windows.Forms.Label labelZoomValue;
         private System.Windows.Forms.TrackBar trackBarZoom;
         private System.Windows.Forms.Timer zoomUpdateTimer;
-        private System.Windows.Forms.CheckBox checkSwitchAccountSelectors;
         private System.Windows.Forms.Label labelUI;
         private System.Windows.Forms.Panel panelZoom;
         private System.Windows.Forms.Label labelUpdates;

Core/Other/Settings/TabSettingsGeneral.cs

@@ -26,7 +26,6 @@ namespace TweetDuck.Core.Other.Settings{
             Disposed += (sender, args) => this.updates.CheckFinished -= updates_CheckFinished;
             
             toolTip.SetToolTip(checkExpandLinks, "Expands links inside the tweets. If disabled,\r\nthe full links show up in a tooltip instead.");
-            toolTip.SetToolTip(checkSwitchAccountSelectors, "When (re)tweeting, click to select a single account or hold Shift to\r\nselect multiple accounts, instead of TweetDeck\'s default behavior.");
             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).");
@@ -41,7 +40,6 @@ namespace TweetDuck.Core.Other.Settings{
             toolTip.SetToolTip(btnCheckUpdates, "Forces an update check, even for updates that had been dismissed.");
 
             checkExpandLinks.Checked = Config.ExpandLinksOnHover;
-            checkSwitchAccountSelectors.Checked = Config.SwitchAccountSelectors;
             checkOpenSearchInFirstColumn.Checked = Config.OpenSearchInFirstColumn;
             checkKeepLikeFollowDialogsOpen.Checked = Config.KeepLikeFollowDialogsOpen;
             checkBestImageQuality.Checked = Config.BestImageQuality;
@@ -65,7 +63,6 @@ namespace TweetDuck.Core.Other.Settings{
 
         public override void OnReady(){
             checkExpandLinks.CheckedChanged += checkExpandLinks_CheckedChanged;
-            checkSwitchAccountSelectors.CheckedChanged += checkSwitchAccountSelectors_CheckedChanged;
             checkOpenSearchInFirstColumn.CheckedChanged += checkOpenSearchInFirstColumn_CheckedChanged;
             checkKeepLikeFollowDialogsOpen.CheckedChanged += checkKeepLikeFollowDialogsOpen_CheckedChanged;
             checkBestImageQuality.CheckedChanged += checkBestImageQuality_CheckedChanged;
@@ -87,10 +84,6 @@ namespace TweetDuck.Core.Other.Settings{
             Config.ExpandLinksOnHover = checkExpandLinks.Checked;
         }
 
-        private void checkSwitchAccountSelectors_CheckedChanged(object sender, EventArgs e){
-            Config.SwitchAccountSelectors = checkSwitchAccountSelectors.Checked;
-        }
-
         private void checkOpenSearchInFirstColumn_CheckedChanged(object sender, EventArgs e){
             Config.OpenSearchInFirstColumn = checkOpenSearchInFirstColumn.Checked;
         }
@@ -170,6 +163,11 @@ namespace TweetDuck.Core.Other.Settings{
 
             btnCheckUpdates.Enabled = false;
             updateCheckEventId = updates.Check(true);
+
+            if (updateCheckEventId == UpdateHandler.CheckCodeNotOnTweetDeck){
+                FormMessage.Error("Update Check", "Updates can only be checked once TweetDeck is fully loaded.", FormMessage.OK);
+                btnCheckUpdates.Enabled = true;
+            }
         }
 
         private void updates_CheckFinished(object sender, UpdateEventArgs e){

Core/TweetDeckBrowser.cs

@@ -9,14 +9,10 @@ using TweetDuck.Core.Handling;
 using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Notification;
 using TweetDuck.Core.Utils;
-using TweetDuck.Plugins;
-using TweetDuck.Plugins.Enums;
-using TweetDuck.Plugins.Events;
 using TweetDuck.Resources;
-using TweetDuck.Updates;
 
 namespace TweetDuck.Core{
-    sealed class TweetDeckBrowser : IDisposable{
+    sealed class TweetDeckBrowser : ITweetDeckBrowser, IDisposable{
         public bool Ready { get; private set; }
 
         public bool Enabled{
@@ -26,6 +22,10 @@ namespace TweetDuck.Core{
 
         public bool IsTweetDeckWebsite{
             get{
+                if (!Ready){
+                    return false;
+                }
+
                 using(IFrame frame = browser.GetBrowser().MainFrame){
                     return TwitterUtils.IsTweetDeckWebsite(frame);
                 }
@@ -33,11 +33,10 @@ namespace TweetDuck.Core{
         }
         
         private readonly ChromiumWebBrowser browser;
-        private readonly PluginManager plugins;
 
         private string prevSoundNotificationPath = null;
 
-        public TweetDeckBrowser(FormBrowser owner, PluginManager plugins, TweetDeckBridge bridge){
+        public TweetDeckBrowser(FormBrowser owner, TweetDeckBridge bridge){
             this.browser = new ChromiumWebBrowser(TwitterUtils.TweetDeckURL){
                 DialogHandler = new FileDialogHandler(),
                 DragHandler = new DragHandlerBrowser(),
@@ -48,29 +47,22 @@ namespace TweetDuck.Core{
                 RequestHandler = new RequestHandlerBrowser()
             };
 
-            #if DEBUG
-            this.browser.ConsoleMessage += BrowserUtils.HandleConsoleMessage;
-            #endif
-
             this.browser.LoadingStateChanged += browser_LoadingStateChanged;
             this.browser.FrameLoadStart += browser_FrameLoadStart;
             this.browser.FrameLoadEnd += browser_FrameLoadEnd;
             this.browser.LoadError += browser_LoadError;
 
             this.browser.RegisterAsyncJsObject("$TD", bridge);
-            this.browser.RegisterAsyncJsObject("$TDP", plugins.Bridge);
             
             this.browser.BrowserSettings.BackgroundColor = (uint)TwitterUtils.BackgroundColor.ToArgb();
             this.browser.Dock = DockStyle.None;
             this.browser.Location = ControlExtensions.InvisibleLocation;
 
-            this.browser.SetupResourceHandler(TweetNotification.AppLogoLink, TweetNotification.AppLogoHandler);
+            this.browser.SetupResourceHandler(TweetNotification.AppLogo);
+            this.browser.SetupResourceHandler(TwitterUtils.LoadingSpinner);
 
             owner.Controls.Add(browser);
             
-            this.plugins = plugins;
-            this.plugins.PluginChangedState += plugins_PluginChangedState;
-            
             Program.UserConfig.MuteToggled += UserConfig_MuteToggled;
             Program.UserConfig.ZoomLevelChanged += UserConfig_ZoomLevelChanged;
             Program.UserConfig.SoundNotificationChanged += UserConfig_SoundNotificationInfoChanged;
@@ -91,8 +83,6 @@ namespace TweetDuck.Core{
         }
 
         public void Dispose(){
-            plugins.PluginChangedState -= plugins_PluginChangedState;
-
             Program.UserConfig.MuteToggled -= UserConfig_MuteToggled;
             Program.UserConfig.ZoomLevelChanged -= UserConfig_ZoomLevelChanged;
             Program.UserConfig.SoundNotificationChanged -= UserConfig_SoundNotificationInfoChanged;
@@ -100,6 +90,24 @@ namespace TweetDuck.Core{
             browser.Dispose();
         }
         
+        void ITweetDeckBrowser.RegisterBridge(string name, object obj){
+            browser.RegisterAsyncJsObject(name, obj);
+        }
+
+        void ITweetDeckBrowser.OnFrameLoaded(Action<IFrame> callback){
+            browser.FrameLoadEnd += (sender, args) => {
+                IFrame frame = args.Frame;
+
+                if (frame.IsMain && TwitterUtils.IsTweetDeckWebsite(frame)){
+                    callback(frame);
+                }
+            };
+        }
+
+        void ITweetDeckBrowser.ExecuteFunction(string name, params object[] args){
+            browser.ExecuteScriptAsync(name, args);
+        }
+
         // event handlers
 
         private void browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){
@@ -114,36 +122,36 @@ namespace TweetDuck.Core{
         }
 
         private void browser_FrameLoadStart(object sender, FrameLoadStartEventArgs e){
-            if (e.Frame.IsMain){
+            IFrame frame = e.Frame;
+
+            if (frame.IsMain){
                 if (Program.UserConfig.ZoomLevel != 100){
                     BrowserUtils.SetZoomLevel(browser.GetBrowser(), Program.UserConfig.ZoomLevel);
                 }
 
-                if (TwitterUtils.IsTwitterWebsite(e.Frame)){
+                if (TwitterUtils.IsTwitterWebsite(frame)){
-                    ScriptLoader.ExecuteFile(e.Frame, "twitter.js");
+                    ScriptLoader.ExecuteFile(frame, "twitter.js");
                 }
+                
+                frame.ExecuteJavaScriptAsync(TwitterUtils.BackgroundColorOverride);
             }
         }
 
         private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
-            if (e.Frame.IsMain && TwitterUtils.IsTweetDeckWebsite(e.Frame)){
+            IFrame frame = e.Frame;
-                e.Frame.ExecuteJavaScriptAsync(TwitterUtils.BackgroundColorFix);
 
+            if (frame.IsMain && TwitterUtils.IsTweetDeckWebsite(frame)){
                 UpdateProperties();
-                TweetDeckBridge.RestoreSessionData(e.Frame);
+                TweetDeckBridge.RestoreSessionData(frame);
-                ScriptLoader.ExecuteFile(e.Frame, "code.js");
+                ScriptLoader.ExecuteFile(frame, "code.js");
                 InjectBrowserCSS();
                 ReinjectCustomCSS(Program.UserConfig.CustomBrowserCSS);
                 UserConfig_SoundNotificationInfoChanged(null, EventArgs.Empty);
-                plugins.ExecutePlugins(e.Frame, PluginEnvironment.Browser);
 
                 TweetDeckBridge.ResetStaticProperties();
 
                 if (Program.UserConfig.FirstRun){
-                    ScriptLoader.ExecuteFile(e.Frame, "introduction.js");
+                    ScriptLoader.ExecuteFile(frame, "introduction.js");
-                }
-                else if (Program.UserConfig.ShowFollowNotification){
-                    ScriptLoader.ExecuteFile(e.Frame, "introduction.follow.js");
                 }
             }
         }
@@ -162,10 +170,6 @@ namespace TweetDuck.Core{
             }
         }
 
-        private void plugins_PluginChangedState(object sender, PluginChangedStateEventArgs e){
-            browser.ExecuteScriptAsync("TDPF_setPluginState", e.Plugin, e.IsEnabled);
-        }
-
         private void UserConfig_MuteToggled(object sender, EventArgs e){
             UpdateProperties();
         }
@@ -188,10 +192,6 @@ namespace TweetDuck.Core{
 
         // external handling
 
-        public UpdateHandler CreateUpdateHandler(UpdaterSettings settings){
-            return new UpdateHandler(browser, settings);
-        }
-
         public void HideVideoOverlay(bool focus){
             if (focus){
                 browser.GetBrowser().GetHost().SendFocusEvent(true);

Core/Utils/BrowserUtils.cs

@@ -7,6 +7,7 @@ using System.Net;
 using System.Windows.Forms;
 using CefSharp.WinForms;
 using TweetDuck.Core.Other;
+using TweetDuck.Data;
 
 namespace TweetDuck.Core.Utils{
     static class BrowserUtils{
@@ -49,6 +50,10 @@ namespace TweetDuck.Core.Utils{
             }
         }
 
+        public static void SetupResourceHandler(this ChromiumWebBrowser browser, ResourceLink resource){
+            browser.SetupResourceHandler(resource.Url, resource.Handler);
+        }
+
         private const string TwitterTrackingUrl = "t.co";
 
         public enum UrlCheckResult{
@@ -132,6 +137,8 @@ namespace TweetDuck.Core.Utils{
         }
 
         public static WebClient CreateWebClient(){
+            WindowsUtils.EnsureTLS12();
+
             WebClient client = new WebClient{ Proxy = null };
             client.Headers[HttpRequestHeader.UserAgent] = HeaderUserAgent;
             return client;
@@ -167,11 +174,5 @@ namespace TweetDuck.Core.Utils{
         public static void SetZoomLevel(IBrowser browser, int percentage){
             browser.GetHost().SetZoomLevel(Math.Log(percentage/100.0, 1.2));
         }
-
-        #if DEBUG
-        public static void HandleConsoleMessage(object sender, ConsoleMessageEventArgs e){
-            Debug.WriteLine("[Console] {0} ({1}:{2})", e.Message, e.Source, e.Line);
-        }
-        #endif
     }
 }

Core/Utils/TwitterUtils.cs

@@ -6,15 +6,18 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using TweetDuck.Core.Other;
+using TweetDuck.Data;
 
 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 BackgroundColorFix = "let e=document.createElement('style');document.head.appendChild(e);e.innerHTML='body::before{background:#1c6399!important}'";
+        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)";
 
-        private static readonly Lazy<Regex> RegexAccountLazy = new Lazy<Regex>(() => new Regex(@"^https?://twitter\.com/(?!signup$|tos$|privacy$)([^/]+)/?$", RegexOptions.Compiled), false);
+        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 = {
@@ -38,8 +41,8 @@ namespace TweetDuck.Core.Utils{
         }
 
         private static string ExtractMediaBaseLink(string url){
-            int dot = url.LastIndexOf('/');
+            int slash = url.LastIndexOf('/');
-            return dot == -1 ? url : StringUtils.ExtractBefore(url, ':', dot);
+            return slash == -1 ? url : StringUtils.ExtractBefore(url, ':', slash);
         }
 
         public static string GetMediaLink(string url, ImageQuality quality){
@@ -88,7 +91,7 @@ namespace TweetDuck.Core.Utils{
                 AutoUpgradeEnabled = true,
                 OverwritePrompt = urls.Length == 1,
                 Title = "Save Image",
-                FileName = $"{string.Join(" ", fileNameParts.Where(part => part.Length > 0))}{ext}",
+                FileName = $"{string.Join(" ", fileNameParts.Where(part => !string.IsNullOrEmpty(part)))}{ext}",
                 Filter = (urls.Length == 1 ? "Image" : "Images")+(string.IsNullOrEmpty(ext) ? " (unknown)|*.*" : $" (*{ext})|*{ext}")
             }){
                 if (dialog.ShowDialog() == DialogResult.OK){

Core/Utils/WindowsUtils.cs

@@ -3,6 +3,7 @@ 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;
@@ -17,6 +18,8 @@ namespace TweetDuck.Core.Utils{
         public static int CurrentProcessID { get; }
         public static bool ShouldAvoidToolWindow { get; }
         
+        private static bool HasMicrosoftBeenBroughtTo2008Yet;
+
         static WindowsUtils(){
             using(Process me = Process.GetCurrentProcess()){
                 CurrentProcessID = me.Id;
@@ -26,6 +29,14 @@ namespace TweetDuck.Core.Utils{
             ShouldAvoidToolWindow = ver.Major == 6 && ver.Minor == 2; // windows 8/10
         }
         
+        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);
 

Data/ResourceLink.cs

@@ -0,0 +1,13 @@
+using CefSharp;
+
+namespace TweetDuck.Data{
+    sealed class ResourceLink{
+        public string Url { get; }
+        public IResourceHandler Handler { get; }
+
+        public ResourceLink(string url, IResourceHandler handler){
+            this.Url = url;
+            this.Handler = handler;
+        }
+    }
+}

Plugins/Controls/PluginControl.Designer.cs

@@ -31,7 +31,7 @@
             this.flowLayoutInfo = new System.Windows.Forms.FlowLayoutPanel();
             this.labelWebsite = new System.Windows.Forms.Label();
             this.labelVersion = new System.Windows.Forms.Label();
-            this.btnOpenConfig = new System.Windows.Forms.Button();
+            this.btnConfigure = new System.Windows.Forms.Button();
             this.labelType = new TweetDuck.Core.Controls.LabelVertical();
             this.panelDescription.SuspendLayout();
             this.flowLayoutInfo.SuspendLayout();
@@ -135,16 +135,16 @@
             this.labelVersion.TextAlign = System.Drawing.ContentAlignment.TopRight;
             this.labelVersion.UseMnemonic = false;
             // 
-            // btnOpenConfig
+            // btnConfigure
             // 
-            this.btnOpenConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnConfigure.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnOpenConfig.Location = new System.Drawing.Point(382, 80);
+            this.btnConfigure.Location = new System.Drawing.Point(382, 80);
-            this.btnOpenConfig.Name = "btnOpenConfig";
+            this.btnConfigure.Name = "btnConfigure";
-            this.btnOpenConfig.Size = new System.Drawing.Size(68, 23);
+            this.btnConfigure.Size = new System.Drawing.Size(68, 23);
-            this.btnOpenConfig.TabIndex = 4;
+            this.btnConfigure.TabIndex = 4;
-            this.btnOpenConfig.Text = "Configure";
+            this.btnConfigure.Text = "Configure";
-            this.btnOpenConfig.UseVisualStyleBackColor = true;
+            this.btnConfigure.UseVisualStyleBackColor = true;
-            this.btnOpenConfig.Click += new System.EventHandler(this.btnOpenConfig_Click);
+            this.btnConfigure.Click += new System.EventHandler(this.btnConfigure_Click);
             // 
             // labelType
             // 
@@ -163,7 +163,7 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.labelType);
-            this.Controls.Add(this.btnOpenConfig);
+            this.Controls.Add(this.btnConfigure);
             this.Controls.Add(this.flowLayoutInfo);
             this.Controls.Add(this.panelDescription);
             this.Controls.Add(this.labelName);
@@ -194,7 +194,7 @@
         private System.Windows.Forms.FlowLayoutPanel flowLayoutInfo;
         private System.Windows.Forms.Label labelWebsite;
         private System.Windows.Forms.Label labelVersion;
-        private System.Windows.Forms.Button btnOpenConfig;
+        private System.Windows.Forms.Button btnConfigure;
         private Core.Controls.LabelVertical labelType;
     }
 }

Plugins/Controls/PluginControl.cs

@@ -1,7 +1,5 @@
 using System;
-using System.Diagnostics;
 using System.Drawing;
-using System.IO;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
@@ -57,8 +55,9 @@ namespace TweetDuck.Plugins.Controls{
             }
         }
 
-        private void btnOpenConfig_Click(object sender, EventArgs e){
+        private void btnConfigure_Click(object sender, EventArgs e){
-            using(Process.Start("explorer.exe", "/select,\""+plugin.ConfigPath.Replace('/', '\\')+"\"")){}
+            pluginManager.ConfigurePlugin(plugin);
+            ParentForm?.Close();
         }
 
         private void btnToggleState_Click(object sender, EventArgs e){
@@ -87,14 +86,13 @@ namespace TweetDuck.Plugins.Controls{
                 labelName.ForeColor = textColor;
                 labelDescription.ForeColor = textColor;
                 btnToggleState.Text = isEnabled ? "Disable" : "Enable";
-                btnOpenConfig.Visible = plugin.HasConfig;
+                btnConfigure.Visible = isEnabled && pluginManager.IsPluginConfigurable(plugin);
-                btnOpenConfig.Enabled = btnOpenConfig.Visible && File.Exists(plugin.ConfigPath);
             }
             else{
                 labelName.ForeColor = Color.DarkRed;
                 labelDescription.ForeColor = Color.DarkRed;
                 btnToggleState.Visible = false;
-                btnOpenConfig.Visible = false;
+                btnConfigure.Visible = false;
             }
         }
     }

Plugins/Enums/PluginGroup.cs

@@ -11,5 +11,13 @@
                 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

@@ -18,11 +18,12 @@ namespace TweetDuck.Plugins{
         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.PluginChangedState += manager_PluginChangedState;
+            this.manager.Config.PluginChangedState += Config_PluginChangedState;
         }
 
         // Event handlers
@@ -31,7 +32,7 @@ namespace TweetDuck.Plugins{
             fileCache.Clear();
         }
 
-        private void manager_PluginChangedState(object sender, PluginChangedStateEventArgs e){
+        private void Config_PluginChangedState(object sender, PluginChangedStateEventArgs e){
             if (!e.IsEnabled){
                 int token = manager.GetTokenFromPlugin(e.Plugin);
 
@@ -114,5 +115,13 @@ namespace TweetDuck.Plugins{
         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/PluginConfig.cs

@@ -6,7 +6,7 @@ using TweetDuck.Plugins.Events;
 
 namespace TweetDuck.Plugins{
     sealed class PluginConfig{
-        public event EventHandler<PluginChangedStateEventArgs> InternalPluginChangedState; // should only be accessed from PluginManager
+        public event EventHandler<PluginChangedStateEventArgs> PluginChangedState;
 
         public IEnumerable<string> DisabledPlugins => disabled;
         public bool AnyDisabled => disabled.Count > 0;
@@ -20,7 +20,7 @@ namespace TweetDuck.Plugins{
 
         public void SetEnabled(Plugin plugin, bool enabled){
             if ((enabled && disabled.Remove(plugin.Identifier)) || (!enabled && disabled.Add(plugin.Identifier))){
-                InternalPluginChangedState?.Invoke(this, new PluginChangedStateEventArgs(plugin, enabled));
+                PluginChangedState?.Invoke(this, new PluginChangedStateEventArgs(plugin, enabled));
             }
         }
 

Plugins/PluginManager.cs

@@ -1,8 +1,11 @@
 using CefSharp;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using TweetDuck.Core;
+using TweetDuck.Data;
 using TweetDuck.Plugins.Enums;
 using TweetDuck.Plugins.Events;
 using TweetDuck.Resources;
@@ -19,33 +22,45 @@ namespace TweetDuck.Plugins{
         public string PathCustomPlugins => Path.Combine(rootPath, "user");
 
         public IEnumerable<Plugin> Plugins => plugins;
+        public IEnumerable<InjectedHTML> NotificationInjections => bridge.NotificationInjections;
+
         public PluginConfig Config { get; }
-        public PluginBridge Bridge { get; }
         
         public event EventHandler<PluginErrorEventArgs> Reloaded;
         public event EventHandler<PluginErrorEventArgs> Executed;
-        public event EventHandler<PluginChangedStateEventArgs> PluginChangedState;
 
         private readonly string rootPath;
         private readonly string configPath;
+        private readonly PluginBridge bridge;
 
         private readonly HashSet<Plugin> plugins = new HashSet<Plugin>();
         private readonly Dictionary<int, Plugin> tokens = new Dictionary<int, Plugin>();
         private readonly Random rand = new Random();
 
+        private ITweetDeckBrowser mainBrowser;
+
         public PluginManager(string rootPath, string configPath){
             this.rootPath = rootPath;
             this.configPath = configPath;
 
             this.Config = new PluginConfig();
-            this.Bridge = new PluginBridge(this);
+            this.bridge = new PluginBridge(this);
 
             Config.Load(configPath);
-            Config.InternalPluginChangedState += Config_InternalPluginChangedState;
+            Config.PluginChangedState += Config_PluginChangedState;
         }
 
-        private void Config_InternalPluginChangedState(object sender, PluginChangedStateEventArgs e){
+        public void Register(ITweetDeckBrowser browser, PluginEnvironment environment, bool asMainBrowser = false){
-            PluginChangedState?.Invoke(this, e);
+            browser.OnFrameLoaded(frame => ExecutePlugins(frame, environment));
+            browser.RegisterBridge("$TDP", bridge);
+
+            if (asMainBrowser){
+                mainBrowser = browser;
+            }
+        }
+
+        private void Config_PluginChangedState(object sender, PluginChangedStateEventArgs e){
+            mainBrowser?.ExecuteFunction("TDPF_setPluginState", e.Plugin, e.IsEnabled);
             Config.Save(configPath);
         }
 
@@ -57,6 +72,24 @@ namespace TweetDuck.Plugins{
             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?.ExecuteFunction("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)){
@@ -115,7 +148,7 @@ namespace TweetDuck.Plugins{
             Reloaded?.Invoke(this, new PluginErrorEventArgs(loadErrors));
         }
 
-        public void ExecutePlugins(IFrame frame, PluginEnvironment environment){
+        private void ExecutePlugins(IFrame frame, PluginEnvironment environment){
             if (!HasAnyPlugin(environment)){
                 return;
             }

Program.cs

@@ -20,7 +20,7 @@ namespace TweetDuck{
         public const string BrandName = "TweetDuck";
         public const string Website = "https://tweetduck.chylex.com";
 
-        public const string VersionTag = "1.12.5";
+        public const string VersionTag = "1.13.1";
 
         public static readonly bool IsPortable = File.Exists("makeportable");
 
@@ -129,7 +129,9 @@ namespace TweetDuck{
             }
             
             BrowserCache.RefreshTimer();
+
             CefSharpSettings.WcfEnabled = false;
+            CefSharpSettings.LegacyJavascriptBindingEnabled = true;
 
             CefSettings settings = new CefSettings{
                 UserAgent = BrowserUtils.HeaderUserAgent,

Properties/Resources.Designer.cs

@@ -99,5 +99,15 @@ namespace TweetDuck.Properties {
                 return ((System.Drawing.Icon)(obj));
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] spinner {
+            get {
+                object obj = ResourceManager.GetObject("spinner", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
     }
 }

Properties/Resources.resx

@@ -130,4 +130,7 @@
   <data name="icon_tray_new" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon-tray-new.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="spinner" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\spinner.apng;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>

README.md

@@ -12,10 +12,9 @@ The program was built using Visual Studio 2017. Before opening the solution, ple
 * **Desktop development with C++**
   * VC++ 2017 v141 toolset
 
-After opening the solution, download the following NuGet packages by right-clicking on the solution and selecting **Restore NuGet Packages**, or manually running these commands in the **Package Manager Console**:
+After opening the solution, download the following NuGet packages by right-clicking on the solution and selecting **Restore NuGet Packages**, or manually running this command in the **Package Manager Console**:
 ```
-PM> Install-Package CefSharp.WinForms -Version 63.0.0-pre01 -Source https://www.myget.org/F/cefsharp/api/v3/index.json
+PM> Install-Package CefSharp.WinForms -Version 64.0.0-CI2508 -Source https://www.myget.org/F/cefsharp/api/v3/index.json
-PM> Install-Package Microsoft.VC120.CRT.JetBrains
 ```
 
 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.

Resources/Plugins/.debug/browser.js

@@ -42,6 +42,14 @@ enabled(){
           col.model.setHasSound(prevSound);
         }, 1);
       }
+      
+      // ========================
+      // D key - trigger debugger
+      // ========================
+      
+      else if (e.keyCode === 68){
+        debugger;
+      }
     }
   };
 }

Resources/Plugins/edit-design/.meta

@@ -8,7 +8,7 @@ Edit layout & design
 chylex
 
 [version]
-1.2
+1.2.4
 
 [website]
 https://tweetduck.chylex.com

Resources/Plugins/edit-design/browser.js

@@ -23,6 +23,8 @@ enabled(){
   
   this.firstTimeLoad = null;
   
+  var me = this;
+  
   // modal dialog loading
   $TDP.readFileRoot(this.$token, "modal.html").then(contents => {
     this.htmlModal = contents;
@@ -126,7 +128,7 @@ enabled(){
       let itemEditDesign = $('<li class="is-selectable"><a href="#" data-action>Edit layout &amp; design</a></li>');
       itemEditDesign.insertAfter(itemTD);
       
-      itemEditDesign.on("click", "a", this.openEditDesignDialog);
+      itemEditDesign.on("click", "a", this.configure.bind(this));
       
       itemEditDesign.hover(function(){
         $(this).addClass("is-selected");
@@ -137,8 +139,6 @@ enabled(){
   };
   
   // modal dialog setup
-  var me = this;
-  
   var updateKey = function(key, value){
     me.config[key] = value;
     
@@ -148,7 +148,7 @@ enabled(){
     }, 1); // delays the slight lag caused by saving and reinjection
   };
   
-  var customDesignModal = TD.components.BaseModal.extend(function(){
+  this.customDesignModal = TD.components.BaseModal.extend(function(){
     let modal = $("#td-design-plugin-modal");
     this.setAndShowContainer(modal, false);
     
@@ -238,7 +238,12 @@ enabled(){
     });
     
     // THEMES
-    let selectedTheme = me.config.themeOverride || TD.settings.getTheme();
+    let selectedTheme = TD.settings.getTheme();
+    
+    if (selectedTheme === "dark" && me.config.themeOverride === "black"){
+      selectedTheme = me.config.themeOverride;
+    }
+    
     modal.find("[data-td-theme='"+selectedTheme+"']").prop("checked", true);
     
     modal.find("[data-td-theme]").change(function(){
@@ -275,8 +280,6 @@ enabled(){
     }
   });
   
-  this.openEditDesignDialog = () => new customDesignModal();
-  
   // animation optimization
   this.optimizations = null;
   this.optimizationTimer = null;
@@ -381,19 +384,26 @@ enabled(){
     this.css.insert("html[data-td-font] { font-size: "+this.config.fontSize+" !important }");
     this.css.insert(".avatar { border-radius: "+this.config.avatarRadius+"% !important }");
     
+    let currentTheme = TD.settings.getTheme();
+    
+    if (currentTheme === "dark" && this.config.themeOverride){
+      currentTheme = this.config.themeOverride;
+    }
+    
     let notificationScrollbarColor = null;
     
     if (this.config.themeColorTweaks){
-      switch(TD.settings.getTheme()){
+      switch(currentTheme){
-        case "dark":
+        case "black":
-          if (this.config.themeOverride === "black"){
           this.css.insert(".app-content, .app-columns-container { background-color: #444448 !important }");
           this.css.insert(".column-drag-handle { opacity: 0.5 !important }");
           this.css.insert(".column-drag-handle:hover { opacity: 1 !important }");
           this.css.insert(".scroll-styled-v:not(.scroll-alt)::-webkit-scrollbar-thumb:not(:hover), .scroll-styled-h:not(.scroll-alt)::-webkit-scrollbar-thumb:not(:hover) { background-color: #666 !important }");
           notificationScrollbarColor = "666";
-          }
+          break;
           
+        case "dark":
+          this.css.insert(".scroll-styled-v:not(.scroll-alt)::-webkit-scrollbar-track, .scroll-styled-h:not(.scroll-alt)::-webkit-scrollbar-track { border-left-color: #14171A !important }");
           break;
 
         case "light":
@@ -430,87 +440,87 @@ enabled(){
     
     if (this.config.revertIcons){
       let iconData = [
-        [ ".icon-twitter-bird", "00" ],
+        [ "twitter-bird", "00" ],
-        [ ".icon-mention", "01" ],
+        [ "mention", "01" ],
-        [ ".icon-following", "02" ],
+        [ "following", "02" ],
-        [ ".icon-message", "03" ],
+        [ "message", "03" ],
-        [ ".icon-home", "04" ],
+        [ "home", "04" ],
-        [ ".icon-hashtag", "05" ],
+        [ "hashtag", "05" ],
-        [ ".icon-reply", "06" ],
+        [ "reply", "06" ],
-        [ ".icon-favorite", "55" ],
+        [ "favorite", "55" ],
-        [ ".icon-retweet", "08" ],
+        [ "retweet", "08" ],
-        [ ".icon-drafts", "09" ],
+        [ "drafts", "09" ],
-        [ ".icon-search", "0a" ],
+        [ "search", "0a" ],
-        [ ".icon-trash", "0c" ],
+        [ "trash", "0c" ],
-        [ ".icon-close", "0d" ],
+        [ "close", "0d" ],
-        [ ".icon-arrow-r:before,.Icon--caretRight", "0e" ],
+        [ "arrow-r:before,.Icon--caretRight", "0e" ],
-        [ ".icon-arrow-l:before,.Icon--caretLeft", "0f" ],
+        [ "arrow-l:before,.Icon--caretLeft", "0f" ],
-        [ ".icon-protected", "13" ],
+        [ "protected", "13" ],
-        [ ".icon-list", "14" ],
+        [ "list", "14" ],
-        [ ".icon-camera", "15" ],
+        [ "camera", "15" ],
-        [ ".icon-more", "16" ],
+        [ "more", "16" ],
-        [ ".icon-settings", "18" ],
+        [ "settings", "18" ],
-        [ ".icon-notifications", "19" ],
+        [ "notifications", "19" ],
-        [ ".icon-user-dd", "1a" ],
+        [ "user-dd", "1a" ],
-        [ ".icon-activity", "1c" ],
+        [ "activity", "1c" ],
-        [ ".icon-trending", "1d" ],
+        [ "trending", "1d" ],
-        [ ".icon-minus", "1e" ],
+        [ "minus", "1e" ],
-        [ ".icon-plus", "1f" ],
+        [ "plus", "1f" ],
-        [ ".icon-geo", "20" ],
+        [ "geo", "20" ],
-        [ ".icon-check", "21" ],
+        [ "check", "21" ],
-        [ ".icon-schedule", "22" ],
+        [ "schedule", "22" ],
-        [ ".icon-dot", "23" ],
+        [ "dot", "23" ],
-        [ ".icon-user", "24" ],
+        [ "user", "24" ],
-        [ ".icon-content", "25" ],
+        [ "content", "25" ],
-        [ ".icon-arrow-d:before,.Icon--caretDown", "26" ],
+        [ "arrow-d:before,.Icon--caretDown", "26" ],
-        [ ".icon-arrow-u", "27" ],
+        [ "arrow-u", "27" ],
-        [ ".icon-share", "28" ],
+        [ "share", "28" ],
-        [ ".icon-info", "29" ],
+        [ "info", "29" ],
-        [ ".icon-verified", "2a" ],
+        [ "verified", "2a" ],
-        [ ".icon-translator", "2b" ],
+        [ "translator", "2b" ],
-        [ ".icon-blocked", "2c" ],
+        [ "blocked", "2c" ],
-        [ ".icon-constrain", "2d" ],
+        [ "constrain", "2d" ],
-        [ ".icon-play-video", "2e" ],
+        [ "play-video", "2e" ],
-        [ ".icon-empty", "2f" ],
+        [ "empty", "2f" ],
-        [ ".icon-clear-input", "30" ],
+        [ "clear-input", "30" ],
-        [ ".icon-compose", "31" ],
+        [ "compose", "31" ],
-        [ ".icon-mark-read", "32" ],
+        [ "mark-read", "32" ],
-        [ ".icon-arrow-r-double", "33" ],
+        [ "arrow-r-double", "33" ],
-        [ ".icon-arrow-l-double", "34" ],
+        [ "arrow-l-double", "34" ],
-        [ ".icon-follow", "35" ],
+        [ "follow", "35" ],
-        [ ".icon-image", "36" ],
+        [ "image", "36" ],
-        [ ".icon-popout", "37" ],
+        [ "popout", "37" ],
-        [ ".icon-move", "39" ],
+        [ "move", "39" ],
-        [ ".icon-compose-grid", "3a" ],
+        [ "compose-grid", "3a" ],
-        [ ".icon-compose-minigrid", "3b" ],
+        [ "compose-minigrid", "3b" ],
-        [ ".icon-compose-list", "3c" ],
+        [ "compose-list", "3c" ],
-        [ ".icon-edit", "40" ],
+        [ "edit", "40" ],
-        [ ".icon-clear-timeline", "41" ],
+        [ "clear-timeline", "41" ],
-        [ ".icon-sliders", "42" ],
+        [ "sliders", "42" ],
-        [ ".icon-custom-timeline", "43" ],
+        [ "custom-timeline", "43" ],
-        [ ".icon-compose-dm", "44" ],
+        [ "compose-dm", "44" ],
-        [ ".icon-bg-dot", "45" ],
+        [ "bg-dot", "45" ],
-        [ ".icon-user-team-mgr", "46" ],
+        [ "user-team-mgr", "46" ],
-        [ ".icon-user-switch", "47" ],
+        [ "user-switch", "47" ],
-        [ ".icon-conversation", "48" ],
+        [ "conversation", "48" ],
-        [ ".icon-dataminr", "49" ],
+        [ "dataminr", "49" ],
-        [ ".icon-link", "4a", ],
+        [ "link", "4a", ],
-        [ ".icon-flash", "50" ],
+        [ "flash", "50" ],
-        [ ".icon-pointer-u", "51" ],
+        [ "pointer-u", "51" ],
-        [ ".icon-analytics", "54" ],
+        [ "analytics", "54" ],
-        [ ".icon-heart", "55" ],
+        [ "heart", "55" ],
-        [ ".icon-calendar", "56" ],
+        [ "calendar", "56" ],
-        [ ".icon-attachment", "57" ],
+        [ "attachment", "57" ],
-        [ ".icon-play", "58" ],
+        [ "play", "58" ],
-        [ ".icon-bookmark", "59" ],
+        [ "bookmark", "59" ],
-        [ ".icon-play-badge", "60" ],
+        [ "play-badge", "60" ],
-        [ ".icon-gif-badge", "61" ],
+        [ "gif-badge", "61" ],
-        [ ".icon-poll", "62" ],
+        [ "poll", "62" ],
         
-        [ ".icon-heart-filled", "55" ],
+        [ "heart-filled", "55" ],
-        [ ".icon-retweet-filled", "08" ],
+        [ "retweet-filled", "08" ],
-        [ ".icon-list-filled", "14" ],
+        [ "list-filled", "14" ],
-        [ ".icon-user-filled", "35" ],
+        [ "user-filled", "35" ],
       ];
       
       this.icons = document.createElement("style");
@@ -522,9 +532,12 @@ enabled(){
   font-style: normal;
 }
 
-${iconData.map(entry => `#tduck ${entry[0]}:before{content:\"\\f0${entry[1]}\";font-family:_of!important}`).join("")}
+${iconData.map(entry => `#tduck .icon-${entry[0]}:before{content:\"\\f0${entry[1]}\";font-family:_of!important}`).join("")}
 
 .drawer .btn .icon, .app-header .btn .icon { line-height: 1em !important }
+.app-search-fake .icon { margin-top: -3px !important }
+#tduck .search-input-control .icon { font-size: 20px !important; top: -4px !important }
+
 .column-header .column-type-icon { bottom: 26px !important }
 .is-options-open .column-type-icon { bottom: 25px !important }
 
@@ -535,10 +548,11 @@ ${iconData.map(entry => `#tduck ${entry[0]}:before{content:\"\\f0${entry[1]}\";f
       document.head.appendChild(this.icons);
     }
     
-    if (this.config.themeOverride === "black"){
+    if (currentTheme === "black"){
       $TDP.readFileRoot(this.$token, "theme.black.css").then(contents => {
         if (this.theme){
           this.theme.element.innerHTML = contents;
+          TD.settings.setTheme("dark"); // forces refresh of notification head tag
         }
       });
     }
@@ -594,6 +608,12 @@ ${this.config.revertIcons ? `
 #tduck .icon-user-dd:before{content:"\\f01a";font-family:_of!important}
 ` : ``}
 
+${currentTheme === "black" ? `
+html.dark a, html.dark a:hover, html.dark a:focus, html.dark a:active { color: #8bd }
+#tduck-show-thread { color: #8bd !important }
+.quoted-tweet { border-color: #292f33 !important }
+` : ``}
+
 ${notificationScrollbarColor ? `
 .scroll-styled-v::-webkit-scrollbar-thumb:not(:hover), .scroll-styled-h::-webkit-scrollbar-thumb:not(:hover) { background-color: #${notificationScrollbarColor} !important }
 ` : ``}
@@ -638,7 +658,7 @@ ready(){
   
   TD.components.GlobalSettings.prototype.switchTab = function(tab){
     if (tab === "tdp-edit-design"){
-      me.openEditDesignDialog();
+      me.configure();
     }
     else{
       return me.prevFuncSettingsSwitchTab.apply(this, arguments);
@@ -646,6 +666,10 @@ ready(){
   };
 }
 
+configure(){
+  new this.customDesignModal();
+}
+
 disabled(){
   if (this.css){
     this.css.remove();

Resources/Plugins/edit-design/modal.html

@@ -168,6 +168,10 @@
     height: 380px;
   }
   
+  #edit-design-panel .mdl-inner {
+    padding-top: 0;
+  }
+  
   #edit-design-panel-inner-cols {
     padding: 0 6px;
   }

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

@@ -1,27 +1,30 @@
 html.dark{color:#e1e8ed}
 html.dark .is-inverted-dark .stream-item{background-color:#fff}
-html.dark body{background-color:#1c6399}
-html.dark body:before{background-image:radial-gradient(circle,#1c6399,#274256)}
 html.dark::selection{background:#e1e8ed;color:#111}
 html.dark a{color:#8bd}
 html.dark a:hover,html.dark a:focus,html.dark a:active{color:#8bd}
 html.dark .txt-mute{color:#8899a6}
 html.dark .txt-mute a:not(:hover):not(:focus){color:#8899a6}
 html.dark .txt-mute-text-only{color:#8899a6}
-html.dark .txt-twitter-darker-gray{color:#657786}
+html.dark .color-twitter-darker-gray{color:#657786}
-html.dark .txt-twitter-gray{color:#AAB8C2}
+html.dark .color-twitter-white{color:#fff}
-html.dark .txt-twitter-emphasis-gray{color:#AAB8C2}
+html.dark .color-twitter-gray{color:#AAB8C2}
-html.dark .txt-twitter-blue{color:#1DA1F2}
+html.dark .color-twitter-blue{color:#1DA1F2}
-html.dark .bg-twitter-blue{background-color:#1DA1F2}
+html.dark .color-twitter-red{color:#E0245E}
-html.dark .txt-twitter-red{color:#E0245E}
+html.dark .color-twitter-deep-red{color:#A01744}
-html.dark .txt-twitter-green{color:#17BF63}
+html.dark .color-twitter-green{color:#17BF63}
-html.dark .txt-twitter-deep-black{color:#14171A}
+html.dark .color-twitter-deep-green{color:#008951}
-html.dark .txt-twitter-dark-black{color:#292F33}
+html.dark .color-twitter-deep-black{color:#14171A}
-html.dark .txt-twitter-dark-gray{color:#8899A6}
+html.dark .color-twitter-dark-black{color:#292F33}
-html.dark .bg-twitter-deep-black{background-color:#292F33}
+html.dark .color-twitter-dark-gray{color:#8899A6}
-html.dark .txt-twitter-black{color:#000}
+html.dark .color-twitter-black{color:#000}
-html.dark .txt-twitter-yellow{color:#FFAD1F}
+html.dark .color-twitter-yellow{color:#FFAD1F}
-html.dark .bg-twitter-lightest-gray{background-color:#F5F8FA}
+html.dark .bg-color-twitter-white{background-color:#fff}
+html.dark .bg-color-twitter-blue{background-color:#1DA1F2}
+html.dark .bg-color-twitter-medium-blue{background-color:#1DA1F2}
+html.dark .bg-color-twitter-faded-yellow{background-color:#FFE8B6}
+html.dark .bg-color-twitter-deep-black{background-color:#292F33}
+html.dark .bg-color-twitter-lightest-gray{background-color:#F5F8FA}
 html.dark .link-hover-override:hover .link-hover-target{color:#8bd}
 html.dark .scroll-styled-v::-webkit-scrollbar-track,html.dark .scroll-styled-h::-webkit-scrollbar-track{border-left:1px solid #292F33}
 html.dark .scroll-styled-v::-webkit-scrollbar-thumb,html.dark .scroll-styled-h::-webkit-scrollbar-thumb{background-color:#657786}
@@ -85,7 +88,7 @@ html.dark .icon-twitter-blue-color{color:#2b7bb9}
 html.dark .btn:hover{color:#1DA1F2;background-color:#292F33}
 html.dark .btn:focus{color:#1DA1F2;background-color:#292F33;box-shadow:0 0 0 1px #fff,0 0 0 3px #71C9F8}
 html.dark .btn:active,html.dark .btn.is-selected{color:#1DA1F2;background-color:#292F33}
-html.dark .btn[disabled],html.dark .btn[disabled]:hover,html.dark .btn[disabled]:active,html.dark .btn.is-disabled,html.dark .btn.is-disabled:hover,html.dark .btn.is-disabled:focus,html.dark .btn.is-disabled:active{border:1px solid #1DA1F2;color:#1DA1F2}
+html.dark .btn[disabled],html.dark .btn[disabled]:hover,html.dark .btn[disabled]:active,html.dark .btn.is-disabled,html.dark .btn.is-disabled:hover,html.dark .btn.is-disabled:focus,html.dark .btn.is-disabled:active{color:#1DA1F2}
 html.dark .btn-on-dark:focus{box-shadow:0 0 0 1px #292F33,0 0 0 3px #71C9F8}
 html.dark .mdl-content .btn-on-dark:focus{box-shadow:0 0 0 1px #fff,0 0 0 3px #71C9F8}
 html.dark .is-inverted-dark .btn:hover,html.dark .is-inverted-dark .btn:focus,html.dark .is-inverted-dark .btn:active,html.dark .is-inverted-dark .btn.is-selected{background-color:#F2F9FF}
@@ -287,7 +290,7 @@ html.dark .app-nav-tab{color:#8899A6}
 html.dark .app-nav-tab:hover{color:#fff}
 html.dark .app-nav-tab.is-selected{color:#292f33}
 html.dark .app-nav-tab.is-selected:hover{color:#292f33}
-html.dark .attach-compose-buttons .tweet-button{background-color:#485865}
+html.dark .attach-compose-buttons .tweet-button{background-color:#485865!important}
 html.dark .with-nav-border-t:before{border-top:1px solid #777}
 html.dark .app-search-input,html.dark .app-search-fake{background-color:#14171A;color:#aab8c2;box-shadow:inset 0 1px 1px rgba(17,17,17,0.5)}
 html.dark .app-search-input::-webkit-input-placeholder{color:#aab8c2}
@@ -428,9 +431,8 @@ html.dark .s-minimal .mdl-header{border-bottom:1px solid #e1e8ed}
 html.dark .lst-launcher .top-row{border-bottom:1px solid #e1e8ed}
 html.dark .lst-launcher .is-disabled a,html.dark .lst-launcher .is-disabled a:hover,html.dark .lst-launcher .is-disabled a:focus,html.dark .lst-launcher .is-disabled a:active{background:#fff}
 html.dark .lst-launcher a:hover,html.dark .lst-launcher a:focus,html.dark .lst-launcher a:active{background:#f2f9ff;border:1px solid #bbddf5}
-html.dark .lst-profile a,html.dark .lst-profile a:hover,html.dark .lst-profile a:focus,html.dark .lst-profile a:active{border:1px solid #ccd6dd;color:#657786}
+html.dark .lst-profile a,html.dark .lst-profile a:hover,html.dark .lst-profile a:focus,html.dark .lst-profile a:active{color:#657786}
 html.dark .mdl-col-settings{background-color:#fff;border-left:1px solid #E1E8ED}
-html.dark .lst-profile.l-grouped{border-top:1px solid #ccd6dd}
 html.dark .mdl-links{color:#8899a6}
 html.dark .mdl-links a{color:#8899a6}
 html.dark .mdl-account-shared-warning .mdl-content{background:#fff}
@@ -844,3 +846,7 @@ html.dark .DatePicker.date-unselected .is-rangeStart,html.dark .DatePicker.date-
 html.dark .DatePicker.date-unselected .is-rangeStart:hover,html.dark .DatePicker.date-unselected .is-rangeEnd:hover{background-color:#005091;color:#ffffff}
 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 .tweet>.color-twitter-blue{color:#8bd!important}

Resources/Plugins/emoji-keyboard/.meta

@@ -9,7 +9,7 @@ Emoji keyboard
 chylex
 
 [version]
-1.4.2
+1.4.3
 
 [website]
 https://tweetduck.chylex.com

Resources/Plugins/emoji-keyboard/browser.js

@@ -32,6 +32,7 @@ enabled(){
   
   this.css = window.TDPF_createCustomStyle(this);
   this.css.insert(".emoji-keyboard { position: absolute; width: 15.35em; background-color: white; border-radius: 1px; font-size: 24px; z-index: 9999 }");
+  this.css.insert(".emoji-keyboard-popup-btn .icon { vertical-align: -4px !important }");
   
   this.css.insert(".emoji-keyboard-list { height: 10.14em; padding: 0.1em; box-sizing: border-box; overflow-y: auto }");
   this.css.insert(".emoji-keyboard-list .separator { height: 26px }");
@@ -49,7 +50,7 @@ enabled(){
   
   // layout
   
-  var buttonHTML = '<button class="needsclick btn btn-on-blue txt-left padding-v--9 emoji-keyboard-popup-btn"><i class="icon icon-heart"></i></button>';
+  var buttonHTML = '<button class="needsclick btn btn-on-blue txt-left padding-v--6 padding-h--8 emoji-keyboard-popup-btn"><i class="icon icon-heart"></i></button>';
   
   this.prevComposeMustache = TD.mustaches["compose/docked_compose.mustache"];
   TD.mustaches["compose/docked_compose.mustache"] = TD.mustaches["compose/docked_compose.mustache"].replace('<div class="cf margin-t--12 margin-b--30">', '<div class="cf margin-t--12 margin-b--30">'+buttonHTML);

Resources/Plugins/templates/.meta

@@ -8,7 +8,7 @@ Templates
 chylex
 
 [version]
-1.0.3
+1.0.4
 
 [website]
 https://tweetduck.chylex.com

Resources/Plugins/templates/browser.js

@@ -34,7 +34,7 @@ enabled(){
   
   // button
   
-  var buttonHTML = '<button class="manage-templates-btn needsclick btn btn-on-blue full-width txt-left margin-b--12 padding-v--9"><i class="icon icon-bookmark"></i><span class="label padding-ls">Manage templates</span></button>';
+  var buttonHTML = '<button class="manage-templates-btn needsclick btn btn-on-blue full-width txt-left margin-b--12 padding-v--6 padding-h--12"><i class="icon icon-bookmark"></i><span class="label padding-ls">Manage templates</span></button>';
   
   this.prevComposeMustache = TD.mustaches["compose/docked_compose.mustache"];
   TD.mustaches["compose/docked_compose.mustache"] = TD.mustaches["compose/docked_compose.mustache"].replace('<div class="js-tweet-type-button">', buttonHTML+'<div class="js-tweet-type-button">');

Resources/Scripts/code.js

@@ -157,7 +157,6 @@
           thumbSizeClass: "media-size-medium"
         }));
         
-        html.css("border", "0");
         html.find("footer").last().remove(); // apparently withTweetActions breaks for certain tweets, nice
         html.find(".js-quote-detail").removeClass("is-actionable margin-b--8"); // prevent quoted tweets from changing the cursor and reduce bottom margin
         
@@ -186,6 +185,12 @@
           return $(this).text() === "Show this thread";
         }).first().each(function(){
           this.id = "tduck-show-thread";
+          
+          let moveBefore = html.find(".tweet-body > .js-media, .tweet-body > .js-media-preview-container, .quoted-tweet");
+          
+          if (moveBefore){
+            $(this).css("margin-top", "5px").removeClass("margin-b--5").parent("span").detach().insertBefore(moveBefore);
+          }
         });
         
         let type = tweet.getChirpType();
@@ -194,6 +199,9 @@
           html.find(".js-user-actions-menu").parent().remove();
           html.find(".account-bio").removeClass("padding-t--5").css("padding-top", "2px");
         }
+        else if ((type.startsWith("favorite") || type.startsWith("retweet")) && tweet.isAboutYou()){
+          html.children().first().addClass("td-notification-padded");
+        }
         else if (type.includes("list_member")){
           html.find(".activity-header").css("margin-top", "2px");
           html.find(".avatar").first().css("margin-bottom", "0");
@@ -286,12 +294,14 @@
       
       tags.push("<style type='text/css'>");
       tags.push("body { background: "+getClassStyleProperty("column", "background-color")+" !important }"); // set background color
+      tags.push("body::before { content: none !important }"); // remove background gradient
+      tags.push(".column { background: transparent !important }"); // remove background color from columns
       tags.push("a[data-full-url] { word-break: break-all !important }"); // break long urls
       tags.push(".media-item, .media-preview { border-radius: 1px !important }"); // square-ify media
       tags.push(".quoted-tweet { border-radius: 0 !important }"); // square-ify quoted tweets
-      tags.push(".tweet-context .nbfc { text-overflow: ellipsis !important; white-space: nowrap !important }"); // force ellipsis on long usernames
+      tags.push(".activity-header.has-source-avatar { margin-bottom: 4px !important }"); // tweak distance between avatar and text
-      tags.push(".activity-header { align-items: center !important; margin-bottom: 4px !important }"); // tweak alignment of avatar and text in notifications
+      tags.push(".activity-header .tweet-timestamp { line-height: unset !important }"); // fix timestamp position
-      tags.push(".activity-header .tweet-timestamp { line-height: unset !important }"); // fix timestamp position in notifications
+      tags.push(".activity-header .icon-user-filled { vertical-align: sub !important; }"); // fix follow icon position
       tags.push("#tduck-show-thread { display: inline-block !important; cursor: pointer }");
       
       if (fontSizeName === "smallest"){
@@ -532,7 +542,8 @@
     let me = $(this)[0];
     
     if (me.classList.contains("js-media-image-link") && highlightedTweetObj){
-      let media = (highlightedTweetObj.quotedTweet || highlightedTweetObj).getMedia().find(media => media.mediaId === me.getAttribute("data-media-entity-id"));
+      let tweet = highlightedTweetObj.hasMedia() ? highlightedTweetObj : highlightedTweetObj.quotedTweet;
+      let media = tweet.getMedia().find(media => media.mediaId === me.getAttribute("data-media-entity-id"));
       
       if ((media.isVideo && media.service === "twitter") || media.isAnimatedGif){
         $TD.setLastRightClickInfo("video", media.chooseVideoVariant().url);
@@ -584,22 +595,15 @@
   // Block: Update highlighted column and tweet for context menu and other functionality.
   //
   (function(){
-    var lastTweet = "";
-    
     const updateHighlightedColumn = function(ele){
       highlightedColumnEle = ele;
       highlightedColumnObj = ele ? TD.controller.columnManager.get(ele.attr("data-column")) : null;
       return !!highlightedColumnObj;
     };
     
-    const updateHighlightedTweet = function(ele, obj, tweetUrl, quoteUrl, authors, imageList){
+    const updateHighlightedTweet = function(ele, obj){
       highlightedTweetEle = ele;
       highlightedTweetObj = obj;
-      
-      if (lastTweet !== tweetUrl){
-        $TD.setLastHighlightedTweet(tweetUrl, quoteUrl, authors, imageList);
-        lastTweet = tweetUrl;
-      }
     };
     
     const processMedia = function(chirp){
@@ -615,6 +619,19 @@
       
       mouseleave: function(){
         updateHighlightedColumn(null);
+      },
+      
+      contextmenu: function(){
+        let tweet = highlightedTweetObj;
+        
+        if (tweet && tweet.chirpType === TD.services.ChirpBase.TWEET){
+          let tweetUrl = tweet.getChirpURL();
+          let quoteUrl = tweet.quotedTweet ? tweet.quotedTweet.getChirpURL() : "";
+          let chirpAuthors = tweet.quotedTweet ? [ tweet.getMainUser().screenName, tweet.quotedTweet.getMainUser().screenName ].join(";") : tweet.getMainUser().screenName;
+          let chirpImages = tweet.hasImage() ? processMedia(tweet) : tweet.quotedTweet && tweet.quotedTweet.hasImage() ? processMedia(tweet.quotedTweet) : "";
+          
+          $TD.setRightClickedChirp(tweetUrl || "", quoteUrl || "", chirpAuthors, chirpImages);
+        }
       }
     });
     
@@ -626,21 +643,11 @@
         let tweet = highlightedColumnObj.findChirp(me.attr("data-tweet-id")) || highlightedColumnObj.findChirp(me.attr("data-key"));
         return if !tweet;
         
-        if (tweet.chirpType === TD.services.ChirpBase.TWEET){
+        updateHighlightedTweet(me, tweet);
-          let tweetUrl = tweet.getChirpURL();
-          let quoteUrl = tweet.quotedTweet ? tweet.quotedTweet.getChirpURL() : "";
-          let authors = tweet.quotedTweet ? [ tweet.getMainUser().screenName, tweet.quotedTweet.getMainUser().screenName ].join(";") : tweet.getMainUser().screenName;
-          let imageList = tweet.quotedTweet && tweet.quotedTweet.hasImage() ? processMedia(tweet.quotedTweet) : tweet.hasImage() ? processMedia(tweet) : "";
-          
-          updateHighlightedTweet(me, tweet, tweetUrl || "", quoteUrl || "", authors, imageList);
-        }
-        else{
-          updateHighlightedTweet(me, tweet, "", "", "", "");
-        }
       },
       
       mouseleave: function(){
-        updateHighlightedTweet(null, null, "", "", "", "");
+        updateHighlightedTweet(null, null);
       }
     });
   })();
@@ -918,26 +925,15 @@
   })();
   
   //
-  // Block: Swap shift key functionality for selecting accounts, and refocus the textbox afterwards.
+  // Block: Refocus the textbox after switching accounts.
   //
   onAppReady.push(function(){
-    const onAccountClick = function(e){
+    const refocusInput = function(){
-      if ($TDX.switchAccountSelectors){
-        e.shiftKey = !e.shiftKey;
-      }
-      
       $(".js-compose-text", ".js-docked-compose").focus();
     };
     
-    $(".js-account-list", ".js-docked-compose").delegate(".js-account-item", "click", onAccountClick);
+    $(".js-account-list", ".js-docked-compose").delegate(".js-account-item", "click", function(e){
-    
+      setTimeout(refocusInput, 0);
-    return if !ensurePropertyExists(TD, "components", "AccountSelector", "prototype", "refreshPostingAccounts");
-    
-    TD.components.AccountSelector.prototype.refreshPostingAccounts = appendToFunction(TD.components.AccountSelector.prototype.refreshPostingAccounts, function(){
-      if (!this.$node.attr("td-account-selector-hook")){
-        this.$node.attr("td-account-selector-hook", "1");
-        this.$node.delegate(".js-account-item", "click", onAccountClick);
-      }
     });
   });
   

Resources/Scripts/introduction.follow.js

@@ -1,91 +0,0 @@
-(function($, $TD){
-  $(document).one("TD.ready", function(){
-    let css = $(`
-<style>
-#td-introduction-modal {
-  display: block;
-}
-
-#td-introduction-modal .mdl {
-  width: 90%;
-  max-width: 626px;
-  height: 244px;
-}
-
-#td-introduction-modal .mdl-header-title {
-  cursor: default;
-}
-
-#td-introduction-modal .mdl-content {
-  padding: 4px 16px 0;
-  overflow-y: auto;
-}
-
-#td-introduction-modal p {
-  margin: 12px 0;
-  font-size: 1.4rem;
-}
-
-#td-introduction-modal p strong {
-  font-weight: normal;
-  text-shadow: 0 0 #000;
-}
-
-#td-introduction-modal footer {
-  padding: 10px 0;
-}
-</style>`).appendTo(document.head);
-    
-    let ele = $(`
-<div id="td-introduction-modal" class="ovl">
-  <div class="mdl is-inverted-dark">
-    <header class="mdl-header">
-      <h3 class="mdl-header-title">Quick message</h3>
-      <a href="#" class="mdl-dismiss link-normal-dark"><i class="icon icon-close"></i></a>
-    </header>
-    <div class="mdl-inner">
-      <div class="mdl-content">
-        <p>Hi! Unfortunately the old <strong>@TryTweetDuck</strong> account was suspended.</p>
-        <p>If you were following it before, or if you want to keep up with the latest news and updates about TweetDuck, please <a id="td-introduction-follow" href="#">follow @TryMyAwesomeApp</a>.</p>
-        <p>Thanks for your support!</p>
-      </div>
-      <footer class="txt-right">
-        <button class="btn btn-positive"><span class="label">Close</span</button>
-      </footer>
-    </div>
-  </div>
-</div>`).appendTo(".js-app");
-    
-    let tdUser = null;
-    let loadTweetDuckUser = (onSuccess, onError) => {
-      if (tdUser !== null){
-        onSuccess(tdUser);
-      }
-      else{
-        TD.controller.clients.getPreferredClient().getUsersByIds([ "957608948189880320" ], users => onSuccess(users[0]), onError);
-      }
-    };
-    
-    loadTweetDuckUser(user => tdUser = user);
-    
-    ele.find("#td-introduction-follow").click(function(){
-      loadTweetDuckUser(user => {
-        $(document).trigger("uiShowFollowFromOptions", { userToFollow: user });
-        
-        $(".js-modals-container").find("header a[rel='user']").each(function(){
-          this.outerHTML = "TweetDuck";
-        });
-      }, () => {
-        alert("An error occurred when retrieving the account information.");
-      });
-    });
-    
-    ele.find("button, a.mdl-dismiss").click(function(){
-      ele.fadeOut(200, function(){
-        $TD.onIntroductionClosed(false, false);
-        ele.remove();
-        css.remove();
-      });
-    });
-  });
-})($, $TD);

Resources/Scripts/introduction.js

@@ -12,6 +12,10 @@
   height: 328px;
 }
 
+#td-introduction-modal .mdl-inner {
+  padding-top: 0;
+}
+
 #td-introduction-modal .mdl-header-title {
   cursor: default;
 }

Resources/Scripts/notification.js

@@ -14,9 +14,11 @@
   };
   
   //
-  // Block: Hook into links to bypass default open function and t.co.
+  // Block: Hook into links to bypass default open function and t.co, and handle skipping notification when opening links.
   //
-  addEventListener(links, "click", function(e){
+  (function(){
+    const onLinkClick = function(e){
+      if (e.button === 0 || e.button === 1){
         let ele = e.currentTarget;
 
         $TD.openBrowser(ele.hasAttribute("data-full-url") ? ele.getAttribute("data-full-url") : ele.getAttribute("href"));
@@ -29,7 +31,12 @@
             $TD.loadNextNotification();
           }
         }
-  });
+      }
+    };
+    
+    addEventListener(links, "click", onLinkClick);
+    addEventListener(links, "auxclick", onLinkClick);
+  })();
   
   //
   // Block: Allow bypassing of t.co in context menus.

Resources/Scripts/plugins.browser.js

@@ -35,6 +35,10 @@
     install(plugin){
       this.installed.push(plugin);
       
+      if (typeof plugin.obj.configure === "function"){
+        $TDP.setConfigurable(plugin.obj.$token);
+      }
+      
       if (!this.isDisabled(plugin)){
         plugin.obj.enabled();
         this.runWhenReady(plugin);
@@ -93,6 +97,13 @@
     window.TD_PLUGINS.setState(window.TD_PLUGINS.findObject(identifier), enable);
   };
   
+  //
+  // Block: Setup a function to trigger plugin configuration.
+  //
+  window.TDPF_configurePlugin = function(identifier){
+    window.TD_PLUGINS.findObject(identifier).obj.configure();
+  };
+  
   //
   // Block: Setup a function to reload the page.
   //

Resources/Scripts/styles/browser.css

@@ -38,7 +38,7 @@
 /* Square-ify stuff */
 /********************/
 
-.btn, .mdl, .mdl-content, .app-search-fake, .app-search-input, .popover, .lst-modal, .tooltip-inner {
+button, .btn, .mdl, .mdl-content, .popover, .lst-modal, .tooltip-inner {
   border-radius: 1px !important;
 }
 
@@ -46,7 +46,7 @@
   border-radius: 1px !important;
 }
 
-.compose-text-container, .compose-reply-tweet, .compose-message-recipient-input-container, .compose-message-recipient, .compose-media-bar-holder, .media-grid-container, .js-quote-tweet-holder {
+.tweet-button, .app-search-fake, .app-search-input, .compose-text-container, .compose-reply-tweet, .compose-message-recipient-input-container, .compose-message-recipient, .compose-media-bar-holder, .media-grid-container, .js-quote-tweet-holder, .detail-view-inline-text {
   border-radius: 0 !important;
 }
 
@@ -54,6 +54,52 @@
   border-radius: 0 !important;
 }
 
+/***********************************/
+/* Revert various design decisions */
+/***********************************/
+
+button {
+  font-weight: normal !important;
+}
+
+.tweet-button:not(:hover) {
+  background-color: #2B7BB9 !important;
+  border-color: #2B7BB9 !important;
+}
+
+#tduck .js-compose-scroller button.full-width {
+  padding: 7px 10px !important;
+}
+
+#tduck .js-compose-scroller button.full-width > i {
+  font-size: 20px !important;
+  vertical-align: -5px !important;
+}
+
+.js-show-drawer {
+  text-align: left;
+}
+
+.js-show-drawer .icon-compose {
+  display: inline-block !important;
+}
+
+.js-show-drawer span::before {
+  content: "New ";
+}
+
+#tduck .app-header .search-input-control input {
+  font-size: 13px !important;
+}
+
+#tduck .app-header .search-input-perform-search {
+  right: 8px !important;
+}
+
+.js-account-safeguard-checkbox, .js-account-safeguard-checkbox label {
+  margin-bottom: 0 !important;
+}
+
 /***********************/
 /* Hide TweetDeck logo */
 /***********************/
@@ -94,23 +140,16 @@
 /* Tweak notification layout and design */
 /****************************************/
 
-.tweet-context .nbfc {
+.activity-header.has-source-avatar {
-  text-overflow: ellipsis !important;
+  margin-bottom: 4px !important
-  white-space: nowrap !important;
-}
-
-.activity-header {
-  align-items: center !important;
-  margin-bottom: 4px !important;
 }
 
 .activity-header .tweet-timestamp {
   line-height: unset !important;
 }
 
-.account-bio.padding-t--5 {
+.activity-header .icon-user-filled {
-  /* follow notification padding */
+  vertical-align: sub !important;
-  padding-top: 2px !important;
 }
 
 html[data-td-theme='light'] .stream-item:not(:hover) .js-user-actions-menu {
@@ -125,6 +164,23 @@ html[data-td-theme='dark'] .stream-item:not(:hover) .js-user-actions-menu {
   opacity: 0.25;
 }
 
+.stream-item[data-key^="favorite"] .has-source-avatar .item-img, .stream-item[data-key^="retweet"] .has-source-avatar .item-img {
+  position: absolute;
+  left: 21px;
+  top: 48px;
+  width: 0 !important;
+}
+
+.stream-item[data-key^="favorite"] .has-source-avatar > .nbfc, .stream-item[data-key^="retweet"] .has-source-avatar > .nbfc {
+  margin-left: 46px;
+  line-height: unset !important;
+}
+
+.stream-item[data-key^="favorite"] .has-source-avatar > .nbfc > .avatar, .stream-item[data-key^="retweet"] .has-source-avatar > .nbfc > .avatar {
+  position: absolute;
+  margin-left: -34px;
+}
+
 /***********************/
 /* Tweaks for features */
 /***********************/
@@ -173,6 +229,12 @@ a[data-full-url] {
   vertical-align: -10% !important;
 }
 
+#tduck .nav-user-info .hide-condensed {
+  /* move login account info */
+  margin: 0px !important;
+  padding-left: 2px !important;
+}
+
 html[data-td-font='smallest'] .sprite-verified-mini {
   /* fix cut off badge when zoomed in */
   width: 13px !important;
@@ -209,6 +271,27 @@ html[data-td-font='smallest'] .tweet-detail-wrapper .badge-verified:before {
   cursor: pointer;
 }
 
+.inline-reply .btn-square, .rpl-actions .btn-square {
+  /* remove effects from buttons under reply input... this keeps happening for some stupid reason */
+  background: transparent !important;
+  box-shadow: none !important;
+}
+
+.js-add-to-customtimeline-input {
+  /* the custom timeline input shadow is behaving super weird when focused */
+  box-shadow: none !important;
+}
+
+#tduck .js-follow-button .icon-follow {
+  /* follow icon is too small which makes it aliased and misaligned */
+  font-size: 17px !important;
+}
+
+.js-follow-button .following-text, .js-follow-button .unfollow-text {
+  /* unfollow button has a border for some reason */
+  border-width: 0 !important;
+}
+
 /***************************************************************/
 /* Fix glaring visual issues that twitter hasn't fixed yet smh */
 /***************************************************************/
@@ -287,3 +370,15 @@ html[data-td-font='smallest'] .tweet-detail-wrapper .badge-verified:before {
 .column-type-message.is-shifted-1 .username {
   vertical-align: bottom;
 }
+
+/******************************/
+/* Hide unused Settings items */
+/******************************/
+
+#show-startup-notifications, #show-startup-notifications + span {
+  display: none;
+}
+
+#auto-play-gifs, #auto-play-gifs + span {
+  display: none;
+}

Resources/Scripts/styles/notification.css

@@ -2,10 +2,6 @@
 /* General */
 /***********/
 
-body:before {
-  content: none !important;
-}
-
 body {
   overflow-y: auto !important;
 }
@@ -34,13 +30,34 @@ body {
   vertical-align: -10% !important;
 }
 
+/************************************/
+/* Favorite & retweet notifications */
+/************************************/
+
+.td-notification-padded .item-img {
+  position: absolute;
+  left: 21px;
+  top: 48px;
+  width: 0 !important;
+}
+
+.td-notification-padded .activity-header > .nbfc {
+  margin-left: 46px;
+  line-height: unset !important;
+}
+
+.td-notification-padded .activity-header > .nbfc > .avatar {
+  position: absolute;
+  margin-left: -34px;
+}
+
 /*********/
 /* Media */
 /*********/
 
 .media-size-medium {
   max-height: 240px;
-  height: calc(100vh - 16px) !important;
+  height: calc(100vh - 20px) !important;
   border-radius: 1px !important;
 }
 
@@ -49,6 +66,11 @@ body {
 }
 
 #tduck .js-media, #tduck .js-media-preview-container {
+  padding-top: 1px;
+  margin-bottom: 2px !important;
+}
+
+#tduck .js-quote-detail .js-media, #tduck .js-quote-detail .js-media-preview-container {
   margin-bottom: 0 !important;
 }
 

Resources/Scripts/twitter.js

@@ -4,7 +4,7 @@
   //
   var injectCSS = function(){
     if (!document.head){
-      setTimeout(injectCSS, 25);
+      setTimeout(injectCSS, 5);
       return;
     }
     
@@ -15,7 +15,7 @@
       style.sheet.insertRule(rule, 0);
     };
     
-    addRule("body { overflow: hidden !important; background-color: #1c6399 !important; }"); // remove scrollbar and change background
+    addRule("body { overflow: hidden !important; }"); // remove scrollbar
     addRule(".page-canvas { box-shadow: 0 0 150px rgba(255, 255, 255, 0.3) !important; }"); // change page box shadow
     addRule(".topbar { display: none !important; }"); // hide top bar
     

Resources/Scripts/update.js

@@ -300,6 +300,13 @@
     });
   };
   
+  //
+  // Block: Check updates on startup.
+  //
+  $(document).one("TD.ready", function(){
+    $TDU.triggerUpdateCheck();
+  });
+  
   //
   // Block: Setup global functions.
   //

TweetDuck.csproj

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="packages\CefSharp.WinForms.63.0.0-pre01\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.63.0.0-pre01\build\CefSharp.WinForms.props')" />
+  <Import Project="packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.props')" />
-  <Import Project="packages\CefSharp.Common.63.0.0-pre01\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.63.0.0-pre01\build\CefSharp.Common.props')" />
+  <Import Project="packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.props')" />
+  <Import Project="packages\cef.redist.x86.3.3282.1731\build\cef.redist.x86.props" Condition="Exists('packages\cef.redist.x86.3.3282.1731\build\cef.redist.x86.props')" />
+  <Import Project="packages\cef.redist.x64.3.3282.1731\build\cef.redist.x64.props" Condition="Exists('packages\cef.redist.x64.3.3282.1731\build\cef.redist.x64.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -105,6 +107,8 @@
     <Compile Include="Core\Handling\RequestHandlerBase.cs" />
     <Compile Include="Core\Handling\RequestHandlerBrowser.cs" />
     <Compile Include="Core\Handling\ResourceHandlerNotification.cs" />
+    <Compile Include="Core\ITweetDeckBrowser.cs" />
+    <Compile Include="Core\Management\ContextInfo.cs" />
     <Compile Include="Core\Notification\Example\FormNotificationExample.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -247,6 +251,7 @@
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Core\Notification\Screenshot\TweetScreenshotManager.cs" />
+    <Compile Include="Data\ResourceLink.cs" />
     <Compile Include="Data\Serialization\FileSerializer.cs" />
     <Compile Include="Data\InjectedHTML.cs" />
     <Compile Include="Data\Serialization\ITypeConverter.cs" />
@@ -354,6 +359,7 @@
     <None Include="Resources\icon-tray-new.ico" />
     <None Include="Resources\icon-tray.ico" />
     <None Include="Resources\PostBuild.ps1" />
+    <None Include="Resources\spinner.apng" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\Plugins\" />
@@ -361,7 +367,6 @@
   <ItemGroup>
     <Content Include="Resources\avatar.png" />
     <Content Include="Resources\Scripts\code.js" />
-    <Content Include="Resources\Scripts\introduction.follow.js" />
     <Content Include="Resources\Scripts\introduction.js" />
     <Content Include="Resources\Scripts\notification.js" />
     <Content Include="Resources\Scripts\pages\error.html" />
@@ -394,8 +399,6 @@
 del "$(TargetDir)LICENSE.txt"
 ren "$(TargetDir)LICENSE.md" "LICENSE.txt"
 xcopy "$(ProjectDir)bld\Resources\CEFSHARP-LICENSE.txt" "$(TargetDir)" /Y
-xcopy "$(ProjectDir)packages\Microsoft.VC120.CRT.JetBrains.12.0.21005.2\DotFiles\msvcp120.dll" "$(TargetDir)" /Y
-xcopy "$(ProjectDir)packages\Microsoft.VC120.CRT.JetBrains.12.0.21005.2\DotFiles\msvcr120.dll" "$(TargetDir)" /Y
 
 rmdir "$(TargetDir)scripts" /S /Q
 mkdir "$(TargetDir)scripts"
@@ -434,19 +437,17 @@ powershell -ExecutionPolicy Unrestricted -File "$(ProjectDir)Resources\PostBuild
   <PropertyGroup>
     <PreBuildEvent>powershell Get-Process TweetDuck.Browser -ErrorAction SilentlyContinue ^| Where-Object {$_.Path -eq '$(TargetDir)TweetDuck.Browser.exe'} ^| Stop-Process; Exit 0</PreBuildEvent>
   </PropertyGroup>
-  <Import Project="packages\cef.redist.x64.3.3239.1716\build\cef.redist.x64.targets" Condition="Exists('packages\cef.redist.x64.3.3239.1716\build\cef.redist.x64.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\cef.redist.x64.3.3239.1716\build\cef.redist.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.3.3239.1716\build\cef.redist.x64.targets'))" />
+    <Error Condition="!Exists('packages\cef.redist.x64.3.3282.1731\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.3.3282.1731\build\cef.redist.x64.props'))" />
-    <Error Condition="!Exists('packages\cef.redist.x86.3.3239.1716\build\cef.redist.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.3.3239.1716\build\cef.redist.x86.targets'))" />
+    <Error Condition="!Exists('packages\cef.redist.x86.3.3282.1731\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.3.3282.1731\build\cef.redist.x86.props'))" />
-    <Error Condition="!Exists('packages\CefSharp.Common.63.0.0-pre01\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.63.0.0-pre01\build\CefSharp.Common.props'))" />
+    <Error Condition="!Exists('packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.props'))" />
-    <Error Condition="!Exists('packages\CefSharp.Common.63.0.0-pre01\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.63.0.0-pre01\build\CefSharp.Common.targets'))" />
+    <Error Condition="!Exists('packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.targets'))" />
-    <Error Condition="!Exists('packages\CefSharp.WinForms.63.0.0-pre01\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.63.0.0-pre01\build\CefSharp.WinForms.props'))" />
+    <Error Condition="!Exists('packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.props'))" />
-    <Error Condition="!Exists('packages\CefSharp.WinForms.63.0.0-pre01\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.63.0.0-pre01\build\CefSharp.WinForms.targets'))" />
+    <Error Condition="!Exists('packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.targets'))" />
   </Target>
-  <Import Project="packages\cef.redist.x86.3.3239.1716\build\cef.redist.x86.targets" Condition="Exists('packages\cef.redist.x86.3.3239.1716\build\cef.redist.x86.targets')" />
+  <Import Project="packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.targets')" />
-  <Import Project="packages\CefSharp.Common.63.0.0-pre01\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.63.0.0-pre01\build\CefSharp.Common.targets')" />
+  <Import Project="packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.targets" Condition="Exists('packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.targets')" />
-  <Import Project="packages\CefSharp.WinForms.63.0.0-pre01\build\CefSharp.WinForms.targets" Condition="Exists('packages\CefSharp.WinForms.63.0.0-pre01\build\CefSharp.WinForms.targets')" />
 </Project>

TweetDuck.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.16
+VisualStudioVersion = 15.0.27130.2027
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetDuck", "TweetDuck.csproj", "{2389A7CD-E0D3-4706-8294-092929A33A2D}"
 EndProject
@@ -20,7 +20,6 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{2389A7CD-E0D3-4706-8294-092929A33A2D}.Debug|x86.ActiveCfg = Debug|x86
 		{2389A7CD-E0D3-4706-8294-092929A33A2D}.Debug|x86.Build.0 = Debug|x86
-		{2389A7CD-E0D3-4706-8294-092929A33A2D}.Debug|x86.Deploy.0 = Debug|x86
 		{2389A7CD-E0D3-4706-8294-092929A33A2D}.Release|x86.ActiveCfg = Release|x86
 		{2389A7CD-E0D3-4706-8294-092929A33A2D}.Release|x86.Build.0 = Release|x86
 		{B10B0017-819E-4F71-870F-8256B36A26AA}.Debug|x86.ActiveCfg = Debug|x86
@@ -42,4 +41,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {43936FDB-CBF7-493D-A99A-24B516646584}
+	EndGlobalSection
 EndGlobal

Updates/UpdateHandler.cs

@@ -1,36 +1,36 @@
 using CefSharp;
-using CefSharp.WinForms;
 using System;
 using System.Windows.Forms;
+using TweetDuck.Core;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
 using TweetDuck.Resources;
 
 namespace TweetDuck.Updates{
     sealed class UpdateHandler{
-        private readonly ChromiumWebBrowser browser;
+        public const int CheckCodeUpdatesDisabled = -1;
+        public const int CheckCodeNotOnTweetDeck = -2;
+
+        private readonly ITweetDeckBrowser browser;
         private readonly UpdaterSettings settings;
 
         public event EventHandler<UpdateEventArgs> UpdateAccepted;
         public event EventHandler<UpdateEventArgs> UpdateDismissed;
         public event EventHandler<UpdateEventArgs> CheckFinished;
 
-        private int lastEventId;
+        private ushort lastEventId;
         private UpdateInfo lastUpdateInfo;
 
-        public UpdateHandler(ChromiumWebBrowser browser, UpdaterSettings settings){
+        public UpdateHandler(ITweetDeckBrowser browser, UpdaterSettings settings){
             this.browser = browser;
             this.settings = settings;
 
-            browser.FrameLoadEnd += browser_FrameLoadEnd;
+            browser.OnFrameLoaded(OnFrameLoaded);
-            browser.RegisterAsyncJsObject("$TDU", new Bridge(this));
+            browser.RegisterBridge("$TDU", new Bridge(this));
         }
 
-        private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
+        private void OnFrameLoaded(IFrame frame){
-            if (e.Frame.IsMain && TwitterUtils.IsTweetDeckWebsite(e.Frame)){
+            ScriptLoader.ExecuteFile(frame, "update.js");
-                ScriptLoader.ExecuteFile(e.Frame, "update.js");
-                Check(false);
-            }
         }
 
         public int Check(bool force){
@@ -39,11 +39,15 @@ namespace TweetDuck.Updates{
                     settings.DismissedUpdate = null;
                 }
                 
-                browser.ExecuteScriptAsync("TDUF_runUpdateCheck", ++lastEventId, Program.VersionTag, settings.DismissedUpdate ?? string.Empty, settings.AllowPreReleases);
+                if (!browser.IsTweetDeckWebsite){
+                    return CheckCodeNotOnTweetDeck;
+                }
+
+                browser.ExecuteFunction("TDUF_runUpdateCheck", (int)unchecked(++lastEventId), Program.VersionTag, settings.DismissedUpdate ?? string.Empty, settings.AllowPreReleases);
                 return lastEventId;
             }
 
-            return 0;
+            return CheckCodeUpdatesDisabled;
         }
 
         public void BeginUpdateDownload(Form ownerForm, UpdateInfo updateInfo, Action<UpdateInfo> onSuccess){

bld/gen_full.iss

@@ -4,9 +4,11 @@
 #define MyAppName "TweetDuck"
 #define MyAppPublisher "chylex"
 #define MyAppURL "https://tweetduck.chylex.com"
+#define MyAppShortURL "https://td.chylex.com"
 #define MyAppExeName "TweetDuck.exe"
 
 #define MyAppVersion GetFileVersion("..\bin\x86\Release\TweetDuck.exe")
+#define VCRedistLink "releases/download/1.13/vc_redist.x86.exe"
 
 [Setup]
 AppId={{8C25A716-7E11-4AAD-9992-8B5D0C78AE06}
@@ -30,6 +32,8 @@ SolidCompression=yes
 InternalCompressLevel=max
 MinVersion=0,6.1
 
+#include <idp.iss>
+
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
@@ -56,36 +60,44 @@ Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\GPUCache"
 
 [Code]
 var UpdatePath: String;
+var ForceRedistPrompt: String;
 
 function TDGetNetFrameworkVersion: Cardinal; forward;
+function TDIsVCMissing: Boolean; forward;
+procedure TDInstallVCRedist; forward;
 
 { Check .NET Framework version on startup, ask user if they want to proceed if older than 4.5.2. }
 function InitializeSetup: Boolean;
 begin
   UpdatePath := ExpandConstant('{param:UPDATEPATH}')
+  ForceRedistPrompt := ExpandConstant('{param:PROMPTREDIST}')
   
-  if TDGetNetFrameworkVersion() >= 379893 then
+  if (TDGetNetFrameworkVersion() < 379893) and (MsgBox('{#MyAppName} requires .NET Framework 4.5.2 or newer,'+#13+#10+'please visit {#MyAppShortURL} for a download link.'+#13+#10+#13+#10'Do you want to proceed with the setup anyway?', mbCriticalError, MB_YESNO or MB_DEFBUTTON2) = IDNO) then
-  begin
-    Result := True;
-    Exit;
-  end;
-  
-  if (MsgBox('{#MyAppName} requires .NET Framework 4.5.2 or newer,'+#13+#10+'please download it from {#MyAppURL}'+#13+#10+#13+#10'Do you want to proceed with the setup anyway?', mbCriticalError, MB_YESNO or MB_DEFBUTTON2) = IDNO) then
   begin
     Result := False;
     Exit;
   end;
   
+  if (TDIsVCMissing() or (ForceRedistPrompt = '1')) and (MsgBox('Microsoft Visual C++ 2015 appears to be missing, would you like to automatically install it?', mbConfirmation, MB_YESNO) = IDYES) then
+  begin
+    idpAddFile('https://github.com/{#MyAppPublisher}/{#MyAppName}/{#VCRedistLink}', ExpandConstant('{tmp}\{#MyAppName}.VC.exe'));
+  end;
+  
   Result := True;
 end;
 
-{ Set the installation path if updating. }
+{ Set the installation path if updating, and prepare download plugin if there are any files to download. }
 procedure InitializeWizard();
 begin
   if (UpdatePath <> '') then
   begin
     WizardForm.DirEdit.Text := UpdatePath;
   end;
+  
+  if (idpFilesCount <> 0) then
+  begin
+    idpDownloadAfter(wpReady);
+  end;
 end;
 
 { Skip the install path selection page if running from an update installer. }
@@ -94,15 +106,21 @@ begin
   Result := (PageID = wpSelectDir) and (UpdatePath <> '')
 end;
 
-{ Check for an old TweetDeck profile and show a warning before installation. }
+{ Check the desktop icon task if not updating. }
+procedure CurPageChanged(CurPageID: Integer);
+begin
+  if CurPageID = wpSelectTasks then
+  begin
+    WizardForm.TasksList.Checked[WizardForm.TasksList.Items.Count-1] := (UpdatePath = '');
+  end;
+end;
+
+{ Install VC++ if downloaded. }
 procedure CurStepChanged(CurStep: TSetupStep);
 begin
   if CurStep = ssInstall then
   begin
-    if DirExists(ExpandConstant('{localappdata}\twitter\TweetDeck')) then
+    TDInstallVCRedist();
-    begin
-      MsgBox('Detected a profile from an old TweetDeck installation, you may uninstall the old client to free up some space.', mbInformation, MB_OK)
-    end;
   end;
 end;
 
@@ -145,3 +163,65 @@ begin
   
   Result := 0;
 end;
+
+{ Check if Visual C++ 2015 or 2017 is installed. }
+function TDIsVCMissing: Boolean;
+var Keys: TArrayOfString;
+var Index: Integer;
+var Key: String;
+var DisplayName: String;
+
+begin
+  if RegGetSubkeyNames(HKEY_LOCAL_MACHINE, 'Software\Classes\Installer\Dependencies', Keys) then
+  begin
+    for Index := 0 to GetArrayLength(Keys)-1 do
+    begin
+      Key := Keys[Index];
+      
+      if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'Software\Classes\Installer\Dependencies\'+Key, 'DisplayName', DisplayName) then
+      begin
+        if (Pos('Microsoft Visual C++', DisplayName) = 1) and (Pos('(x86)', DisplayName) > 1) and ((Pos(' 2015 ', DisplayName) > 1) or (Pos(' 2017 ', DisplayName) > 1)) then
+        begin
+          Result := False;
+          Exit;
+        end;
+      end;
+    end;
+  end;
+  
+  Result := True;
+end;
+
+{ Run the Visual C++ installer if downloaded. }
+procedure TDInstallVCRedist;
+var InstallFile: String;
+var ResultCode: Integer;
+
+begin
+  InstallFile := ExpandConstant('{tmp}\{#MyAppName}.VC.exe')
+  
+  if FileExists(InstallFile) then
+  begin
+    WizardForm.ProgressGauge.Style := npbstMarquee;
+    
+    try
+      if Exec(InstallFile, '/passive /norestart', '', SW_SHOW, ewWaitUntilTerminated, ResultCode) then
+      begin
+        if ResultCode <> 0 then
+        begin
+          DeleteFile(InstallFile);
+          Exit;
+        end;
+      end else
+      begin
+        MsgBox('Could not run the Visual C++ installer, please visit https://github.com/{#MyAppPublisher}/{#MyAppName}/{#VCRedistLink} and download the latest version manually. Error: '+SysErrorMessage(ResultCode), mbCriticalError, MB_OK);
+        
+        DeleteFile(InstallFile);
+        Exit;
+      end;
+    finally
+      WizardForm.ProgressGauge.Style := npbstNormal;
+      DeleteFile(InstallFile);
+    end;
+  end;
+end;

bld/gen_port.iss

@@ -4,9 +4,11 @@
 #define MyAppName "TweetDuck"
 #define MyAppPublisher "chylex"
 #define MyAppURL "https://tweetduck.chylex.com"
+#define MyAppShortURL "https://td.chylex.com"
 #define MyAppExeName "TweetDuck.exe"
 
 #define MyAppVersion GetFileVersion("..\bin\x86\Release\TweetDuck.exe")
+#define VCRedistLink "releases/download/1.13/vc_redist.x86.exe"
 
 [Setup]
 AppId={{8C25A716-7E11-4AAD-9992-8B5D0C78AE06}
@@ -30,6 +32,8 @@ SolidCompression=yes
 InternalCompressLevel=max
 MinVersion=0,6.1
 
+#include <idp.iss>
+
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
@@ -42,36 +46,44 @@ Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChang
 
 [Code]
 var UpdatePath: String;
+var ForceRedistPrompt: String;
 
 function TDGetNetFrameworkVersion: Cardinal; forward;
+function TDIsVCMissing: Boolean; forward;
+procedure TDInstallVCRedist; forward;
 
 { Check .NET Framework version on startup, ask user if they want to proceed if older than 4.5.2. }
 function InitializeSetup: Boolean;
 begin
   UpdatePath := ExpandConstant('{param:UPDATEPATH}')
+  ForceRedistPrompt := ExpandConstant('{param:PROMPTREDIST}')
   
-  if TDGetNetFrameworkVersion() >= 379893 then
+  if (TDGetNetFrameworkVersion() < 379893) and (MsgBox('{#MyAppName} requires .NET Framework 4.5.2 or newer,'+#13+#10+'please visit {#MyAppShortURL} for a download link.'+#13+#10+#13+#10'Do you want to proceed with the setup anyway?', mbCriticalError, MB_YESNO or MB_DEFBUTTON2) = IDNO) then
-  begin
-    Result := True;
-    Exit;
-  end;
-  
-  if (MsgBox('{#MyAppName} requires .NET Framework 4.5.2 or newer,'+#13+#10+'please download it from {#MyAppURL}'+#13+#10+#13+#10'Do you want to proceed with the setup anyway?', mbCriticalError, MB_YESNO or MB_DEFBUTTON2) = IDNO) then
   begin
     Result := False;
     Exit;
   end;
   
+  if (TDIsVCMissing() or (ForceRedistPrompt = '1')) and (MsgBox('Microsoft Visual C++ 2015 appears to be missing, would you like to automatically install it?', mbConfirmation, MB_YESNO) = IDYES) then
+  begin
+    idpAddFile('https://github.com/{#MyAppPublisher}/{#MyAppName}/{#VCRedistLink}', ExpandConstant('{tmp}\{#MyAppName}.VC.exe'));
+  end;
+  
   Result := True;
 end;
 
-{ Set the installation path if updating. }
+{ Set the installation path if updating, and prepare download plugin if there are any files to download. }
 procedure InitializeWizard();
 begin
   if (UpdatePath <> '') then
   begin
     WizardForm.DirEdit.Text := UpdatePath;
   end;
+  
+  if (idpFilesCount <> 0) then
+  begin
+    idpDownloadAfter(wpReady);
+  end;
 end;
 
 { Skip the install path selection page if running from an update installer. }
@@ -80,6 +92,24 @@ begin
   Result := (PageID = wpSelectDir) and (UpdatePath <> '')
 end;
 
+{ Install VC++ if downloaded, and create a 'makeportable' file for portable installs. }
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+  if CurStep = ssInstall then
+  begin
+    TDInstallVCRedist();
+  end else if CurStep = ssPostInstall then
+  begin
+    while not SaveStringToFile(ExpandConstant('{app}\makeportable'), '', False) do
+    begin
+      if MsgBox('Could not create a ''makeportable'' file in the installation folder. If the file is not present, the installation will not be fully portable.', mbCriticalError, MB_RETRYCANCEL) <> IDRETRY then
+      begin
+        break;
+      end;
+    end;
+  end;
+end;
+
 { Return DWORD value containing the build version of .NET Framework. }
 function TDGetNetFrameworkVersion: Cardinal;
 var FrameworkVersion: Cardinal;
@@ -94,17 +124,64 @@ begin
   Result := 0;
 end;
 
-{ Create a 'makeportable' file if running in portable mode. }
+{ Check if Visual C++ 2015 or 2017 is installed. }
-procedure CurStepChanged(CurStep: TSetupStep);
+function TDIsVCMissing: Boolean;
+var Keys: TArrayOfString;
+var Index: Integer;
+var Key: String;
+var DisplayName: String;
+
 begin
-  if CurStep = ssPostInstall then
+  if RegGetSubkeyNames(HKEY_LOCAL_MACHINE, 'Software\Classes\Installer\Dependencies', Keys) then
   begin
-    while not SaveStringToFile(ExpandConstant('{app}\makeportable'), '', False) do
+    for Index := 0 to GetArrayLength(Keys)-1 do
     begin
-      if MsgBox('Could not create a ''makeportable'' file in the installation folder. If the file is not present, the installation will not be fully portable.', mbCriticalError, MB_RETRYCANCEL) <> IDRETRY then
+      Key := Keys[Index];
+      
+      if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'Software\Classes\Installer\Dependencies\'+Key, 'DisplayName', DisplayName) then
       begin
-        break;
+        if (Pos('Microsoft Visual C++', DisplayName) = 1) and (Pos('(x86)', DisplayName) > 1) and ((Pos(' 2015 ', DisplayName) > 1) or (Pos(' 2017 ', DisplayName) > 1)) then
+        begin
+          Result := False;
+          Exit;
         end;
       end;
     end;
   end;
+  
+  Result := True;
+end;
+
+{ Run the Visual C++ installer if downloaded. }
+procedure TDInstallVCRedist;
+var InstallFile: String;
+var ResultCode: Integer;
+
+begin
+  InstallFile := ExpandConstant('{tmp}\{#MyAppName}.VC.exe')
+  
+  if FileExists(InstallFile) then
+  begin
+    WizardForm.ProgressGauge.Style := npbstMarquee;
+    
+    try
+      if Exec(InstallFile, '/passive /norestart', '', SW_SHOW, ewWaitUntilTerminated, ResultCode) then
+      begin
+        if ResultCode <> 0 then
+        begin
+          DeleteFile(InstallFile);
+          Exit;
+        end;
+      end else
+      begin
+        MsgBox('Could not run the Visual C++ installer, please visit https://github.com/{#MyAppPublisher}/{#MyAppName}/{#VCRedistLink} and download the latest version manually. Error: '+SysErrorMessage(ResultCode), mbCriticalError, MB_OK);
+        
+        DeleteFile(InstallFile);
+        Exit;
+      end;
+    finally
+      WizardForm.ProgressGauge.Style := npbstNormal;
+      DeleteFile(InstallFile);
+    end;
+  end;
+end;

bld/gen_upd.iss

@@ -4,6 +4,7 @@
 #define MyAppName "TweetDuck"
 #define MyAppPublisher "chylex"
 #define MyAppURL "https://tweetduck.chylex.com"
+#define MyAppShortURL "https://td.chylex.com"
 #define MyAppExeName "TweetDuck.exe"
 
 #define MyAppID "8C25A716-7E11-4AAD-9992-8B5D0C78AE06"
@@ -59,7 +60,10 @@ Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\Cache"
 Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\GPUCache"
 
 [InstallDelete]
+Type: files; Name: "{app}\msvcp120.dll"
+Type: files; Name: "{app}\msvcr120.dll"
 Type: files; Name: "{app}\TweetLib.Audio.dll"
+Type: filesandordirs; Name: "{app}\scripts"
 Type: filesandordirs; Name: "{app}\plugins\official"
 Type: files; Name: "{app}\locales\am.pak"
 Type: files; Name: "{app}\locales\ar.pak"
@@ -145,13 +149,7 @@ begin
     idpAddFile('https://github.com/{#MyAppPublisher}/{#MyAppName}/releases/download/'+TDGetAppVersionClean()+'/'+TDGetFullDownloadFileName(), ExpandConstant('{tmp}\{#MyAppName}.Full.exe'));
   end;
   
-  if TDGetNetFrameworkVersion() >= 379893 then
+  if (TDGetNetFrameworkVersion() < 379893) and (MsgBox('{#MyAppName} requires .NET Framework 4.5.2 or newer,'+#13+#10+'please visit {#MyAppShortURL} for a download link.'+#13+#10+#13+#10'Do you want to proceed with the setup anyway?', mbCriticalError, MB_YESNO or MB_DEFBUTTON2) = IDNO) then
-  begin
-    Result := True;
-    Exit;
-  end;
-  
-  if (MsgBox('{#MyAppName} requires .NET Framework 4.5.2 or newer,'+#13+#10+'please download it from {#MyAppURL}'+#13+#10+#13+#10'Do you want to proceed with the setup anyway?', mbCriticalError, MB_YESNO or MB_DEFBUTTON2) = IDNO) then
   begin
     Result := False;
     Exit;
@@ -272,8 +270,15 @@ end;
 { Return whether the version of the installed libcef.dll library matches internal one. }
 function TDIsMatchingCEFVersion: Boolean;
 var CEFVersion: String;
+var TmpTDVersion: String;
 
 begin
+  if GetVersionNumbersString(UpdatePath+'TweetDuck.exe', TmpTDVersion) and (CompareStr(TmpTDVersion, '1.13.0.0') = 0) then
+  begin
+    Result := False;
+    Exit;
+  end;
+  
   Result := (GetVersionNumbersString(UpdatePath+'libcef.dll', CEFVersion) and (CompareStr(CEFVersion, '{#CefVersion}') = 0))
 end;
 

packages.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.redist.x64" version="3.3239.1716" targetFramework="net452" xmlns="" />
+  <package id="cef.redist.x64" version="3.3282.1731" targetFramework="net452" xmlns="" />
-  <package id="cef.redist.x86" version="3.3239.1716" targetFramework="net452" xmlns="" />
+  <package id="cef.redist.x86" version="3.3282.1731" targetFramework="net452" xmlns="" />
-  <package id="CefSharp.Common" version="63.0.0-pre01" targetFramework="net452" xmlns="" />
+  <package id="CefSharp.Common" version="64.0.0-CI2508" targetFramework="net452" xmlns="" />
-  <package id="CefSharp.WinForms" version="63.0.0-pre01" targetFramework="net452" xmlns="" />
+  <package id="CefSharp.WinForms" version="64.0.0-CI2508" targetFramework="net452" xmlns="" />
   <package id="Microsoft.VC120.CRT.JetBrains" version="12.0.21005.2" targetFramework="net452" xmlns="" />
 </packages>

subprocess/Program.cs

@@ -3,7 +3,7 @@ using CefSharp.BrowserSubprocess;
 
 namespace TweetDuck.Browser{
     static class Program{
-        internal const string Version = "1.4.0.0";
+        internal const string Version = "1.4.1.0";
 
         private static int Main(string[] args){
             SubProcess.EnableHighDPISupport();

subprocess/TweetDuck.Browser.csproj

@@ -24,9 +24,9 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CefSharp.BrowserSubprocess.Core, Version=63.0.0.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=x86">
+    <Reference Include="CefSharp.BrowserSubprocess.Core, Version=64.0.0.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\CefSharp.Common.63.0.0-pre01\CefSharp\x86\CefSharp.BrowserSubprocess.Core.dll</HintPath>
+      <HintPath>..\packages\CefSharp.Common.64.0.0-CI2508\CefSharp\x86\CefSharp.BrowserSubprocess.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

tests/Core/TestTwitterUtils.cs

@@ -21,7 +21,19 @@ namespace UnitTests.Core{
             Assert.IsFalse(TwitterUtils.RegexAccount.IsMatch("http://twitter.com/"));
             Assert.IsFalse(TwitterUtils.RegexAccount.IsMatch("http://twitter.com/chylexmc/status"));
             Assert.IsFalse(TwitterUtils.RegexAccount.IsMatch("http://nottwitter.com/chylexmc"));
+            Assert.IsFalse(TwitterUtils.RegexAccount.IsMatch("https://twitter.com/chylexmc?"));
             Assert.IsFalse(TwitterUtils.RegexAccount.IsMatch("www.twitter.com/chylexmc"));
+            
+            Assert.IsFalse(TwitterUtils.RegexAccount.IsMatch("https://twitter.com/signup"));
+            Assert.IsFalse(TwitterUtils.RegexAccount.IsMatch("https://twitter.com/tos"));
+            Assert.IsFalse(TwitterUtils.RegexAccount.IsMatch("https://twitter.com/privacy"));
+            Assert.IsFalse(TwitterUtils.RegexAccount.IsMatch("https://twitter.com/search"));
+            Assert.IsFalse(TwitterUtils.RegexAccount.IsMatch("https://twitter.com/search?query"));
+            Assert.IsFalse(TwitterUtils.RegexAccount.IsMatch("https://twitter.com/search-home"));
+            Assert.IsFalse(TwitterUtils.RegexAccount.IsMatch("https://twitter.com/search-advanced"));
+            
+            Assert.IsTrue(TwitterUtils.RegexAccount.IsMatch("https://twitter.com/tosser"));
+            Assert.IsTrue(TwitterUtils.RegexAccount.IsMatch("https://twitter.com/searching"));
         }
 
         [TestMethod]