Skip to content

feat: Support multiple bangs in the same query #75

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
Tyarel8 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: Support multiple bangs in the same query #75

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
103 changes: 58 additions & 45 deletions background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,54 +169,67 @@ browser.webRequest.onBeforeRequest.addListener(
}
}
if (bang) {
const bangKey = getBangKey(bang);
browser.storage.session.get(bangKey).then(
function onGot(item) {
// Any matches?
if (Object.hasOwn(item, bangKey)) {
browser.storage.session
.get(PreferencePrefix.INACTIVE_BANGS)
.then(
function onGot(inactiveBangs) {
// Support multiple bangs separated by the bang symbol,
// e.g. "!google!duckduckgo" triggers both !google and !duckduckgo.
const bangNames = bang.split(bangSymbol).filter((b) => b.length > 0);
const bangKeys = bangNames.map((b) => getBangKey(b));
browser.storage.session.get(bangKeys).then(
function onGot(items) {
// Filter to only found bangs.
const foundBangNames = bangNames.filter((b) =>
Object.hasOwn(items, getBangKey(b)),
);
if (foundBangNames.length === 0) {
return;
}
browser.storage.session
.get(PreferencePrefix.INACTIVE_BANGS)
.then(
function onGot(inactiveBangs) {
let isFirstTarget = true;
for (const bangName of foundBangNames) {
const bangKey = getBangKey(bangName);
const bangData = items[bangKey];
if (
!(
item[bangKey].default &&
inactiveBangs[
PreferencePrefix.INACTIVE_BANGS
].includes(bang)
)
bangData.default &&
inactiveBangs[
PreferencePrefix.INACTIVE_BANGS
].includes(bangName)
) {
const bangTargets = item[bangKey].targets;
let targetUrl;
bangTargets.forEach((target, index) => {
if (query.length === 0 && target.baseUrl != null) {
targetUrl = target.baseUrl;
} else {
if (target.urlEncodeQuery) {
query = encodeURIComponent(query);
}
targetUrl = new URL(
target.url.replace("{{{s}}}", query),
).toString();
}
// Open first target URL in current tab...
if (index === 0) {
updateTab(details.tabId, targetUrl);
} else {
// ...and the rest in new tabs.
browser.tabs.create({
url: targetUrl,
active: false,
});
}
});
continue;
}
},
function onError(error) {
// TODO: Handle error.
},
);
}
const bangTargets = bangData.targets;
let targetUrl;
bangTargets.forEach((target) => {
if (query.length === 0 && target.baseUrl != null) {
targetUrl = target.baseUrl;
} else {
let encodedQuery = query;
if (target.urlEncodeQuery) {
encodedQuery = encodeURIComponent(query);
}
targetUrl = new URL(
target.url.replace("{{{s}}}", encodedQuery),
).toString();
}
// Open first target URL in current tab...
if (isFirstTarget) {
updateTab(details.tabId, targetUrl);
isFirstTarget = false;
} else {
// ...and the rest in new tabs.
browser.tabs.create({
url: targetUrl,
active: false,
});
}
});
}
},
function onError(error) {
// TODO: Handle error.
},
);
},
function onError(error) {
// TODO: Handle error.
Expand Down