Merge branch 'master' of https://github.com/chylex/TweetDuck

Core/Handling/RequestHandlerBrowser.cs

@@ -42,6 +42,9 @@ public override bool OnBeforeBrowse(IWebBrowser browserControl, IBrowser browser
                 BlockNextUserNavUrl = string.Empty;
                 return block;
             }
+            else if (request.TransitionType.HasFlag(TransitionType.ForwardBack) && TwitterUrls.IsTweetDeck(frame.Url)){
+                return true;
+            }
 
             return base.OnBeforeBrowse(browserControl, browser, frame, request, userGesture, isRedirect);
         }

Core/Notification/FormNotificationMain.cs

@@ -166,7 +166,16 @@ private void timerDisplayDelay_Tick(object sender, EventArgs e){
         }
 
         private void timerHideProgress_Tick(object sender, EventArgs e){
-            if (Bounds.Contains(Cursor.Position) || FreezeTimer || ContextMenuOpen){
+            bool isCursorInside = Bounds.Contains(Cursor.Position);
+
+            if (isCursorInside){
+                StartMouseHook();
+            }
+            else{
+                StopMouseHook(false);
+            }
+
+            if (isCursorInside || FreezeTimer || ContextMenuOpen){
                 return;
             }
 
@@ -257,7 +266,6 @@ protected void PrepareAndDisplayWindow(){
             }
             
             MoveToVisibleLocation();
-            StartMouseHook();
         }
 
         protected virtual void OnNotificationReady(){

Resources/Scripts/code.js

@@ -1457,6 +1457,24 @@
     };
   }
   
+  //
+  // Block: Add missing languages for Bing Translator (Bengali, Icelandic, Tagalog, Tamil, Telugu, Urdu).
+  //
+  if (ensurePropertyExists(TD, "languages", "getSupportedTranslationSourceLanguages")){
+    const newCodes = [ "bn", "is", "tl", "ta", "te", "ur" ];
+    const codeSet = new Set(TD.languages.getSupportedTranslationSourceLanguages());
+    
+    for(const lang of newCodes){
+      codeSet.add(lang);
+    }
+    
+    const codeList = [...codeSet];
+    
+    TD.languages.getSupportedTranslationSourceLanguages = function(){
+      return codeList;
+    };
+  }
+  
   //
   // Block: Setup global function to refresh all columns.
   //

Resources/Scripts/styles/twitter.css

@@ -40,78 +40,50 @@
 /* General styling */
 /*******************/
 
+* {
+  border-radius: 0 !important;
+}
+
 body {
-  /* remove scrollbar */
   overflow: hidden !important;
 }
 
-.page-canvas {
-  /* tweak page shadow */
+.page-canvas, div[tweetduck-login-wrapper], body.ResponsiveLayout > div.PageContainer > div.Section {
   box-shadow: 0 0 150px rgba(255, 255, 255, 0.3) !important;
 }
 
 .topbar, .TopNav {
-  /* hide top bar */
   display: none !important;
 }
-    
-.page-canvas, .buttons, .btn, input {
-  /* sharpen borders */
-  border-radius: 0 !important;
-}
 
 input {
-  /* tweak input padding */
   padding: 5px 8px 4px !important;
 }
 
 button[type='submit'] {
-  /* style buttons */
   border: 1px solid rgba(0, 0, 0, 0.3) !important;
-  border-radius: 0 !important;
 }
 
-.tweetduck-helper {
-  /* custom login text */
+/****************************/
+/* General per-page styling */
+/****************************/
+
+html[mobile][login] div[tweetduck-login-wrapper] {
+  /* vertically center page & fix colors */
+  margin-top: calc(50vh - 200px);
+  padding: 26px 1.1vw;
+  background-color: white;
+}
+
+html[mobile][login] #tweetduck-helper:hover {
+  text-decoration: underline;
+}
+
+html[desktop][login] #tweetduck-helper {
   margin-top: 15px !important;
   font-weight: bold !important;
 }
 
-/********************************************/
-/* Fix min width and margins on logout page */
-/********************************************/
-
-html[logout] .page-canvas {
-  width: auto !important;
-  max-width: 888px;
-}
-
-html[logout] .signout-wrapper {
-  width: auto !important;
-  margin: 0 auto !important;
-}
-
-html[logout] .signout {
-  margin: 60px 0 54px !important;
-}
-
-html[logout] .buttons {
-  padding-bottom: 0 !important;
-}
-
-/*******************************/
-/* General logout page styling */
-/*******************************/
-
-html[logout] .aside {
-  /* hide elements around dialog */
-  display: none;
-}
-
-html[logout] .buttons button, html[logout] .buttons a {
-  /* style buttons */
-  display: inline-block;
-  margin: 0 4px !important;
+html[mobile][logout] div[role="button"] {
   border: 1px solid rgba(0, 0, 0, 0.3) !important;
-  border-radius: 0 !important;
 }

Resources/Scripts/twitter.js

@@ -1,4 +1,8 @@
 (function(){
+  const isLogin = location.pathname === "/login";
+  const isLogout = location.pathname === "/logout";
+  const isMobile = location.host === "mobile.twitter.com";
+  
   //
   // Function: Inject custom CSS into the page.
   //
@@ -14,51 +18,119 @@
     
     document.head.appendChild(link);
     
-    if (location.pathname === "/logout"){
+    if (isLogin){
+      document.documentElement.setAttribute("login", "");
+    }
+    else if (isLogout){
       document.documentElement.setAttribute("logout", "");
     }
+    
+    if (isMobile){
+      document.documentElement.setAttribute("mobile", "");
+    }
+    else{
+      document.documentElement.setAttribute("desktop", "");
+    }
   };
   
   setTimeout(injectCSS, 1);
   
   //
-  // Block: Make login page links external.
+  // Function: Trigger once element exists.
   //
-  if (location.pathname === "/login"){
-    document.addEventListener("DOMContentLoaded", function(){
-      const openLinkExternally = function(e){
-        let href = e.currentTarget.getAttribute("href");
-        $TD.openBrowser(href[0] === '/' ? location.origin+href : href);
-        
-        e.preventDefault();
-        e.stopPropagation();
-      };
+  const triggerWhenExists = function(query, callback){
+    let id = window.setInterval(function(){
+      let ele = document.querySelector(query);
       
-      for(let link of document.getElementsByTagName("A")){
-        link.addEventListener("click", openLinkExternally);
+      if (ele && callback(ele)){
+        window.clearInterval(id);
       }
-      
-      let texts = document.querySelector(".page-canvas > div:last-child");
-      
-      if (texts){
-        texts.insertAdjacentHTML("beforeend", `<p class="tweetduck-helper">Used the TweetDuck app before? <a href="#">Import your profile »</a></p>`);
-        
-        texts.querySelector(".tweetduck-helper > a").addEventListener("click", function(){
-          $TD.openProfileImport();
+    }, 5);
+  };
+  
+  //
+  // Block: Add profile import button & enable custom styling, make page links external on old login page.
+  //
+  if (isLogin){
+    document.addEventListener("DOMContentLoaded", function(){
+      if (isMobile){
+        triggerWhenExists("main h1", function(heading){
+          heading.parentNode.setAttribute("tweetduck-login-wrapper", "");
+          return true;
         });
+        
+        triggerWhenExists("a[href='/i/flow/signup']", function(texts){
+          texts = texts.parentNode;
+          
+          let link = texts.childNodes[0];
+          let separator = texts.childNodes[1];
+          
+          if (link && separator){
+            texts.classList.add("tweetduck-login-links");
+            
+            link = link.cloneNode(false);
+            link.id = "tweetduck-helper";
+            link.href = "#";
+            link.innerText = "Import TweetDuck profile";
+            
+            texts.appendChild(separator.cloneNode(true));
+            texts.appendChild(link);
+            
+            link.addEventListener("click", function(){
+              $TD.openProfileImport();
+            });
+            
+            return true;
+          }
+          else{
+            return false;
+          }
+        });
+      }
+      else{
+        const openLinkExternally = function(e){
+          let href = e.currentTarget.getAttribute("href");
+          $TD.openBrowser(href[0] === '/' ? location.origin+href : href);
+          
+          e.preventDefault();
+          e.stopPropagation();
+        };
+        
+        for(let link of document.getElementsByTagName("A")){
+          link.addEventListener("click", openLinkExternally);
+        }
+        
+        let texts = document.querySelector(".page-canvas > div:last-child");
+        
+        if (texts){
+          texts.insertAdjacentHTML("beforeend", `<p id="tweetduck-helper">Used the TweetDuck app before? <a href="#">Import your profile »</a></p>`);
+          
+          texts.querySelector("#tweetduck-helper > a").addEventListener("click", function(){
+            $TD.openProfileImport();
+          });
+        }
       }
     });
   }
+  
   //
-  // Block: Fix broken Cancel button on logout page.
+  // Block: Hide cookie crap.
   //
-  else if (location.pathname === "/logout"){
+  if (isMobile){
     document.addEventListener("DOMContentLoaded", function(){
-      let cancel = document.querySelector(".buttons .cancel");
-      
-      if (cancel && cancel.tagName === "A"){
-        cancel.href = "https://tweetdeck.twitter.com/";
-      }
+      triggerWhenExists("a[href^='https://help.twitter.com/rules-and-policies/twitter-cookies']", function(cookie){
+        while(!!cookie){
+          if (cookie.offsetHeight > 30){
+            cookie.remove();
+            return true;
+          }
+          else{
+            cookie = cookie.parentNode;
+          }
+        }
+        
+        return false;
+      });
     });
   }
 })();

lib/TweetLib.Core/Features/Twitter/TwitterUrls.cs

@@ -14,11 +14,11 @@ public static bool IsTweetDeck(string url){
         }
 
         public static bool IsTwitter(string url){
-            return url.Contains("//twitter.com/");
+            return url.Contains("//twitter.com/") || url.Contains("//mobile.twitter.com/");
         }
 
         public static bool IsTwitterLogin2Factor(string url){
-            return url.Contains("//twitter.com/account/login_verification");
+            return url.Contains("//twitter.com/account/login_verification") || url.Contains("//mobile.twitter.com/account/login_verification");
         }
 
         public static string? GetFileNameFromUrl(string url){