X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fmoderation%2Fuser-moderation-dropdown.component.ts;h=24f7178217b66ea85bfb00ce1dcf1a984cc2b1ee;hb=f36da21e40104a50acb00132920b835240cebb38;hp=174e9f024c82119f8ef71a7bc7a7e63a4017b32b;hpb=791645e620fb98c6e7c32271d91d91ff7e41b892;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/shared/moderation/user-moderation-dropdown.component.ts b/client/src/app/shared/moderation/user-moderation-dropdown.component.ts index 174e9f024..24f717821 100644 --- a/client/src/app/shared/moderation/user-moderation-dropdown.component.ts +++ b/client/src/app/shared/moderation/user-moderation-dropdown.component.ts @@ -1,43 +1,52 @@ -import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core' -import { NotificationsService } from 'angular2-notifications' +import { Component, EventEmitter, Input, OnChanges, Output, ViewChild } from '@angular/core' import { I18n } from '@ngx-translate/i18n-polyfill' import { DropdownAction } from '@app/shared/buttons/action-dropdown.component' import { UserBanModalComponent } from '@app/shared/moderation/user-ban-modal.component' import { UserService } from '@app/shared/users' -import { AuthService, ConfirmService } from '@app/core' +import { AuthService, ConfirmService, Notifier, ServerService } from '@app/core' import { User, UserRight } from '../../../../../shared/models/users' +import { Account } from '@app/shared/account/account.model' +import { BlocklistService } from '@app/shared/blocklist' @Component({ selector: 'my-user-moderation-dropdown', - templateUrl: './user-moderation-dropdown.component.html', - styleUrls: [ './user-moderation-dropdown.component.scss' ] + templateUrl: './user-moderation-dropdown.component.html' }) -export class UserModerationDropdownComponent implements OnInit { - @ViewChild('userBanModal') userBanModal: UserBanModalComponent +export class UserModerationDropdownComponent implements OnChanges { + @ViewChild('userBanModal', { static: false }) userBanModal: UserBanModalComponent @Input() user: User + @Input() account: Account + @Input() buttonSize: 'normal' | 'small' = 'normal' + @Input() placement = 'left' @Output() userChanged = new EventEmitter() @Output() userDeleted = new EventEmitter() - userActions: DropdownAction[] = [] + userActions: DropdownAction<{ user: User, account: Account }>[][] = [] constructor ( private authService: AuthService, - private notificationsService: NotificationsService, + private notifier: Notifier, private confirmService: ConfirmService, + private serverService: ServerService, private userService: UserService, + private blocklistService: BlocklistService, private i18n: I18n ) { } - ngOnInit () { + get requiresEmailVerification () { + return this.serverService.getConfig().signup.requiresEmailVerification + } + + ngOnChanges () { this.buildActions() } openBanUserModal (user: User) { if (user.username === 'root') { - this.notificationsService.error(this.i18n('Error'), this.i18n('You cannot ban root.')) + this.notifier.error(this.i18n('You cannot ban root.')) return } @@ -56,21 +65,18 @@ export class UserModerationDropdownComponent implements OnInit { this.userService.unbanUsers(user) .subscribe( () => { - this.notificationsService.success( - this.i18n('Success'), - this.i18n('User {{username}} unbanned.', { username: user.username }) - ) + this.notifier.success(this.i18n('User {{username}} unbanned.', { username: user.username })) this.userChanged.emit() }, - err => this.notificationsService.error(this.i18n('Error'), err.message) + err => this.notifier.error(err.message) ) } async removeUser (user: User) { if (user.username === 'root') { - this.notificationsService.error(this.i18n('Error'), this.i18n('You cannot delete root.')) + this.notifier.error(this.i18n('You cannot delete root.')) return } @@ -80,17 +86,138 @@ export class UserModerationDropdownComponent implements OnInit { this.userService.removeUser(user).subscribe( () => { - this.notificationsService.success( - this.i18n('Success'), - this.i18n('User {{username}} deleted.', { username: user.username }) - ) + this.notifier.success(this.i18n('User {{username}} deleted.', { username: user.username })) this.userDeleted.emit() }, - err => this.notificationsService.error(this.i18n('Error'), err.message) + err => this.notifier.error(err.message) ) } + setEmailAsVerified (user: User) { + this.userService.updateUser(user.id, { emailVerified: true }).subscribe( + () => { + this.notifier.success(this.i18n('User {{username}} email set as verified', { username: user.username })) + + this.userChanged.emit() + }, + + err => this.notifier.error(err.message) + ) + } + + blockAccountByUser (account: Account) { + this.blocklistService.blockAccountByUser(account) + .subscribe( + () => { + this.notifier.success(this.i18n('Account {{nameWithHost}} muted.', { nameWithHost: account.nameWithHost })) + + this.account.mutedByUser = true + this.userChanged.emit() + }, + + err => this.notifier.error(err.message) + ) + } + + unblockAccountByUser (account: Account) { + this.blocklistService.unblockAccountByUser(account) + .subscribe( + () => { + this.notifier.success(this.i18n('Account {{nameWithHost}} unmuted.', { nameWithHost: account.nameWithHost })) + + this.account.mutedByUser = false + this.userChanged.emit() + }, + + err => this.notifier.error(err.message) + ) + } + + blockServerByUser (host: string) { + this.blocklistService.blockServerByUser(host) + .subscribe( + () => { + this.notifier.success(this.i18n('Instance {{host}} muted.', { host })) + + this.account.mutedServerByUser = true + this.userChanged.emit() + }, + + err => this.notifier.error(err.message) + ) + } + + unblockServerByUser (host: string) { + this.blocklistService.unblockServerByUser(host) + .subscribe( + () => { + this.notifier.success(this.i18n('Instance {{host}} unmuted.', { host })) + + this.account.mutedServerByUser = false + this.userChanged.emit() + }, + + err => this.notifier.error(err.message) + ) + } + + blockAccountByInstance (account: Account) { + this.blocklistService.blockAccountByInstance(account) + .subscribe( + () => { + this.notifier.success(this.i18n('Account {{nameWithHost}} muted by the instance.', { nameWithHost: account.nameWithHost })) + + this.account.mutedByInstance = true + this.userChanged.emit() + }, + + err => this.notifier.error(err.message) + ) + } + + unblockAccountByInstance (account: Account) { + this.blocklistService.unblockAccountByInstance(account) + .subscribe( + () => { + this.notifier.success(this.i18n('Account {{nameWithHost}} unmuted by the instance.', { nameWithHost: account.nameWithHost })) + + this.account.mutedByInstance = false + this.userChanged.emit() + }, + + err => this.notifier.error(err.message) + ) + } + + blockServerByInstance (host: string) { + this.blocklistService.blockServerByInstance(host) + .subscribe( + () => { + this.notifier.success(this.i18n('Instance {{host}} muted by the instance.', { host })) + + this.account.mutedServerByInstance = true + this.userChanged.emit() + }, + + err => this.notifier.error(err.message) + ) + } + + unblockServerByInstance (host: string) { + this.blocklistService.unblockServerByInstance(host) + .subscribe( + () => { + this.notifier.success(this.i18n('Instance {{host}} unmuted by the instance.', { host })) + + this.account.mutedServerByInstance = false + this.userChanged.emit() + }, + + err => this.notifier.error(err.message) + ) + } + getRouterUserEditLink (user: User) { return [ '/admin', 'users', 'update', user.id ] } @@ -101,28 +228,100 @@ export class UserModerationDropdownComponent implements OnInit { if (this.authService.isLoggedIn()) { const authUser = this.authService.getUser() - if (authUser.hasRight(UserRight.MANAGE_USERS)) { - this.userActions = this.userActions.concat([ + if (this.user && authUser.id === this.user.id) return + + if (this.user && authUser.hasRight(UserRight.MANAGE_USERS)) { + this.userActions.push([ { label: this.i18n('Edit'), - linkBuilder: this.getRouterUserEditLink + linkBuilder: ({ user }) => this.getRouterUserEditLink(user) }, { label: this.i18n('Delete'), - handler: user => this.removeUser(user) + handler: ({ user }) => this.removeUser(user) }, { label: this.i18n('Ban'), - handler: user => this.openBanUserModal(user), - isDisplayed: user => !user.blocked + handler: ({ user }) => this.openBanUserModal(user), + isDisplayed: ({ user }) => !user.blocked }, { label: this.i18n('Unban'), - handler: user => this.unbanUser(user), - isDisplayed: user => user.blocked + handler: ({ user }) => this.unbanUser(user), + isDisplayed: ({ user }) => user.blocked + }, + { + label: this.i18n('Set Email as Verified'), + handler: ({ user }) => this.setEmailAsVerified(user), + isDisplayed: ({ user }) => this.requiresEmailVerification && !user.blocked && user.emailVerified === false } ]) } + + // Actions on accounts/servers + if (this.account) { + // User actions + this.userActions.push([ + { + label: this.i18n('Mute this account'), + isDisplayed: ({ account }) => account.mutedByUser === false, + handler: ({ account }) => this.blockAccountByUser(account) + }, + { + label: this.i18n('Unmute this account'), + isDisplayed: ({ account }) => account.mutedByUser === true, + handler: ({ account }) => this.unblockAccountByUser(account) + }, + { + label: this.i18n('Mute the instance'), + isDisplayed: ({ account }) => !account.userId && account.mutedServerByInstance === false, + handler: ({ account }) => this.blockServerByUser(account.host) + }, + { + label: this.i18n('Unmute the instance'), + isDisplayed: ({ account }) => !account.userId && account.mutedServerByInstance === true, + handler: ({ account }) => this.unblockServerByUser(account.host) + } + ]) + + let instanceActions: DropdownAction<{ user: User, account: Account }>[] = [] + + // Instance actions + if (authUser.hasRight(UserRight.MANAGE_ACCOUNTS_BLOCKLIST)) { + instanceActions = instanceActions.concat([ + { + label: this.i18n('Mute this account by your instance'), + isDisplayed: ({ account }) => account.mutedByInstance === false, + handler: ({ account }) => this.blockAccountByInstance(account) + }, + { + label: this.i18n('Unmute this account by your instance'), + isDisplayed: ({ account }) => account.mutedByInstance === true, + handler: ({ account }) => this.unblockAccountByInstance(account) + } + ]) + } + + // Instance actions + if (authUser.hasRight(UserRight.MANAGE_SERVERS_BLOCKLIST)) { + instanceActions = instanceActions.concat([ + { + label: this.i18n('Mute the instance by your instance'), + isDisplayed: ({ account }) => !account.userId && account.mutedServerByInstance === false, + handler: ({ account }) => this.blockServerByInstance(account.host) + }, + { + label: this.i18n('Unmute the instance by your instance'), + isDisplayed: ({ account }) => !account.userId && account.mutedServerByInstance === true, + handler: ({ account }) => this.unblockServerByInstance(account.host) + } + ]) + } + + if (instanceActions.length !== 0) { + this.userActions.push(instanceActions) + } + } } } }