diff --git a/src/webpage/channel.ts b/src/webpage/channel.ts index 85afe8b..e46404e 100644 --- a/src/webpage/channel.ts +++ b/src/webpage/channel.ts @@ -2509,7 +2509,10 @@ class Channel extends SnowFlake { } else { console.error("something bad happened"); } - if (messagez.mentionsuser(this.localuser.user) && messagez.author !== this.localuser.user) { + if ( + (messagez.mentionsuser(this.localuser.user) || this.guild.id === "@me") && + messagez.author !== this.localuser.user + ) { this.mentions++; } this.lastmessageid = messagez.id; @@ -2542,6 +2545,7 @@ class Channel extends SnowFlake { if (this.localuser.user.status === "dnd") { return; } + if ( !this.guild.mute_config || new Date(this.guild.mute_config.end_time).getTime() < Date.now() diff --git a/src/webpage/jsontypes.ts b/src/webpage/jsontypes.ts index c98b106..65d1985 100644 --- a/src/webpage/jsontypes.ts +++ b/src/webpage/jsontypes.ts @@ -310,7 +310,7 @@ type userjson = { bot: boolean; premium_since: string; premium_type: number; - theme_colors: string; + theme_colors: [number, number] | null; pronouns?: string; badge_ids: string[]; webhook?: webhookInfo; diff --git a/src/webpage/localuser.ts b/src/webpage/localuser.ts index ed9a095..9afffed 100644 --- a/src/webpage/localuser.ts +++ b/src/webpage/localuser.ts @@ -8,7 +8,6 @@ import {getBulkInfo, setTheme, Specialuser} from "./utils/utils.js"; import { channeljson, guildFolder, - guildjson, mainuserjson, memberjson, memberlistupdatejson, @@ -2129,6 +2128,7 @@ class Localuser { const colorPicker = settingsLeft.addColorInput(I18n.profileColor(), (_) => {}, { initColor: color, }); + colorPicker.watchForChange((_) => { console.log(); color = _;