[showCurrentPageReport]="true" i18n-currentPageReportTemplate
currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} reports"
>
+ <ng-template pTemplate="caption">
+ <div class="caption">
+ <div class="ml-auto">
+ <input
+ type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..."
+ (keyup)="onSearch($event)"
+ >
+ </div>
+ </div>
+ </ng-template>
+
<ng-template pTemplate="header">
<tr> <!-- header -->
<th style="width: 40px;"></th>
</a>
</td>
- <td>
+ <td *ngIf="!videoAbuse.video.deleted">
<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-image"><img [src]="videoAbuse.video.thumbnailPath"></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" class="glyphicon glyphicon-new-window"></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>
</a>
</td>
- <td>{{ videoAbuse.createdAt }}</td>
+ <td *ngIf="videoAbuse.video.deleted" class="c-hand" [pRowToggler]="videoAbuse">
+ <div class="video-abuse-video" i18n-title title="Video was deleted">
+ <div class="video-abuse-video-image"><span i18n>Deleted</span></div>
+ <div class="video-abuse-video-text">
+ <div>
+ {{ videoAbuse.video.name }}
+ <span class="glyphicon glyphicon-trash"></span>
+ </div>
+ <div class="text-muted">by {{ videoAbuse.video.channel?.displayName }} on {{ videoAbuse.video.channel?.host }} </div>
+ </div>
+ </div>
+ </td>
+
+ <td class="c-hand" [pRowToggler]="videoAbuse">{{ videoAbuse.createdAt }}</td>
<td class="c-hand video-abuse-states" [pRowToggler]="videoAbuse">
<span *ngIf="isVideoAbuseAccepted(videoAbuse)" [title]="videoAbuse.state.label" class="glyphicon glyphicon-ok"></span>
@import 'mixins';
@import 'miniature';
+.caption {
+ justify-content: flex-end;
+
+ input {
+ @include peertube-input-text(250px);
+ }
+}
+
.video-abuse-video-link {
@include disable-outline;
position: relative;
import { DomSanitizer } from '@angular/platform-browser'
import { BlocklistService } from '@app/shared/blocklist'
import { VideoService } from '@app/shared/video/video.service'
+import { ActivatedRoute } from '@angular/router'
+import { first } from 'rxjs/operators'
@Component({
selector: 'my-video-abuse-list',
private confirmService: ConfirmService,
private i18n: I18n,
private markdownRenderer: MarkdownService,
- private sanitizer: DomSanitizer
+ private sanitizer: DomSanitizer,
+ private route: ActivatedRoute,
) {
super()
ngOnInit () {
this.initialize()
+
+ this.route.queryParams
+ .pipe(first(params => params.search !== undefined && params.search !== null))
+ .subscribe(params => this.search = params.search)
}
getIdentifier () {
}
protected loadData () {
- return this.videoAbuseService.getVideoAbuses(this.pagination, this.sort)
- .subscribe(
- async resultList => {
- this.totalRecords = resultList.total
-
- this.videoAbuses = resultList.data
-
- for (const abuse of this.videoAbuses) {
- Object.assign(abuse, {
- reasonHtml: await this.toHtml(abuse.reason),
- moderationCommentHtml: await this.toHtml(abuse.moderationComment),
- embedHtml: this.sanitizer.bypassSecurityTrustHtml(this.getVideoEmbed(abuse)),
- reporterAccount: new Account(abuse.reporterAccount)
- })
- }
-
- },
-
- err => this.notifier.error(err.message)
- )
+ return this.videoAbuseService.getVideoAbuses({
+ pagination: this.pagination,
+ sort: this.sort,
+ search: this.search
+ }).subscribe(
+ async resultList => {
+ this.totalRecords = resultList.total
+
+ this.videoAbuses = resultList.data
+
+ for (const abuse of this.videoAbuses) {
+ Object.assign(abuse, {
+ reasonHtml: await this.toHtml(abuse.reason),
+ moderationCommentHtml: await this.toHtml(abuse.moderationComment),
+ embedHtml: this.sanitizer.bypassSecurityTrustHtml(this.getVideoEmbed(abuse)),
+ reporterAccount: new Account(abuse.reporterAccount)
+ })
+ }
+
+ },
+
+ err => this.notifier.error(err.message)
+ )
}
private toHtml (text: string) {
private restExtractor: RestExtractor
) {}
- getVideoAbuses (pagination: RestPagination, sort: SortMeta): Observable<ResultList<VideoAbuse>> {
+ getVideoAbuses (options: {
+ pagination: RestPagination,
+ sort: SortMeta,
+ search?: string
+ }): Observable<ResultList<VideoAbuse>> {
+ const { pagination, sort, search } = options
const url = VideoAbuseService.BASE_VIDEO_ABUSE_URL + 'abuse'
let params = new HttpParams()
params = this.restService.addRestGetParams(params, pagination, sort)
+ if (search) params = params.append('search', search)
+
return this.authHttp.get<ResultList<VideoAbuse>>(url, { params })
.pipe(
map(res => this.restExtractor.convertResultListDateToHuman(res)),
start: req.query.start,
count: req.query.count,
sort: req.query.sort,
+ search: req.query.search,
serverAccountId: serverActor.Account.id,
user
})
import {
- AllowNull, BelongsTo, Column, CreatedAt, DataType, Default, ForeignKey, Is, Model, Table, UpdatedAt, DefaultScope
+ AllowNull, BelongsTo, Column, CreatedAt, DataType, Default, ForeignKey, Is, Model, Table, UpdatedAt, Scopes
} from 'sequelize-typescript'
import { VideoAbuseObject } from '../../../shared/models/activitypub/objects'
import { VideoAbuse } from '../../../shared/models/videos'
import { ActorModel } from '../activitypub/actor'
import { VideoBlacklistModel } from './video-blacklist'
-@DefaultScope(() => ({
- include: [
- {
- model: AccountModel,
- required: true
- },
- {
- model: VideoModel,
- required: false,
+export enum ScopeNames {
+ FOR_API = 'FOR_API'
+}
+
+@Scopes(() => ({
+ [ScopeNames.FOR_API]: (options: {
+ search?: string
+ searchReporter?: string
+ searchVideo?: string
+ searchVideoChannel?: string
+ serverAccountId: number
+ userAccountId: any
+ }) => {
+ const search = (sourceField, targetField) => sourceField ? ({
+ [targetField]: {
+ [Op.iLike]: `%${sourceField}%`
+ }
+ }) : {}
+
+ let where = {
+ reporterAccountId: {
+ [Op.notIn]: literal('(' + buildBlockedAccountSQL(options.serverAccountId, options.userAccountId) + ')')
+ }
+ }
+
+ if (options.search) {
+ where = Object.assign(where, {
+ [Op.or]: [
+ {
+ [Op.and]: [
+ { videoId: { [Op.not]: null } },
+ { '$Video.name$': { [Op.iLike]: `%${options.search}%` } }
+ ]
+ },
+ {
+ [Op.and]: [
+ { videoId: { [Op.not]: null } },
+ { '$Video.VideoChannel.name$': { [Op.iLike]: `%${options.search}%` } }
+ ]
+ },
+ {
+ [Op.and]: [
+ { deletedVideo: { [Op.not]: null } },
+ { deletedVideo: { name: { [Op.iLike]: `%${options.search}%` } } }
+ ]
+ },
+ {
+ [Op.and]: [
+ { deletedVideo: { [Op.not]: null } },
+ { deletedVideo: { channel: { displayName: { [Op.iLike]: `%${options.search}%` } } } }
+ ]
+ },
+ { '$Account.name$': { [Op.iLike]: `%${options.search}%` } }
+ ]
+ })
+ }
+
+ console.log(where)
+
+ return {
include: [
{
- model: ThumbnailModel
+ model: AccountModel,
+ required: true,
+ where: { ...search(options.searchReporter, 'name') }
},
{
- model: VideoChannelModel.unscoped(),
+ model: VideoModel,
+ required: false,
+ where: { ...search(options.searchVideo, 'name') },
include: [
{
- model: ActorModel
+ model: ThumbnailModel
+ },
+ {
+ model: VideoChannelModel.unscoped(),
+ where: { ...search(options.searchVideoChannel, 'name') },
+ include: [
+ {
+ model: ActorModel
+ }
+ ]
+ },
+ {
+ attributes: [ 'id', 'reason', 'unfederated' ],
+ model: VideoBlacklistModel
}
]
- },
- {
- attributes: [ 'id', 'reason', 'unfederated' ],
- model: VideoBlacklistModel
}
- ]
+ ],
+ where
}
- ]
+ }
}))
@Table({
tableName: 'videoAbuse',
start: number
count: number
sort: string
+ search?: string
serverAccountId: number
user?: MUserAccountId
}) {
- const { start, count, sort, user, serverAccountId } = parameters
+ const { start, count, sort, search, user, serverAccountId } = parameters
const userAccountId = user ? user.Account.id : undefined
const query = {
offset: start,
limit: count,
order: getSort(sort),
- where: {
- reporterAccountId: {
- [Op.notIn]: literal('(' + buildBlockedAccountSQL(serverAccountId, userAccountId) + ')')
- }
- },
col: 'VideoAbuseModel.id',
distinct: true
}
- return VideoAbuseModel.findAndCountAll(query)
+ const filters = {
+ search,
+ serverAccountId,
+ userAccountId
+ }
+
+ return VideoAbuseModel
+ .scope({ method: [ ScopeNames.FOR_API, filters ] })
+ .findAndCountAll(query)
.then(({ rows, count }) => {
return { total: count, data: rows }
})
projects / github / Chocobozzz / PeerTube.git / commitdiff
