Page MenuHomePhorge
Files F32176336

D10116.1765067981.diff
No OneTemporary
Actions

Size
1 KB
Referenced Files
None
Subscribers
None

D10116.1765067981.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
@@ -1051,8 +1051,12 @@
return !!memberInfo.permissions[threadPermissions.CHANGE_ROLE]?.value;
}
+function roleIsDefaultRole(roleInfo: ?RoleInfo): boolean {
+ return !!(roleInfo && roleInfo.specialRole === specialRoles.DEFAULT_ROLE);
+}
+
function roleIsAdminRole(roleInfo: ?RoleInfo): boolean {
- return !!(roleInfo && !roleInfo.isDefault && roleInfo.name === 'Admins');
+ return !!(roleInfo && roleInfo.specialRole === specialRoles.ADMIN_ROLE);
}
function threadHasAdminRole(
@@ -1370,8 +1374,8 @@
}
function checkIfDefaultMembersAreVoiced(threadInfo: ThreadInfo): boolean {
- const defaultRoleID = Object.keys(threadInfo.roles).find(
- roleID => threadInfo.roles[roleID].isDefault,
+ const defaultRoleID = Object.keys(threadInfo.roles).find(roleID =>
+ roleIsDefaultRole(threadInfo.roles[roleID]),
);
invariant(
defaultRoleID !== undefined,
@@ -1560,7 +1564,7 @@
if (
canRemoveMembers &&
!memberInfo.isViewer &&
- (canChangeRoles || threadInfo.roles[role]?.isDefault)
+ (canChangeRoles || roleIsDefaultRole(threadInfo.roles[role]))
) {
result.push('remove_user');
}
@@ -1792,6 +1796,7 @@
threadTypeDescriptions,
memberIsAdmin,
memberHasAdminPowers,
+ roleIsDefaultRole,
roleIsAdminRole,
threadHasAdminRole,
identifyInvalidatedThreads,

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 7, 12:39 AM (10 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5841632
Default Alt Text
D10116.1765067981.diff (1 KB)

Event Timeline