less shitcode

This commit is contained in:
Manti 2022-12-31 03:51:25 +03:00
parent 7b30e7e23f
commit 409b091847
2 changed files with 18 additions and 25 deletions

View file

@ -16,39 +16,37 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
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 API_URL = "https://timezonedb.catvibers.me/";
const Cache = new Map<string, number | null>(); const Cache = new Map<string, string | null>();
export const moment: typeof import("moment") = findByPropsLazy("parseTwoDigitYear");
const getSettings = () => Vencord.Settings.plugins.Timezones; const getSettings = () => Vencord.Settings.plugins.Timezones;
export async function getUserTimezone(discordID: string): Promise<number | null> { export async function getUserTimezone(discordID: string): Promise<string | null> {
if (getSettings()[`timezones.${discordID}`]) if (getSettings()[`timezones.${discordID}`])
return Number(getSettings()[`timezones.${discordID}`]); return getSettings()[`timezones.${discordID}`];
if (Cache.has(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( const response = await fetch(API_URL + "api/user/" + discordID);
r => r.json() const timezone = await response.json();
);
if (timezone.error) { if (response.status !== 200) {
Cache.set(discordID, null); Cache.set(discordID, null);
return null; return null;
} }
Cache.set(discordID, timezone.timezone); Cache.set(discordID, timezone.timezoneId);
return Number(timezone.timezone); 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 new Intl.DateTimeFormat(locale, { hour: "numeric", minute: "numeric", timeZone: timezone }).format(timestamp); // we hate javascript
return time.format(Vencord.Settings.plugins.Timezones.use24hr ? "HH:mm" : "h:mm A");
} }

View file

@ -33,11 +33,6 @@ export default definePlugin({
description: "Shows the timezones of users", description: "Shows the timezones of users",
authors: [Devs.mantikafasi], authors: [Devs.mantikafasi],
options: { options: {
use24hr: {
type: OptionType.BOOLEAN,
description: "Use 24h format",
default: true,
},
showTimezonesInChat: { showTimezonesInChat: {
type: OptionType.BOOLEAN, type: OptionType.BOOLEAN,
@ -64,7 +59,7 @@ export default definePlugin({
}, },
{ {
name: "timezone", 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, type: ApplicationCommandOptionType.STRING,
} }
@ -141,7 +136,7 @@ export default definePlugin({
const user = e.user as User; const user = e.user as User;
const [timezone, setTimezone] = React.useState<number | null>(null); const [timezone, setTimezone] = React.useState<string | null>(null);
React.useEffect(() => { React.useEffect(() => {
getUserTimezone(user.id).then(timezone => setTimezone(timezone)); getUserTimezone(user.id).then(timezone => setTimezone(timezone));
@ -168,7 +163,7 @@ export default definePlugin({
const message = e.message as Message; const message = e.message as Message;
const [timezone, setTimezone] = React.useState<number | null>(null); const [timezone, setTimezone] = React.useState<string | null>(null);
React.useEffect(() => { React.useEffect(() => {
getUserTimezone(e.message.author.id).then(timezone => setTimezone(timezone)); getUserTimezone(e.message.author.id).then(timezone => setTimezone(timezone));
@ -176,7 +171,7 @@ export default definePlugin({
return ( return (
<span className={classes(styles.timestampInline, styles.timestamp)}> <span className={classes(styles.timestampInline, styles.timestamp)}>
{timezone && "• " + getTimeString(timezone, message.timestamp)} {timezone && "• " + getTimeString(timezone, message.timestamp.toDate())}
</span>); </span>);
} }
}); });