Merge branch 'dev'

This commit is contained in:
thororen1234 2024-11-17 19:09:29 -05:00
commit 4c0c0d4eef
2 changed files with 4 additions and 3 deletions

View file

@ -8,7 +8,8 @@ const extensionMap = {
"ogg": [".ogv", ".oga", ".ogx", ".ogm", ".spx", ".opus"], "ogg": [".ogv", ".oga", ".ogx", ".ogm", ".spx", ".opus"],
"jpg": [".jpg", ".jpeg", ".jfif", ".jpe", ".jif", ".jfi", ".pjpeg", ".pjp"], "jpg": [".jpg", ".jpeg", ".jfif", ".jpe", ".jif", ".jfi", ".pjpeg", ".pjp"],
"svg": [".svgz"], "svg": [".svgz"],
"mp4": [".m4v", ".m4r", ".m4b", ".m4p"], "mp4": [".m4v", ".m4r", ".m4p"],
"m4a": [".m4b"],
"mov": [".movie", ".qt"], "mov": [".movie", ".qt"],
}; };

View file

@ -214,9 +214,9 @@ export default definePlugin({
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);
return role != null && ( return (
<span style={{ <span style={{
color: role.colorString, color: role?.colorString,
fontWeight: "unset", fontWeight: "unset",
letterSpacing: ".05em" letterSpacing: ".05em"
}}> }}>