Simplify conditions, fix message.new handler

Author: arnautov-anton

src/components/ChannelList/hooks/useChannelListShape.ts

@@ -113,10 +113,15 @@ export const useChannelListShapeDefaults = <SCG extends ExtendableGenerics>() =>
         return customHandler(setChannels, event);
       }
 
-      setChannels((channels) => {
-        const targetChannelIndex = channels.findIndex((channel) => channel.cid === event.cid);
+      const channelType = event.channel_type;
+      const channelId = event.channel_id;
+
+      if (!channelType || !channelId) return;
+
+      setChannels((currentChannels) => {
+        const targetChannel = client.channel(channelType, channelId);
+        const targetChannelIndex = currentChannels.indexOf(targetChannel);
         const targetChannelExistsWithinList = targetChannelIndex >= 0;
-        const targetChannel = channels[targetChannelIndex];
 
         const isTargetChannelPinned = isChannelPinned(targetChannel);
         const isTargetChannelArchived = isChannelArchived(targetChannel);
@@ -126,34 +131,24 @@ export const useChannelListShapeDefaults = <SCG extends ExtendableGenerics>() =>
 
         if (
           // target channel is archived, filter is defined and is set to false
-          (isTargetChannelArchived && considerArchivedChannels && !filters.archived) ||
+          (considerArchivedChannels && isTargetChannelArchived && !filters.archived) ||
+          (considerArchivedChannels && !isTargetChannelArchived && filters.archived) ||
           // target channel is pinned, sort is defined
           (isTargetChannelPinned && considerPinnedChannels) ||
           // list order is locked
           lockChannelOrder ||
           // target channel is not within the loaded list and loading from cache is disallowed
           (!targetChannelExistsWithinList && !allowNewMessagesFromUnfilteredChannels)
         ) {
-          return channels;
-        }
-
-        // we either have the channel to move or we pull it from the cache (or instantiate) if it's allowed
-        const channelToMove: Channel<SCG> | null =
-          channels[targetChannelIndex] ??
-          (allowNewMessagesFromUnfilteredChannels && event.channel_type
-            ? client.channel(event.channel_type, event.channel_id)
-            : null);
-
-        if (channelToMove) {
-          return moveChannelUpwards({
-            channels,
-            channelToMove,
-            channelToMoveIndexWithinChannels: targetChannelIndex,
-            sort,
-          });
+          return currentChannels;
         }
 
-        return channels;
+        return moveChannelUpwards({
+          channels: currentChannels,
+          channelToMove: targetChannel,
+          channelToMoveIndexWithinChannels: targetChannelIndex,
+          sort,
+        });
       });
     },
     [client],
@@ -272,7 +267,6 @@ export const useChannelListShapeDefaults = <SCG extends ExtendableGenerics>() =>
         return;
       }
 
-      const member = event.member;
       const channelType = event.channel_type;
       const channelId = event.channel_id;
 
@@ -287,6 +281,9 @@ export const useChannelListShapeDefaults = <SCG extends ExtendableGenerics>() =>
         const targetChannelIndex = currentChannels.indexOf(targetChannel);
         const targetChannelExistsWithinList = targetChannelIndex >= 0;
 
+        const isTargetChannelArchived = isChannelArchived(targetChannel);
+        const isTargetChannelPinned = isChannelPinned(targetChannel);
+
         // handle pinning
         if (!considerPinnedChannels || lockChannelOrder) return currentChannels;
 
@@ -298,9 +295,8 @@ export const useChannelListShapeDefaults = <SCG extends ExtendableGenerics>() =>
 
         // handle archiving (remove channel)
         if (
-          considerArchivedChannels &&
-          ((typeof member.archived_at === 'string' && !filters.archived) ||
-            (!member.archived_at && filters.archived))
+          (considerArchivedChannels && isTargetChannelArchived && !filters.archived) ||
+          (considerArchivedChannels && !isTargetChannelArchived && filters.archived)
         ) {
           return newChannels;
         }
@@ -310,7 +306,7 @@ export const useChannelListShapeDefaults = <SCG extends ExtendableGenerics>() =>
         // calculate last pinned channel index only if `pinned_at` sort is set to
         // ascending order or if it's in descending order while the pin is being removed, otherwise
         // we move to the top (index 0)
-        if (pinnedAtSort === 1 || (pinnedAtSort === -1 && !member.pinned_at)) {
+        if (pinnedAtSort === 1 || (pinnedAtSort === -1 && !isTargetChannelPinned)) {
           lastPinnedChannelIndex = findLastPinnedChannelIndex({ channels: newChannels });
         }
 

src/components/ChannelList/utils.ts

@@ -179,15 +179,15 @@ export const shouldConsiderArchivedChannels = <SCG extends ExtendableGenerics>(
 export const isChannelPinned = <SCG extends ExtendableGenerics>(channel: Channel<SCG>) => {
   if (!channel) return false;
 
-  const member = channel.state.membership;
+  const membership = channel.state.membership;
 
-  return !!member?.pinned_at;
+  return typeof membership.pinned_at === 'string';
 };
 
 export const isChannelArchived = <SCG extends ExtendableGenerics>(channel: Channel<SCG>) => {
   if (!channel) return false;
 
-  const member = channel.state.membership;
+  const membership = channel.state.membership;
 
-  return !!member?.archived_at;
+  return typeof membership.archived_at === 'string';
 };