From cfc7d3350beef4b5533295d516506c3d173ff685 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Thu, 23 May 2024 21:33:25 +1000
Subject: [PATCH] fix: message search results will use shortened pubkeys for
 authors

and will now resolve your blinded ids
---
 ts/components/search/MessageSearchResults.tsx | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/ts/components/search/MessageSearchResults.tsx b/ts/components/search/MessageSearchResults.tsx
index b0b0e6484..8fe2af7c9 100644
--- a/ts/components/search/MessageSearchResults.tsx
+++ b/ts/components/search/MessageSearchResults.tsx
@@ -1,6 +1,12 @@
 import styled, { CSSProperties } from 'styled-components';
 
-import { useConversationUsername, useIsPrivate } from '../../hooks/useParamSelector';
+import {
+  useIsPrivate,
+  useIsPublic,
+  useNicknameOrProfileNameOrShortenedPubkey,
+} from '../../hooks/useParamSelector';
+import { isUsAnySogsFromCache } from '../../session/apis/open_group_api/sogsv3/knownBlindedkeys';
+import { PubKey } from '../../session/types';
 import { UserUtils } from '../../session/utils';
 import { getOurPubKeyStrFromCache } from '../../session/utils/User';
 import { openConversationToSpecificMessage } from '../../state/ducks/conversations';
@@ -118,14 +124,18 @@ const FromUserInGroup = (props: { authorPubkey: string; conversationId: string }
   const { authorPubkey, conversationId } = props;
 
   const ourKey = getOurPubKeyStrFromCache();
+  const isPublic = useIsPublic(conversationId);
   const convoIsPrivate = useIsPrivate(conversationId);
-  const authorConvoName = useConversationUsername(authorPubkey);
+  const authorConvoName = useNicknameOrProfileNameOrShortenedPubkey(authorPubkey);
 
   if (convoIsPrivate) {
     return null;
   }
 
-  if (authorPubkey === ourKey) {
+  if (
+    authorPubkey === ourKey ||
+    (isPublic && PubKey.isBlinded(authorPubkey) && isUsAnySogsFromCache(authorPubkey))
+  ) {
     return (
       <StyledConversationFromUserInGroup>{window.i18n('you')}: </StyledConversationFromUserInGroup>
     );