Fix MoreUserTags freezing the client
This commit is contained in:
parent
f70cc5205c
commit
035e2add0b
|
@ -55,7 +55,8 @@ const PermissionUtil = findByProps("computePermissions", "canEveryoneRole") as {
|
||||||
computePermissions({ ...args }): bigint;
|
computePermissions({ ...args }): bigint;
|
||||||
};
|
};
|
||||||
|
|
||||||
const Tag = findComponentByCode(".DISCORD_SYSTEM_MESSAGE_BOT_TAG_TOOLTIP,") as React.ComponentType<{ type?: number, className?: string, useRemSizes?: boolean; }> & { Types: Record<string, number>; };
|
const Tag = findComponentByCode(".DISCORD_SYSTEM_MESSAGE_BOT_TAG_TOOLTIP,") as React.ComponentType<{ type?: number, className?: string, useRemSizes?: boolean; }>;
|
||||||
|
const { BotTagTypes } = findByProps("BotTagTypes");
|
||||||
|
|
||||||
const isWebhook = (message: Message, user: User) => !!message?.webhookId && user.isNonUserBot();
|
const isWebhook = (message: Message, user: User) => !!message?.webhookId && user.isNonUserBot();
|
||||||
|
|
||||||
|
@ -116,7 +117,7 @@ function SettingsComponent(props: { setValue(v: any): void; }) {
|
||||||
onMouseEnter={onMouseEnter}
|
onMouseEnter={onMouseEnter}
|
||||||
onMouseLeave={onMouseLeave}
|
onMouseLeave={onMouseLeave}
|
||||||
>
|
>
|
||||||
{t.displayName} Tag <Tag type={Tag.Types[t.name]} />
|
{t.displayName} Tag <Tag type={BotTagTypes[t.name]} />
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
|
@ -316,7 +317,7 @@ export default definePlugin({
|
||||||
return obj;
|
return obj;
|
||||||
},
|
},
|
||||||
|
|
||||||
isOPTag: (tag: number) => tag === Tag.Types.ORIGINAL_POSTER || tags.some(t => tag === Tag.Types[`${t.name}-OP`]),
|
isOPTag: (tag: number) => tag === BotTagTypes.ORIGINAL_POSTER || tags.some(t => tag === BotTagTypes[`${t.name}-OP`]),
|
||||||
|
|
||||||
getTagText(passedTagName: string, strings: Record<string, string>) {
|
getTagText(passedTagName: string, strings: Record<string, string>) {
|
||||||
if (!passedTagName) return strings.APP_TAG;
|
if (!passedTagName) return strings.APP_TAG;
|
||||||
|
@ -349,9 +350,9 @@ export default definePlugin({
|
||||||
if (!user)
|
if (!user)
|
||||||
return null;
|
return null;
|
||||||
if (location === "chat" && user.id === "1")
|
if (location === "chat" && user.id === "1")
|
||||||
return Tag.Types.OFFICIAL;
|
return BotTagTypes.OFFICIAL;
|
||||||
if (user.isClyde())
|
if (user.isClyde())
|
||||||
return Tag.Types.AI;
|
return BotTagTypes.AI;
|
||||||
|
|
||||||
let type = typeof origType === "number" ? origType : null;
|
let type = typeof origType === "number" ? origType : null;
|
||||||
|
|
||||||
|
@ -370,11 +371,11 @@ export default definePlugin({
|
||||||
(tag.condition?.(message!, user, channel))
|
(tag.condition?.(message!, user, channel))
|
||||||
) {
|
) {
|
||||||
if (channel.isForumPost() && channel.ownerId === user.id)
|
if (channel.isForumPost() && channel.ownerId === user.id)
|
||||||
type = Tag.Types[`${tag.name}-OP`];
|
type = BotTagTypes[`${tag.name}-OP`];
|
||||||
else if (user.bot && !isWebhook(message!, user) && !settings.dontShowBotTag)
|
else if (user.bot && !isWebhook(message!, user) && !settings.dontShowBotTag)
|
||||||
type = Tag.Types[`${tag.name}-BOT`];
|
type = BotTagTypes[`${tag.name}-BOT`];
|
||||||
else
|
else
|
||||||
type = Tag.Types[tag.name];
|
type = BotTagTypes[tag.name];
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,14 @@ import { makeLazy } from "./lazy";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A lazy component. The factory method is called on first render.
|
* A lazy component. The factory method is called on first render.
|
||||||
|
*
|
||||||
|
* IMPORTANT: You cannot access properties set on the lazy component using this method.
|
||||||
|
*
|
||||||
|
* Example of how you cannot access the properties set on the component:
|
||||||
|
* ```
|
||||||
|
* const Component = LazyComponent(...);
|
||||||
|
* console.log(Component.Types); // This will not work
|
||||||
|
* ````
|
||||||
* @param factory Function returning a component
|
* @param factory Function returning a component
|
||||||
* @param attempts How many times to try to get the component before giving up
|
* @param attempts How many times to try to get the component before giving up
|
||||||
* @returns Result of factory function
|
* @returns Result of factory function
|
||||||
|
|
|
@ -182,6 +182,14 @@ export function find<T = any>(filter: FilterFn, callback: (mod: any) => any = m
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Find the first component that matches the filter.
|
* Find the first component that matches the filter.
|
||||||
|
*
|
||||||
|
* IMPORTANT: You cannot access properties set on the found component using this method. You should instead try to obtain the property using a non component find instead.
|
||||||
|
*
|
||||||
|
* Example of how you cannot access the properties set on the component:
|
||||||
|
* ```
|
||||||
|
* const Component = findComponent(...);
|
||||||
|
* console.log(Component.Types); // This will not work
|
||||||
|
* ````
|
||||||
* @param filter A function that takes a module and returns a boolean
|
* @param filter A function that takes a module and returns a boolean
|
||||||
* @param parse A function that takes the found component as its first argument and returns a component. Useful if you want to wrap the found component in something. Defaults to the original component
|
* @param parse A function that takes the found component as its first argument and returns a component. Useful if you want to wrap the found component in something. Defaults to the original component
|
||||||
* @returns The component if found, or a noop component
|
* @returns The component if found, or a noop component
|
||||||
|
@ -226,6 +234,13 @@ export function findComponent<T extends object = any>(filter: FilterFn, parse: (
|
||||||
/**
|
/**
|
||||||
* Find the first component that is exported by the first prop name.
|
* Find the first component that is exported by the first prop name.
|
||||||
*
|
*
|
||||||
|
* IMPORTANT: You cannot access properties set on the found component using this method. You should instead try to obtain the property using a non component find instead.
|
||||||
|
*
|
||||||
|
* Example of how you cannot access the properties set on the component:
|
||||||
|
* ```
|
||||||
|
* const Component = findExportedComponent(...);
|
||||||
|
* console.log(Component.Types); // This will not work
|
||||||
|
* ````
|
||||||
* @example findExportedComponent("FriendRow")
|
* @example findExportedComponent("FriendRow")
|
||||||
* @example findExportedComponent("FriendRow", "Friend", FriendRow => React.memo(FriendRow))
|
* @example findExportedComponent("FriendRow", "Friend", FriendRow => React.memo(FriendRow))
|
||||||
*
|
*
|
||||||
|
@ -271,6 +286,13 @@ export function findExportedComponent<T extends object = any>(...props: string[]
|
||||||
/**
|
/**
|
||||||
* Find the first component in a default export that includes all the given code.
|
* Find the first component in a default export that includes all the given code.
|
||||||
*
|
*
|
||||||
|
* IMPORTANT: You cannot access properties set on the found component using this method. You should instead try to obtain the property using a non component find instead.
|
||||||
|
*
|
||||||
|
* Example of how you cannot access the properties set on the component:
|
||||||
|
* ```
|
||||||
|
* const Component = findComponentByCode(...);
|
||||||
|
* console.log(Component.Types); // This will not work
|
||||||
|
* ````
|
||||||
* @example findComponentByCode(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR")
|
* @example findComponentByCode(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR")
|
||||||
* @example findComponentByCode(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR", ".BACKGROUND_PRIMARY)", ColorPicker => React.memo(ColorPicker))
|
* @example findComponentByCode(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR", ".BACKGROUND_PRIMARY)", ColorPicker => React.memo(ColorPicker))
|
||||||
*
|
*
|
||||||
|
@ -507,6 +529,14 @@ export function webpackDependantLazy<T = any>(factory: () => any, attempts?: num
|
||||||
* This is just a wrapper around {@link LazyComponent} to make our reporter test for your webpack finds.
|
* This is just a wrapper around {@link LazyComponent} to make our reporter test for your webpack finds.
|
||||||
*
|
*
|
||||||
* A lazy component. The factory method is called on first render.
|
* A lazy component. The factory method is called on first render.
|
||||||
|
*
|
||||||
|
* IMPORTANT: You cannot access properties set on the lazy component using this method.
|
||||||
|
*
|
||||||
|
* Example of how you cannot access the properties set on the component:
|
||||||
|
* ```
|
||||||
|
* const Component = webpackDependantLazyComponent(...);
|
||||||
|
* console.log(Component.Types); // This will not work
|
||||||
|
* ````
|
||||||
* @param factory Function returning a Component
|
* @param factory Function returning a Component
|
||||||
* @param attempts How many times to try to get the component before giving up
|
* @param attempts How many times to try to get the component before giving up
|
||||||
* @returns Result of factory function
|
* @returns Result of factory function
|
||||||
|
@ -543,6 +573,14 @@ export const proxyLazyWebpack = deprecatedRedirect("proxyLazyWebpack", "webpackD
|
||||||
* This is just a wrapper around {@link LazyComponent} to make our reporter test for your webpack finds.
|
* This is just a wrapper around {@link LazyComponent} to make our reporter test for your webpack finds.
|
||||||
*
|
*
|
||||||
* A lazy component. The factory method is called on first render.
|
* A lazy component. The factory method is called on first render.
|
||||||
|
*
|
||||||
|
* IMPORTANT: You cannot access properties set on the lazy component using this method.
|
||||||
|
*
|
||||||
|
* Example of how you cannot access the properties set on the component:
|
||||||
|
* ```
|
||||||
|
* const Component = LazyComponentWebpack(...);
|
||||||
|
* console.log(Component.Types); // This will not work
|
||||||
|
* ````
|
||||||
* @param factory Function returning a Component
|
* @param factory Function returning a Component
|
||||||
* @param attempts How many times to try to get the component before giving up
|
* @param attempts How many times to try to get the component before giving up
|
||||||
* @returns Result of factory function
|
* @returns Result of factory function
|
||||||
|
|
Loading…
Reference in a new issue