Skip to content

Add support for Thunderbird addons gallery #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jackymancs4 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for Thunderbird addons gallery #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ if (chrome.declarativeWebRequest) {
hostEquals: 'addons.allizom.org'
}, {
hostEquals: 'addons-dev.allizom.org'
}, {
hostEquals: 'addons.thunderbird.net'
}]
};
chrome.webNavigation.onCommitted.addListener(showPageActionIfNeeded, webNavigationFilter);
Expand Down
2 changes: 1 addition & 1 deletion src/crxviewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1537,7 +1537,7 @@ function showAdvancedOpener() {
var extensionId = get_extensionID(urlInput.value);
var amoslug = get_amo_slug(urlInput.value);
var maybeCrx = /\.crx([?#&]|$)|^(https?:\/\/)?(chrome|clients\d)\.google\.com/.test(urlInput.value) || !!extensionId;
var maybeXpi = /\.xpi([?#&]|$)|\.mozilla\./i.test(urlInput.value) || !!amoslug;
var maybeXpi = /\.xpi([?#&]|$)|\.mozilla\.|\.thunderbird\./i.test(urlInput.value) || !!amoslug;
if (!extensionId) {
cwsOptions.classList.add('disabled-site');
if (maybeXpi) {
Expand Down
24 changes: 17 additions & 7 deletions src/cws_pattern.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,25 @@ var ows_pattern = /^https?:\/\/addons.opera.com\/.*?extensions\/(?:details|downl
var ows_match_pattern = '*://addons.opera.com/*extensions/details/*';

// Firefox addon gallery
var amo_pattern = /^https?:\/\/(addons\.mozilla\.org|addons(?:-dev)?\.allizom\.org)\/.*?(?:addon|review)\/([^/<>"'?#]+)/;
var amo_download_pattern = /^https?:\/\/(addons\.mozilla\.org|addons(?:-dev)?\.allizom\.org)\/[^?#]*\/downloads\/latest\/([^/?#]+)/;
var amo_domain_pattern = /^https?:\/\/(addons\.mozilla\.org|addons(?:-dev)?\.allizom\.org)\//;
var amo_file_version_pattern = /^https?:\/\/(addons\.mozilla\.org|addons(?:-dev)?\.allizom\.org)\/(?:[^?#\/]*\/)?firefox\/files\/browse\/(\d+)(\/[^?#\/]+\.xpi)?/;
var amo_pattern = /^https?:\/\/(addons\.mozilla\.org|addons(?:-dev)?\.allizom\.org|addons\.thunderbird\.net)\/.*?(?:addon|review)\/([^/<>"'?#]+)/;
var amo_download_pattern = /^https?:\/\/(addons\.mozilla\.org|addons(?:-dev)?\.allizom\.org|addons\.thunderbird\.net)\/[^?#]*\/downloads\/latest\/([^/?#]+)/;
var amo_domain_pattern = /^https?:\/\/(addons\.mozilla\.org|addons(?:-dev)?\.allizom\.org|addons\.thunderbird\.net)\//;
var amo_file_version_pattern = /^https?:\/\/(addons\.mozilla\.org|addons(?:-dev)?\.allizom\.org|addons\.thunderbird\.net)\/(?:[^?#\/]*\/)?(?:firefox|thunderbird)\/files\/browse\/(\d+)(\/[^?#\/]+\.xpi)?/;
var amo_match_patterns = [
'*://addons.mozilla.org/*addon/*',
'*://addons.mozilla.org/*review/*',
'*://addons.allizom.org/*addon/*',
'*://addons.allizom.org/*review/*',
'*://addons-dev.allizom.org/*addon/*',
'*://addons-dev.allizom.org/*review/*',
'*://addons.thunderbird.net/*addon/*',
'*://addons.thunderbird.net/*review/*',
];
var amo_file_version_match_patterns = [
'*://addons.mozilla.org/*firefox/files/browse/*',
'*://addons.allizom.org/*firefox/files/browse/*',
'*://addons-dev.allizom.org/*firefox/files/browse/*',
'*://addons.thunderbird.net/*thunderbird/files/browse/*',
];

// string extensionID if valid URL
Expand Down Expand Up @@ -70,7 +73,7 @@ function get_xpi_url(amoDomain, addonSlug) {
platformId = 2;
}

var url = 'https://' + amoDomain + '/firefox/downloads/latest/';
var url = get_amo_base_url(amoDomain) + '/downloads/latest/';
url += addonSlug;
url += '/platform:' + platformId;
url += '/';
Expand All @@ -96,7 +99,7 @@ function get_crx_url(extensionID_or_url) {
}
match = amo_file_version_pattern.exec(extensionID_or_url);
if (match) {
return 'https://' + match[1] + '/firefox/downloads/file/' + match[2] + (match[3] || '/addon.xpi');
return get_amo_base_url(match[1]) + '/downloads/file/' + match[2] + (match[3] || '/addon.xpi');
}
// Chrome Web Store
match = get_extensionID(extensionID_or_url);
Expand Down Expand Up @@ -162,7 +165,7 @@ function get_webstore_url(url) {
}
var amo = get_amo_slug(url);
if (amo) {
return 'https://' + get_amo_domain(url) + '/firefox/addon/' + amo;
return get_amo_base_url(get_amo_domain(url))+'/addon/' + amo;
}
}

Expand All @@ -182,6 +185,13 @@ function get_zip_name(url, /*optional*/filename) {
return filename.replace(/\.(crx|jar|nex|xpi|zip)$/i, '') + '.zip';
}

function get_amo_base_url(amoDomain) {
if (amoDomain === 'addons.thunderbird.net') {
return 'https://addons.thunderbird.net/thunderbird';
}
return 'https://' + amoDomain + '/firefox';
}

function get_amo_domain(url) {
var match = amo_domain_pattern.exec(url);
return match ? match[1] : 'addons.mozilla.org';
Expand Down