removed some questionable code

This commit is contained in:
Manti 2022-12-30 18:41:44 +03:00
parent f078181598
commit 45d678d52a
2 changed files with 17 additions and 20 deletions

View file

@ -23,33 +23,30 @@ const API_URL = "https://timezonedb.catvibers.me/";
const Cache = new Map(); const Cache = new Map();
export const moment: typeof import("moment") = findByPropsLazy("parseTwoDigitYear"); export const moment: typeof import("moment") = findByPropsLazy("parseTwoDigitYear");
export interface Timezone {
userID: string,
timezoneId: string,
timezone: string;
error: string;
}
const getSettings = () => Vencord.Settings.plugins.Timezones; const getSettings = () => Vencord.Settings.plugins.Timezones;
export async function getUserTimezone(discordID: string): Promise<Timezone> { export async function getUserTimezone(discordID: string): Promise<Number | null> {
if (getSettings()[`timezones.${discordID}`]) if (getSettings()[`timezones.${discordID}`])
return { return Number(getSettings()[`timezones.${discordID}`]);
timezone: getSettings()[`timezones.${discordID}`],
} as Timezone;
if (Cache.has(discordID)) { if (Cache.has(discordID)) {
return Cache.get(discordID).timezone; return Cache.get(discordID);
} }
const timezone = await fetch(API_URL + "api/user/" + discordID).then( const timezone = await fetch(API_URL + "api/user/" + discordID).then(
r => r.json() r => r.json()
); );
Cache.set(discordID, timezone);
if (timezone.error) {
Cache.set(discordID, null);
return null;
}
Cache.set(discordID, timezone.timezone);
return timezone.timezone; return timezone.timezone;
} }
export function getTimeString(timezone: Timezone, timestamp = moment()): string { export function getTimeString(timezone: Number, timestamp = moment()): string {
const time = timestamp.utcOffset(Number(timezone)); const time = timestamp.utcOffset(Number(timezone));

View file

@ -25,7 +25,7 @@ import { findByPropsLazy } from "@webpack";
import { React } from "@webpack/common"; import { React } from "@webpack/common";
import { Message, User } from "discord-types/general"; import { Message, User } from "discord-types/general";
import { getTimeString, getUserTimezone, Timezone } from "./Utils"; import { getTimeString, getUserTimezone } from "./Utils";
const styles = findByPropsLazy("timestampInline"); const styles = findByPropsLazy("timestampInline");
export default definePlugin({ export default definePlugin({
@ -74,7 +74,7 @@ export default definePlugin({
const user = findOption(args, "user"); const user = findOption(args, "user");
const timezone = findOption(args, "timezone"); const timezone = findOption(args, "timezone");
Vencord.Settings.plugins.Timezones[`timezones.${user}`] = timezone; Vencord.Settings.plugins.Timezones[`timezones.${user}`] = timezone;
sendBotMessage(ctx.channel.id, {content: "Timezone set"}); sendBotMessage(ctx.channel.id, { content: "Timezone set" });
}, },
}, },
{ {
@ -91,11 +91,11 @@ export default definePlugin({
execute(args, ctx) { execute(args, ctx) {
const user = findOption(args, "user"); const user = findOption(args, "user");
if (!Vencord.Settings.plugins.Timezones[`timezones.${user}`]) { if (!Vencord.Settings.plugins.Timezones[`timezones.${user}`]) {
sendBotMessage(ctx.channel.id, {content: "No timezone"}); sendBotMessage(ctx.channel.id, { content: "No timezone" });
return; return;
} }
delete Vencord.Settings.plugins.Timezones[`timezones.${user}`]; delete Vencord.Settings.plugins.Timezones[`timezones.${user}`];
sendBotMessage(ctx.channel.id, {content: "Timezone deleted"}); sendBotMessage(ctx.channel.id, { content: "Timezone deleted" });
} }
}, },
{ {
@ -109,7 +109,7 @@ export default definePlugin({
if (str.length === 0) { if (str.length === 0) {
str = "No timezones set"; str = "No timezones set";
} }
sendBotMessage(ctx.channel.id, {content:str}); sendBotMessage(ctx.channel.id, { content: str });
} }
} }
], ],
@ -141,7 +141,7 @@ export default definePlugin({
const user = e.user as User; const user = e.user as User;
const [timezone, setTimezone] = React.useState<Timezone | null>(null); const [timezone, setTimezone] = React.useState<Number | null>(null);
React.useEffect(() => { React.useEffect(() => {
getUserTimezone(user.id).then(timezone => setTimezone(timezone)); getUserTimezone(user.id).then(timezone => setTimezone(timezone));
@ -171,7 +171,7 @@ export default definePlugin({
const message = e.message as Message; const message = e.message as Message;
const [timezone, setTimezone] = React.useState<Timezone | null>(null); const [timezone, setTimezone] = React.useState<Number | null>(null);
React.useEffect(() => { React.useEffect(() => {
getUserTimezone(e.message.author.id).then(timezone => setTimezone(timezone)); getUserTimezone(e.message.author.id).then(timezone => setTimezone(timezone));