From a8cdeb10bf98938bceeade012485940b58d2beb3 Mon Sep 17 00:00:00 2001 From: rushiiMachine <33725716+rushiiMachine@users.noreply.github.com> Date: Sun, 23 Jun 2024 12:43:55 -0700 Subject: [PATCH] reformat --- src/plugins/timezones/index.tsx | 144 +++++++++++++++-------------- src/plugins/timezones/settings.tsx | 8 +- src/plugins/timezones/utils.ts | 20 ++-- 3 files changed, 93 insertions(+), 79 deletions(-) diff --git a/src/plugins/timezones/index.tsx b/src/plugins/timezones/index.tsx index 444f3d203..d856924cb 100644 --- a/src/plugins/timezones/index.tsx +++ b/src/plugins/timezones/index.tsx @@ -8,13 +8,10 @@ import * as DataStore from "@api/DataStore"; import { Devs } from "@utils/constants"; import definePlugin from "@utils/types"; import { findByPropsLazy } from "@webpack"; -import { React, SearchableSelect, Text, Toasts, UserStore } from "@webpack/common"; +import { SearchableSelect, Text, Toasts, useEffect, UserStore, useState } from "@webpack/common"; import { Message, User } from "discord-types/general"; import settings from "./settings"; -const classNames = findByPropsLazy("customStatusSection"); - - import { CogWheel, DeleteIcon } from "@components/Icons"; import { VENCORD_USER_AGENT } from "@shared/vencordUserAgent"; import { makeLazy } from "@utils/lazy"; @@ -22,6 +19,9 @@ import { classes } from "@utils/misc"; import { useForceUpdater } from "@utils/react"; import { API_URL, DATASTORE_KEY, getAllTimezones, getTimeString, getUserTimezone, TimezoneDB } from "./utils"; + +const classNames = findByPropsLazy("customStatusSection"); + const styles = findByPropsLazy("timestampInline"); const useTimezones = makeLazy(getAllTimezones); @@ -30,58 +30,59 @@ export default definePlugin({ settings, name: "Timezones", - description: "Allows you to see and set the timezones of other users.", - authors: [Devs.mantikafasi, Devs.Arjix], + description: "Set and display the local times of you and other users via TimezoneDB", + authors: [Devs.rushii, Devs.mantikafasi, Devs.Aria, Devs.Arjix], commands: [ { name: "timezone", - description: "Sends link to a website that shows timezone string, useful if you want to know your friends timezone", - execute: () => { - return { content: "https://gh.lewisakura.moe/timezone/" }; - } - } + description: "Sends a link to a utility website that shows your current timezone identifier", + execute: () => ({ content: "https://gh.lewisakura.moe/timezone/" }), + }, ], + // TODO: show button to authorize tzdb and manage public tz settingsAboutComponent: () => { const href = `${API_URL}?client_mod=${encodeURIComponent(VENCORD_USER_AGENT)}`; return ( - A plugin that displays the local time for specific users using their timezone.
- Timezones can either be set manually or fetched automatically from the TimezoneDB +
+ This plugin supports setting your own Timezone publicly for others to fetch and display via TimezoneDB. + You can override other users' timezones locally if they haven't set their own. ); }, patches: [ + // { + // find: "copyMetaData:\"User Tag\"", + // replacement: { + // match: /return(\(0.+?}\)}\)]}\))}/, + // replace: "return [$1, $self.getProfileTimezonesComponent(arguments[0])] }", + // }, + // }, { - find: "copyMetaData:\"User Tag\"", - replacement: { - - match: /return(\(0,.\.jsx\)\(.\.default,{className:.+?}\)]}\)}\))/, - replace: "return [$1, $self.getProfileTimezonesComponent(arguments[0])]" - }, - }, - { + // TODO: fix this // thank you https://github.com/Syncxv/vc-timezones/blob/master/index.tsx for saving me from painful work - find: ".badgesContainer,", + find: ".badgesContainer,{", replacement: { match: /id:\(0,\i\.getMessageTimestampId\)\(\i\),timestamp.{1,50}}\),/, - replace: "$&,$self.getTimezonesComponent(arguments[0])," - } - } + replace: "$&,$self.getTimezonesComponent(arguments[0]),", + }, + }, ], + // TODO: make this not ugly (port vc-timezones plugin) getProfileTimezonesComponent: ({ user }: { user: User; }) => { - const { preference, showTimezonesInProfile } = settings.use(["preference", "showTimezonesInProfile"]); + const { preference, showInProfile } = settings.use(["preference", "showInProfile"]); - const [timezone, setTimezone] = React.useState(); - const [isInEditMode, setIsInEditMode] = React.useState(false); - const [timezones, setTimezones] = React.useState([]); + const [timezone, setTimezone] = useState(); + const [isInEditMode, setIsInEditMode] = useState(false); + const [timezones, setTimezones] = useState([]); const forceUpdate = useForceUpdater(); - React.useEffect(() => { + useEffect(() => { useTimezones().then(setTimezones); getUserTimezone(user.id, preference).then(tz => setTimezone(tz)); @@ -91,20 +92,20 @@ export default definePlugin({ return () => clearInterval(interval); }, [preference]); - if (!showTimezonesInProfile) + if (!showInProfile) return null; return ( {!isInEditMode && ({ label: tz, value: tz }))} value={timezone ? { label: timezone, value: timezone } : undefined} - onChange={value => { setTimezone(value); }} + onChange={value => { + setTimezone(value); + }} /> )} @@ -141,10 +144,10 @@ export default definePlugin({ alignItems: "center", justifyContent: "space-around", width: "60%", - marginTop: "5%" + marginTop: "5%", } : { marginLeft: "2%", - display: "flex" + display: "flex", }} > { DataStore.update(DATASTORE_KEY, (oldValue: TimezoneDB | undefined) => { oldValue = oldValue || {}; @@ -198,7 +206,7 @@ export default definePlugin({ Toasts.show({ type: Toasts.Type.SUCCESS, message: "Timezone removed!", - id: Toasts.genId() + id: Toasts.genId(), }); setIsInEditMode(false); setTimezone(await getUserTimezone(user.id, preference)); @@ -207,7 +215,7 @@ export default definePlugin({ Toasts.show({ type: Toasts.Type.FAILURE, message: "Something went wrong, please try again later.", - id: Toasts.genId() + id: Toasts.genId(), }); }); }} @@ -217,31 +225,33 @@ export default definePlugin({ /> } - + ); }, getTimezonesComponent: ({ message }: { message: Message; }) => { + console.log(message); - const { showTimezonesInChat, preference } = settings.use(["preference", "showTimezonesInChat"]); - const [timezone, setTimezone] = React.useState(); + const { showInChat, preference } = settings.use(["preference", "showInChat"]); + const [timeString, setTimeString] = useState(); - React.useEffect(() => { - if (!showTimezonesInChat) return; - - getUserTimezone(message.author.id, preference).then(tz => setTimezone(tz)); - }, [showTimezonesInChat, preference]); - - if (!showTimezonesInChat || message.author.id === UserStore.getCurrentUser()?.id) + if (!showInChat || message.author.id === UserStore.getCurrentUser()?.id) return null; - return ( + useEffect(() => { + if (!showInChat) return; + + (async function() { + const timezone = await getUserTimezone(message.author.id, preference); + const timestamp = (message.timestamp as unknown) as Date; // discord-types is outdated + setTimeString(timezone && "• " + getTimeString(timezone, timestamp)); + })(); + }, [showInChat, preference]); + + return <> - { - timezone && "• " + getTimeString(timezone, - /* message.timestamp is actually Date but as discord-types is outdated I had to do this */ - ((message.timestamp as unknown) as Date)) - } - ); - } + {timeString} + + ; + }, }); diff --git a/src/plugins/timezones/settings.tsx b/src/plugins/timezones/settings.tsx index 357dddde1..d39b77ec5 100644 --- a/src/plugins/timezones/settings.tsx +++ b/src/plugins/timezones/settings.tsx @@ -46,14 +46,14 @@ export default definePluginSettings({ ], default: CustomTimezonePreference.Secondary, }, - showTimezonesInChat: { + showInChat: { type: OptionType.BOOLEAN, - description: "Show timezones in chat", + description: "Show local time on messages in chat", default: true, }, - showTimezonesInProfile: { + showInProfile: { type: OptionType.BOOLEAN, - description: "Show timezones in profile", + description: "Show timezones in user profiles", default: true, }, }); diff --git a/src/plugins/timezones/utils.ts b/src/plugins/timezones/utils.ts index 33a4d0dc9..cbc7e41cf 100644 --- a/src/plugins/timezones/utils.ts +++ b/src/plugins/timezones/utils.ts @@ -6,13 +6,13 @@ import * as DataStore from "@api/DataStore"; import { findStoreLazy } from "@webpack"; -export const DATASTORE_KEY = "plugins.timezones.savedTimezones"; - import { debounce } from "@shared/debounce"; import { VENCORD_USER_AGENT } from "@shared/vencordUserAgent"; import { CustomTimezonePreference } from "./settings"; +export const DATASTORE_KEY = "plugins.timezones.savedTimezones"; + export interface TimezoneDB { [userId: string]: string; } @@ -25,8 +25,13 @@ const UserSettingsProtoStore = findStoreLazy("UserSettingsProtoStore"); export function getTimeString(timezone: string, timestamp = new Date()): string { try { const locale = UserSettingsProtoStore.settings.localization.locale.value; - return new Intl.DateTimeFormat(locale, { hour: "numeric", minute: "numeric", timeZone: timezone }).format(timestamp); // we hate javascript + return new Intl.DateTimeFormat(locale, { + hour: "numeric", + minute: "numeric", + timeZone: timezone, + }).format(timestamp); // we hate javascript } catch (e) { + // TODO: log error return "Error"; // incase it gets invalid timezone from api, probably not gonna happen but if it does this will prevent discord from crashing } } @@ -42,7 +47,7 @@ async function bulkFetchTimezones(ids: string[]): Promise => { if (typeof Intl !== "undefined" && "supportedValuesOf" in Intl) { try { return Intl.supportedValuesOf("timeZone"); - } catch { } + } catch { + } } return await fetch(timezonesLink).then(tzs => tzs.json());