fix for badge and unread count

E-boi · Jun 18, 2024 · a615c3d · a615c3d
1 parent eeafddf
commit a615c3d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/plugins/pindms/components/GuildPins.tsx b/plugins/pindms/components/GuildPins.tsx
@@ -143,8 +143,9 @@ function GuildPin({ id }: { id: string }) {
   const status = common.flux.useStateFromStores<string>([StatusStore], () =>
     StatusStore!.getStatus(user.id),
   );
-  const unreadCount = common.flux.useStateFromStores<number>([ReadStateStore], () =>
-    ReadStateStore!.getUnreadCount(channel.id),
+  const unreadCount = common.flux.useStateFromStores<number>(
+    [ReadStateStore],
+    () => ReadStateStore!.getUnreadCount(channel.id) || ReadStateStore!.getMentionCount(channel.id),
   );
   const isTyping = common.flux.useStateFromStores<boolean>([TypingStore], () =>
     TypingStore!.isTyping(channel.id, user.id),

diff --git a/plugins/pindms/components/index.ts b/plugins/pindms/components/index.ts
@@ -94,7 +94,7 @@ export const StatusBlob = AvatarRaw?.X as FC | undefined;
 
 const BadgeRaw = webpack.getBySource('"count","color","disableColor","shape","className","style"');
 
-export const Badge = webpack.getByProps<{
+export const Badge = await webpack.waitForProps<{
   renderMediaBadge: (props: {
     activeEvent?: boolean;
     activity?: boolean;

diff --git a/plugins/pindms/stores.tsx b/plugins/pindms/stores.tsx
@@ -11,7 +11,11 @@ export const TypingStore = webpack.getByStoreName<
 >("TypingStore");
 
 export const ReadStateStore = webpack.getByStoreName<
-  Store & { getUnreadCount: (channelId: string) => number; lastMessageId: (id: string) => number }
+  Store & {
+    getUnreadCount: (channelId: string) => number;
+    getMentionCount: (channelId: string) => number;
+    lastMessageId: (id: string) => number;
+  }
 >("ReadStateStore");
 
 export const ChannelStore = webpack.getByStoreName<