Improved UX, removed tabs permission #2

src/manifest.json

@@ -17,7 +17,6 @@
 	},
 	"permissions": [
 		"storage",
-		"tabs",
 		"activeTab",
 		"https://*/*"
 	],

src/pages/lib/lemmy.js

@@ -47,8 +47,13 @@ function resolveObject(q, type, options) {
 }
 
 function can_lemmy_to_lemmy(url, options) {
-    if (!options.lemmy) return 'credentials'
-    return true
+    for (const regexItem of [regex.post, regex.comment, regex.communityFederated, regex.communityLocal, regex.userFederated, regex.userLocal]) {
+        if (url.pathname.match(regexItem)) {
+            if (!options.lemmy) return 'credentials'
+            return true
+        }
+    }
+    return false
 }
 
 function lemmy_to_lemmy(url, options) {
@@ -105,9 +110,12 @@ function lemmy_to_lemmy(url, options) {
 }
 
 function can_lemmy_to_mastodon(url, options) {
-    if (!options.mastodon) return 'credentials'
+
     for (const regexItem of [regex.userFederated, regex.userLocal, regex.communityFederated, regex.communityLocal]) {
-        if (url.pathname.match(regexItem)) return true
+        if (url.pathname.match(regexItem)) {
+            if (!options.mastodon) return 'credentials'
+            return true
+        }
     }
     return false
 }
@@ -140,10 +148,10 @@ function lemmy_to_mastodon(url, options) {
 
 export default {
     isLemmy,
-    
+
     can_lemmy_to_lemmy,
     lemmy_to_lemmy,
-    
+
     can_lemmy_to_mastodon,
     lemmy_to_mastodon,
     regex

src/pages/lib/mastodon.js

@@ -23,9 +23,11 @@ function isMastodon(url) {
 }
 
 function can_mastodon_to_lemmy(url, options) {
-    if (!options.lemmy) return 'credentials'
     for (const regexItem of [regex.userFederated, regex.userLocal]) {
-        if (url.pathname.match(regexItem)) return true
+        if (url.pathname.match(regexItem)) {
+            if (!options.lemmy) return 'credentials'
+            return true
+        }
     }
     return false
 }
@@ -47,7 +49,12 @@ function mastodon_to_lemmy(url, options) {
 }
 
 function can_mastodon_to_mastodon(url, options) {
-    if (!options.lemmy) return 'credentials'
+    for (const regexItem of [regex.postLocal, regex.postFederated, regex.userFederated, regex.userLocal]) {
+        if (url.pathname.match(regexItem)) {
+            if (!options.lemmy) return 'credentials'
+            return true
+        }
+    }
     return true
 }
 

src/pages/popup/popup.html

@@ -32,7 +32,6 @@ <h4 data-localise="__MSG_settings__">Settings</h4>
             </svg>
         </a>
     </div>
-    <div class="space"></div>
     <script type="module" src="./popup.js"></script>
 </body>