Change tab when changing follow url

2 files changed, 24 insertions, 11 deletions

diff --git a/client/src/app/+admin/follows/follows.component.ts b/client/src/app/+admin/follows/follows.component.ts
index 97422a41b..a1be82585 100644
--- a/client/src/app/+admin/follows/follows.component.ts
+++ b/client/src/app/+admin/follows/follows.component.ts
@@ -1,11 +1,12 @@
-import { AfterViewInit, Component, ViewChild } from '@angular/core'
+import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core'
+import { NavigationEnd, Router } from '@angular/router'
 import { TabsetComponent } from 'ngx-bootstrap/tabs'
 
 @Component({
   templateUrl: './follows.component.html',
   styleUrls: [ './follows.component.scss' ]
 })
-export class FollowsComponent implements AfterViewInit {
+export class FollowsComponent implements OnInit, AfterViewInit {
   @ViewChild('followsMenuTabs') followsMenuTabs: TabsetComponent
 
   links = [
@@ -23,6 +24,18 @@ export class FollowsComponent implements AfterViewInit {
     }
   ]
 
+  constructor (private router: Router) {}
+
+  ngOnInit () {
+    this.router.events.subscribe(
+      event => {
+        if (event instanceof NavigationEnd) {
+          this.updateActiveTab()
+        }
+      }
+    )
+  }
+
   ngAfterViewInit () {
     // Avoid issue with change detector
     setTimeout(() => this.updateActiveTab())
diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index 045a50ef0..64e5829ca 100644
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -51,16 +51,16 @@ function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoInstance
   const previewUrl = CONFIG.WEBSERVER.URL + STATIC_PATHS.PREVIEWS + video.getPreviewName()
   const videoUrl = CONFIG.WEBSERVER.URL + '/videos/watch/' + video.uuid
 
-  const videoName = escapeHTML(video.name)
-  const videoDescription = escapeHTML(video.description)
+  const videoNameEscaped = escapeHTML(video.name)
+  const videoDescriptionEscaped = escapeHTML(video.description)
   const embedUrl = CONFIG.WEBSERVER.URL + video.getEmbedPath()
 
   const openGraphMetaTags = {
     'og:type': 'video',
-    'og:title': videoName,
+    'og:title': videoNameEscaped,
     'og:image': previewUrl,
     'og:url': videoUrl,
-    'og:description': videoDescription,
+    'og:description': videoDescriptionEscaped,
 
     'og:video:url': embedUrl,
     'og:video:secure_url': embedUrl,
@@ -68,14 +68,14 @@ function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoInstance
     'og:video:width': EMBED_SIZE.width,
     'og:video:height': EMBED_SIZE.height,
 
-    'name': videoName,
-    'description': videoDescription,
+    'name': videoNameEscaped,
+    'description': videoDescriptionEscaped,
     'image': previewUrl,
 
     'twitter:card': 'summary_large_image',
     'twitter:site': '@Chocobozzz',
-    'twitter:title': videoName,
-    'twitter:description': videoDescription,
+    'twitter:title': videoNameEscaped,
+    'twitter:description': videoDescriptionEscaped,
     'twitter:image': previewUrl,
     'twitter:player': embedUrl,
     'twitter:player:width': EMBED_SIZE.width,
@@ -86,7 +86,7 @@ function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoInstance
     {
       type: 'application/json+oembed',
       href: CONFIG.WEBSERVER.URL + '/services/oembed?url=' + encodeURIComponent(videoUrl),
-      title: videoName
+      title: videoNameEscaped
     }
   ]