RoleColorEverywhere: Fix message headers colors (#3036)
This commit is contained in:
parent
f8dfe217b1
commit
7ca4ea3d13
1 changed files with 9 additions and 11 deletions
|
@ -156,7 +156,7 @@ export default definePlugin({
|
||||||
find: "#{intl::MESSAGE_EDITED}",
|
find: "#{intl::MESSAGE_EDITED}",
|
||||||
replacement: {
|
replacement: {
|
||||||
match: /(?<=isUnsupported\]:(\i)\.isUnsupported\}\),)(?=children:\[)/,
|
match: /(?<=isUnsupported\]:(\i)\.isUnsupported\}\),)(?=children:\[)/,
|
||||||
replace: "style:$self.useMessageColorStyle($1),"
|
replace: "style:$self.useMessageColorsStyle($1),"
|
||||||
},
|
},
|
||||||
predicate: () => settings.store.colorChatMessages
|
predicate: () => settings.store.colorChatMessages
|
||||||
}
|
}
|
||||||
|
@ -188,13 +188,19 @@ export default definePlugin({
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
useMessageColor(message: any) {
|
useMessageColorsStyle(message: any) {
|
||||||
try {
|
try {
|
||||||
const { messageSaturation } = settings.use(["messageSaturation"]);
|
const { messageSaturation } = settings.use(["messageSaturation"]);
|
||||||
const author = useMessageAuthor(message);
|
const author = useMessageAuthor(message);
|
||||||
|
|
||||||
if (author.colorString != null && messageSaturation !== 0) {
|
if (author.colorString != null && messageSaturation !== 0) {
|
||||||
return `color-mix(in oklab, ${author.colorString} ${messageSaturation}%, var(--text-normal))`;
|
const value = `color-mix(in oklab, ${author.colorString} ${messageSaturation}%, var({DEFAULT}))`;
|
||||||
|
|
||||||
|
return {
|
||||||
|
color: value.replace("{DEFAULT}", "--text-normal"),
|
||||||
|
"--header-primary": value.replace("{DEFAULT}", "--header-primary"),
|
||||||
|
"--text-muted": value.replace("{DEFAULT}", "--text-muted")
|
||||||
|
};
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
new Logger("RoleColorEverywhere").error("Failed to get message color", e);
|
new Logger("RoleColorEverywhere").error("Failed to get message color", e);
|
||||||
|
@ -203,14 +209,6 @@ export default definePlugin({
|
||||||
return null;
|
return null;
|
||||||
},
|
},
|
||||||
|
|
||||||
useMessageColorStyle(message: any) {
|
|
||||||
const color = this.useMessageColor(message);
|
|
||||||
|
|
||||||
return color && {
|
|
||||||
color
|
|
||||||
};
|
|
||||||
},
|
|
||||||
|
|
||||||
RoleGroupColor: ErrorBoundary.wrap(({ id, count, title, guildId, label }: { id: string; count: number; title: string; guildId: string; label: string; }) => {
|
RoleGroupColor: ErrorBoundary.wrap(({ id, count, title, guildId, label }: { id: string; count: number; title: string; guildId: string; label: string; }) => {
|
||||||
const role = GuildStore.getRole(guildId, id);
|
const role = GuildStore.getRole(guildId, id);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue