supersonic/Midora
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better error message for failed twitter labeling

Browse Source
This commit is contained in:
shinigami-eyes 2019-10-17 12:30:42 +01:00
parent 5598bf534d
commit 714dda8cf3
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
extension/content.ts
View File

@ -425,10 +425,8 @@ function tryParseURL(urlstr: string) {
}
}
function getIdentifierFromURLImpl(url: URL): string {
function tryUnwrapNestedURL(url: URL): URL {
if (!url) return null;
// nested urls
if (url.href.indexOf('http', 1) != -1) {
if (url.pathname.startsWith('/intl/')) return null; // facebook language switch links
@ -441,11 +439,22 @@ function getIdentifierFromURLImpl(url: URL): string {
for (const value of values) {
if (value.startsWith('http:') || value.startsWith('https:')) {
return getIdentifierFromURLImpl(tryParseURL(value));
return tryParseURL(value);
}
}
const newurl = tryParseURL(url.href.substring(url.href.indexOf('http', 1)));
if (newurl) return getIdentifierFromURLImpl(newurl);
if (newurl) return newurl;
}
return null;
}
function getIdentifierFromURLImpl(url: URL): string {
if (!url) return null;
// nested urls
const nested = tryUnwrapNestedURL(url);
if (nested) {
return getIdentifierFromURLImpl(nested);
}
// fb group member badge
@ -533,6 +542,12 @@ function getSnippet(node: HTMLElement) {
function getBadIdentifierReason(identifier: string, url: string) {
identifier = identifier || '';
url = url || '';
if (url) {
const nested = tryUnwrapNestedURL(tryParseURL(url));
if (nested) url = nested.href;
}
if (identifier == 't.co') return 'Shortened link. Please follow the link and then mark the resulting page.';
if (
identifier.startsWith('reddit.com/user/') ||
identifier == 'twitter.com/threadreaderapp' ||