Merge pull request #13 from ddasutein/update-twitter

Version 2.1.0
ddasutein · Jul 17, 2021 · c5b50d6 · c5b50d6
2 parents 0bcac2a + 59e39c8
commit c5b50d6
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 6 deletions.
diff --git a/js/Event/Announcement.js b/js/Event/Announcement.js
@@ -12,4 +12,4 @@
  * 
  */
 
-document.getElementsByClassName('main-body-section-announcement')[1].style.display ='none';
+document.getElementsByClassName('main-body-section-announcement')[0].style.display ='none';
diff --git a/js/Event/SaveAsEventHandle.js b/js/Event/SaveAsEventHandle.js
@@ -124,7 +124,7 @@ chrome.contextMenus.onClicked.addListener(function (info, tab) {
                 return;
             } 
             else if (info.menuItemId === "saveImage"){
-                SaveTwitterMedia(tab.url, info.srcUrl);
+                SaveTwitterMedia(tab.url, info.srcUrl, info.linkUrl);
 
             }
             break;

diff --git a/js/Event/Twitter/TwitterContent.js b/js/Event/Twitter/TwitterContent.js
@@ -16,7 +16,7 @@
  * Twitter supports various image sizes. When using `original`,
  * the extension can save images up to 4096x4096 resolution
  */
-const size = {
+ const size = {
     small: "&name=small",
     medium: "&name=medium",
     large: "&name=large",
@@ -50,11 +50,19 @@ function ViewOriginalMedia(url) {
     window.open(updatedUrl, "_blank");
 }
 
-function SaveTwitterMedia(tabUrl, url) {
+function SaveTwitterMedia(tabUrl, url, linkUrl) {
 
     let fileName;
     let fileNameBuilderArray = [];
     let tweetId = SplitURL(tabUrl, 5);
+    let save_image_not_full_view = false;
+
+    if (tweetId == null || tweetId.length == 0){
+        if (!!linkUrl){
+            tweetId = SplitURL(linkUrl, 5);
+            save_image_not_full_view = true;
+        }
+    }
 
     try {
         if (tweetId == null || tweetId.length == 0) {
@@ -70,7 +78,26 @@ function SaveTwitterMedia(tabUrl, url) {
             return key.category == CategoryEnum.Twitter
         });
 
-        IncludeMentionSymbol = ((bool) => bool ? fileNameBuilderArray.push("@" + SplitURL(tabUrl, 3)) : fileNameBuilderArray.push(SplitURL(tabUrl, 3)));
+        IncludeMentionSymbol = ((bool) => {
+            if (bool == true){
+
+                if (save_image_not_full_view == true){
+                    fileNameBuilderArray.push("@" + SplitURL(linkUrl, 3));
+                } else {
+                    fileNameBuilderArray.push("@" + SplitURL(tabUrl, 3));
+                }
+
+            } else {
+
+                if (save_image_not_full_view == true){
+                    fileNameBuilderArray.push(SplitURL(linkUrl, 3));
+                } else {
+                    fileNameBuilderArray.push(SplitURL(tabUrl, 3));
+                }
+
+            }
+        })
+
         IncludeTweetID = ((bool) => bool ? fileNameBuilderArray.push(tweetId) : false);
         IncludeDate = ((bool, settings) => {
             settings.filter((x) => {

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
     "name": "AutoRename",
     "short_name": "AutoRename",
-    "version": "2.0.0",
+    "version": "2.1.0",
     "description": "Rename image files from the internet with a meaningful file name",
     "default_locale": "en",
     "manifest_version": 2,