aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/shared/shared-custom-markup
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-10-27 14:37:04 +0200
committerChocobozzz <chocobozzz@cpy.re>2021-10-29 11:48:21 +0200
commit2760b454a761f6af3138b2fb5f34340772ab0d1e (patch)
tree2b3a2d81478f8b432eb54cce4caa5a760c494627 /client/src/app/shared/shared-custom-markup
parente4611b54910d8e7f2b4f8a97ee2d9cc8e1054127 (diff)
downloadPeerTube-2760b454a761f6af3138b2fb5f34340772ab0d1e.tar.gz
PeerTube-2760b454a761f6af3138b2fb5f34340772ab0d1e.tar.zst
PeerTube-2760b454a761f6af3138b2fb5f34340772ab0d1e.zip
Deprecate filter video query
Introduce include and isLocal instead
Diffstat (limited to 'client/src/app/shared/shared-custom-markup')
-rw-r--r--client/src/app/shared/shared-custom-markup/custom-markup.service.ts3
-rw-r--r--client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts6
2 files changed, 4 insertions, 5 deletions
diff --git a/client/src/app/shared/shared-custom-markup/custom-markup.service.ts b/client/src/app/shared/shared-custom-markup/custom-markup.service.ts
index ab640d348..a959b336d 100644
--- a/client/src/app/shared/shared-custom-markup/custom-markup.service.ts
+++ b/client/src/app/shared/shared-custom-markup/custom-markup.service.ts
@@ -7,7 +7,6 @@ import {
7 ContainerMarkupData, 7 ContainerMarkupData,
8 EmbedMarkupData, 8 EmbedMarkupData,
9 PlaylistMiniatureMarkupData, 9 PlaylistMiniatureMarkupData,
10 VideoFilter,
11 VideoMiniatureMarkupData, 10 VideoMiniatureMarkupData,
12 VideosListMarkupData 11 VideosListMarkupData
13} from '@shared/models' 12} from '@shared/models'
@@ -193,7 +192,7 @@ export class CustomMarkupService {
193 192
194 isLive: this.buildBoolean(data.isLive), 193 isLive: this.buildBoolean(data.isLive),
195 194
196 filter: this.buildBoolean(data.onlyLocal) ? 'local' as VideoFilter : undefined 195 isLocal: this.buildBoolean(data.onlyLocal) ? true : undefined
197 } 196 }
198 197
199 this.dynamicElementService.setModel(component, model) 198 this.dynamicElementService.setModel(component, model)
diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts
index 856e43681..0e4d5fb12 100644
--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts
+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts
@@ -1,7 +1,7 @@
1import { finalize } from 'rxjs/operators' 1import { finalize } from 'rxjs/operators'
2import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core' 2import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
3import { AuthService, Notifier } from '@app/core' 3import { AuthService, Notifier } from '@app/core'
4import { VideoFilter, VideoSortField } from '@shared/models' 4import { VideoSortField } from '@shared/models'
5import { Video, VideoService } from '../../shared-main' 5import { Video, VideoService } from '../../shared-main'
6import { MiniatureDisplayOptions } from '../../shared-video-miniature' 6import { MiniatureDisplayOptions } from '../../shared-video-miniature'
7import { CustomMarkupComponent } from './shared' 7import { CustomMarkupComponent } from './shared'
@@ -21,7 +21,7 @@ export class VideosListMarkupComponent implements CustomMarkupComponent, OnInit
21 @Input() languageOneOf: string[] 21 @Input() languageOneOf: string[]
22 @Input() count: number 22 @Input() count: number
23 @Input() onlyDisplayTitle: boolean 23 @Input() onlyDisplayTitle: boolean
24 @Input() filter: VideoFilter 24 @Input() isLocal: boolean
25 @Input() isLive: boolean 25 @Input() isLive: boolean
26 @Input() maxRows: number 26 @Input() maxRows: number
27 @Input() channelHandle: string 27 @Input() channelHandle: string
@@ -86,7 +86,7 @@ export class VideosListMarkupComponent implements CustomMarkupComponent, OnInit
86 }, 86 },
87 categoryOneOf: this.categoryOneOf, 87 categoryOneOf: this.categoryOneOf,
88 languageOneOf: this.languageOneOf, 88 languageOneOf: this.languageOneOf,
89 filter: this.filter, 89 isLocal: this.isLocal,
90 isLive: this.isLive, 90 isLive: this.isLive,
91 sort: this.sort as VideoSortField, 91 sort: this.sort as VideoSortField,
92 account: { nameWithHost: this.accountHandle }, 92 account: { nameWithHost: this.accountHandle },