From 0eecca4fb912529a35e0254fda12cb2f59b571a7 Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Fri, 1 Mar 2024 14:02:39 -0500
Subject: [PATCH] Message: Fix incorrect meta position on channel posts (#4312)

---
 src/api/gramjs/methods/messages.ts                     |  2 +-
 src/components/middle/message/Message.tsx              |  2 +-
 src/components/middle/message/_message-content.scss    |  2 +-
 .../middle/message/helpers/buildContentClassName.ts    | 10 +++++-----
 src/global/actions/api/messages.ts                     |  4 +++-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/api/gramjs/methods/messages.ts b/src/api/gramjs/methods/messages.ts
index 890443a7a..21dd438ba 100644
--- a/src/api/gramjs/methods/messages.ts
+++ b/src/api/gramjs/methods/messages.ts
@@ -1011,7 +1011,7 @@ export async function fetchMessageViews({
     }))
   )));
 
-  if (!results || results.find((result) => !result)) return undefined;
+  if (!results || results.some((result) => !result)) return undefined;
 
   const viewsList = results.flatMap((result) => result!.views);
   const users = results.flatMap((result) => result!.users);
diff --git a/src/components/middle/message/Message.tsx b/src/components/middle/message/Message.tsx
index 50db62f92..718a369b8 100644
--- a/src/components/middle/message/Message.tsx
+++ b/src/components/middle/message/Message.tsx
@@ -692,7 +692,7 @@ const Message: FC<OwnProps & StateProps> = ({
     asForwarded,
     hasThread: hasThread && !noComments,
     forceSenderName,
-    hasComments: repliesThreadInfo && repliesThreadInfo.messagesCount > 0,
+    hasCommentCounter: hasThread && repliesThreadInfo.messagesCount > 0,
     hasActionButton: canForward || canFocus,
     hasReactions,
     isGeoLiveActive: location?.type === 'geoLive' && !isGeoLiveExpired(message),
diff --git a/src/components/middle/message/_message-content.scss b/src/components/middle/message/_message-content.scss
index b79d7cb23..d908d2725 100644
--- a/src/components/middle/message/_message-content.scss
+++ b/src/components/middle/message/_message-content.scss
@@ -682,7 +682,7 @@
   flex-wrap: wrap;
   align-items: flex-end;
 
-  &.has-comments {
+  &.has-comment-counter {
     min-height: 5.25rem;
     margin-top: 0 !important;
 
diff --git a/src/components/middle/message/helpers/buildContentClassName.ts b/src/components/middle/message/helpers/buildContentClassName.ts
index 99b7dbb2e..fe39aab4e 100644
--- a/src/components/middle/message/helpers/buildContentClassName.ts
+++ b/src/components/middle/message/helpers/buildContentClassName.ts
@@ -12,7 +12,7 @@ export function buildContentClassName(
     asForwarded,
     hasThread,
     forceSenderName,
-    hasComments,
+    hasCommentCounter,
     hasActionButton,
     hasReactions,
     isGeoLiveActive,
@@ -25,7 +25,7 @@ export function buildContentClassName(
     asForwarded?: boolean;
     hasThread?: boolean;
     forceSenderName?: boolean;
-    hasComments?: boolean;
+    hasCommentCounter?: boolean;
     hasActionButton?: boolean;
     hasReactions?: boolean;
     isGeoLiveActive?: boolean;
@@ -69,8 +69,8 @@ export function buildContentClassName(
       classNames.push('round');
     }
 
-    if (hasComments) {
-      classNames.push('has-comments');
+    if (hasCommentCounter) {
+      classNames.push('has-comment-counter');
     }
   }
   if (isMedia) {
@@ -133,7 +133,7 @@ export function buildContentClassName(
   if (!isCustomShape) {
     classNames.push('has-shadow');
 
-    if (isMedia && hasComments) {
+    if (isMedia && hasThread) {
       classNames.push('has-background');
     }
 
diff --git a/src/global/actions/api/messages.ts b/src/global/actions/api/messages.ts
index 8609f3ccc..8842f6925 100644
--- a/src/global/actions/api/messages.ts
+++ b/src/global/actions/api/messages.ts
@@ -1849,7 +1849,9 @@ addActionHandler('loadMessageViews', async (global, actions, payload): Promise<v
       forwardsCount: update.forwards,
     });
 
-    global = updateThreadInfo(global, chatId, update.id, update.threadInfo);
+    if (update.threadInfo) {
+      global = updateThreadInfo(global, chatId, update.id, update.threadInfo);
+    }
   });
 
   setGlobal(global);