|
@@ -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) {
|
|
|
+ if (a_arr[i].href.indexOf('denetme.net') > 0) {
|
|
|
let urlArr = new URL(a_arr[i]);
|
|
|
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) {
|