Merge branch 'main' into dev
Some checks are pending
Sync to Codeberg / Sync Codeberg and Github (push) Waiting to run
Test / Test (push) Waiting to run

This commit is contained in:
thororen1234 2025-02-17 01:18:21 -05:00
commit 2156bc1576
No known key found for this signature in database
2 changed files with 2 additions and 2 deletions

View file

@ -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;

View file

@ -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;
}