From 56d234216557d206ea84632252f5c3838d323ee8 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Thu, 8 Aug 2024 14:19:41 -0400
Subject: [PATCH] UnreadBadgeCount PR Ver
---
.../unreadBadgeCount/index.tsx | 91 ++++++++++++++++---
.../unreadBadgeCount/styles.css | 16 ++++
2 files changed, 94 insertions(+), 13 deletions(-)
diff --git a/src/equicordplugins/unreadBadgeCount/index.tsx b/src/equicordplugins/unreadBadgeCount/index.tsx
index 20a7736f..0b461cdc 100644
--- a/src/equicordplugins/unreadBadgeCount/index.tsx
+++ b/src/equicordplugins/unreadBadgeCount/index.tsx
@@ -4,33 +4,98 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
+import "./styles.css";
+
+import { definePluginSettings } from "@api/Settings";
import ErrorBoundary from "@components/ErrorBoundary";
import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
-import { findByPropsLazy } from "@webpack";
+import definePlugin, { OptionType } from "@utils/types";
+import { findByPropsLazy, findStoreLazy } from "@webpack";
import { ReadStateStore, useStateFromStores } from "@webpack/common";
+import { Channel } from "discord-types/general";
+
+const UserGuildSettingsStore = findStoreLazy("UserGuildSettingsStore");
+const JoinedThreadsStore = findStoreLazy("JoinedThreadsStore");
const { NumberBadge } = findByPropsLazy("NumberBadge");
-import "./styles.css";
+const settings = definePluginSettings({
+ showOnMutedChannels: {
+ description: "Show unread count on muted channels",
+ type: OptionType.BOOLEAN,
+ default: false,
+ },
+ notificationCountLimit: {
+ description: "Show +99 instead of true amount",
+ type: OptionType.BOOLEAN,
+ default: false,
+ },
+ replaceWhiteDot: {
+ description: "Replace the white dot with the badge",
+ type: OptionType.BOOLEAN,
+ default: false,
+ restartNeeded: true,
+ },
+});
export default definePlugin({
name: "UnreadCountBadge",
authors: [Devs.Joona],
- description: "Show unread count in the channel list",
+ description: "Shows unread message count badges on channels in the channel list",
+ settings,
+
patches: [
// Kanged from typingindicators
{
find: "UNREAD_IMPORTANT:",
- replacement: {
- match: /\.name\),.{0,120}\.children.+?:null(?<=,channel:(\i).+?)/,
- replace: "$&,$self.CountBadge({channelId:$1.id})"
- }
+ replacement: [
+ {
+ match: /\.name\),.{0,120}\.children.+?:null/,
+ replace: "$&,$self.CountBadge({channel: arguments[0].channel,})",
+ predicate: () => !settings.store.replaceWhiteDot
+ },
+ {
+ match: /\(0,\i\.jsx\)\("div",{className:\i\(\)\(\i\.unread,\i\?\i\.unreadImportant:void 0\)}\)/,
+ replace: "$self.CountBadge({channel: arguments[0].channel, whiteDot:$&})",
+ predicate: () => settings.store.replaceWhiteDot
+ }
+ ]
+ },
+ // Threads
+ {
+ // This is the thread "spine" that shows in the left
+ find: "M11 9H4C2.89543 9 2 8.10457 2 7V1C2 0.447715 1.55228 0 1 0C0.447715 0 0 0.447715 0 1V7C0 9.20914 1.79086 11 4 11H11C11.5523 11 12 10.5523 12 10C12 9.44771 11.5523 9 11 9Z",
+ replacement: [
+ {
+ match: /mentionsCount:\i.{0,50}?null/,
+ replace: "$&,$self.CountBadge({channel: arguments[0].thread})",
+ predicate: () => !settings.store.replaceWhiteDot
+ },
+ {
+ match: /\(0,\i\.jsx\)\("div",{className:\i\(\)\(\i\.unread,\i\.unreadImportant\)}\)/,
+ replace: "$self.CountBadge({channel: arguments[0].thread, whiteDot:$&})",
+ predicate: () => settings.store.replaceWhiteDot
+ }
+ ]
},
],
- CountBadge: ErrorBoundary.wrap(({ channelId }: { channelId: string; }) => {
- const unreadCount = useStateFromStores([ReadStateStore], () => ReadStateStore.getUnreadCount(channelId));
- if (!unreadCount) return null;
- return ;
- }, { noop: true })
+ CountBadge: ErrorBoundary.wrap(({ channel, whiteDot }: { channel: Channel, whiteDot?: JSX.Element; }) => {
+ const unreadCount = useStateFromStores([ReadStateStore], () => ReadStateStore.getUnreadCount(channel.id));
+ if (!unreadCount) return whiteDot || null;
+
+ if (!settings.store.showOnMutedChannels && (UserGuildSettingsStore.isChannelMuted(channel.guild_id, channel.id) || JoinedThreadsStore.isMuted(channel.id)))
+ return null;
+ const className = `vc-unreadCountBadge${whiteDot ? "-dot" : ""}${channel.threadMetadata ? "-thread" : ""}`;
+ return (
+ 99 && settings.store.notificationCountLimit
+ ? "+99"
+ : unreadCount
+ }
+ />
+ );
+ }, { noop: true }),
});
diff --git a/src/equicordplugins/unreadBadgeCount/styles.css b/src/equicordplugins/unreadBadgeCount/styles.css
index 793d089e..e049e72c 100644
--- a/src/equicordplugins/unreadBadgeCount/styles.css
+++ b/src/equicordplugins/unreadBadgeCount/styles.css
@@ -2,6 +2,22 @@
margin-left: 4px;
}
+.vc-unreadCountBadge-dot {
+ position: absolute;
+ top: 25%;
+ margin-left: -3%;
+ scale: 0.9;
+ z-index: 1;
+}
+
+.vc-unreadCountBadge-dot-thread {
+ position: absolute;
+ top: 20%;
+ margin-left: -18%;
+ scale: 0.9;
+ z-index: 1;
+}
+
[class*="modeMuted_"] .unreadCountBadge {
display: none;
}