Page MenuHomePhorge
Files F33367043

D13812.1768949359.diff
No OneTemporary
Actions

Size
1 KB
Referenced Files
None
Subscribers
None

D13812.1768949359.diff
View Options

diff --git a/keyserver/src/creators/thread-creator.js b/keyserver/src/creators/thread-creator.js
--- a/keyserver/src/creators/thread-creator.js
+++ b/keyserver/src/creators/thread-creator.js
@@ -62,6 +62,7 @@
+forceAddMembers: boolean,
+updatesForCurrentSession: UpdatesForCurrentSession,
+silentlyFailMembers: boolean,
+ +dontCheckPermissions: boolean,
}>;
// If forceAddMembers is set, we will allow the viewer to add random users who
@@ -363,7 +364,9 @@
ghostMembersChangeset,
recalculatePermissionsChangeset,
] = await Promise.all([
- changeRole(id, [viewer.userID], newRoles.creator.id),
+ changeRole(id, [viewer.userID], newRoles.creator.id, {
+ dontCheckPermissions: !!options?.dontCheckPermissions,
+ }),
initialMemberPromise,
ghostMemberPromise,
recalculateThreadPermissions(id),
diff --git a/keyserver/src/updaters/thread-permission-updaters.js b/keyserver/src/updaters/thread-permission-updaters.js
--- a/keyserver/src/updaters/thread-permission-updaters.js
+++ b/keyserver/src/updaters/thread-permission-updaters.js
@@ -90,6 +90,7 @@
// This will only be set if the user is joining or leaving the thread
// Joined means role > 0
+defaultSubscription?: ThreadSubscription,
+ +dontCheckJoinPermissions?: boolean,
};
type ChangeRoleMemberInfo = {
permissionsFromParent?: ?ThreadPermissionsBlob,
@@ -265,9 +266,12 @@
const newRole = getRoleForPermissions(targetRole, permissions);
const userBecameMember = Number(oldRole) <= 0 && Number(newRole) > 0;
const userLostMembership = Number(oldRole) > 0 && Number(newRole) <= 0;
+ const dontCheckJoinPermissions = options?.dontCheckJoinPermissions;
if (
- (intent === 'join' && Number(newRole) <= 0) ||
+ (intent === 'join' &&
+ Number(newRole) <= 0 &&
+ !dontCheckJoinPermissions) ||
(intent === 'leave' && Number(newRole) > 0)
) {
throw new ServerError('invalid_parameters');

File Metadata

Mime Type
text/plain
Expires
Tue, Jan 20, 10:49 PM (19 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5964673
Default Alt Text
D13812.1768949359.diff (1 KB)

Event Timeline