Page MenuHomePhabricator
Files F3375306

D7313.id24665.diff
No OneTemporary
Actions

D7313.id24665.diff
View Options

diff --git a/keyserver/src/creators/role-creator.js b/keyserver/src/creators/role-creator.js
--- a/keyserver/src/creators/role-creator.js
+++ b/keyserver/src/creators/role-creator.js
@@ -83,6 +83,7 @@
[threadPermissions.EDIT_THREAD_NAME]: true,
[threadPermissions.EDIT_THREAD_COLOR]: true,
[threadPermissions.EDIT_THREAD_DESCRIPTION]: true,
+ [threadPermissions.EDIT_THREAD_AVATAR]: true,
[threadPermissions.CREATE_SUBCHANNELS]: true,
[threadPermissions.ADD_MEMBERS]: true,
};
@@ -140,6 +141,8 @@
DESCENDANT + threadPermissions.EDIT_THREAD_COLOR;
const descendantEditThreadDescription =
DESCENDANT + threadPermissions.EDIT_THREAD_DESCRIPTION;
+ const descendantEditThreadAvatar =
+ DESCENDANT + threadPermissions.EDIT_THREAD_AVATAR;
const topLevelDescendantCreateSubchannels =
TOP_LEVEL_DESCENDANT + threadPermissions.CREATE_SUBCHANNELS;
const topLevelDescendantCreateSidebars =
@@ -161,6 +164,7 @@
[threadPermissions.EDIT_THREAD_NAME]: true,
[threadPermissions.EDIT_THREAD_COLOR]: true,
[threadPermissions.EDIT_THREAD_DESCRIPTION]: true,
+ [threadPermissions.EDIT_THREAD_AVATAR]: true,
[threadPermissions.CREATE_SUBCHANNELS]: true,
[threadPermissions.CREATE_SIDEBARS]: true,
[threadPermissions.ADD_MEMBERS]: true,
@@ -176,6 +180,7 @@
[descendantEditThreadName]: true,
[descendantEditThreadColor]: true,
[descendantEditThreadDescription]: true,
+ [descendantEditThreadAvatar]: true,
[topLevelDescendantCreateSubchannels]: true,
[topLevelDescendantCreateSidebars]: true,
[descendantAddMembers]: true,
@@ -210,6 +215,7 @@
[threadPermissions.EDIT_THREAD_NAME]: true,
[threadPermissions.EDIT_THREAD_COLOR]: true,
[threadPermissions.EDIT_THREAD_DESCRIPTION]: true,
+ [threadPermissions.EDIT_THREAD_AVATAR]: true,
[threadPermissions.ADD_MEMBERS]: true,
[threadPermissions.EDIT_PERMISSIONS]: true,
[threadPermissions.REMOVE_MEMBERS]: true,
@@ -256,6 +262,7 @@
[threadPermissions.EDIT_THREAD_NAME]: true,
[threadPermissions.EDIT_THREAD_COLOR]: true,
[threadPermissions.EDIT_THREAD_DESCRIPTION]: true,
+ [threadPermissions.EDIT_THREAD_AVATAR]: true,
[threadPermissions.CREATE_SIDEBARS]: true,
[openDescendantKnowOf]: true,
[openDescendantVisible]: true,
diff --git a/keyserver/src/database/migration-config.js b/keyserver/src/database/migration-config.js
--- a/keyserver/src/database/migration-config.js
+++ b/keyserver/src/database/migration-config.js
@@ -276,6 +276,7 @@
},
],
[23, updateRolesAndPermissionsForAllThreads],
+ [24, updateRolesAndPermissionsForAllThreads],
]);
const newDatabaseVersion: number = Math.max(...migrations.keys());
diff --git a/lib/types/thread-types.js b/lib/types/thread-types.js
--- a/lib/types/thread-types.js
+++ b/lib/types/thread-types.js
@@ -101,6 +101,7 @@
LEAVE_THREAD: 'leave_thread',
REACT_TO_MESSAGE: 'react_to_message',
EDIT_MESSAGE: 'edit_message',
+ EDIT_THREAD_AVATAR: 'edit_thread_avatar',
});
export type ThreadPermission = $Values<typeof threadPermissions>;
export function assertThreadPermissions(
@@ -125,7 +126,8 @@
ourThreadPermissions === 'change_role' ||
ourThreadPermissions === 'leave_thread' ||
ourThreadPermissions === 'react_to_message' ||
- ourThreadPermissions === 'edit_message',
+ ourThreadPermissions === 'edit_message' ||
+ ourThreadPermissions === 'edit_thread_avatar',
'string is not threadPermissions enum',
);
return ourThreadPermissions;

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 27, 7:35 PM (21 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2591465
Default Alt Text
D7313.id24665.diff (3 KB)

Event Timeline