aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-07-20 11:37:06 +0200
committerChocobozzz <me@florianbigard.com>2020-07-20 11:37:06 +0200
commit0bdad52fbbad81e7654adc495088da56a00437df (patch)
tree206f4693cc7fa62531fdf6830d6bf9fbbdc07cc1 /client
parent69a019968e225f1eac4a3df3041f141d0047d7f0 (diff)
downloadPeerTube-0bdad52fbbad81e7654adc495088da56a00437df.tar.gz
PeerTube-0bdad52fbbad81e7654adc495088da56a00437df.tar.zst
PeerTube-0bdad52fbbad81e7654adc495088da56a00437df.zip
Fix issues with external links in search page
Diffstat (limited to 'client')
-rw-r--r--client/src/app/+search/channel-lazy-load.resolver.ts8
-rw-r--r--client/src/app/+search/search.component.html20
-rw-r--r--client/src/app/+search/search.component.ts36
-rw-r--r--client/src/app/+search/video-lazy-load.resolver.ts8
-rw-r--r--client/src/app/shared/shared-thumbnail/video-thumbnail.component.html15
-rw-r--r--client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts7
-rw-r--r--client/src/app/shared/shared-video-miniature/video-miniature.component.html12
-rw-r--r--client/src/app/shared/shared-video-miniature/video-miniature.component.ts25
-rw-r--r--client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html2
9 files changed, 81 insertions, 52 deletions
diff --git a/client/src/app/+search/channel-lazy-load.resolver.ts b/client/src/app/+search/channel-lazy-load.resolver.ts
index 17a212829..d9f7ec901 100644
--- a/client/src/app/+search/channel-lazy-load.resolver.ts
+++ b/client/src/app/+search/channel-lazy-load.resolver.ts
@@ -12,20 +12,12 @@ export class ChannelLazyLoadResolver implements Resolve<any> {
12 12
13 resolve (route: ActivatedRouteSnapshot) { 13 resolve (route: ActivatedRouteSnapshot) {
14 const url = route.params.url 14 const url = route.params.url
15 const externalRedirect = route.params.externalRedirect
16 const fromPath = route.params.fromPath
17 15
18 if (!url) { 16 if (!url) {
19 console.error('Could not find url param.', { params: route.params }) 17 console.error('Could not find url param.', { params: route.params })
20 return this.router.navigateByUrl('/404') 18 return this.router.navigateByUrl('/404')
21 } 19 }
22 20
23 if (externalRedirect === 'true') {
24 window.open(url)
25 this.router.navigateByUrl(fromPath)
26 return
27 }
28
29 return this.searchService.searchVideoChannels({ search: url }) 21 return this.searchService.searchVideoChannels({ search: url })
30 .pipe( 22 .pipe(
31 map(result => { 23 map(result => {
diff --git a/client/src/app/+search/search.component.html b/client/src/app/+search/search.component.html
index 9bff024ad..84be4fb14 100644
--- a/client/src/app/+search/search.component.html
+++ b/client/src/app/+search/search.component.html
@@ -35,15 +35,27 @@
35 35
36 <ng-container *ngFor="let result of results"> 36 <ng-container *ngFor="let result of results">
37 <div *ngIf="isVideoChannel(result)" class="entry video-channel"> 37 <div *ngIf="isVideoChannel(result)" class="entry video-channel">
38 <a [routerLink]="getChannelUrl(result)"> 38 <a *ngIf="!isExternalChannelUrl()" [routerLink]="getChannelUrl(result)">
39 <img [src]="result.avatarUrl" alt="Avatar" />
40 </a>
41
42 <a *ngIf="isExternalChannelUrl()" [href]="getChannelUrl(result)" target="_blank">
39 <img [src]="result.avatarUrl" alt="Avatar" /> 43 <img [src]="result.avatarUrl" alt="Avatar" />
40 </a> 44 </a>
41 45
42 <div class="video-channel-info"> 46 <div class="video-channel-info">
43 <a [routerLink]="getChannelUrl(result)" class="video-channel-names"> 47 <a *ngIf="!isExternalChannelUrl()" [routerLink]="getChannelUrl(result)" class="video-channel-names">
48 <ng-container *ngTemplateOutlet="aContent"></ng-container>
49 </a>
50
51 <a *ngIf="isExternalChannelUrl()" [href]="getChannelUrl(result)" target="_blank" class="video-channel-names">
52 <ng-container *ngTemplateOutlet="aContent"></ng-container>
53 </a>
54
55 <ng-template #aContent>
44 <div class="video-channel-display-name">{{ result.displayName }}</div> 56 <div class="video-channel-display-name">{{ result.displayName }}</div>
45 <div class="video-channel-name">{{ result.nameWithHost }}</div> 57 <div class="video-channel-name">{{ result.nameWithHost }}</div>
46 </a> 58 </ng-template>
47 59
48 <div i18n class="video-channel-followers">{{ result.followersCount }} subscribers</div> 60 <div i18n class="video-channel-followers">{{ result.followersCount }} subscribers</div>
49 </div> 61 </div>
@@ -54,7 +66,7 @@
54 <div *ngIf="isVideo(result)" class="entry video"> 66 <div *ngIf="isVideo(result)" class="entry video">
55 <my-video-miniature 67 <my-video-miniature
56 [video]="result" [user]="userMiniature" [displayAsRow]="true" [displayVideoActions]="!hideActions()" 68 [video]="result" [user]="userMiniature" [displayAsRow]="true" [displayVideoActions]="!hideActions()"
57 [displayOptions]="videoDisplayOptions" [useLazyLoadUrl]="advancedSearch.searchTarget === 'search-index'" 69 [displayOptions]="videoDisplayOptions" [videoLinkType]="getVideoLinkType()"
58 (videoBlocked)="removeVideoFromArray(result)" (videoRemoved)="removeVideoFromArray(result)" 70 (videoBlocked)="removeVideoFromArray(result)" (videoRemoved)="removeVideoFromArray(result)"
59 ></my-video-miniature> 71 ></my-video-miniature>
60 </div> 72 </div>
diff --git a/client/src/app/+search/search.component.ts b/client/src/app/+search/search.component.ts
index 1ed54937b..70116fab3 100644
--- a/client/src/app/+search/search.component.ts
+++ b/client/src/app/+search/search.component.ts
@@ -5,7 +5,7 @@ import { AuthService, ComponentPagination, HooksService, Notifier, ServerService
5import { immutableAssign } from '@app/helpers' 5import { immutableAssign } from '@app/helpers'
6import { Video, VideoChannel } from '@app/shared/shared-main' 6import { Video, VideoChannel } from '@app/shared/shared-main'
7import { AdvancedSearch, SearchService } from '@app/shared/shared-search' 7import { AdvancedSearch, SearchService } from '@app/shared/shared-search'
8import { MiniatureDisplayOptions } from '@app/shared/shared-video-miniature' 8import { MiniatureDisplayOptions, VideoLinkType } from '@app/shared/shared-video-miniature'
9import { MetaService } from '@ngx-meta/core' 9import { MetaService } from '@ngx-meta/core'
10import { I18n } from '@ngx-translate/i18n-polyfill' 10import { I18n } from '@ngx-translate/i18n-polyfill'
11import { SearchTargetType, ServerConfig } from '@shared/models' 11import { SearchTargetType, ServerConfig } from '@shared/models'
@@ -119,6 +119,25 @@ export class SearchComponent implements OnInit, OnDestroy {
119 return this.authService.isLoggedIn() 119 return this.authService.isLoggedIn()
120 } 120 }
121 121
122 getVideoLinkType (): VideoLinkType {
123 if (this.advancedSearch.searchTarget === 'search-index') {
124 const remoteUriConfig = this.serverConfig.search.remoteUri
125
126 // Redirect on the external instance if not allowed to fetch remote data
127 if ((!this.isUserLoggedIn() && !remoteUriConfig.anonymous) || !remoteUriConfig.users) {
128 return 'external'
129 }
130
131 return 'lazy-load'
132 }
133
134 return 'internal'
135 }
136
137 isExternalChannelUrl () {
138 return this.getVideoLinkType() === 'external'
139 }
140
122 search () { 141 search () {
123 forkJoin([ 142 forkJoin([
124 this.getVideosObs(), 143 this.getVideosObs(),
@@ -184,17 +203,16 @@ export class SearchComponent implements OnInit, OnDestroy {
184 } 203 }
185 204
186 getChannelUrl (channel: VideoChannel) { 205 getChannelUrl (channel: VideoChannel) {
187 if (this.advancedSearch.searchTarget === 'search-index' && channel.url) { 206 // Same algorithm than videos
188 const remoteUriConfig = this.serverConfig.search.remoteUri 207 if (this.getVideoLinkType() === 'external') {
189 208 return channel.url
190 // Redirect on the external instance if not allowed to fetch remote data 209 }
191 const externalRedirect = (!this.authService.isLoggedIn() && !remoteUriConfig.anonymous) || !remoteUriConfig.users
192 const fromPath = window.location.pathname + window.location.search
193 210
194 return [ '/search/lazy-load-channel', { url: channel.url, externalRedirect, fromPath } ] 211 if (this.getVideoLinkType() === 'internal') {
212 return [ '/video-channels', channel.nameWithHost ]
195 } 213 }
196 214
197 return [ '/video-channels', channel.nameWithHost ] 215 return [ '/search/lazy-load-channel', { url: channel.url } ]
198 } 216 }
199 217
200 hideActions () { 218 hideActions () {
diff --git a/client/src/app/+search/video-lazy-load.resolver.ts b/client/src/app/+search/video-lazy-load.resolver.ts
index e8b2b8c74..d4fe6ed79 100644
--- a/client/src/app/+search/video-lazy-load.resolver.ts
+++ b/client/src/app/+search/video-lazy-load.resolver.ts
@@ -12,20 +12,12 @@ export class VideoLazyLoadResolver implements Resolve<any> {
12 12
13 resolve (route: ActivatedRouteSnapshot) { 13 resolve (route: ActivatedRouteSnapshot) {
14 const url = route.params.url 14 const url = route.params.url
15 const externalRedirect = route.params.externalRedirect
16 const fromPath = route.params.fromPath
17 15
18 if (!url) { 16 if (!url) {
19 console.error('Could not find url param.', { params: route.params }) 17 console.error('Could not find url param.', { params: route.params })
20 return this.router.navigateByUrl('/404') 18 return this.router.navigateByUrl('/404')
21 } 19 }
22 20
23 if (externalRedirect === 'true') {
24 window.open(url)
25 this.router.navigateByUrl(fromPath)
26 return
27 }
28
29 return this.searchService.searchVideos({ search: url }) 21 return this.searchService.searchVideos({ search: url })
30 .pipe( 22 .pipe(
31 map(result => { 23 map(result => {
diff --git a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.html b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.html
index fe5510c56..0cb0f321b 100644
--- a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.html
+++ b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.html
@@ -1,7 +1,12 @@
1<a 1<a *ngIf="!videoHref" [routerLink]="getVideoRouterLink()" [queryParams]="queryParams" class="video-thumbnail">
2 [routerLink]="getVideoRouterLink()" [queryParams]="queryParams" 2 <ng-container *ngTemplateOutlet="aContent"></ng-container>
3 class="video-thumbnail" 3</a>
4> 4
5<a *ngIf="videoHref" [href]="videoHref" [target]="videoTarget" class="video-thumbnail">
6 <ng-container *ngTemplateOutlet="aContent"></ng-container>
7</a>
8
9<ng-template #aContent>
5 <img alt="" [attr.aria-label]="video.name" [attr.src]="getImageUrl()" [ngClass]="{ 'blur-filter': nsfw }" /> 10 <img alt="" [attr.aria-label]="video.name" [attr.src]="getImageUrl()" [ngClass]="{ 'blur-filter': nsfw }" />
6 11
7 <div *ngIf="displayWatchLaterPlaylist" class="video-thumbnail-actions-overlay"> 12 <div *ngIf="displayWatchLaterPlaylist" class="video-thumbnail-actions-overlay">
@@ -30,4 +35,4 @@
30 <div class="progress-bar" *ngIf="video.userHistory?.currentTime"> 35 <div class="progress-bar" *ngIf="video.userHistory?.currentTime">
31 <div [ngStyle]="{ 'width.%': getProgressPercent() }"></div> 36 <div [ngStyle]="{ 'width.%': getProgressPercent() }"></div>
32 </div> 37 </div>
33</a> 38</ng-template>
diff --git a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts
index 3ff45d9b7..812c7a508 100644
--- a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts
+++ b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts
@@ -11,8 +11,11 @@ import { Video } from '../shared-main'
11export class VideoThumbnailComponent { 11export class VideoThumbnailComponent {
12 @Input() video: Video 12 @Input() video: Video
13 @Input() nsfw = false 13 @Input() nsfw = false
14 @Input() routerLink: any[] 14
15 @Input() videoRouterLink: any[]
15 @Input() queryParams: { [ p: string ]: any } 16 @Input() queryParams: { [ p: string ]: any }
17 @Input() videoHref: string
18 @Input() videoTarget: string
16 19
17 @Input() displayWatchLaterPlaylist: boolean 20 @Input() displayWatchLaterPlaylist: boolean
18 @Input() inWatchLaterPlaylist: boolean 21 @Input() inWatchLaterPlaylist: boolean
@@ -49,7 +52,7 @@ export class VideoThumbnailComponent {
49 } 52 }
50 53
51 getVideoRouterLink () { 54 getVideoRouterLink () {
52 if (this.routerLink) return this.routerLink 55 if (this.videoRouterLink) return this.videoRouterLink
53 56
54 return [ '/videos/watch', this.video.uuid ] 57 return [ '/videos/watch', this.video.uuid ]
55 } 58 }
diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.html b/client/src/app/shared/shared-video-miniature/video-miniature.component.html
index e5d91e69a..a88b3bc9e 100644
--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.html
+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.html
@@ -1,6 +1,6 @@
1<div class="video-miniature" [ngClass]="{ 'display-as-row': displayAsRow, 'fit-width': fitWidth }" (mouseenter)="loadActions()"> 1<div class="video-miniature" [ngClass]="{ 'display-as-row': displayAsRow, 'fit-width': fitWidth }" (mouseenter)="loadActions()">
2 <my-video-thumbnail 2 <my-video-thumbnail
3 [video]="video" [nsfw]="isVideoBlur" [routerLink]="videoLink" 3 [video]="video" [nsfw]="isVideoBlur" [videoRouterLink]="videoRouterLink" [videoHref]="videoHref" [videoTarget]="videoTarget"
4 [displayWatchLaterPlaylist]="isWatchLaterPlaylistDisplayed()" [inWatchLaterPlaylist]="inWatchLaterPlaylist" (watchLaterClick)="onWatchLaterClick($event)" 4 [displayWatchLaterPlaylist]="isWatchLaterPlaylistDisplayed()" [inWatchLaterPlaylist]="inWatchLaterPlaylist" (watchLaterClick)="onWatchLaterClick($event)"
5 > 5 >
6 <ng-container ngProjectAs="label-warning" *ngIf="displayOptions.privacyLabel && isUnlistedVideo()" i18n>Unlisted</ng-container> 6 <ng-container ngProjectAs="label-warning" *ngIf="displayOptions.privacyLabel && isUnlistedVideo()" i18n>Unlisted</ng-container>
@@ -15,10 +15,12 @@
15 </a> 15 </a>
16 16
17 <div class="w-100 d-flex flex-column"> 17 <div class="w-100 d-flex flex-column">
18 <a 18 <a *ngIf="!videoHref" tabindex="-1" class="video-miniature-name"
19 tabindex="-1" 19 [routerLink]="videoRouterLink" [attr.title]="video.name" [ngClass]="{ 'blur-filter': isVideoBlur }"
20 class="video-miniature-name" 20 >{{ video.name }}</a>
21 [routerLink]="videoLink" [attr.title]="video.name" [ngClass]="{ 'blur-filter': isVideoBlur }" 21
22 <a *ngIf="videoHref" tabindex="-1" class="video-miniature-name"
23 [href]="videoHref" [target]="videoTarget" [attr.title]="video.name" [ngClass]="{ 'blur-filter': isVideoBlur }"
22 >{{ video.name }}</a> 24 >{{ video.name }}</a>
23 25
24 <span class="video-miniature-created-at-views"> 26 <span class="video-miniature-created-at-views">
diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts
index e1adbb6ad..f434550dd 100644
--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts
+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts
@@ -29,6 +29,7 @@ export type MiniatureDisplayOptions = {
29 blacklistInfo?: boolean 29 blacklistInfo?: boolean
30 nsfw?: boolean 30 nsfw?: boolean
31} 31}
32export type VideoLinkType = 'internal' | 'lazy-load' | 'external'
32 33
33@Component({ 34@Component({
34 selector: 'my-video-miniature', 35 selector: 'my-video-miniature',
@@ -55,7 +56,7 @@ export class VideoMiniatureComponent implements OnInit {
55 @Input() displayVideoActions = true 56 @Input() displayVideoActions = true
56 @Input() fitWidth = false 57 @Input() fitWidth = false
57 58
58 @Input() useLazyLoadUrl = false 59 @Input() videoLinkType: VideoLinkType = 'internal'
59 60
60 @Output() videoBlocked = new EventEmitter() 61 @Output() videoBlocked = new EventEmitter()
61 @Output() videoUnblocked = new EventEmitter() 62 @Output() videoUnblocked = new EventEmitter()
@@ -85,7 +86,9 @@ export class VideoMiniatureComponent implements OnInit {
85 playlistElementId?: number 86 playlistElementId?: number
86 } 87 }
87 88
88 videoLink: any[] = [] 89 videoRouterLink: any[] = []
90 videoHref: string
91 videoTarget: string
89 92
90 private ownerDisplayTypeChosen: 'account' | 'videoChannel' 93 private ownerDisplayTypeChosen: 'account' | 'videoChannel'
91 94
@@ -125,18 +128,20 @@ export class VideoMiniatureComponent implements OnInit {
125 } 128 }
126 129
127 buildVideoLink () { 130 buildVideoLink () {
128 if (this.useLazyLoadUrl && this.video.url) { 131 if (this.videoLinkType === 'internal' || !this.video.url) {
129 const remoteUriConfig = this.serverConfig.search.remoteUri 132 this.videoRouterLink = [ '/videos/watch', this.video.uuid ]
130 133 return
131 // Redirect on the external instance if not allowed to fetch remote data 134 }
132 const externalRedirect = (!this.authService.isLoggedIn() && !remoteUriConfig.anonymous) || !remoteUriConfig.users
133 const fromPath = window.location.pathname + window.location.search
134 135
135 this.videoLink = [ '/search/lazy-load-video', { url: this.video.url, externalRedirect, fromPath } ] 136 if (this.videoLinkType === 'external') {
137 this.videoRouterLink = null
138 this.videoHref = this.video.url
139 this.videoTarget = '_blank'
136 return 140 return
137 } 141 }
138 142
139 this.videoLink = [ '/videos/watch', this.video.uuid ] 143 // Lazy load
144 this.videoRouterLink = [ '/search/lazy-load-video', { url: this.video.url } ]
140 } 145 }
141 146
142 displayOwnerAccount () { 147 displayOwnerAccount () {
diff --git a/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html b/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html
index e3f7ef017..473fdc102 100644
--- a/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html
+++ b/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html
@@ -8,7 +8,7 @@
8 <my-video-thumbnail 8 <my-video-thumbnail
9 *ngIf="playlistElement.video" 9 *ngIf="playlistElement.video"
10 [video]="playlistElement.video" [nsfw]="isVideoBlur(playlistElement.video)" 10 [video]="playlistElement.video" [nsfw]="isVideoBlur(playlistElement.video)"
11 [routerLink]="buildRouterLink()" [queryParams]="buildRouterQuery()" 11 [videoRouterLink]="buildRouterLink()" [queryParams]="buildRouterQuery()"
12 ></my-video-thumbnail> 12 ></my-video-thumbnail>
13 13
14 <div class="fake-thumbnail" *ngIf="!playlistElement.video"></div> 14 <div class="fake-thumbnail" *ngIf="!playlistElement.video"></div>