Merge branch 'mobx'

src/components/navigation/left/ServerListSidebar.tsx

@@ -12,9 +12,7 @@ import ConditionalLink from "../../../lib/ConditionalLink";
 import PaintCounter from "../../../lib/PaintCounter";
 import { isTouchscreenDevice } from "../../../lib/isTouchscreenDevice";
 
-import { connectState } from "../../../redux/connector";
-import { LastOpened } from "../../../redux/reducers/last_opened";
-import { Unreads } from "../../../redux/reducers/unreads";
+import { useApplicationState } from "../../../mobx/State";
 
 import { useIntermediate } from "../../../context/intermediate/Intermediate";
 import { useClient } from "../../../context/revoltjs/RevoltClient";
@@ -25,7 +23,6 @@ import UserHover from "../../common/user/UserHover";
 import UserIcon from "../../common/user/UserIcon";
 import IconButton from "../../ui/IconButton";
 import LineDivider from "../../ui/LineDivider";
-import { mapChannelWithUnread } from "./common";
 
 import { Children } from "../../../types/Preact";
 
@@ -195,46 +192,14 @@ function Swoosh() {
     );
 }
 
-interface Props {
-    unreads: Unreads;
-    lastOpened: LastOpened;
-}
-
-export const ServerListSidebar = observer(({ unreads, lastOpened }: Props) => {
+export default observer(() => {
     const client = useClient();
+    const state = useApplicationState();
 
     const { server: server_id } = useParams<{ server?: string }>();
     const server = server_id ? client.servers.get(server_id) : undefined;
-    const activeServers = [...client.servers.values()];
-    const channels = [...client.channels.values()].map((x) =>
-        mapChannelWithUnread(x, unreads),
-    );
-
-    const unreadChannels = channels
-        .filter((x) => x.unread)
-        .map((x) => x.channel?._id);
-
-    const servers = activeServers.map((server) => {
-        let alertCount = 0;
-        for (const id of server.channel_ids) {
-            const channel = channels.find((x) => x.channel?._id === id);
-            if (channel?.alertCount) {
-                alertCount += channel.alertCount;
-            }
-        }
-
-        return {
-            server,
-            unread: (typeof server.channel_ids.find((x) =>
-                unreadChannels.includes(x),
-            ) !== "undefined"
-                ? alertCount > 0
-                    ? "mention"
-                    : "unread"
-                : undefined) as "mention" | "unread" | undefined,
-            alertCount,
-        };
-    });
+    const servers = [...client.servers.values()];
+    const channels = [...client.channels.values()];
 
     const history = useHistory();
     const path = useLocation().pathname;
@@ -242,16 +207,16 @@ export const ServerListSidebar = observer(({ unreads, lastOpened }: Props) => {
 
     let homeUnread: "mention" | "unread" | undefined;
     let alertCount = 0;
-    for (const x of channels) {
-        if (x.channel?.channel_type === "Group" && x.unread) {
+    for (const channel of channels) {
+        if (channel?.channel_type === "Group" && channel.unread) {
             homeUnread = "unread";
-            alertCount += x.alertCount ?? 0;
+            alertCount += channel.mentions.length;
         }
 
         if (
-            x.channel?.channel_type === "DirectMessage" &&
-            x.channel.active &&
-            x.unread
+            channel.channel_type === "DirectMessage" &&
+            channel.active &&
+            channel.unread
         ) {
             alertCount++;
         }
@@ -270,7 +235,7 @@ export const ServerListSidebar = observer(({ unreads, lastOpened }: Props) => {
             <ServerList>
                 <ConditionalLink
                     active={homeActive}
-                    to={lastOpened.home ? `/channel/${lastOpened.home}` : "/"}>
+                    to={state.layout.getLastHomePath()}>
                     <ServerEntry home active={homeActive}>
                         <Swoosh />
                         <div
@@ -278,13 +243,13 @@ export const ServerListSidebar = observer(({ unreads, lastOpened }: Props) => {
                             onClick={() =>
                                 homeActive && history.push("/settings")
                             }>
-                            <UserHover user={client.user}>
+                            <UserHover user={client.user ?? undefined}>
                                 <Icon
                                     size={42}
                                     unread={homeUnread}
                                     count={alertCount}>
                                     <UserIcon
-                                        target={client.user}
+                                        target={client.user ?? undefined}
                                         size={32}
                                         status
                                         hover
@@ -295,35 +260,40 @@ export const ServerListSidebar = observer(({ unreads, lastOpened }: Props) => {
                     </ServerEntry>
                 </ConditionalLink>
                 <LineDivider />
-                {servers.map((entry) => {
-                    const active = entry.server._id === server?._id;
-                    const id = lastOpened[entry.server._id];
+                {servers.map((server) => {
+                    const active = server._id === server_id;
+
+                    const isUnread = server.isUnread(state.notifications);
+                    const mentionCount = server.getMentions(
+                        state.notifications,
+                    ).length;
 
                     return (
                         <ConditionalLink
-                            key={entry.server._id}
+                            key={server._id}
                             active={active}
-                            to={`/server/${entry.server._id}${
-                                id ? `/channel/${id}` : ""
-                            }`}>
+                            to={state.layout.getServerPath(server._id)}>
                             <ServerEntry
                                 active={active}
                                 onContextMenu={attachContextMenu("Menu", {
-                                    server: entry.server._id,
-                                    unread: entry.unread,
+                                    server: server._id,
+                                    unread: isUnread,
                                 })}>
                                 <Swoosh />
                                 <Tooltip
-                                    content={entry.server.name}
+                                    content={server.name}
                                     placement="right">
                                     <Icon
                                         size={42}
-                                        unread={entry.unread}
-                                        count={entry.alertCount}>
-                                        <ServerIcon
-                                            size={32}
-                                            target={entry.server}
-                                        />
+                                        unread={
+                                            mentionCount > 0
+                                                ? "mention"
+                                                : isUnread
+                                                ? "unread"
+                                                : undefined
+                                        }
+                                        count={mentionCount}>
+                                        <ServerIcon size={32} target={server} />
                                     </Icon>
                                 </Tooltip>
                             </ServerEntry>
@@ -357,10 +327,3 @@ export const ServerListSidebar = observer(({ unreads, lastOpened }: Props) => {
         </ServersBase>
     );
 });
-
-export default connectState(ServerListSidebar, (state) => {
-    return {
-        unreads: state.unreads,
-        lastOpened: state.lastOpened,
-    };
-});