Page MenuHomePhorge
Files F32557385

D5218.1767247591.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D5218.1767247591.diff
View Options

diff --git a/lib/shared/thread-utils.js b/lib/shared/thread-utils.js
--- a/lib/shared/thread-utils.js
+++ b/lib/shared/thread-utils.js
@@ -209,18 +209,23 @@
.map(memberInfo => memberInfo.id);
}
+function threadMembersWithoutAddedAshoat<T: ThreadInfo | RawThreadInfo>(
+ threadInfo: T,
+): $PropertyType<T, 'members'> {
+ if (threadInfo.community !== genesis.id) {
+ return threadInfo.members;
+ }
+ return threadInfo.members.filter(
+ member => member.id !== ashoat.id || member.role,
+ );
+}
+
function threadIsGroupChat(threadInfo: ThreadInfo | RawThreadInfo): boolean {
return (
- threadInfo.members.filter(member => {
- if (
- member.id === ashoat.id &&
- !member.role &&
- threadInfo.community === genesis.id
- ) {
- return false;
- }
- return member.role || member.permissions[threadPermissions.VOICED]?.value;
- }).length > 2
+ threadMembersWithoutAddedAshoat(threadInfo).filter(
+ member =>
+ member.role || member.permissions[threadPermissions.VOICED]?.value,
+ ).length > 2
);
}
@@ -1456,4 +1461,5 @@
switchMemberAdminRoleInThread,
getAvailableThreadMemberActions,
selectedThreadColors,
+ threadMembersWithoutAddedAshoat,
};
diff --git a/native/chat/message-list-header-title.react.js b/native/chat/message-list-header-title.react.js
--- a/native/chat/message-list-header-title.react.js
+++ b/native/chat/message-list-header-title.react.js
@@ -5,7 +5,10 @@
import { View, Platform } from 'react-native';
import Icon from 'react-native-vector-icons/Ionicons';
-import { threadIsPending } from 'lib/shared/thread-utils';
+import {
+ threadIsPending,
+ threadMembersWithoutAddedAshoat,
+} from 'lib/shared/thread-utils';
import type { ThreadInfo } from 'lib/types/thread-types';
import { firstLine } from 'lib/utils/string-utils';
@@ -26,7 +29,8 @@
class MessageListHeaderTitle extends React.PureComponent<Props> {
render() {
const isSearchEmpty =
- this.props.searching && this.props.threadInfo.members.length === 1;
+ this.props.searching &&
+ threadMembersWithoutAddedAshoat(this.props.threadInfo).length === 1;
let icon, fakeIcon;
const areSettingsDisabled =
threadIsPending(this.props.threadInfo.id) || isSearchEmpty;

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 1, 6:06 AM (10 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5875217
Default Alt Text
D5218.1767247591.diff (2 KB)

Event Timeline