Merge remote-tracking branch 'upstream/dev' into dev

src/plugins/implicitRelationships/index.ts

@@ -20,7 +20,7 @@ import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { findStoreLazy } from "@webpack";
-import { Constants, FluxDispatcher, GuildStore, RelationshipStore, RestAPI, SnowflakeUtils, UserStore } from "@webpack/common";
+import { Constants, FluxDispatcher, GuildStore, RelationshipStore, SnowflakeUtils, UserStore } from "@webpack/common";
 import { Settings } from "Vencord";
 
 const UserAffinitiesStore = findStoreLazy("UserAffinitiesV2Store");
@@ -121,19 +121,6 @@ export default definePlugin({
             : comparator(row);
     },
 
-    async refreshUserAffinities() {
-        try {
-            await RestAPI.get({ url: "/users/@me/affinities/users", retries: 3 }).then(({ body }) => {
-                FluxDispatcher.dispatch({
-                    type: "LOAD_USER_AFFINITIES_SUCCESS",
-                    affinities: body,
-                });
-            });
-        } catch (e) {
-            // Not a critical error if this fails for some reason
-        }
-    },
-
     async fetchImplicitRelationships() {
         // Implicit relationships are defined as users that you:
         // 1. Have an affinity for

src/plugins/replaceGoogleSearch/index.tsx

@@ -69,7 +69,7 @@ function makeSearchItem(src: string) {
                                     aria-hidden="true"
                                     height={16}
                                     width={16}
-                                    src={`https://www.google.com/s2/favicons?domain=${Engines[engine]}&sz=64`}
+                                    src={`https://icons.duckduckgo.com/ip3/${new URL(Engines[engine]).hostname}.ico`}
                                 />
                                 {engine}
                             </Flex>

src/shared/SettingsStore.ts

@@ -160,7 +160,7 @@ export class SettingsStore<T extends object> {
         // So, we need to extract the top-level setting path (plugins.pluginName.settingName),
         // to be able to notify globalListeners and top-level setting name listeners (let { settingName } = settings.use(["settingName"]),
         // with the new value
-        if (paths.length > 2 && paths[0] === "plugins") {
+        if (paths.length > 3 && paths[0] === "plugins") {
             const settingPath = paths.slice(0, 3);
             const settingPathStr = settingPath.join(".");
             const settingValue = settingPath.reduce((acc, curr) => acc[curr], root);