diff --git a/src/plugins/Timezones/Utils.ts b/src/plugins/Timezones/Utils.ts
index 75c88812b..2774e3793 100644
--- a/src/plugins/Timezones/Utils.ts
+++ b/src/plugins/Timezones/Utils.ts
@@ -16,39 +16,37 @@
* along with this program. If not, see .
*/
-import { findByPropsLazy } from "@webpack";
+const PreloadedUserSettings = findLazy(m => m.ProtoClass?.typeName === "discord_protos.discord_users.v1.PreloadedUserSettings");
+import { findLazy } from "@webpack";
const API_URL = "https://timezonedb.catvibers.me/";
-const Cache = new Map();
-export const moment: typeof import("moment") = findByPropsLazy("parseTwoDigitYear");
+const Cache = new Map();
const getSettings = () => Vencord.Settings.plugins.Timezones;
-export async function getUserTimezone(discordID: string): Promise {
+export async function getUserTimezone(discordID: string): Promise {
if (getSettings()[`timezones.${discordID}`])
- return Number(getSettings()[`timezones.${discordID}`]);
+ return getSettings()[`timezones.${discordID}`];
if (Cache.has(discordID)) {
- return Cache.get(discordID) as number | null;
+ return Cache.get(discordID) as string | null;
}
- const timezone = await fetch(API_URL + "api/user/" + discordID).then(
- r => r.json()
- );
+ const response = await fetch(API_URL + "api/user/" + discordID);
+ const timezone = await response.json();
- if (timezone.error) {
+ if (response.status !== 200) {
Cache.set(discordID, null);
return null;
}
- Cache.set(discordID, timezone.timezone);
- return Number(timezone.timezone);
+ Cache.set(discordID, timezone.timezoneId);
+ return timezone.timezoneId;
}
-export function getTimeString(timezone: number, timestamp = moment()): string {
+export function getTimeString(timezone: string, timestamp = new Date()): string {
+ const locale = PreloadedUserSettings.getCurrentValue().localization.locale.value;
- const time = timestamp.utcOffset(Number(timezone));
-
- return time.format(Vencord.Settings.plugins.Timezones.use24hr ? "HH:mm" : "h:mm A");
+ return new Intl.DateTimeFormat(locale, { hour: "numeric", minute: "numeric", timeZone: timezone }).format(timestamp); // we hate javascript
}
diff --git a/src/plugins/Timezones/index.tsx b/src/plugins/Timezones/index.tsx
index f8e2a3e5c..0b9e06561 100644
--- a/src/plugins/Timezones/index.tsx
+++ b/src/plugins/Timezones/index.tsx
@@ -33,11 +33,6 @@ export default definePlugin({
description: "Shows the timezones of users",
authors: [Devs.mantikafasi],
options: {
- use24hr: {
- type: OptionType.BOOLEAN,
- description: "Use 24h format",
- default: true,
- },
showTimezonesInChat: {
type: OptionType.BOOLEAN,
@@ -64,7 +59,7 @@ export default definePlugin({
},
{
name: "timezone",
- description: "Timezone to set (+3, -5, etc.)",
+ description: "Timezone id to set (see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones)",
type: ApplicationCommandOptionType.STRING,
}
@@ -141,7 +136,7 @@ export default definePlugin({
const user = e.user as User;
- const [timezone, setTimezone] = React.useState(null);
+ const [timezone, setTimezone] = React.useState(null);
React.useEffect(() => {
getUserTimezone(user.id).then(timezone => setTimezone(timezone));
@@ -168,7 +163,7 @@ export default definePlugin({
const message = e.message as Message;
- const [timezone, setTimezone] = React.useState(null);
+ const [timezone, setTimezone] = React.useState(null);
React.useEffect(() => {
getUserTimezone(e.message.author.id).then(timezone => setTimezone(timezone));
@@ -176,7 +171,7 @@ export default definePlugin({
return (
- {timezone && "• " + getTimeString(timezone, message.timestamp)}
+ {timezone && "• " + getTimeString(timezone, message.timestamp.toDate())}
);
}
});