mirror of
https://github.com/Equicord/Equicord.git
synced 2025-02-23 00:29:10 -05:00
Merge branch 'main' into dev
This commit is contained in:
commit
2156bc1576
2 changed files with 2 additions and 2 deletions
|
@ -165,7 +165,7 @@ export default definePlugin({
|
|||
|
||||
getColorString(userId: string, channelOrGuildId: string) {
|
||||
try {
|
||||
if (Settings.plugins.customUserColors.enabled)
|
||||
if (Settings.plugins.CustomUserColors.enabled)
|
||||
return getCustomColorString(userId, true);
|
||||
|
||||
const guildId = ChannelStore.getChannel(channelOrGuildId)?.guild_id ?? GuildStore.getGuild(channelOrGuildId)?.id;
|
||||
|
|
|
@ -60,7 +60,7 @@ interface Props {
|
|||
|
||||
function typingUserColor(guildId: string, userId: string) {
|
||||
if (!settings.store.showRoleColors) return;
|
||||
if (Settings.plugins.customUserColors.enabled) return getCustomColorString(userId, true);
|
||||
if (Settings.plugins.CustomUserColors.enabled) return getCustomColorString(userId, true);
|
||||
return GuildMemberStore.getMember(guildId, userId)?.colorString;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue