ActivityPub-federated video streaming platform using P2P directly in your web browser
Clearer user right name
Chocobozzz5996552c8ad3
diff --git a/packages/core-utils/src/users/user-role.ts b/packages/core-utils/src/users/user-role.tsindex 64c120b373..04af3af7ce 100644--- a/packages/core-utils/src/users/user-role.ts+++ b/packages/core-utils/src/users/user-role.ts@@ -1,12 +1,12 @@import { UserRight, UserRightType, UserRole, UserRoleType } from '@peertube/peertube-models'-export const USER_ROLE_LABELS: { [ id in UserRoleType ]: string } = {+export const USER_ROLE_LABELS: { [id in UserRoleType]: string } = {[UserRole.USER]: 'User',[UserRole.MODERATOR]: 'Moderator',[UserRole.ADMINISTRATOR]: 'Administrator'}-const userRoleRights: { [ id in UserRoleType ]: UserRightType[] } = {+const userRoleRights: { [id in UserRoleType]: UserRightType[] } = {[UserRole.ADMINISTRATOR]: [UserRight.ALL],@@ -20,8 +20,8 @@ const userRoleRights: { [ id in UserRoleType ]: UserRightType[] } = {UserRight.MANAGE_ANY_VIDEO_COMMENT,UserRight.UPDATE_ANY_VIDEO,UserRight.SEE_ALL_VIDEOS,- UserRight.MANAGE_ACCOUNTS_BLOCKLIST,- UserRight.MANAGE_SERVERS_BLOCKLIST,+ UserRight.MANAGE_SERVER_ACCOUNTS_BLOCKLIST,+ UserRight.MANAGE_SERVER_SERVERS_BLOCKLIST,UserRight.MANAGE_USERS,UserRight.SEE_ALL_COMMENTS,UserRight.MANAGE_REGISTRATIONS,diff --git a/packages/models/src/users/user-right.enum.ts b/packages/models/src/users/user-right.enum.tsindex fe8e32308a..9f5e52db29 100644--- a/packages/models/src/users/user-right.enum.ts+++ b/packages/models/src/users/user-right.enum.ts@@ -18,8 +18,8 @@ export const UserRight = {MANAGE_CONFIGURATION: 8,MANAGE_INSTANCE_CUSTOM_PAGE: 9,- MANAGE_ACCOUNTS_BLOCKLIST: 10,- MANAGE_SERVERS_BLOCKLIST: 11,+ MANAGE_SERVER_ACCOUNTS_BLOCKLIST: 10,+ MANAGE_SERVER_SERVERS_BLOCKLIST: 11,MANAGE_VIDEO_BLACKLIST: 12,MANAGE_ANY_VIDEO_CHANNEL: 13,diff --git a/server/core/controllers/api/server/server-blocklist.ts b/server/core/controllers/api/server/server-blocklist.tsindex a9ebd66279..e17761959f 100644--- a/server/core/controllers/api/server/server-blocklist.ts+++ b/server/core/controllers/api/server/server-blocklist.ts@@ -31,9 +31,10 @@ import { ServerBlocklistModel } from '../../../models/server/server-blocklist.jsconst serverBlocklistRouter = express.Router()-serverBlocklistRouter.get('/blocklist/accounts',+serverBlocklistRouter.get(+ '/blocklist/accounts',authenticate,- ensureUserHasRight(UserRight.MANAGE_ACCOUNTS_BLOCKLIST),+ ensureUserHasRight(UserRight.MANAGE_SERVER_ACCOUNTS_BLOCKLIST),paginationValidator,accountsBlocklistSortValidator,setDefaultSort,@@ -41,23 +42,26 @@ serverBlocklistRouter.get('/blocklist/accounts',asyncMiddleware(listBlockedAccounts))-serverBlocklistRouter.post('/blocklist/accounts',+serverBlocklistRouter.post(+ '/blocklist/accounts',authenticate,- ensureUserHasRight(UserRight.MANAGE_ACCOUNTS_BLOCKLIST),+ ensureUserHasRight(UserRight.MANAGE_SERVER_ACCOUNTS_BLOCKLIST),asyncMiddleware(blockAccountValidator),asyncRetryTransactionMiddleware(blockAccount))-serverBlocklistRouter.delete('/blocklist/accounts/:accountName',+serverBlocklistRouter.delete(+ '/blocklist/accounts/:accountName',authenticate,- ensureUserHasRight(UserRight.MANAGE_ACCOUNTS_BLOCKLIST),+ ensureUserHasRight(UserRight.MANAGE_SERVER_ACCOUNTS_BLOCKLIST),asyncMiddleware(unblockAccountByServerValidator),asyncRetryTransactionMiddleware(unblockAccount))-serverBlocklistRouter.get('/blocklist/servers',+serverBlocklistRouter.get(+ '/blocklist/servers',authenticate,- ensureUserHasRight(UserRight.MANAGE_SERVERS_BLOCKLIST),+ ensureUserHasRight(UserRight.MANAGE_SERVER_SERVERS_BLOCKLIST),paginationValidator,serversBlocklistSortValidator,setDefaultSort,@@ -65,16 +69,18 @@ serverBlocklistRouter.get('/blocklist/servers',asyncMiddleware(listBlockedServers))-serverBlocklistRouter.post('/blocklist/servers',+serverBlocklistRouter.post(+ '/blocklist/servers',authenticate,- ensureUserHasRight(UserRight.MANAGE_SERVERS_BLOCKLIST),+ ensureUserHasRight(UserRight.MANAGE_SERVER_SERVERS_BLOCKLIST),asyncMiddleware(blockServerValidator),asyncRetryTransactionMiddleware(blockServer))-serverBlocklistRouter.delete('/blocklist/servers/:host',+serverBlocklistRouter.delete(+ '/blocklist/servers/:host',authenticate,- ensureUserHasRight(UserRight.MANAGE_SERVERS_BLOCKLIST),+ ensureUserHasRight(UserRight.MANAGE_SERVER_SERVERS_BLOCKLIST),asyncMiddleware(unblockServerByServerValidator),asyncRetryTransactionMiddleware(unblockServer))