From 6768e22e53e2bd2068825b361af53516cc9cc055 Mon Sep 17 00:00:00 2001
From: rushiiMachine <33725716+rushiiMachine@users.noreply.github.com>
Date: Tue, 25 Jun 2024 10:14:17 -0700
Subject: [PATCH] rename overwrites to overrides

---
 src/plugins/timezones/cache.ts       |  8 ++++----
 src/plugins/timezones/components.tsx | 28 ++++++++++++++--------------
 src/plugins/timezones/settings.tsx   | 10 +++++-----
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/plugins/timezones/cache.ts b/src/plugins/timezones/cache.ts
index c746a893e..bf38c7f0c 100644
--- a/src/plugins/timezones/cache.ts
+++ b/src/plugins/timezones/cache.ts
@@ -10,7 +10,7 @@ import { debounce } from "@shared/debounce";
 import { Logger } from "@utils/Logger";
 
 import { fetchTimezone, fetchTimezonesBulk, Snowflake } from "./api";
-import settings, { TimezoneOverwrites } from "./settings";
+import settings, { TimezoneOverrides } from "./settings";
 
 // TODO: cache invalidation
 export const TimezoneCache = createStore("TimezoneCache", "TimezoneCache");
@@ -54,9 +54,9 @@ export async function getUserTimezone(
     immediate: boolean = false,
     force: boolean = false,
 ): Promise<string | null> {
-    const overwrites: TimezoneOverwrites = settings.store.timezoneOverwrites ?? {};
-    const overwrite = overwrites[userId];
-    if (overwrite !== undefined) return overwrite;
+    const overrides: TimezoneOverrides = settings.store.timezoneOverrides ?? {};
+    const override = overrides[userId];
+    if (override !== undefined) return override;
     if (!settings.store.enableApi) return null;
 
     if (!force) {
diff --git a/src/plugins/timezones/components.tsx b/src/plugins/timezones/components.tsx
index 3a819de51..66ac04be4 100644
--- a/src/plugins/timezones/components.tsx
+++ b/src/plugins/timezones/components.tsx
@@ -24,7 +24,7 @@ import { SelectOption } from "@webpack/types";
 
 import { Snowflake } from "./api";
 import { getUserTimezone } from "./cache";
-import settings, { TimezoneOverwrites } from "./settings";
+import settings, { TimezoneOverrides } from "./settings";
 import { formatTimestamp, getTimezonesLazy } from "./utils";
 
 // Based on Syncxv's vc-timezones user plugin //
@@ -99,7 +99,7 @@ function LocalTimestampInner(props: LocalTimestampProps): JSX.Element | null {
                     className={classes}
                     onClick={() => {
                         toolTipProps.onClick();
-                        openTimezoneOverwriteModal(props.userId);
+                        openTimezoneOverrideModal(props.userId);
                     }}>
                     {shortTimeFormatted}
                 </span>
@@ -113,7 +113,7 @@ interface TimezoneOverrideModalProps {
     modalProps: ModalProps,
 }
 
-function TimezoneOverrideModal(props: TimezoneOverrideModalProps) {
+function SetTimezoneOverrideModal(props: TimezoneOverrideModalProps) {
     const [availableTimezones, setAvailableTimezones] = useState<SelectOption[]>();
     const [timezone, setTimezone] = useState<string | "NONE" | undefined>();
 
@@ -140,22 +140,22 @@ function TimezoneOverrideModal(props: TimezoneOverrideModalProps) {
             setAvailableTimezones(options);
         });
 
-        const overwrites: TimezoneOverwrites = settings.store.timezoneOverwrites ?? {};
-        const overwrite = overwrites[props.userId];
-        setTimezone(overwrite === null ? "NONE" : overwrite);
+        const overrides: TimezoneOverrides = settings.store.timezoneOverrides ?? {};
+        const override = overrides[props.userId];
+        setTimezone(override === null ? "NONE" : override);
     }, []);
 
-    function saveOverwrite() {
+    function saveOverride() {
         if (availableTimezones === undefined) return;
 
-        const overwrites: TimezoneOverwrites = {
+        const overrides: TimezoneOverrides = {
             [props.userId]: timezone === "NONE" ? null : timezone,
-            ...settings.store.timezoneOverwrites,
+            ...settings.store.timezoneOverrides,
         };
         if (timezone === undefined)
-            delete overwrites[props.userId];
+            delete overrides[props.userId];
 
-        settings.store.timezoneOverwrites = overwrites;
+        settings.store.timezoneOverrides = overrides;
 
         props.modalProps.onClose();
     }
@@ -198,7 +198,7 @@ function TimezoneOverrideModal(props: TimezoneOverrideModalProps) {
             <Button
                 color={Button.Colors.BRAND}
                 disabled={availableTimezones === undefined}
-                onClick={saveOverwrite}>
+                onClick={saveOverride}>
                 Save
             </Button>
             <Button color={Button.Colors.RED} onClick={props.modalProps.onClose}>
@@ -208,10 +208,10 @@ function TimezoneOverrideModal(props: TimezoneOverrideModalProps) {
     </ModalRoot>;
 }
 
-export function openTimezoneOverwriteModal(userId: string) {
+export function openTimezoneOverrideModal(userId: string) {
     openModal(modalProps => <>
         <ErrorBoundary>
-            <TimezoneOverrideModal userId={userId} modalProps={modalProps} />
+            <SetTimezoneOverrideModal userId={userId} modalProps={modalProps} />
         </ErrorBoundary>
     </>);
 }
diff --git a/src/plugins/timezones/settings.tsx b/src/plugins/timezones/settings.tsx
index 632f264fb..2f8deb7c0 100644
--- a/src/plugins/timezones/settings.tsx
+++ b/src/plugins/timezones/settings.tsx
@@ -25,7 +25,7 @@ import { Text } from "@webpack/common";
 import { Snowflake } from "./api";
 import { TimezoneCache } from "./cache";
 
-export type TimezoneOverwrites = Record<Snowflake, string | null>;
+export type TimezoneOverrides = Record<Snowflake, string | null>;
 
 const DEFAULT_API = "https://timezonedb.catvibers.me/api";
 
@@ -54,11 +54,11 @@ const settings = definePluginSettings({
         description: "Show local time in user profiles",
         default: true,
     },
-    timezoneOverwrites: {
+    timezoneOverrides: {
         type: OptionType.COMPONENT,
-        description: "Local overwrites for users' timezones",
+        description: "Local overrides for users' timezones",
         component: props => <>
-            <TimezoneOverwritesSetting
+            <TimezoneOverridesSetting
                 setValue={props.setValue}
                 setError={props.setError}
                 option={props.option} />
@@ -84,6 +84,6 @@ export function SettingsComponent(): JSX.Element {
     </>;
 }
 
-function TimezoneOverwritesSetting(props: IPluginOptionComponentProps): JSX.Element {
+function TimezoneOverridesSetting(props: IPluginOptionComponentProps): JSX.Element {
     return <></>;
 }