userplugins/userflags
1
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request 'more fixes and stuff guh' (#2) from Sqaaakoi-VencordUserPlugins/userflags-fork:more-fixes into main

Browse source 
Reviewed-on: https://git.nin0.dev///userplugins/userflags/pulls/2
This commit is contained in:
nin0dev 2024-10-19 06:13:41 -04:00
commit 5cd3917d22
1 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
index.tsx
View file

@ -10,7 +10,6 @@ import { addAccessory } from "@api/MessageAccessories";
import { Devs } from "@utils/constants"; import { Devs } from "@utils/constants";
import definePlugin from "@utils/types"; import definePlugin from "@utils/types";
import { Parser, React, Text } from "@webpack/common"; import { Parser, React, Text } from "@webpack/common";
import { Message } from "discord-types/general";
let userFlags = new Map<string, Flag>(); let userFlags = new Map<string, Flag>();
@ -27,23 +26,22 @@ type FlagRegistryEntry = {
emoji: string; emoji: string;
}; };
// worst typing ever? const flagRegistry: Record<FlagType, FlagRegistryEntry> = {
const flagRegistry: { [key in FlagType]: FlagRegistryEntry } = {
[FlagType.DANGER]: { [FlagType.DANGER]: {
label: "Danger", label: "Danger",
color: "#ff7473", color: "#ff7473",
emoji: "🛑" emoji: "🛑"
} as FlagRegistryEntry, },
[FlagType.WARNING]: { [FlagType.WARNING]: {
label: "Warning", label: "Warning",
color: "#ffb02e", color: "#ffb02e",
emoji: "⚠️" emoji: "⚠️"
} as FlagRegistryEntry, },
[FlagType.INFO]: { [FlagType.INFO]: {
label: "Info", label: "Info",
color: "#62a8ff", color: "#62a8ff",
emoji: "🔵" emoji: "ℹ️"
} as FlagRegistryEntry, },
[FlagType.POSITIVE]: { [FlagType.POSITIVE]: {
label: "Positive", label: "Positive",
color: "#62ff74", color: "#62ff74",
@ -57,14 +55,22 @@ type Flag = {
text: string; text: string;
}; };
const subscribers = new Set<() => void>();
function subscribe(callback: () => void) {
subscribers.add(callback);
return () => subscribers.delete(callback);
};
function Flag({ id }: { id: string; }) { function Flag({ id }: { id: string; }) {
const flag = React.useSyncExternalStore(subscribe, () => userFlags.get(id));
if (!flag) return null;
return ( return (
<div> <div>
<Text <Text
variant="text-md/bold" variant="text-md/bold"
style={{ color: flagRegistry[userFlags.get(id)?.type || ""]?.color }} style={{ color: flagRegistry[flag.type].color }}
> >
{Parser.parse(flagRegistry[userFlags.get(id)?.type || ""]?.emoji)} {userFlags.get(id)?.text} {Parser.parse(flagRegistry[flag.type].emoji)} {flag.text}
</Text> </Text>
</div> </div>
); );
@ -81,15 +87,12 @@ export default definePlugin({
if (typeof savedFlags === "string") { if (typeof savedFlags === "string") {
userFlags = new Map<string, Flag>(JSON.parse(savedFlags)); userFlags = new Map<string, Flag>(JSON.parse(savedFlags));
} else { } else {
userFlags = new Map(savedFlags); userFlags = new Map<string, Flag>(savedFlags);
} }
} }
addAccessory("flag", (props: Record<string, any>) => { addAccessory("flag", (props: Record<string, any>) => (
if (userFlags.has((props.message as Message).author.id)) { <Flag id={props.message.author.id} />
return <Flag id={props.message.author.id} />; ), 4);
}
return null;
}, 4);
}, },
commands: [ commands: [
{ {
@ -104,9 +107,9 @@ export default definePlugin({
required: true required: true
}, },
{ {
"name": "type", name: "type",
"type": ApplicationCommandOptionType.STRING, type: ApplicationCommandOptionType.STRING,
"description": "The type of flag to add", description: "The type of flag to add",
choices: Object.entries(flagRegistry).map(([key, flag]) => ({ choices: Object.entries(flagRegistry).map(([key, flag]) => ({
name: key, name: key,
label: flag.label, label: flag.label,
@ -130,6 +133,7 @@ export default definePlugin({
type, type,
text text
}); });
subscribers.forEach(cb => cb());
sendBotMessage(ctx.channel.id, { sendBotMessage(ctx.channel.id, {
content: `Flag set on <@${user}> with content \`${text}\`!` content: `Flag set on <@${user}> with content \`${text}\`!`
}); });
@ -152,6 +156,7 @@ export default definePlugin({
execute: async (args: Argument[], ctx: CommandContext) => { execute: async (args: Argument[], ctx: CommandContext) => {
const user = findOption(args, "user", ""); const user = findOption(args, "user", "");
userFlags.delete(user); userFlags.delete(user);
subscribers.forEach(cb => cb());
sendBotMessage(ctx.channel.id, { sendBotMessage(ctx.channel.id, {
content: `Flag removed from <@${user}>` content: `Flag removed from <@${user}>`
}); });