Merge branch 'dev_1.0.5' of https://git.yishihui.com/DeNet/de-net into dev_1.0.5

src/logic/content/ParseCard.js

@@ -71,14 +71,14 @@ class ParseCard {
         for (let i in a_arr) {
             // 获取推特id
             if (a_arr[i].href.indexOf('facebook.com') > 0) {
-                let faceUrl = new URL(a_arr[i]);
+                let faceUrl = new URL(a_arr[i].href);
                 let faceSearch = new URLSearchParams(faceUrl.search);
                 let faceJumpUrl = decodeURIComponent(faceSearch.get('u'));
                 if (faceJumpUrl !== 'null') {
                     let urlArr = new URL(faceJumpUrl);
                     let searchArr = new URLSearchParams(urlArr.search);
                     let deUrlParams = searchArr.get('deUrlParams') || '{}';
-                    deUrlParams = JSON.parse(deUrlParams);
+                        deUrlParams = JSON.parse(deUrlParams);
                     if (!tweet_Id) {
                         tweet_Id = deUrlParams.tweetId;
                     }
@@ -90,13 +90,20 @@ class ParseCard {
                     }
                 }
             } else {
-                if (a_arr[i].href.indexOf('denetme.net') > 0 && !tweet_Id) {
-                    let urlArr = new URL(a_arr[i]);
+                if (a_arr[i].href.indexOf('denetme.net') > 0) {
+                    let urlArr = new URL(a_arr[i].href);
                     let searchArr = new URLSearchParams(urlArr.search);
-                    tweet_Id = searchArr.get('tweetId')
-                }
-                if (a_arr[i].href.indexOf('denetme.net') > 0 && !short_url) {
-                    short_url = a_arr[i].href
+                    let deUrlParams = searchArr.get('deUrlParams') || '{}';
+                        deUrlParams = JSON.parse(deUrlParams);
+                    if (!tweet_Id) {
+                        tweet_Id = deUrlParams.tweetId;
+                    }
+                    if (!short_url) {
+                        short_url = a_arr[i].href
+                    }
+                    if (!tweet_author) {
+                        tweet_author = deUrlParams.fullName;
+                    }
                 }
             }
             if (tweet_Id && short_url) {
@@ -227,17 +234,17 @@ class ParseCard {
                 }
                 if (_iframe.length > 1) {
                     for (let i = 0; i < _iframe.length; i++) {
-                        if (_iframe > 0) {
+                        if (i > 0) {
                             _iframe[i].remove()
                         }
                     }
                 }
             } else {
-                let _iframe = dom.parentElement.querySelectorAll('iframe') || []
-                if (_iframe.length > 1) {
-                    for (let i = 0; i < _iframe.length; i++) {
-                        if (_iframe > 0) {
-                            _iframe[i].remove()
+                let arr_iframe = dom.closest('article').querySelectorAll('iframe') || []
+                if (arr_iframe.length > 1) {
+                    for (let i = 0; i < arr_iframe.length; i++) {
+                        if (i > 0) {
+                            arr_iframe[i].remove()
                         }
                     }
                 }

src/logic/content/twitter.js

@@ -690,7 +690,7 @@ export function init() {
         let inTwitter = window.location.href.includes('twitter.com');
         let inTwitterNode = document.querySelector('main');
         let inFacebook = window.location.href.includes('facebook.com');
-        let inFacebookNode = document.querySelector('div[role="main"]');
+        let inFacebookNode = document.querySelector('#facebook');
         if (inTwitter && inTwitterNode) {
             clearInterval(timer)
             setInterval(() => {
@@ -712,7 +712,11 @@ export function init() {
                     onChangePageMain(inFacebookNode)
                     changeQueueNum(1)
                 }
+                if (queue_num <= 0) {
+                    return
+                }
                 setIframeRedPacket('facebook')
+                changeQueueNum(-1)
             }, 1000)
         }
     }, 1000);