<ng-template pTemplate="body" let-serverBlock>
<tr>
- <td>{{ serverBlock.blockedServer.host }}</td>
+ <td>
+ <a [href]="'https://' + serverBlock.blockedServer.host" i18n-title title="Open instance in a new tab" target="_blank" rel="noopener noreferrer">
+ {{ serverBlock.blockedServer.host }}
+ <span class="glyphicon glyphicon-new-window"></span>
+ </a>
+ </td>
<td>{{ serverBlock.createdAt }}</td>
<td class="action-cell">
<button class="unblock-button" (click)="unblockServer(serverBlock)" i18n>Unmute</button>
@import '_variables';
@import '_mixins';
+a {
+ @include disable-default-a-behaviour;
+ display: inline-block;
+
+ &, &:hover {
+ color: var(--mainForegroundColor);
+ }
+
+ span {
+ font-size: 80%;
+ color: var(--inputPlaceholderColor);
+ }
+}
+
.unblock-button {
@include peertube-button;
@include grey-button;
}
}
-.glyphicon-trash {
- font-size: 80%;
-}
-
.screenratio {
position: relative;
width: 100%;
display: inline-flex;
justify-content: center;
align-items: center;
+ color: var(--inputPlaceholderColor);
}
::ng-deep iframe {
</td>
<td>
- <span *ngIf="videoAbuse.video.deleted" i18n-title title="Video was deleted" class="glyphicon glyphicon-trash"></span>
- <a [href]="getVideoUrl(videoAbuse)" i18n-title title="Open video in a new tab" target="_blank" rel="noopener noreferrer">
- {{ videoAbuse.video.name }}
+ <a [href]="getVideoUrl(videoAbuse)" class="video-abuse-video-link" i18n-title title="Open video in a new tab" target="_blank" rel="noopener noreferrer">
+ <div class="video-abuse-video">
+ <div class="video-abuse-video-image">
+ <img *ngIf="!videoAbuse.video.deleted" [src]="videoAbuse.video.thumbnailPath">
+ <span *ngIf="videoAbuse.video.deleted" i18n>Deleted</span>
+ </div>
+ <div class="video-abuse-video-text">
+ <div>
+ {{ videoAbuse.video.name }}
+ <span *ngIf="!videoAbuse.video.deleted && !videoAbuse.video.blacklisted" class="glyphicon glyphicon-new-window"></span>
+ <span *ngIf="videoAbuse.video.deleted" i18n-title title="Video was deleted" class="glyphicon glyphicon-trash"></span>
+ <span *ngIf="videoAbuse.video.blacklisted" i18n-title title="Video was blacklisted" class="glyphicon glyphicon-ban-circle"></span>
+ </div>
+ <div class="text-muted">by {{ videoAbuse.video.channel?.displayName }} on {{ videoAbuse.video.channel?.host }} </div>
+ </div>
+ </div>
</a>
</td>
<div class="col-4">
<div class="screenratio">
- <div *ngIf="videoAbuse.video.deleted">
+ <div *ngIf="videoAbuse.video.deleted || videoAbuse.video.blacklisted">
<span i18n>The video was {{ videoAbuse.video.deleted ? 'deleted' : 'blacklisted' }}</span>
</div>
- <div *ngIf="!videoAbuse.video.deleted" [innerHTML]="videoAbuse.embedHtml"></div>
+ <div *ngIf="!videoAbuse.video.deleted && !videoAbuse.video.blacklisted" [innerHTML]="videoAbuse.embedHtml"></div>
</div>
</div>
</div>
--- /dev/null
+@import 'mixins';
+@import 'miniature';
+
+.video-abuse-video-link {
+ @include disable-outline;
+ position: relative;
+ top: 3px;
+}
+
+.video-abuse-video {
+ display: inline-flex;
+
+ .video-abuse-video-image {
+ @include miniature-thumbnail;
+
+ $image-height: 45px;
+
+ height: $image-height;
+ width: #{(16/9) * $image-height};
+ margin-right: 0.5rem;
+ border-radius: 2px;
+ border: none;
+ background: transparent;
+ display: inline-flex;
+ justify-content: center;
+ align-items: center;
+
+ img {
+ height: 100%;
+ width: 100%;
+ border-radius: 2px;
+ }
+
+ span {
+ color: var(--inputPlaceholderColor);
+ }
+ }
+
+ .video-abuse-video-text {
+ display: inline-flex;
+ flex-direction: column;
+ justify-content: center;
+ font-size: 90%;
+ color: var(--mainForegroundColor);
+ line-height: 1rem;
+
+ div .glyphicon {
+ font-size: 80%;
+ color: gray;
+ margin-left: 0.1rem;
+ }
+
+ div + div {
+ font-size: 80%;
+ }
+ }
+}
@Component({
selector: 'my-video-abuse-list',
templateUrl: './video-abuse-list.component.html',
- styleUrls: [ '../moderation.component.scss']
+ styleUrls: [ '../moderation.component.scss', './video-abuse-list.component.scss' ]
})
export class VideoAbuseListComponent extends RestTable implements OnInit {
@ViewChild('moderationCommentModal', { static: true }) moderationCommentModal: ModerationCommentModalComponent
videoAbuses: (VideoAbuse & { moderationCommentHtml?: string, reasonHtml?: string })[] = []
totalRecords = 0
- rowsPerPageOptions = [ 20, 50, 100 ]
+ rowsPerPageOptions = [ 20, 50, 100 ]
rowsPerPage = this.rowsPerPageOptions[0]
sort: SortMeta = { field: 'createdAt', order: 1 }
pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
},
{
label: this.i18n('Blacklist video'),
- isDisplayed: videoAbuse => !videoAbuse.video.deleted,
+ isDisplayed: videoAbuse => !videoAbuse.video.deleted && !videoAbuse.video.blacklisted,
handler: videoAbuse => {
this.videoBlacklistService.blacklistVideo(videoAbuse.video.id, undefined, true)
.subscribe(
)
}
},
+ {
+ label: this.i18n('Unblacklist video'),
+ isDisplayed: videoAbuse => !videoAbuse.video.deleted && videoAbuse.video.blacklisted,
+ handler: videoAbuse => {
+ this.videoBlacklistService.removeVideoFromBlacklist(videoAbuse.video.id)
+ .subscribe(
+ () => {
+ this.notifier.success(this.i18n('Video unblacklisted.'))
+
+ this.updateVideoAbuseState(videoAbuse, VideoAbuseState.ACCEPTED)
+ },
+
+ err => this.notifier.error(err.message)
+ )
+ }
+ },
{
label: this.i18n('Delete video'),
isDisplayed: videoAbuse => !videoAbuse.video.deleted,
handler: async videoAbuse => {
- const res = await this.confirmService.confirm(this.i18n('Do you really want to delete this video?'), this.i18n('Delete'))
+ const res = await this.confirmService.confirm(
+ this.i18n('Do you really want to delete this video?'),
+ this.i18n('Delete')
+ )
if (res === false) return
this.videoService.removeVideo(videoAbuse.video.id)
isHeader: true
},
{
- label: this.i18n('Mute reporter'),
+ label: this.i18n('Mute reporter'),
handler: async videoAbuse => {
const account = videoAbuse.reporterAccount as Account
this.blocklistService.blockAccountByInstance(account)
.subscribe(
() => {
- this.notifier.success(this.i18n('Account {{nameWithHost}} muted by the instance.', { nameWithHost: account.nameWithHost }))
+ this.notifier.success(
+ this.i18n('Account {{nameWithHost}} muted by the instance.', { nameWithHost: account.nameWithHost })
+ )
account.mutedByInstance = true
},
+ err => this.notifier.error(err.message)
+ )
+ }
+ },
+ {
+ label: this.i18n('Mute server'),
+ isDisplayed: videoAbuse => !videoAbuse.reporterAccount.userId,
+ handler: async videoAbuse => {
+ this.blocklistService.blockServerByInstance(videoAbuse.reporterAccount.host)
+ .subscribe(
+ () => {
+ this.notifier.success(
+ this.i18n('Server {{host}} muted by the instance.', { host: videoAbuse.reporterAccount.host })
+ )
+ },
+
err => this.notifier.error(err.message)
)
}
this.userService.updateUser(this.user.id, userUpdate).subscribe(
() => {
- this.notifier.success(this.i18n('User {{user.username}} updated.', { username: this.user.username }))
+ this.notifier.success(this.i18n('User {{username}} updated.', { username: this.user.username }))
this.router.navigate([ '/admin/users/list' ])
},
const videoUrl = WEBSERVER.URL + videoAbuse.Video.getWatchStaticPath()
const text = 'Hi,\n\n' +
- `${WEBSERVER.HOST} received an abuse for the following video ${videoUrl}\n\n` +
+ `${WEBSERVER.HOST} received an abuse for the following video: ${videoUrl}\n\n` +
'Cheers,\n' +
`${CONFIG.EMAIL.BODY.SIGNATURE}`
-import { AllowNull, BelongsTo, Column, CreatedAt, DataType, Default, ForeignKey, Is, Model, Table, UpdatedAt } from 'sequelize-typescript'
+import {
+ AllowNull, BelongsTo, Column, CreatedAt, DataType, Default, ForeignKey, Is, Model, Table, UpdatedAt, DefaultScope
+} from 'sequelize-typescript'
import { VideoAbuseObject } from '../../../shared/models/activitypub/objects'
import { VideoAbuse } from '../../../shared/models/videos'
import {
import { MUserAccountId, MVideoAbuse, MVideoAbuseFormattable, MVideoAbuseVideo } from '../../typings/models'
import * as Bluebird from 'bluebird'
import { literal, Op } from 'sequelize'
+import { ThumbnailModel } from './thumbnail'
+import { VideoChannelModel } from './video-channel'
+import { ActorModel } from '../activitypub/actor'
+import { VideoBlacklistModel } from './video-blacklist'
+@DefaultScope(() => ({
+ include: [
+ {
+ model: AccountModel,
+ required: true
+ },
+ {
+ model: VideoModel,
+ required: false,
+ include: [
+ {
+ model: ThumbnailModel
+ },
+ {
+ model: VideoChannelModel.unscoped(),
+ include: [
+ {
+ model: ActorModel
+ }
+ ]
+ },
+ {
+ attributes: [ 'id', 'reason', 'unfederated' ],
+ model: VideoBlacklistModel
+ }
+ ]
+ }
+ ]
+}))
@Table({
tableName: 'videoAbuse',
indexes: [
[Op.notIn]: literal('(' + buildBlockedAccountSQL(serverAccountId, userAccountId) + ')')
}
},
- include: [
- {
- model: AccountModel,
- required: true
- },
- {
- model: VideoModel,
- required: false
- }
- ]
+ col: 'VideoAbuseModel.id',
+ distinct: true
}
return VideoAbuseModel.findAndCountAll(query)
uuid: video.uuid,
name: video.name,
nsfw: video.nsfw,
- deleted: !this.Video
+ deleted: !this.Video,
+ blacklisted: this.Video && this.Video.isBlacklisted(),
+ thumbnailPath: this.Video?.getMiniatureStaticPath(),
+ channel: this.Video?.VideoChannel.toFormattedSummaryJSON() || this.deletedVideo?.channel
},
createdAt: this.createdAt
}
if (instance.VideoAbuses.length === 0) return undefined
}
- const details = instance.toFormattedJSON()
+ const details = instance.toFormattedDetailsJSON()
for (const abuse of instance.VideoAbuses) {
tasks.push((_ => {
import { VideoAbuseModel } from '../../../models/video/video-abuse'
import { PickWith } from '../../utils'
-import { MVideo } from './video'
+import { MVideoAccountLightBlacklistAllFiles } from './video'
import { MAccountDefault, MAccountFormattable } from '../account'
type Use<K extends keyof VideoAbuseModel, M> = PickWith<VideoAbuseModel, K, M>
export type MVideoAbuseVideo =
MVideoAbuse &
Pick<VideoAbuseModel, 'toActivityPubObject'> &
- Use<'Video', MVideo>
+ Use<'Video', MVideoAccountLightBlacklistAllFiles>
export type MVideoAbuseAccountVideo =
MVideoAbuse &
Pick<VideoAbuseModel, 'toActivityPubObject'> &
- Use<'Video', MVideo> &
+ Use<'Video', MVideoAccountLightBlacklistAllFiles> &
Use<'Account', MAccountDefault>
// ############################################################################
export type MVideoAbuseFormattable =
MVideoAbuse &
Use<'Account', MAccountFormattable> &
- Use<'Video', Pick<MVideo, 'id' | 'uuid' | 'name' | 'nsfw'>>
+ Use<'Video', Pick<MVideoAccountLightBlacklistAllFiles,
+ 'id' | 'uuid' | 'name' | 'nsfw' | 'getMiniatureStaticPath' | 'isBlacklisted' | 'VideoChannel'>>
import { Account } from '../../actors/index'
import { VideoConstant } from '../video-constant.model'
import { VideoAbuseState } from './video-abuse-state.model'
+import { VideoChannelSummary } from '../channel/video-channel.model'
export interface VideoAbuse {
id: number
uuid: string
nsfw: boolean
deleted: boolean
+ blacklisted: boolean
+ thumbnailPath?: string
+ channel?: VideoChannelSummary
}
createdAt: Date
projects / oweals / peertube.git / commitdiff