SheWhoReignsSupreme/Equicord
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(timezones): show recipient timezone in dms + fix showLocalTimezone (#1244)

Browse source 
* feat(timezones): show recipient timezone in dms

* fix(timezones): make sure showOwnTimezone is not bypassed

* fix(timezones): prevent showLocalTimezone from minifying every timezone instead of just local
This commit is contained in:
Luca 2026-07-11 02:24:35 +02:00 • committed by GitHub
parent a9e077fc3a
commit 634820dbaa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/equicordplugins/timezones/index.tsx
View file

@ -14,7 +14,7 @@ import { Devs, EquicordDevs } from "@utils/constants";
import definePlugin, { OptionType } from "@utils/types"; import definePlugin, { OptionType } from "@utils/types";
import { Message, User } from "@vencord/discord-types"; import { Message, User } from "@vencord/discord-types";
import { findByPropsLazy, findCssClassesLazy } from "@webpack"; import { findByPropsLazy, findCssClassesLazy } from "@webpack";
import { Button, Menu, openModal, showToast, Toasts, Tooltip, useEffect, UserStore, useState } from "@webpack/common"; import { Button, ChannelStore, Menu, openModal, showToast, Toasts, Tooltip, useEffect, UserStore, useState } from "@webpack/common";
import { deleteTimezone, getTimezone, loadDatabaseTimezones, setUserDatabaseTimezone } from "./database"; import { deleteTimezone, getTimezone, loadDatabaseTimezones, setUserDatabaseTimezone } from "./database";
import { SetTimezoneModal } from "./TimezoneModal"; import { SetTimezoneModal } from "./TimezoneModal";
@ -66,6 +66,12 @@ export const settings = definePluginSettings({
default: true default: true
}, },
recipientTimezoneInDms: {
type: OptionType.BOOLEAN,
description: "In DMs, show the recipient's timezone on your messages",
default: false
},
showProfileTime: { showProfileTime: {
type: OptionType.BOOLEAN, type: OptionType.BOOLEAN,
description: "Show time in profiles", description: "Show time in profiles",
@ -201,13 +207,13 @@ const TimestampComponent = ErrorBoundary.wrap(({ userId, timestamp, type }: Prop
if (settings.store.showTimezoneInfo) { if (settings.store.showTimezoneInfo) {
const userTimezone = getSystemTimezone(); const userTimezone = getSystemTimezone();
if (timezone === userTimezone && !settings.store.showLocalTimezone) { isLocal = timezone === userTimezone;
if (isLocal && !settings.store.showLocalTimezone) {
displayTime = "local"; displayTime = "local";
isLocal = true;
} else { } else {
const timezoneInfo = getTimezoneAbbreviation(timezone, currentTime); const timezoneInfo = getTimezoneAbbreviation(timezone, currentTime);
const tz = timezoneInfo || timezone; const tz = timezoneInfo || timezone;
const hideLocalTime = settings.store.showLocalTimezone && type === "message"; const hideLocalTime = isLocal && type === "message";
displayTime = hideLocalTime ? tz : `${shortTime} ${tz}`; displayTime = hideLocalTime ? tz : `${shortTime} ${tz}`;
} }
} }
@ -349,9 +355,20 @@ export default definePlugin({
}, },
renderMessageTimezone: (props?: { message?: Message; }) => { renderMessageTimezone: (props?: { message?: Message; }) => {
if (!settings.store.showMessageHeaderTime || !props?.message) return null; const { showMessageHeaderTime, recipientTimezoneInDms, "Show Own Timezone": showOwnTimezone } = settings.store;
if (props.message.author.id === UserStore.getCurrentUser().id && !settings.store["Show Own Timezone"]) return null;
return <TimestampComponent userId={props.message.author.id} timestamp={props.message.timestamp.toISOString()} type="message" />; if (!showMessageHeaderTime || !props?.message) return null;
let userId = props.message.author.id;
if (userId === UserStore.getCurrentUser().id) {
const channel = recipientTimezoneInDms ? ChannelStore.getChannel(props.message.channel_id) : undefined;
const recipientId = channel?.type === 1 ? channel.recipients[0] : undefined;
if (recipientId && resolveUserTimezone(recipientId)) userId = recipientId;
else if (!showOwnTimezone) return null;
}
return <TimestampComponent userId={userId} timestamp={props.message.timestamp.toISOString()} type="message" />;
} }
}); });