Labeling warnings for reddit and facebook photos

This commit is contained in:
shinigami-eyes 2019-10-07 21:07:36 +02:00
parent 5c8735cd66
commit 8686b55d53
3 changed files with 9 additions and 1 deletions

View File

@ -471,6 +471,7 @@ function saveLabel(response: ShinigamiEyesSubmission) {
sendMessageToContent(response.tabId, response.frameId, { sendMessageToContent(response.tabId, response.frameId, {
updateAllLabels: true, updateAllLabels: true,
confirmSetIdentifier: response.identifier, confirmSetIdentifier: response.identifier,
confirmSetUrl: response.url,
confirmSetLabel: response.mark || 'none' confirmSetLabel: response.mark || 'none'
}); });
//browser.tabs.executeScript(response.tabId, {code: 'updateAllLabels()'}); //browser.tabs.executeScript(response.tabId, {code: 'updateAllLabels()'});
@ -531,6 +532,7 @@ browser.contextMenus.onClicked.addListener(function (info, tab) {
if (badIdentifiers[response.identifier]) { if (badIdentifiers[response.identifier]) {
sendMessageToContent(tabId, frameId, { sendMessageToContent(tabId, frameId, {
confirmSetIdentifier: response.identifier, confirmSetIdentifier: response.identifier,
confirmSetUrl: response.url,
confirmSetLabel: 'bad-identifier', confirmSetLabel: 'bad-identifier',
badIdentifierReason: badIdentifiersReasons[response.identifier] badIdentifierReason: badIdentifiersReasons[response.identifier]
}); });

View File

@ -539,6 +539,11 @@ function getBadIdentifierReason(identifier: string, url: string) {
identifier == 'twitter.com/threader_app') return 'This is user is a bot.'; identifier == 'twitter.com/threader_app') return 'This is user is a bot.';
if (identifier == 'twitter.com/hashtag') return 'Hashtags cannot be labeled, only users.'; if (identifier == 'twitter.com/hashtag') return 'Hashtags cannot be labeled, only users.';
if (url.includes('youtube.com/watch')) return 'Only channels can be labeled, not specific videos.'; if (url.includes('youtube.com/watch')) return 'Only channels can be labeled, not specific videos.';
if (url.includes('reddit.com/') && url.includes('/comments/')) return 'Only users and subreddits can be labeled, not specific posts.';
if (url.includes('facebook.com') && (
url.includes('/posts/') ||
url.includes('/photo.php') ||
url.includes('/photos/'))) return 'Only pages, users and groups can be labeled, not specific posts or photos.';
if (url.includes('wiki') && url.includes('#')) return 'Wiki paragraphs cannot be labeled, only whole articles.'; if (url.includes('wiki') && url.includes('#')) return 'Wiki paragraphs cannot be labeled, only whole articles.';
return null; return null;
} }
@ -595,7 +600,7 @@ function displayConfirmation(identifier: string, label: LabelKind, badIdentifier
browser.runtime.onMessage.addListener<ShinigamiEyesMessage, ShinigamiEyesSubmission>((message, sender, sendResponse) => { browser.runtime.onMessage.addListener<ShinigamiEyesMessage, ShinigamiEyesSubmission>((message, sender, sendResponse) => {
if (message.updateAllLabels || message.confirmSetLabel) { if (message.updateAllLabels || message.confirmSetLabel) {
displayConfirmation(message.confirmSetIdentifier, message.confirmSetLabel, message.badIdentifierReason, message.url); displayConfirmation(message.confirmSetIdentifier, message.confirmSetLabel, message.badIdentifierReason, message.confirmSetUrl);
updateAllLabels(true); updateAllLabels(true);
return; return;
} }

View File

@ -35,6 +35,7 @@ interface ShinigamiEyesCommand {
setTheme?: string setTheme?: string
confirmSetIdentifier?: string confirmSetIdentifier?: string
confirmSetLabel?: LabelKind confirmSetLabel?: LabelKind
confirmSetUrl?: string
badIdentifierReason?: BadIdentifierReason badIdentifierReason?: BadIdentifierReason
} }
type LabelMap = { [identifier: string]: LabelKind }; type LabelMap = { [identifier: string]: LabelKind };