diff --git a/lib/permissions/dm-permissions.js b/lib/permissions/dm-permissions.js --- a/lib/permissions/dm-permissions.js +++ b/lib/permissions/dm-permissions.js @@ -43,22 +43,22 @@ ) { return { ...basePermissions, - [threadPermissions.EDIT_ENTRIES]: true, - [threadPermissions.CREATE_SIDEBARS]: true, [openDescendantKnowOf]: true, [openDescendantVisible]: true, [openChildJoinThread]: true, + [threadPermissions.EDIT_ENTRIES]: true, + [threadPermissions.CREATE_SIDEBARS]: true, }; } return { ...basePermissions, + [openDescendantKnowOf]: true, + [openDescendantVisible]: true, + [openChildJoinThread]: true, [threadPermissions.EDIT_ENTRIES]: true, [threadPermissions.CREATE_SIDEBARS]: true, [threadPermissions.ADD_MEMBERS]: true, [threadPermissions.LEAVE_THREAD]: true, - [openDescendantKnowOf]: true, - [openDescendantVisible]: true, - [openChildJoinThread]: true, }; } diff --git a/lib/permissions/keyserver-permissions.js b/lib/permissions/keyserver-permissions.js --- a/lib/permissions/keyserver-permissions.js +++ b/lib/permissions/keyserver-permissions.js @@ -105,27 +105,6 @@ DESCENDANT + threadPermissions.DELETE_ALL_MESSAGES; const baseAdminPermissions = { - [threadPermissions.KNOW_OF]: true, - [threadPermissions.VISIBLE]: true, - [threadPermissions.VOICED]: true, - [threadPermissions.REACT_TO_MESSAGE]: true, - [threadPermissions.EDIT_MESSAGE]: true, - [threadPermissions.EDIT_ENTRIES]: true, - [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.DELETE_THREAD]: true, - [threadPermissions.REMOVE_MEMBERS]: true, - [threadPermissions.CHANGE_ROLE]: true, - [threadPermissions.MANAGE_PINS]: true, - [threadPermissions.MANAGE_INVITE_LINKS]: true, - [threadPermissions.VOICED_IN_ANNOUNCEMENT_CHANNELS]: true, - [threadPermissions.MANAGE_FARCASTER_CHANNEL_TAGS]: true, - [threadPermissions.DELETE_OWN_MESSAGES]: true, - [threadPermissions.DELETE_ALL_MESSAGES]: true, [descendantKnowOf]: true, [descendantVisible]: true, [topLevelDescendantJoinThread]: true, @@ -149,6 +128,27 @@ [descendantEditMessage]: true, [descendantDeleteOwnMessages]: true, [descendantDeleteAllMessages]: true, + [threadPermissions.KNOW_OF]: true, + [threadPermissions.VISIBLE]: true, + [threadPermissions.VOICED]: true, + [threadPermissions.REACT_TO_MESSAGE]: true, + [threadPermissions.EDIT_MESSAGE]: true, + [threadPermissions.EDIT_ENTRIES]: true, + [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.DELETE_THREAD]: true, + [threadPermissions.REMOVE_MEMBERS]: true, + [threadPermissions.CHANGE_ROLE]: true, + [threadPermissions.MANAGE_PINS]: true, + [threadPermissions.MANAGE_INVITE_LINKS]: true, + [threadPermissions.VOICED_IN_ANNOUNCEMENT_CHANNELS]: true, + [threadPermissions.MANAGE_FARCASTER_CHANNEL_TAGS]: true, + [threadPermissions.DELETE_OWN_MESSAGES]: true, + [threadPermissions.DELETE_ALL_MESSAGES]: true, }; let adminPermissions; @@ -189,13 +189,13 @@ if (thinThreadType === threadTypes.GENESIS_PRIVATE) { const memberPermissions = { + [openDescendantKnowOf]: true, + [openDescendantVisible]: true, + [openChildJoinThread]: true, [threadPermissions.KNOW_OF]: true, [threadPermissions.VISIBLE]: true, [threadPermissions.VOICED]: true, [threadPermissions.CREATE_SIDEBARS]: true, - [openDescendantKnowOf]: true, - [openDescendantVisible]: true, - [openChildJoinThread]: true, }; return { Members: memberPermissions, @@ -205,13 +205,13 @@ if (thinThreadType === threadTypes.GENESIS_PERSONAL) { return { Members: { + [openDescendantKnowOf]: true, + [openDescendantVisible]: true, + [openChildJoinThread]: true, [threadPermissions.KNOW_OF]: true, [threadPermissions.VISIBLE]: true, [threadPermissions.VOICED]: true, [threadPermissions.CREATE_SIDEBARS]: true, - [openDescendantKnowOf]: true, - [openDescendantVisible]: true, - [openChildJoinThread]: true, }, }; } @@ -221,15 +221,15 @@ if (!threadTypeIsCommunityRoot(thinThreadType)) { const memberPermissions = { + [openDescendantKnowOf]: true, + [openDescendantVisible]: true, + [openTopLevelDescendantJoinThread]: true, + [openChildJoinThread]: true, [threadPermissions.VOICED]: true, [threadPermissions.KNOW_OF]: true, [threadPermissions.VISIBLE]: true, [threadPermissions.CREATE_SIDEBARS]: true, [threadPermissions.LEAVE_THREAD]: true, - [openDescendantKnowOf]: true, - [openDescendantVisible]: true, - [openTopLevelDescendantJoinThread]: true, - [openChildJoinThread]: true, }; return { Members: memberPermissions, @@ -251,19 +251,19 @@ OPEN_TOP_LEVEL_DESCENDANT + threadPermissions.JOIN_THREAD; const genesisUniversalCommunityPermissions = { - [threadPermissions.KNOW_OF]: true, - [threadPermissions.VISIBLE]: true, [openDescendantKnowOf]: true, [openDescendantVisible]: true, [openTopLevelDescendantJoinThread]: true, + [threadPermissions.KNOW_OF]: true, + [threadPermissions.VISIBLE]: true, }; const baseUniversalCommunityPermissions = { ...genesisUniversalCommunityPermissions, - [threadPermissions.CREATE_SIDEBARS]: true, - [threadPermissions.LEAVE_THREAD]: true, - [openChildJoinThread]: true, }; + baseUniversalCommunityPermissions[openChildJoinThread] = true; + baseUniversalCommunityPermissions[threadPermissions.CREATE_SIDEBARS] = true; + baseUniversalCommunityPermissions[threadPermissions.LEAVE_THREAD] = true; if (threadType === threadTypes.GENESIS) { return genesisUniversalCommunityPermissions;