<div class="actor-name">{{ account.nameWithHost }}</div>
<span *ngIf="user?.blocked" [ngbTooltip]="user.blockedReason" class="badge badge-danger" i18n>Banned</span>
+ <span *ngIf="account.muted" class="badge badge-danger" i18n>Muted</span>
+ <span *ngIf="account.mutedServer" class="badge badge-danger" i18n>Instance muted</span>
- <my-user-moderation-dropdown buttonSize="small" [user]="user" (userChanged)="onUserChanged()" (userDeleted)="onUserDeleted()">
+ <my-user-moderation-dropdown
+ buttonSize="small" [account]="account" [user]="user"
+ (userChanged)="onUserChanged()" (userDeleted)="onUserDeleted()"
+ >
</my-user-moderation-dropdown>
</div>
<div i18n class="actor-followers">{{ account.followersCount }} subscribers</div>
<th i18n pSortableColumn="createdAt">Created <p-sortIcon field="createdAt"></p-sortIcon></th>
<th i18n>Video</th>
<th i18n pSortableColumn="state" style="width: 80px;">State <p-sortIcon field="state"></p-sortIcon></th>
- <th style="width: 50px;"></th>
+ <th style="width: 120px;"></th>
</tr>
</ng-template>
<th i18n pSortableColumn="name">Video name <p-sortIcon field="name"></p-sortIcon></th>
<th i18n>Sensitive</th>
<th i18n pSortableColumn="createdAt">Date <p-sortIcon field="createdAt"></p-sortIcon></th>
- <th style="width: 50px;"></th>
+ <th style="width: 120px;"></th>
</tr>
</ng-template>
</td>
<td>
- {{ user.username }}
- <span *ngIf="user.blocked" class="banned-info">(banned)</span>
+ <a i18n-title title="Go to the account page" target="_blank" rel="noopener noreferrer" [routerLink]="[ '/accounts/' + user.username ]">
+ {{ user.username }}
+ <span i18n *ngIf="user.blocked" class="banned-info">(banned)</span>
+ </a>
</td>
<td>{{ user.email }}</td>
<td>{{ user.videoQuotaUsed }} / {{ user.videoQuota }}</td>
--- /dev/null
+<div class="admin-sub-header">
+ <div i18n class="form-sub-title">Muted accounts</div>
+</div>
+
+<p-table
+ [value]="blockedAccounts" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage"
+ [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)"
+>
+
+ <ng-template pTemplate="header">
+ <tr>
+ <th i18n>Account</th>
+ <th i18n pSortableColumn="createdAt">Muted at <p-sortIcon field="createdAt"></p-sortIcon></th>
+ </tr>
+ </ng-template>
+
+ <ng-template pTemplate="body" let-accountBlock>
+ <tr>
+ <td>{{ accountBlock.blockedAccount.nameWithHost }}</td>
+ <td>{{ accountBlock.createdAt }}</td>
+ <td class="action-cell">
+ <button class="unblock-button" (click)="unblockAccount(accountBlock)" i18n>Unmute</button>
+ </td>
+ </tr>
+ </ng-template>
+</p-table>
--- /dev/null
+@import '_variables';
+@import '_mixins';
+
+.unblock-button {
+ @include peertube-button;
+ @include grey-button;
+}
\ No newline at end of file
--- /dev/null
+import { Component, OnInit } from '@angular/core'
+import { NotificationsService } from 'angular2-notifications'
+import { I18n } from '@ngx-translate/i18n-polyfill'
+import { RestPagination, RestTable } from '@app/shared'
+import { SortMeta } from 'primeng/components/common/sortmeta'
+import { BlocklistService, AccountBlock } from '@app/shared/blocklist'
+
+@Component({
+ selector: 'my-account-blocklist',
+ styleUrls: [ './my-account-blocklist.component.scss' ],
+ templateUrl: './my-account-blocklist.component.html'
+})
+export class MyAccountBlocklistComponent extends RestTable implements OnInit {
+ blockedAccounts: AccountBlock[] = []
+ totalRecords = 0
+ rowsPerPage = 10
+ sort: SortMeta = { field: 'createdAt', order: -1 }
+ pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
+
+ constructor (
+ private notificationsService: NotificationsService,
+ private blocklistService: BlocklistService,
+ private i18n: I18n
+ ) {
+ super()
+ }
+
+ ngOnInit () {
+ this.initialize()
+ }
+
+ unblockAccount (accountBlock: AccountBlock) {
+ const blockedAccount = accountBlock.blockedAccount
+
+ this.blocklistService.unblockAccountByUser(blockedAccount)
+ .subscribe(
+ () => {
+ this.notificationsService.success(
+ this.i18n('Success'),
+ this.i18n('Account {{nameWithHost}} unmuted.', { nameWithHost: blockedAccount.nameWithHost })
+ )
+
+ this.loadData()
+ }
+ )
+ }
+
+ protected loadData () {
+ return this.blocklistService.getUserAccountBlocklist(this.pagination, this.sort)
+ .subscribe(
+ resultList => {
+ this.blockedAccounts = resultList.data
+ this.totalRecords = resultList.total
+ },
+
+ err => this.notificationsService.error(this.i18n('Error'), err.message)
+ )
+ }
+}
--- /dev/null
+<div class="admin-sub-header">
+ <div i18n class="form-sub-title">Muted instances</div>
+</div>
+
+<p-table
+ [value]="blockedAccounts" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage"
+ [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)"
+>
+
+ <ng-template pTemplate="header">
+ <tr>
+ <th i18n>Instance</th>
+ <th i18n pSortableColumn="createdAt">Muted at <p-sortIcon field="createdAt"></p-sortIcon></th>
+ <th></th>
+ </tr>
+ </ng-template>
+
+ <ng-template pTemplate="body" let-serverBlock>
+ <tr>
+ <td>{{ serverBlock.blockedServer.host }}</td>
+ <td>{{ serverBlock.createdAt }}</td>
+ <td class="action-cell">
+ <button class="unblock-button" (click)="unblockServer(serverBlock)" i18n>Unmute</button>
+ </td>
+ </tr>
+ </ng-template>
+</p-table>
--- /dev/null
+@import '_variables';
+@import '_mixins';
+
+.unblock-button {
+ @include peertube-button;
+ @include grey-button;
+}
\ No newline at end of file
--- /dev/null
+import { Component, OnInit } from '@angular/core'
+import { NotificationsService } from 'angular2-notifications'
+import { I18n } from '@ngx-translate/i18n-polyfill'
+import { RestPagination, RestTable } from '@app/shared'
+import { SortMeta } from 'primeng/components/common/sortmeta'
+import { ServerBlock } from '../../../../../shared'
+import { BlocklistService } from '@app/shared/blocklist'
+
+@Component({
+ selector: 'my-account-server-blocklist',
+ styleUrls: [ './my-account-server-blocklist.component.scss' ],
+ templateUrl: './my-account-server-blocklist.component.html'
+})
+export class MyAccountServerBlocklistComponent extends RestTable implements OnInit {
+ blockedAccounts: ServerBlock[] = []
+ totalRecords = 0
+ rowsPerPage = 10
+ sort: SortMeta = { field: 'createdAt', order: -1 }
+ pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
+
+ constructor (
+ private notificationsService: NotificationsService,
+ private blocklistService: BlocklistService,
+ private i18n: I18n
+ ) {
+ super()
+ }
+
+ ngOnInit () {
+ this.initialize()
+ }
+
+ unblockServer (serverBlock: ServerBlock) {
+ const host = serverBlock.blockedServer.host
+
+ this.blocklistService.unblockServerByUser(host)
+ .subscribe(
+ () => {
+ this.notificationsService.success(
+ this.i18n('Success'),
+ this.i18n('Instance {{host}} unmuted.', { host })
+ )
+
+ this.loadData()
+ }
+ )
+ }
+
+ protected loadData () {
+ return this.blocklistService.getUserServerBlocklist(this.pagination, this.sort)
+ .subscribe(
+ resultList => {
+ this.blockedAccounts = resultList.data
+ this.totalRecords = resultList.total
+ },
+
+ err => this.notificationsService.error(this.i18n('Error'), err.message)
+ )
+ }
+}
import { MyAccountVideoImportsComponent } from '@app/+my-account/my-account-video-imports/my-account-video-imports.component'
import { MyAccountSubscriptionsComponent } from '@app/+my-account/my-account-subscriptions/my-account-subscriptions.component'
import { MyAccountOwnershipComponent } from '@app/+my-account/my-account-ownership/my-account-ownership.component'
+import { MyAccountBlocklistComponent } from '@app/+my-account/my-account-blocklist/my-account-blocklist.component'
+import { MyAccountServerBlocklistComponent } from '@app/+my-account/my-account-blocklist/my-account-server-blocklist.component'
const myAccountRoutes: Routes = [
{
title: 'Ownership changes'
}
}
+ },
+ {
+ path: 'blocklist/accounts',
+ component: MyAccountBlocklistComponent,
+ data: {
+ meta: {
+ title: 'Accounts blocklist'
+ }
+ }
+ },
+ {
+ path: 'blocklist/servers',
+ component: MyAccountServerBlocklistComponent,
+ data: {
+ meta: {
+ title: 'Instances blocklist'
+ }
+ }
}
]
}
</div>
</div>
- <a i18n routerLink="/my-account/ownership" routerLinkActive="active" class="title-page">Ownership changes</a>
+ <div ngbDropdown class="misc">
+ <span role="button" class="title-page" [ngClass]="{ active: miscLabel !== '' }" ngbDropdownToggle>
+ <ng-container i18n>Misc</ng-container>
+ <ng-container *ngIf="miscLabel"> - {{ miscLabel }}</ng-container>
+ </span>
+
+ <div ngbDropdownMenu>
+ <a class="dropdown-item" i18n routerLink="/my-account/blocklist/accounts">Muted accounts</a>
+
+ <a class="dropdown-item" i18n routerLink="/my-account/blocklist/servers">Muted instances</a>
+
+ <a class="dropdown-item" i18n routerLink="/my-account/ownership">Ownership changes</a>
+ </div>
+ </div>
+
</div>
<div class="margin-content">
-.my-library {
+.my-library, .misc {
span[role=button] {
cursor: pointer;
}
export class MyAccountComponent implements OnInit, OnDestroy {
libraryLabel = ''
+ miscLabel = ''
private routeSub: Subscription
) {}
ngOnInit () {
- this.updateLibraryLabel(this.router.url)
+ this.updateLabels(this.router.url)
this.routeSub = this.router.events
.pipe(filter(event => event instanceof NavigationStart))
- .subscribe((event: NavigationStart) => this.updateLibraryLabel(event.url))
+ .subscribe((event: NavigationStart) => this.updateLabels(event.url))
}
ngOnDestroy () {
return importConfig.http.enabled || importConfig.torrent.enabled
}
- private updateLibraryLabel (url: string) {
+ private updateLabels (url: string) {
const [ path ] = url.split('?')
if (path.startsWith('/my-account/video-channels')) {
} else {
this.libraryLabel = ''
}
+
+ if (path.startsWith('/my-account/blocklist/accounts')) {
+ this.miscLabel = this.i18n('Muted accounts')
+ } else if (path.startsWith('/my-account/blocklist/servers')) {
+ this.miscLabel = this.i18n('Muted instances')
+ } else {
+ this.miscLabel = ''
+ }
}
}
import { MyAccountVideoImportsComponent } from '@app/+my-account/my-account-video-imports/my-account-video-imports.component'
import { MyAccountDangerZoneComponent } from '@app/+my-account/my-account-settings/my-account-danger-zone'
import { MyAccountSubscriptionsComponent } from '@app/+my-account/my-account-subscriptions/my-account-subscriptions.component'
+import { MyAccountBlocklistComponent } from '@app/+my-account/my-account-blocklist/my-account-blocklist.component'
+import { MyAccountServerBlocklistComponent } from '@app/+my-account/my-account-blocklist/my-account-server-blocklist.component'
@NgModule({
imports: [
ActorAvatarInfoComponent,
MyAccountVideoImportsComponent,
MyAccountDangerZoneComponent,
- MyAccountSubscriptionsComponent
+ MyAccountSubscriptionsComponent,
+ MyAccountBlocklistComponent,
+ MyAccountServerBlocklistComponent
],
exports: [
displayName: string
description: string
nameWithHost: string
+ muted: boolean
+ mutedServer: boolean
userId?: number
this.description = hash.description
this.userId = hash.userId
this.nameWithHost = Actor.CREATE_BY_STRING(this.name, this.host)
+
+ this.muted = false
+ this.mutedServer = false
}
}
--- /dev/null
+import { AccountBlock as AccountBlockServer } from '../../../../../shared'
+import { Account } from '../account/account.model'
+
+export class AccountBlock implements AccountBlockServer {
+ byAccount: Account
+ blockedAccount: Account
+ createdAt: Date | string
+
+ constructor (block: AccountBlockServer) {
+ this.byAccount = new Account(block.byAccount)
+ this.blockedAccount = new Account(block.blockedAccount)
+ this.createdAt = block.createdAt
+ }
+}
\ No newline at end of file
--- /dev/null
+import { Injectable } from '@angular/core'
+import { environment } from '../../../environments/environment'
+import { HttpClient, HttpParams } from '@angular/common/http'
+import { RestExtractor, RestPagination, RestService } from '../rest'
+import { SortMeta } from 'primeng/api'
+import { catchError, map } from 'rxjs/operators'
+import { AccountBlock as AccountBlockServer, ResultList, ServerBlock } from '../../../../../shared'
+import { Account } from '@app/shared/account/account.model'
+import { AccountBlock } from '@app/shared/blocklist/account-block.model'
+
+@Injectable()
+export class BlocklistService {
+ static BASE_USER_BLOCKLIST_URL = environment.apiUrl + '/api/v1/users/me/blocklist'
+
+ constructor (
+ private authHttp: HttpClient,
+ private restExtractor: RestExtractor,
+ private restService: RestService
+ ) { }
+
+ /*********************** User -> Account blocklist ***********************/
+
+ getUserAccountBlocklist (pagination: RestPagination, sort: SortMeta) {
+ let params = new HttpParams()
+ params = this.restService.addRestGetParams(params, pagination, sort)
+
+ return this.authHttp.get<ResultList<AccountBlock>>(BlocklistService.BASE_USER_BLOCKLIST_URL + '/accounts', { params })
+ .pipe(
+ map(res => this.restExtractor.convertResultListDateToHuman(res)),
+ map(res => this.restExtractor.applyToResultListData(res, this.formatAccountBlock.bind(this))),
+ catchError(err => this.restExtractor.handleError(err))
+ )
+ }
+
+ blockAccountByUser (account: Account) {
+ const body = { accountName: account.nameWithHost }
+
+ return this.authHttp.post(BlocklistService.BASE_USER_BLOCKLIST_URL + '/accounts', body)
+ .pipe(catchError(err => this.restExtractor.handleError(err)))
+ }
+
+ unblockAccountByUser (account: Account) {
+ const path = BlocklistService.BASE_USER_BLOCKLIST_URL + '/accounts/' + account.nameWithHost
+
+ return this.authHttp.delete(path)
+ .pipe(catchError(err => this.restExtractor.handleError(err)))
+ }
+
+ /*********************** User -> Server blocklist ***********************/
+
+ getUserServerBlocklist (pagination: RestPagination, sort: SortMeta) {
+ let params = new HttpParams()
+ params = this.restService.addRestGetParams(params, pagination, sort)
+
+ return this.authHttp.get<ResultList<ServerBlock>>(BlocklistService.BASE_USER_BLOCKLIST_URL + '/servers', { params })
+ .pipe(
+ map(res => this.restExtractor.convertResultListDateToHuman(res)),
+ catchError(err => this.restExtractor.handleError(err))
+ )
+ }
+
+ blockServerByUser (host: string) {
+ const body = { host }
+
+ return this.authHttp.post(BlocklistService.BASE_USER_BLOCKLIST_URL + '/servers', body)
+ .pipe(catchError(err => this.restExtractor.handleError(err)))
+ }
+
+ unblockServerByUser (host: string) {
+ const path = BlocklistService.BASE_USER_BLOCKLIST_URL + '/servers/' + host
+
+ return this.authHttp.delete(path)
+ .pipe(catchError(err => this.restExtractor.handleError(err)))
+ }
+
+ private formatAccountBlock (accountBlock: AccountBlockServer) {
+ return new AccountBlock(accountBlock)
+ }
+}
--- /dev/null
+export * from './blocklist.service'
+export * from './account-block.model'
\ No newline at end of file
<div ngbDropdownMenu class="dropdown-menu">
<ng-container *ngFor="let action of actions">
- <div class="dropdown-item" *ngIf="action.isDisplayed === undefined || action.isDisplayed(entry) === true">
+ <ng-container *ngIf="action.isDisplayed === undefined || action.isDisplayed(entry) === true">
<a *ngIf="action.linkBuilder" class="dropdown-item" [routerLink]="action.linkBuilder(entry)">{{ action.label }}</a>
- <span *ngIf="!action.linkBuilder" class="custom-action" class="dropdown-item" (click)="action.handler(entry)" role="button">
+ <span *ngIf="!action.linkBuilder" class="custom-action dropdown-item" (click)="action.handler(entry)" role="button">
{{ action.label }}
</span>
- </div>
+ </ng-container>
</ng-container>
</div>
</div>
\ No newline at end of file
.dropdown-item {
cursor: pointer;
color: #000 !important;
+
+ a, span {
+ display: block;
+ width: 100%;
+ }
}
}
\ No newline at end of file
-<ng-container *ngIf="user && userActions.length !== 0">
+<ng-container *ngIf="userActions.length !== 0">
<my-user-ban-modal #userBanModal (userBanned)="onUserBanned()"></my-user-ban-modal>
- <my-action-dropdown [actions]="userActions" [entry]="user" [buttonSize]="buttonSize" [placement]="placement"></my-action-dropdown>
+ <my-action-dropdown
+ [actions]="userActions" [entry]="{ user: user, account: account }"
+ [buttonSize]="buttonSize" [placement]="placement"
+ ></my-action-dropdown>
</ng-container>
\ No newline at end of file
-import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'
+import { Component, EventEmitter, Input, OnChanges, Output, ViewChild } from '@angular/core'
import { NotificationsService } from 'angular2-notifications'
import { I18n } from '@ngx-translate/i18n-polyfill'
import { DropdownAction } from '@app/shared/buttons/action-dropdown.component'
import { UserService } from '@app/shared/users'
import { AuthService, ConfirmService } 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' ]
})
-export class UserModerationDropdownComponent implements OnInit {
+export class UserModerationDropdownComponent implements OnChanges {
@ViewChild('userBanModal') userBanModal: UserBanModalComponent
@Input() user: User
+ @Input() account: Account
+
@Input() buttonSize: 'normal' | 'small' = 'normal'
@Input() placement = 'left'
private notificationsService: NotificationsService,
private confirmService: ConfirmService,
private userService: UserService,
+ private blocklistService: BlocklistService,
private i18n: I18n
) { }
- ngOnInit () {
+ ngOnChanges () {
this.buildActions()
}
)
}
+ blockAccountByUser (account: Account) {
+ this.blocklistService.blockAccountByUser(account)
+ .subscribe(
+ () => {
+ this.notificationsService.success(
+ this.i18n('Success'),
+ this.i18n('Account {{nameWithHost}} muted.', { nameWithHost: account.nameWithHost })
+ )
+
+ this.account.muted = true
+ this.userChanged.emit()
+ },
+
+ err => this.notificationsService.error(this.i18n('Error'), err.message)
+ )
+ }
+
+ unblockAccountByUser (account: Account) {
+ this.blocklistService.unblockAccountByUser(account)
+ .subscribe(
+ () => {
+ this.notificationsService.success(
+ this.i18n('Success'),
+ this.i18n('Account {{nameWithHost}} unmuted.', { nameWithHost: account.nameWithHost })
+ )
+
+ this.account.muted = false
+ this.userChanged.emit()
+ },
+
+ err => this.notificationsService.error(this.i18n('Error'), err.message)
+ )
+ }
+
+ blockServerByUser (host: string) {
+ this.blocklistService.blockServerByUser(host)
+ .subscribe(
+ () => {
+ this.notificationsService.success(
+ this.i18n('Success'),
+ this.i18n('Instance {{host}} muted.', { host })
+ )
+
+ this.account.mutedServer = true
+ this.userChanged.emit()
+ },
+
+ err => this.notificationsService.error(this.i18n('Error'), err.message)
+ )
+ }
+
+ unblockServerByUser (host: string) {
+ this.blocklistService.unblockServerByUser(host)
+ .subscribe(
+ () => {
+ this.notificationsService.success(
+ this.i18n('Success'),
+ this.i18n('Instance {{host}} unmuted.', { host })
+ )
+
+ this.account.mutedServer = false
+ this.userChanged.emit()
+ },
+
+ err => this.notificationsService.error(this.i18n('Error'), err.message)
+ )
+ }
+
getRouterUserEditLink (user: User) {
return [ '/admin', 'users', 'update', user.id ]
}
if (this.authService.isLoggedIn()) {
const authUser = this.authService.getUser()
- if (authUser.hasRight(UserRight.MANAGE_USERS)) {
+ if (this.user && authUser.id === this.user.id) return
+
+ if (this.user && authUser.hasRight(UserRight.MANAGE_USERS)) {
this.userActions = this.userActions.concat([
{
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.muted
},
{
label: this.i18n('Unban'),
- handler: user => this.unbanUser(user),
- isDisplayed: user => user.blocked
+ handler: ({ user }) => this.unbanUser(user),
+ isDisplayed: ({ user }) => user.muted
+ }
+ ])
+ }
+
+ // User actions on accounts/servers
+ if (this.account) {
+ this.userActions = this.userActions.concat([
+ {
+ label: this.i18n('Mute this account'),
+ isDisplayed: ({ account }) => account.muted === false,
+ handler: ({ account }) => this.blockAccountByUser(account)
+ },
+ {
+ label: this.i18n('Unmute this account'),
+ isDisplayed: ({ account }) => account.muted === true,
+ handler: ({ account }) => this.unblockAccountByUser(account)
+ },
+ {
+ label: this.i18n('Mute the instance'),
+ isDisplayed: ({ account }) => !account.userId && account.mutedServer === false,
+ handler: ({ account }) => this.blockServerByUser(account.host)
+ },
+ {
+ label: this.i18n('Unmute the instance'),
+ isDisplayed: ({ account }) => !account.userId && account.mutedServer === true,
+ handler: ({ account }) => this.unblockServerByUser(account.host)
}
])
}
import { OverviewService } from '@app/shared/overview'
import { UserBanModalComponent } from '@app/shared/moderation'
import { UserModerationDropdownComponent } from '@app/shared/moderation/user-moderation-dropdown.component'
+import { BlocklistService } from '@app/shared/blocklist'
@NgModule({
imports: [
OverviewService,
VideoChangeOwnershipValidatorsService,
VideoAcceptOwnershipValidatorsService,
+ BlocklistService,
I18nPrimengCalendarService,
ScreenService,
asyncRetryTransactionMiddleware,
authenticate,
paginationValidator,
- serverGetValidator,
setDefaultPagination,
setDefaultSort,
unblockAccountByAccountValidator
import {
accountsBlocklistSortValidator,
blockAccountByAccountValidator,
+ blockServerByAccountValidator,
serversBlocklistSortValidator,
unblockServerByAccountValidator
} from '../../../middlewares/validators'
myBlocklistRouter.post('/me/blocklist/servers',
authenticate,
- asyncMiddleware(serverGetValidator),
+ asyncMiddleware(blockServerByAccountValidator),
asyncRetryTransactionMiddleware(blockServer)
)
function addAccountInBlocklist (byAccountId: number, targetAccountId: number) {
return sequelizeTypescript.transaction(async t => {
- return AccountBlocklistModel.create({
+ return AccountBlocklistModel.upsert({
accountId: byAccountId,
targetAccountId: targetAccountId
}, { transaction: t })
function addServerInBlocklist (byAccountId: number, targetServerId: number) {
return sequelizeTypescript.transaction(async t => {
- return ServerBlocklistModel.create({
+ return ServerBlocklistModel.upsert({
accountId: byAccountId,
targetServerId
}, { transaction: t })
-import { param, body } from 'express-validator/check'
+import { body, param } from 'express-validator/check'
import * as express from 'express'
import { logger } from '../../helpers/logger'
import { areValidationErrors } from './utils'
import { AccountBlocklistModel } from '../../models/account/account-blocklist'
import { isHostValid } from '../../helpers/custom-validators/servers'
import { ServerBlocklistModel } from '../../models/server/server-blocklist'
+import { ServerModel } from '../../models/server/server'
+import { CONFIG } from '../../initializers'
const blockAccountByAccountValidator = [
body('accountName').exists().withMessage('Should have an account name with host'),
if (areValidationErrors(req, res)) return
if (!await isAccountNameWithHostExist(req.body.accountName, res)) return
+ const user = res.locals.oauth.token.User as UserModel
+ const accountToBlock = res.locals.account
+
+ if (user.Account.id === accountToBlock.id) {
+ res.status(409)
+ .send({ error: 'You cannot block yourself.' })
+ .end()
+
+ return
+ }
+
return next()
}
]
}
]
+const blockServerByAccountValidator = [
+ body('host').custom(isHostValid).withMessage('Should have a valid host'),
+
+ async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ logger.debug('Checking serverGetValidator parameters', { parameters: req.body })
+
+ if (areValidationErrors(req, res)) return
+
+ const host: string = req.body.host
+
+ if (host === CONFIG.WEBSERVER.HOST) {
+ return res.status(409)
+ .send({ error: 'You cannot block your own server.' })
+ .end()
+ }
+
+ const server = await ServerModel.loadByHost(host)
+ if (!server) {
+ return res.status(404)
+ .send({ error: 'Server host not found.' })
+ .end()
+ }
+
+ res.locals.server = server
+
+ return next()
+ }
+]
+
const unblockServerByAccountValidator = [
param('host').custom(isHostValid).withMessage('Should have an account name with host'),
// ---------------------------------------------------------------------------
export {
+ blockServerByAccountValidator,
blockAccountByAccountValidator,
unblockAccountByAccountValidator,
unblockServerByAccountValidator
{
model: () => AccountModel,
required: true,
- as: 'AccountBlocked'
+ as: 'BlockedAccount'
}
]
}
name: 'targetAccountId',
allowNull: false
},
- as: 'AccountBlocked',
+ as: 'BlockedAccount',
onDelete: 'CASCADE'
})
- AccountBlocked: AccountModel
+ BlockedAccount: AccountModel
static loadByAccountAndTarget (accountId: number, targetAccountId: number) {
const query = {
toFormattedJSON (): AccountBlock {
return {
byAccount: this.ByAccount.toFormattedJSON(),
- accountBlocked: this.AccountBlocked.toFormattedJSON(),
+ blockedAccount: this.BlockedAccount.toFormattedJSON(),
createdAt: this.createdAt
}
}
},
onDelete: 'CASCADE'
})
- ServerBlocked: ServerModel
+ BlockedServer: ServerModel
static loadByAccountAndHost (accountId: number, host: string) {
const query = {
toFormattedJSON (): ServerBlock {
return {
byAccount: this.ByAccount.toFormattedJSON(),
- serverBlocked: this.ServerBlocked.toFormattedJSON(),
+ blockedServer: this.BlockedServer.toFormattedJSON(),
createdAt: this.createdAt
}
}
})
})
+ it('Should fail to block ourselves', async function () {
+ await makePostBodyRequest({
+ url: server.url,
+ token: server.accessToken,
+ path,
+ fields: { accountName: 'root' },
+ statusCodeExpected: 409
+ })
+ })
+
it('Should succeed with the correct params', async function () {
await makePostBodyRequest({
url: server.url,
})
})
+ it('Should fail with our own server', async function () {
+ await makePostBodyRequest({
+ url: server.url,
+ token: server.accessToken,
+ path,
+ fields: { host: 'localhost:9001' },
+ statusCodeExpected: 409
+ })
+ })
+
it('Should succeed with the correct params', async function () {
await makePostBodyRequest({
url: server.url,
const block = blocks[0]
expect(block.byAccount.displayName).to.equal('root')
expect(block.byAccount.name).to.equal('root')
- expect(block.accountBlocked.displayName).to.equal('user2')
- expect(block.accountBlocked.name).to.equal('user2')
- expect(block.accountBlocked.host).to.equal('localhost:9002')
+ expect(block.blockedAccount.displayName).to.equal('user2')
+ expect(block.blockedAccount.name).to.equal('user2')
+ expect(block.blockedAccount.host).to.equal('localhost:9002')
}
{
const block = blocks[0]
expect(block.byAccount.displayName).to.equal('root')
expect(block.byAccount.name).to.equal('root')
- expect(block.accountBlocked.displayName).to.equal('user1')
- expect(block.accountBlocked.name).to.equal('user1')
- expect(block.accountBlocked.host).to.equal('localhost:9001')
+ expect(block.blockedAccount.displayName).to.equal('user1')
+ expect(block.blockedAccount.name).to.equal('user1')
+ expect(block.blockedAccount.host).to.equal('localhost:9001')
}
})
const block = blocks[0]
expect(block.byAccount.displayName).to.equal('root')
expect(block.byAccount.name).to.equal('root')
- expect(block.serverBlocked.host).to.equal('localhost:9002')
+ expect(block.blockedServer.host).to.equal('localhost:9002')
})
it('Should unblock the remote server', async function () {
export interface AccountBlock {
byAccount: Account
- accountBlocked: Account
+ blockedAccount: Account
createdAt: Date | string
}
export interface ServerBlock {
byAccount: Account
- serverBlocked: {
+ blockedServer: {
host: string
}
createdAt: Date | string
projects / oweals / peertube.git / commitdiff