dorkbutt/vencord
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

TypingIndicator: fix TypingTweaks compatibility

Browse source
This commit is contained in:
Vendicated 2025-07-01 23:18:12 +02:00
parent 23eb85e898
commit 43ba1a4a5e
No known key found for this signature in database
GPG key ID: D66986BAF75ECF18
3 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/plugins/appleMusic.desktop/native.ts
View file

@ -44,7 +44,6 @@ const getToken = async () => {
return token; return token;
}; };
getToken().then(console.log);
async function fetchRemoteData({ id, name, artist, album }: { id: string, name: string, artist: string, album: string; }) { async function fetchRemoteData({ id, name, artist, album }: { id: string, name: string, artist: string, album: string; }) {
if (id === cachedRemoteData?.id) { if (id === cachedRemoteData?.id) {
if ("data" in cachedRemoteData) return cachedRemoteData.data; if ("data" in cachedRemoteData) return cachedRemoteData.data;

13
src/plugins/typingIndicator/index.tsx
View file

@ -69,26 +69,29 @@ function TypingIndicator({ channelId, guildId }: { channelId: string; guildId: s
const myId = UserStore.getCurrentUser()?.id; const myId = UserStore.getCurrentUser()?.id;
const typingUsersArray = Object.keys(typingUsers).filter(id => id !== myId && !(RelationshipStore.isBlocked(id) && !settings.store.includeBlockedUsers)); const typingUsersArray = Object.keys(typingUsers).filter(id =>
id !== myId && !(RelationshipStore.isBlocked(id) && !settings.store.includeBlockedUsers)
);
const [a, b, c] = typingUsersArray;
let tooltipText: string; let tooltipText: string;
switch (typingUsersArray.length) { switch (typingUsersArray.length) {
case 0: break; case 0: break;
case 1: { case 1: {
tooltipText = getIntlMessage("ONE_USER_TYPING", { a: getDisplayName(guildId, typingUsersArray[0]) }); tooltipText = getIntlMessage("ONE_USER_TYPING", { a: getDisplayName(guildId, a) });
break; break;
} }
case 2: { case 2: {
tooltipText = getIntlMessage("TWO_USERS_TYPING", { a: getDisplayName(guildId, typingUsersArray[0]), b: getDisplayName(guildId, typingUsersArray[1]) }); tooltipText = getIntlMessage("TWO_USERS_TYPING", { a: getDisplayName(guildId, a), b: getDisplayName(guildId, b) });
break; break;
} }
case 3: { case 3: {
tooltipText = getIntlMessage("THREE_USERS_TYPING", { a: getDisplayName(guildId, typingUsersArray[0]), b: getDisplayName(guildId, typingUsersArray[1]), c: getDisplayName(guildId, typingUsersArray[2]) }); tooltipText = getIntlMessage("THREE_USERS_TYPING", { a: getDisplayName(guildId, a), b: getDisplayName(guildId, b), c: getDisplayName(guildId, c) });
break; break;
} }
default: { default: {
tooltipText = Settings.plugins.TypingTweaks.enabled tooltipText = Settings.plugins.TypingTweaks.enabled
? buildSeveralUsers({ a: getDisplayName(guildId, typingUsersArray[0]), b: getDisplayName(guildId, typingUsersArray[1]), count: typingUsersArray.length - 2 }) ? buildSeveralUsers({ a: UserStore.getUser(a), b: UserStore.getUser(b), count: typingUsersArray.length - 2, guildId })
: getIntlMessage("SEVERAL_USERS_TYPING"); : getIntlMessage("SEVERAL_USERS_TYPING");
break; break;
} }

10
src/plugins/typingTweaks/index.tsx
View file

@ -22,7 +22,7 @@ import { Devs } from "@utils/constants";
import { openUserProfile } from "@utils/discord"; import { openUserProfile } from "@utils/discord";
import definePlugin, { OptionType } from "@utils/types"; import definePlugin, { OptionType } from "@utils/types";
import { Avatar, GuildMemberStore, React, RelationshipStore } from "@webpack/common"; import { Avatar, GuildMemberStore, React, RelationshipStore } from "@webpack/common";
import { Channel, User } from "discord-types/general"; import { User } from "discord-types/general";
import { PropsWithChildren } from "react"; import { PropsWithChildren } from "react";
import managedStyle from "./style.css?managed"; import managedStyle from "./style.css?managed";
@ -45,12 +45,12 @@ const settings = definePluginSettings({
} }
}); });
export const buildSeveralUsers = ErrorBoundary.wrap(({ a, b, count, channel }: { a: User, b: User, count: number; channel: Channel; }) => { export const buildSeveralUsers = ErrorBoundary.wrap(({ a, b, count, guildId }: { a: User, b: User, count: number; guildId: string; }) => {
return ( return (
<> <>
<TypingUser user={a} guildId={channel.guild_id} /> <TypingUser user={a} guildId={guildId} />
{", "} {", "}
<TypingUser user={b} guildId={channel.guild_id} /> <TypingUser user={b} guildId={guildId} />
{", "} {", "}
and {count} others are typing... and {count} others are typing...
</> </>
@ -115,7 +115,7 @@ export default definePlugin({
// Adds the alternative formatting for several users typing // Adds the alternative formatting for several users typing
match: /(,{a:(\i),b:(\i),c:\i}\):\i\.length>3&&\(\i=)\i\.\i\.string\(\i\.\i#{intl::SEVERAL_USERS_TYPING}\)(?<=(\i)\.length.+?)/, match: /(,{a:(\i),b:(\i),c:\i}\):\i\.length>3&&\(\i=)\i\.\i\.string\(\i\.\i#{intl::SEVERAL_USERS_TYPING}\)(?<=(\i)\.length.+?)/,
replace: (_, rest, a, b, users) => replace: (_, rest, a, b, users) =>
`${rest}$self.buildSeveralUsers({ a: ${a}, b: ${b}, count: ${users}.length - 2, channel: arguments[0]?.channel })`, `${rest}$self.buildSeveralUsers({ a: ${a}, b: ${b}, count: ${users}.length - 2, channel: arguments[0]?.channel?.guild_id })`,
predicate: () => settings.store.alternativeFormatting predicate: () => settings.store.alternativeFormatting
} }
] ]