From b745cdd4d7a84e26b75fbadb03984001ef66760f Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Tue, 4 Jan 2022 14:40:03 +0000
Subject: [PATCH] fix: show full member list on update

---
 .../navigation/right/MemberSidebar.tsx        | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/components/navigation/right/MemberSidebar.tsx b/src/components/navigation/right/MemberSidebar.tsx
index f912df6e..f05296fb 100644
--- a/src/components/navigation/right/MemberSidebar.tsx
+++ b/src/components/navigation/right/MemberSidebar.tsx
@@ -1,5 +1,4 @@
 /* eslint-disable react-hooks/rules-of-hooks */
-import isEqual from "lodash.isequal";
 import { reaction } from "mobx";
 import { observer } from "mobx-react-lite";
 import { useParams } from "react-router-dom";
@@ -9,7 +8,7 @@ import { Channel } from "revolt.js/dist/maps/Channels";
 import { Server } from "revolt.js/dist/maps/Servers";
 import { User } from "revolt.js/dist/maps/Users";
 
-import { Inputs, useContext, useEffect, useRef, useState } from "preact/hooks";
+import { useContext, useEffect, useState } from "preact/hooks";
 
 import { defer } from "../../../lib/defer";
 
@@ -22,15 +21,6 @@ import {
 import { GenericSidebarBase } from "../SidebarBase";
 import MemberList, { MemberListGroup } from "./MemberList";
 
-/*export const Container = styled.div`
-    padding-top: 48px;
-
-    ${isTouchscreenDevice &&
-    css`
-        padding-top: 0;
-    `}
-`;*/
-
 export default function MemberSidebar() {
     const channel = useClient().channels.get(
         useParams<{ channel: string }>().channel,
@@ -48,14 +38,13 @@ export default function MemberSidebar() {
 
 function useEntries(
     channel: Channel,
-    keys: string[],
-    renderListener: (effect: () => void) => () => void,
+    renderListener: (effect: (keys: string[]) => void) => () => void,
     isServer?: boolean,
 ) {
     const client = channel.client;
     const [entries, setEntries] = useState<MemberListGroup[]>([]);
 
-    function sort() {
+    function sort(keys: string[]) {
         defer(() => {
             const categories: { [key: string]: [User, string][] } = {
                 online: [],
@@ -170,8 +159,6 @@ function useEntries(
         });
     }
 
-    useEffect(() => sort(), []);
-
     useEffect(() => {
         return renderListener(sort);
         // eslint-disable-next-line
@@ -182,8 +169,8 @@ function useEntries(
 
 export const GroupMemberSidebar = observer(
     ({ channel }: { channel: Channel }) => {
-        const entries = useEntries(channel, channel.recipient_ids!, (effect) =>
-            reaction(() => channel.recipient_ids, effect),
+        const entries = useEntries(channel, (effect) =>
+            reaction(() => channel.recipient_ids!, effect),
         );
 
         return (
@@ -222,7 +209,6 @@ export const ServerMemberSidebar = observer(
 
         const entries = useEntries(
             channel,
-            [...client.members.keys()],
             (effect) => reaction(() => [...client.members.keys()], effect),
             true,
         );