Skip to content
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

Jump to bottom

Redirect all engines to Kagi by default #73

Merged
merged 1 commit into from
May 21, 2024
Merged

Redirect all engines to Kagi by default #73

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
72 changes: 0 additions & 72 deletions ...rsal/Kagi Search.xcodeproj/xcuserdata/nano.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions safari/Universal/MainConfig.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
MARKETING_VERSION = 2.2.2
CURRENT_PROJECT_VERSION = 24 // this needs to be increased with each version change as well (not set to 1 when version is updated)
MARKETING_VERSION = 2.2.3
CURRENT_PROJECT_VERSION = 25 // this needs to be increased with each version change as well (not set to 1 when version is updated)
PRODUCT_NAME = Kagi for Safari
10 changes: 5 additions & 5 deletions safari/Universal/Shared (Extension)/Resources/background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ function domainKeyForHost(knownHost) {
}
return "";
}
const supportedEngineNames = Object.keys(domainMap);
const supportedEngineNames = Object.keys(domainMap).concat(["All"]);
const www = "www.";
const yahoo = "search.yahoo.com";
const extensionId = "com.kagi.Kagi-Search-for-Safari.Extension (TFVG979488)";
Expand All @@ -309,7 +309,7 @@ var ua = {},
os = !0,
rs = !0,
currentEngine = "All",
defaultEngineToRedirect = "Google",
defaultEngineToRedirect = "All",
defaultKagiSearchTemplate = "https://kagi.com/search?q=%s",
kagiSearchTemplate = defaultKagiSearchTemplate,
kagiPrivateSearchTemplate = "",
Expand Down Expand Up @@ -339,7 +339,7 @@ function captureQuery(a) {
b.endsWith(yahoo) && (b = yahoo);
const path = a.pathname;
var shouldBlockGoogleNonSearch = (b in googleUrls && !(path.startsWith("/search")));
var shouldBlockRedirectBasedOnUserPreference = ([currentEngine, "All"].indexOf(domainKeyForHost(b)) < 0);
var shouldBlockRedirectBasedOnUserPreference = (currentEngine != "All" && currentEngine != domainKeyForHost(b));
if (b in builtInEngines && !(shouldBlockGoogleNonSearch || shouldBlockRedirectBasedOnUserPreference) && (a = (new URLSearchParams(a.search)).get(builtInEngines[b]))) return a;
}

Expand Down Expand Up @@ -447,8 +447,8 @@ function getPreferencesFromStorage(callback) {
// Engine to redirect
var engine = value.kagiEngineToRedirect;
if (typeof (engine) == "string") {
if (engine == "All" || supportedEngineNames.indexOf(engine) < 0) {
currentEngine = defaultEngineToRedirect; // default to redirecting Google
if (supportedEngineNames.indexOf(engine) < 0) {
currentEngine = defaultEngineToRedirect; // default to redirecting All engines to Kagi
} else {
currentEngine = engine;
}
Expand Down
1 change: 1 addition & 0 deletions safari/Universal/Shared (Extension)/Resources/popup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ <h4>Engine to redirect</h4>
<p>Select the search engine you want to redirect to Kagi.</p>
<fieldset>
<select type="text" id="engine-to-redirect">
<option value="All" name="All">All Search Engines</option>
<option value="Google" name="Google">Google</option>
<option value="DuckDuckGo" name="DuckDuckGo">DuckDuckGo</option>
<option value="Yahoo" name="Yahoo">Yahoo</option>
Expand Down
6 changes: 3 additions & 3 deletions safari/Universal/Shared (Extension)/Resources/popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ document.querySelector("#private-session-link").addEventListener('paste', privat
// -----------------------
// MARK: - Selecting default engine to redirect
// -----------------------
var engineToRedirect = "All";
const defaultEngineToRedirect = "Google";
const defaultEngineToRedirect = "All";
var engineToRedirect = defaultEngineToRedirect;
const engineSelect = document.getElementById('engine-to-redirect');

// Updates the UI
Expand Down Expand Up @@ -129,7 +129,7 @@ function fetchAndUpdateKnownHostList() {

// If the currently-redirecting engine no longer has permissions in the extension,
// reset to "All"
let enginesToDisplayInRedirectList = Array.from(document.querySelectorAll("[data-engine]")).map((en) => en.getAttribute("data-engine"));
let enginesToDisplayInRedirectList = ["All"].concat(Array.from(document.querySelectorAll("[data-engine]")).map((en) => en.getAttribute("data-engine")));
if (engineToRedirect != "All" && enginesToDisplayInRedirectList.indexOf(engineToRedirect) < 0) {
engineToRedirect = "All";
}
Expand Down
2 changes: 1 addition & 1 deletion safari/Universal/iOS (Extension)/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

"name": "__MSG_extension_name__",
"description": "__MSG_extension_description__",
"version": "2.2.2",
"version": "2.2.3",

"icons": {
"512": "images/Icon.png"
Expand Down
2 changes: 1 addition & 1 deletion safari/Universal/macOS (Extension)/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

"name": "__MSG_extension_name__",
"description": "__MSG_extension_description__",
"version": "2.2.2",
"version": "2.2.3",

"icons": {
"512": "images/Icon.png"
Expand Down
Loading