Page MenuHomePhabricator
Files F2830759

D12444.id41472.diff
No OneTemporary
Actions

D12444.id41472.diff
View Options

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
@@ -13,6 +13,7 @@
} from 'lib/permissions/thread-permissions.js';
import type { CalendarQuery } from 'lib/types/entry-types.js';
import { messageTypes } from 'lib/types/message-types-enum.js';
+import type { ThreadSubscription } from 'lib/types/subscription-types.js';
import type {
ThreadPermissionsBlob,
ThreadRolePermissionsBlob,
@@ -60,6 +61,7 @@
+role: string,
+oldRole: string,
+unread?: boolean,
+ +defaultSubscription?: ThreadSubscription,
};
type MembershipRowToDelete = {
+operation: 'delete',
@@ -81,6 +83,9 @@
type ChangeRoleOptions = {
+setNewMembersToUnread?: boolean,
+forcePermissionRecalculation?: boolean,
+ // This will only be set if the user is joining or leaving the thread
+ // Joined means role > 0
+ +defaultSubscription?: ThreadSubscription,
};
type ChangeRoleMemberInfo = {
permissionsFromParent?: ?ThreadPermissionsBlob,
@@ -101,6 +106,7 @@
const setNewMembersToUnread =
options?.setNewMembersToUnread && intent === 'join';
const forcePermissionRecalculation = options?.forcePermissionRecalculation;
+ const defaultSubscription = options?.defaultSubscription;
if (userIDs.length === 0) {
return {
@@ -291,6 +297,7 @@
role: newRole,
oldRole,
unread: userBecameMember && setNewMembersToUnread,
+ defaultSubscription,
});
} else {
membershipRows.push({
@@ -929,14 +936,22 @@
const time = Date.now();
const insertRows = [];
for (const rowToSave of toSave) {
+ let subscriptionString;
+
+ if (rowToSave.defaultSubscription) {
+ subscriptionString = JSON.stringify(rowToSave.defaultSubscription);
+ } else if (rowToSave.intent === 'join') {
+ subscriptionString = joinSubscriptionString;
+ } else {
+ subscriptionString = defaultSubscriptionString;
+ }
+
insertRows.push([
rowToSave.userID,
rowToSave.threadID,
rowToSave.role,
time,
- rowToSave.intent === 'join'
- ? joinSubscriptionString
- : defaultSubscriptionString,
+ subscriptionString,
rowToSave.permissions ? JSON.stringify(rowToSave.permissions) : null,
rowToSave.permissionsForChildren
? JSON.stringify(rowToSave.permissionsForChildren)

File Metadata

Mime Type
text/plain
Expires
Sat, Sep 28, 9:13 PM (5 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2194882
Default Alt Text
D12444.id41472.diff (2 KB)

Event Timeline