From 8be9f43aed84aa82a4a8e166c0855bd19e8afa90 Mon Sep 17 00:00:00 2001
From: Rigel Kent <sendmemail@rigelk.eu>
Date: Fri, 28 Sep 2018 13:42:33 +0200
Subject: [PATCH] correct local subscribe in the subscription menu

---
 .../user-subscription/subscribe-button.component.html      | 7 +++----
 .../shared/user-subscription/subscribe-button.component.ts | 1 +
 .../+video-watch/comment/video-comment-add.component.html  | 7 ++++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/client/src/app/shared/user-subscription/subscribe-button.component.html b/client/src/app/shared/user-subscription/subscribe-button.component.html
index 2c8481c96..dbf6a34f0 100644
--- a/client/src/app/shared/user-subscription/subscribe-button.component.html
+++ b/client/src/app/shared/user-subscription/subscribe-button.component.html
@@ -33,15 +33,14 @@
 
     <div class="dropdown-menu" ngbDropdownMenu>
 
-      <h6 class="dropdown-header" i18n>Using an ActivityPub-compatible account</h6>
+      <h6 class="dropdown-header" i18n>Using an ActivityPub account</h6>
 
-      <button class="dropdown-item" (click)="subscribe()"
-              *ngIf="subscribed === false">
+      <button class="dropdown-item" (click)="subscribe()">
         <span *ngIf="!isUserLoggedIn()" i18n>Subscribe with an account on {{ videoChannel.host }}</span>
         <span *ngIf="isUserLoggedIn()" i18n>Subscribe with your local account</span>
       </button>
 
-      <button class="dropdown-item" i18n>Subscribe with a remote account:</button>
+      <button class="dropdown-item" i18n>Subscribe with a Mastodon account:</button>
       <my-remote-subscribe showHelp="true" account="{{ uriAccount }}"></my-remote-subscribe>
 
       <div class="dropdown-divider"></div>
diff --git a/client/src/app/shared/user-subscription/subscribe-button.component.ts b/client/src/app/shared/user-subscription/subscribe-button.component.ts
index 95c2bb8f8..315ea5037 100644
--- a/client/src/app/shared/user-subscription/subscribe-button.component.ts
+++ b/client/src/app/shared/user-subscription/subscribe-button.component.ts
@@ -52,6 +52,7 @@ export class SubscribeButtonComponent implements OnInit {
     if (this.isUserLoggedIn()) {
       this.localSubscribe()
     } else {
+      this.authService.redirectUrl = this.router.url
       this.gotoLogin()
     }
   }
diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.html b/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
index 4a48f4649..086a1d84e 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
+++ b/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
@@ -34,7 +34,12 @@
     </span>
     <span class="btn btn-sm mx-3" role="button" (click)="gotoLogin()" i18n>login to comment</span>
     <span i18n>
-      Otherwise you can comment using an account on an ActivityPub-compatible instance:
+      Otherwise you can comment using an account on any ActivityPub-compatible instance.
+      On most platforms, you can find the video by typing its URL in the search bar and then comment it
+      from within the software's interface.
+    </span>
+    <span i18n>
+      If you have an account on Mastodon or Pleroma, you can open it directly in their interface:
     </span>
     <my-remote-subscribe [interact]="true" account="{{ uri }}"></my-remote-subscribe>
   </div>
-- 
2.25.1