Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix video action dropdown rights checker

Chocobozzzcc80e1ca1023
diff --git a/.dprint.json b/.dprint.json
index a55694dc77..34db0aa264 100644
--- a/.dprint.json
+++ b/.dprint.json
@@ -83,11 +83,11 @@
"packages/tests/fixtures/**/*"
],
"plugins": [
- "https://plugins.dprint.dev/typescript-0.91.1.wasm",
+ "https://plugins.dprint.dev/typescript-0.95.15.wasm",
"https://plugins.dprint.dev/json-0.19.3.wasm",
"https://plugins.dprint.dev/markdown-0.17.1.wasm",
"https://plugins.dprint.dev/toml-0.6.2.wasm",
"https://plugins.dprint.dev/g-plane/malva-v0.12.0.wasm",
- "https://plugins.dprint.dev/g-plane/markup_fmt-v0.24.1.wasm"
+ "https://plugins.dprint.dev/g-plane/markup_fmt-v0.26.0.wasm"
]
}
diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.ts b/client/src/app/+admin/overview/users/user-list/user-list.component.ts
index cb3bde6ba5..0bbe4c6597 100644
--- a/client/src/app/+admin/overview/users/user-list/user-list.component.ts
+++ b/client/src/app/+admin/overview/users/user-list/user-list.component.ts
@@ -131,18 +131,18 @@ export class UserListComponent implements OnInit, OnDestroy {
label: $localize`Delete`,
description: $localize`Videos will be deleted, comments will be tombstoned.`,
handler: users => this.removeUsers(users),
- isDisplayed: users => users.every(u => this.authUser.canManage(u))
+ isDisplayed: users => users.every(u => this.authUser.canManageUser(u))
},
{
label: $localize`Ban`,
description: $localize`User won't be able to login anymore, but videos and comments will be kept as is.`,
handler: users => this.openBanUserModal(users),
- isDisplayed: users => users.every(u => this.authUser.canManage(u) && u.blocked === false)
+ isDisplayed: users => users.every(u => this.authUser.canManageUser(u) && u.blocked === false)
},
{
label: $localize`Unban`,
handler: users => this.unbanUsers(users),
- isDisplayed: users => users.every(u => this.authUser.canManage(u) && u.blocked === true)
+ isDisplayed: users => users.every(u => this.authUser.canManageUser(u) && u.blocked === true)
}
],
[
@@ -150,14 +150,14 @@ export class UserListComponent implements OnInit, OnDestroy {
label: $localize`Set email as verified`,
handler: users => this.setEmailsAsVerified(users),
isDisplayed: users => {
- return users.every(u => this.authUser.canManage(u) && !u.blocked && u.emailVerified !== true)
+ return users.every(u => this.authUser.canManageUser(u) && !u.blocked && u.emailVerified !== true)
}
},
{
label: $localize`Re-send verification emails`,
handler: users => this.resendVerificationEmails(users),
isDisplayed: users => {
- return users.every(u => this.authUser.canManage(u) && !u.blocked && u.emailVerified !== true && !u.pluginAuth)
+ return users.every(u => this.authUser.canManageUser(u) && !u.blocked && u.emailVerified !== true && !u.pluginAuth)
}
}
]
diff --git a/client/src/app/core/auth/auth-user.model.ts b/client/src/app/core/auth/auth-user.model.ts
index f241e6f410..3e17ef21e6 100644
--- a/client/src/app/core/auth/auth-user.model.ts
+++ b/client/src/app/core/auth/auth-user.model.ts
@@ -44,7 +44,7 @@ export class AuthUser extends User implements ServerMyUserModel {
return hasUserRight(this.role.id, right)
}
- canManage (user: ServerUserModel) {
+ canManageUser (user: ServerUserModel) {
const myRole = this.role.id
if (myRole === UserRole.ADMINISTRATOR) return true
diff --git a/client/src/app/shared/shared-main/menu/lateral-menu.component.scss b/client/src/app/shared/shared-main/menu/lateral-menu.component.scss
index e96a87b589..76697d5adb 100644
--- a/client/src/app/shared/shared-main/menu/lateral-menu.component.scss
+++ b/client/src/app/shared/shared-main/menu/lateral-menu.component.scss
@@ -13,7 +13,7 @@ ul {
.svg-container {
position: absolute;
top: 0;
- opacity: 0.4;
+ opacity: 0.3;
z-index: 0;
overflow: hidden;
width: 100%;
diff --git a/client/src/app/shared/shared-main/video/video.model.ts b/client/src/app/shared/shared-main/video/video.model.ts
index 215a19a601..f732cc049c 100644
--- a/client/src/app/shared/shared-main/video/video.model.ts
+++ b/client/src/app/shared/shared-main/video/video.model.ts
@@ -241,10 +241,6 @@ export class Video implements VideoServerModel {
// ---------------------------------------------------------------------------
- isRemovableBy (user: AuthUser) {
- return user && this.isLocal === true && (this.account.name === user.username || user.hasRight(UserRight.REMOVE_ANY_VIDEO))
- }
-
isBlockableBy (user: AuthUser) {
return this.blacklisted !== true && user && user.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) === true
}
@@ -254,13 +250,20 @@ export class Video implements VideoServerModel {
}
isUpdatableBy (user: AuthUser) {
- return user && this.isLocal === true && (this.account.name === user.username || user.hasRight(UserRight.UPDATE_ANY_VIDEO))
+ return user && this.isLocal === true && (user.isEditorOfChannel(this.channel) || user.hasRight(UserRight.UPDATE_ANY_VIDEO))
}
- isEditableBy (user: AuthUser, videoStudioEnabled: boolean) {
- return videoStudioEnabled &&
+ isStudioEditableBy (options: {
+ user: AuthUser
+ studioEnabled: boolean
+ }) {
+ return options.studioEnabled &&
this.state?.id === VideoState.PUBLISHED &&
- this.isUpdatableBy(user)
+ this.isUpdatableBy(options.user)
+ }
+
+ isRemovableBy (user: AuthUser) {
+ return user && this.isLocal === true && (user.isEditorOfChannel(this.channel) || user.hasRight(UserRight.REMOVE_ANY_VIDEO))
}
// ---------------------------------------------------------------------------
diff --git a/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts b/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts
index 35e886476b..ad897f4911 100644
--- a/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts
+++ b/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts
@@ -355,7 +355,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
const displayOptions = this.displayOptions()
const hasManageRight = this.user() && displayOptions.instanceUser && authUser.hasRight(UserRight.MANAGE_USERS) &&
- authUser.canManage(this.user())
+ authUser.canManageUser(this.user())
const hasAccountBlocklistRight = this.account() && displayOptions.instanceAccount &&
authUser.hasRight(UserRight.MANAGE_ACCOUNTS_BLOCKLIST)
diff --git a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
index 10b351f873..3840343f60 100644
--- a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
+++ b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
@@ -179,7 +179,10 @@ export class VideoActionsDropdownComponent implements OnChanges {
isVideoEditable () {
if (!this.user) return false
- return this.video().isEditableBy(this.user, this.serverService.getHTMLConfig().videoStudio.enabled)
+ return this.video().isStudioEditableBy({
+ user: this.user,
+ studioEnabled: this.serverService.getHTMLConfig().videoStudio.enabled
+ })
}
isVideoStatsAvailable () {