From 0c966ed49e9dc8ca55f21ed679c7f6f12c66c16a Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Mon, 8 Jun 2020 19:29:17 +0200
Subject: [PATCH] Renaming links to slugs

---
 .../episodes-list/episodes-list.component.html   |  6 +++---
 src/app/player/player.component.ts               | 16 ++++++++--------
 src/models/episode.ts                            |  2 +-
 src/models/watch-item.ts                         |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/app/episodes-list/episodes-list.component.html b/src/app/episodes-list/episodes-list.component.html
index 5456e3c7..052bdf86 100644
--- a/src/app/episodes-list/episodes-list.component.html
+++ b/src/app/episodes-list/episodes-list.component.html
@@ -2,7 +2,7 @@
 	<div class="episodes" #scrollView (scroll)="onScroll()">
 		<div class="episode" *ngFor="let episode of this.episodes" #episodeDom >
 			<button mat-icon-button class="moreBtn" [matMenuTriggerFor]="more" [matMenuTriggerData]="{episode: episode}"><i class="material-icons">more_vert</i></button>
-			<a routerLink="/watch/{{episode.link}}" href="/watch/{{episode.link}}">
+			<a routerLink="/watch/{{episode.slug}}" href="/watch/{{episode.slug}}">
 				<div matRipple class="img" [style.background-image]="sanitize(episode.thumb)">
 					<button mat-icon-button class="playBtn"><i class="material-icons playIcon">play_circle_outline</i></button>
 				</div>
@@ -19,13 +19,13 @@
 			</a>
 		</div>
 	</div>
-	
+
 	<mat-menu #more="matMenu">
 		<ng-template matMenuContent let-episode="episode">
 			<a [href]="'/video/' + episode.link" download><button mat-menu-item>Download episode</button></a>
 		</ng-template>
 	</mat-menu>
-	
+
 	<button mat-raised-button color="accent" class="scrollBtn leftBtn d-none" #leftBtn (click)="scrollLeft()"><mat-icon>arrow_left</mat-icon></button>
 	<button mat-raised-button color="accent" class="scrollBtn rightBtn" #rightBtn (click)="scrollRight()"><mat-icon>arrow_right</mat-icon></button>
 </div>
diff --git a/src/app/player/player.component.ts b/src/app/player/player.component.ts
index cb2a1c28..2bb03eca 100644
--- a/src/app/player/player.component.ts
+++ b/src/app/player/player.component.ts
@@ -52,8 +52,8 @@ export class PlayerComponent implements OnInit
 	private thumb: HTMLElement;
 	private progress: HTMLElement;
 	private buffered: HTMLElement;
-	
-	
+
+
 	private oidcSecurity: OidcSecurityService;
 
 	constructor(private route: ActivatedRoute, private sanitizer: DomSanitizer, private snackBar: MatSnackBar, private title: Title, private router: Router, private location: Location, private injector: Injector) { }
@@ -78,7 +78,7 @@ export class PlayerComponent implements OnInit
 				this.title.setTitle(this.item.showTitle + " - Kyoo");
 			else
 				this.title.setTitle(this.item.showTitle + " S" + this.item.seasonNumber + ":E" + this.item.episodeNumber + " - Kyoo");
-			
+
 			if (navigator.userAgent.match(/Mobi/) && document.fullscreenElement == null)
 			{
 				this.fullscreen();
@@ -414,11 +414,11 @@ export class PlayerComponent implements OnInit
 
 		if (this.playMethod == method.direct)
 		{
-			this.player.src = "/video/" + this.item.link;
+			this.player.src = "/video/" + this.item.slug;
 		}
 		else if (this.playMethod == method.transmux)
 		{
-			this.hlsPlayer.loadSource("/video/transmux/" + this.item.link + "/");
+			this.hlsPlayer.loadSource("/video/transmux/" + this.item.slug + "/");
 			this.hlsPlayer.attachMedia(this.player);
 			this.hlsPlayer.on(Hls.Events.MANIFEST_LOADED, () =>
 			{
@@ -427,7 +427,7 @@ export class PlayerComponent implements OnInit
 		}
 		else
 		{
-			this.hlsPlayer.loadSource("/video/transcode/" + this.item.link + "/");
+			this.hlsPlayer.loadSource("/video/transcode/" + this.item.slug + "/");
 			this.hlsPlayer.attachMedia(this.player);
 			this.hlsPlayer.on(Hls.Events.MANIFEST_LOADED, () =>
 			{
@@ -444,7 +444,7 @@ export class PlayerComponent implements OnInit
 	next()
 	{
 		if (this.item.nextEpisode != null)
-			this.router.navigate(["/watch/" + this.item.nextEpisode.link], { queryParamsHandling: "merge", replaceUrl: true });
+			this.router.navigate(["/watch/" + this.item.nextEpisode.slug], { queryParamsHandling: "merge", replaceUrl: true });
 	}
 
 	previous()
@@ -620,7 +620,7 @@ export class PlayerComponent implements OnInit
 				track.src = subtitle.link.replace(".srt", ".vtt");
 				track.classList.add("subtitle_container");
 				track.default = true;
-				track.onload = () => 
+				track.onload = () =>
 				{
 					this.player.textTracks[0].mode = "showing";
 				};
diff --git a/src/models/episode.ts b/src/models/episode.ts
index 80fddab8..8253a14e 100644
--- a/src/models/episode.ts
+++ b/src/models/episode.ts
@@ -6,7 +6,7 @@ export interface Episode
 	episodeNumber: number;
 	title: string;
 	thumb: string;
-	link: string;
+	slug: string;
 	overview: string;
 	releaseDate;
 	runtime: number;
diff --git a/src/models/watch-item.ts b/src/models/watch-item.ts
index caa43f7e..8c3ad7bb 100644
--- a/src/models/watch-item.ts
+++ b/src/models/watch-item.ts
@@ -7,7 +7,7 @@ export interface WatchItem
 	seasonNumber: number;
 	episodeNumber: number;
 	title: string;
-	link: string;
+	slug: string;
 	duration: number;
 	releaseDate;
 	isMovie: boolean;