From 8b849a6650466c2e0f3e8244090218ab21941664 Mon Sep 17 00:00:00 2001
From: Nicolas Constant <github@nicolas-constant.com>
Date: Mon, 21 Dec 2020 23:12:47 -0500
Subject: [PATCH] added move notification support

---
 .../mentions/mentions.component.ts            |  2 +-
 .../notification/notification.component.html  | 19 +++++++++++++++++++
 .../notification/notification.component.ts    |  3 ++-
 .../notifications/notifications.component.ts  |  4 +++-
 .../stream-notifications.component.ts         |  2 +-
 src/app/services/mastodon-wrapper.service.ts  |  2 +-
 src/app/services/mastodon.service.ts          |  2 +-
 .../services/models/mastodon.interfaces.ts    |  3 ++-
 src/app/services/user-notification.service.ts |  2 +-
 9 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/app/components/floating-column/manage-account/mentions/mentions.component.ts b/src/app/components/floating-column/manage-account/mentions/mentions.component.ts
index f4529731..61288d72 100644
--- a/src/app/components/floating-column/manage-account/mentions/mentions.component.ts
+++ b/src/app/components/floating-column/manage-account/mentions/mentions.component.ts
@@ -83,7 +83,7 @@ export class MentionsComponent extends TimelineBase {
 
     protected getNextStatuses(): Promise<Status[]> {
         console.warn('MENTIONS get next status');
-        return this.mastodonService.getNotifications(this.account, ['follow', 'favourite', 'reblog', 'poll'], this.lastId)
+        return this.mastodonService.getNotifications(this.account, ['follow', 'favourite', 'reblog', 'poll', 'move'], this.lastId)
              .then((result: Notification[]) => {
                 const statuses = result.map(x => x.status);
                                  
diff --git a/src/app/components/floating-column/manage-account/notifications/notification/notification.component.html b/src/app/components/floating-column/manage-account/notifications/notification/notification.component.html
index a91f1481..93d2f28d 100644
--- a/src/app/components/floating-column/manage-account/notifications/notification/notification.component.html
+++ b/src/app/components/floating-column/manage-account/notifications/notification/notification.component.html
@@ -50,6 +50,25 @@
         </a>
     </div>
 
+    <div *ngIf="notification.type === 'move'">
+        <div class="stream__notification--icon" title="{{notification.account.acct}}">
+            <fa-icon class="followed" [icon]="faTruckMoving"></fa-icon>
+        </div>
+        <div class="stream__notification--label">
+            <a href class="stream__link" title="{{notification.account.acct}}"
+                (click)="openAccount(notification.account)" (auxclick)="openUrl(notification.account.url)"
+                innerHTML="{{ notification.account | accountEmoji }}"></a>
+            migrated to
+        </div>
+
+        <a href (click)="openAccount(notification.target)" (auxclick)="openUrl(notification.target.url)"
+            class="follow-account" title="{{notification.target.acct}}">
+            <img class="follow-account__avatar" src="{{ notification.target.avatar }}" />
+            <span class="follow-account__display-name" innerHTML="{{ notification.target | accountEmoji }}"></span>
+            <span class="follow-account__acct">@{{ notification.target.acct }}</span>
+        </a>
+    </div>
+
     <app-status *ngIf="notification.status && notification.type !== 'mention'" class="stream__status" [statusWrapper]="notification.status"
         [notificationAccount]="notification.account" [notificationType]="notification.type"
         (browseAccountEvent)="browseAccount($event)" (browseHashtagEvent)="browseHashtag($event)"
diff --git a/src/app/components/floating-column/manage-account/notifications/notification/notification.component.ts b/src/app/components/floating-column/manage-account/notifications/notification/notification.component.ts
index 547a58fb..b5294b5c 100644
--- a/src/app/components/floating-column/manage-account/notifications/notification/notification.component.ts
+++ b/src/app/components/floating-column/manage-account/notifications/notification/notification.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input } from '@angular/core';
-import { faUserPlus, faUserClock, faCheck, faTimes } from "@fortawesome/free-solid-svg-icons";
+import { faUserPlus, faUserClock, faCheck, faTimes, faTruckMoving } from "@fortawesome/free-solid-svg-icons";
 
 import { NotificationWrapper } from '../notifications.component';
 import { ToolsService } from '../../../../../services/tools.service';
@@ -18,6 +18,7 @@ export class NotificationComponent extends BrowseBase {
     faUserClock = faUserClock;
     faCheck = faCheck;
     faTimes = faTimes;
+    faTruckMoving = faTruckMoving;
 
     @Input() notification: NotificationWrapper;
 
diff --git a/src/app/components/floating-column/manage-account/notifications/notifications.component.ts b/src/app/components/floating-column/manage-account/notifications/notifications.component.ts
index c8a9db9c..da9313d0 100644
--- a/src/app/components/floating-column/manage-account/notifications/notifications.component.ts
+++ b/src/app/components/floating-column/manage-account/notifications/notifications.component.ts
@@ -156,6 +156,7 @@ export class NotificationWrapper {
                 break;
         }
         this.account = notification.account;
+        this.target = notification.target;
         this.wrapperId = `${this.type}-${notification.id}`;
         this.notification = notification;
         this.provider = provider;
@@ -165,6 +166,7 @@ export class NotificationWrapper {
     notification: Notification;
     wrapperId: string;
     account: Account;
+    target: Account;
     status: StatusWrapper;
-    type: 'mention' | 'reblog' | 'favourite' | 'follow' | 'poll' | 'follow_request';
+    type: 'mention' | 'reblog' | 'favourite' | 'follow' | 'poll' | 'follow_request' | 'move';
 }
\ No newline at end of file
diff --git a/src/app/components/stream/stream-notifications/stream-notifications.component.ts b/src/app/components/stream/stream-notifications/stream-notifications.component.ts
index 339b83cb..98676882 100644
--- a/src/app/components/stream/stream-notifications/stream-notifications.component.ts
+++ b/src/app/components/stream/stream-notifications/stream-notifications.component.ts
@@ -237,7 +237,7 @@ export class StreamNotificationsComponent extends BrowseBase {
 
         this.isMentionsLoading = true;
 
-        this.mastodonService.getNotifications(this.account, ['follow', 'favourite', 'reblog', 'poll', 'follow_request'], this.lastMentionId)
+        this.mastodonService.getNotifications(this.account, ['follow', 'favourite', 'reblog', 'poll', 'follow_request', 'move'], this.lastMentionId)
             .then((result: Notification[]) => {
                 if (result.length === 0) {
                     this.mentionsMaxReached = true;
diff --git a/src/app/services/mastodon-wrapper.service.ts b/src/app/services/mastodon-wrapper.service.ts
index 4dde19f8..9452ced7 100644
--- a/src/app/services/mastodon-wrapper.service.ts
+++ b/src/app/services/mastodon-wrapper.service.ts
@@ -252,7 +252,7 @@ export class MastodonWrapperService {
             });
     }
 
-    getNotifications(account: AccountInfo, excludeTypes: ('follow' | 'favourite' | 'reblog' | 'mention' | 'poll' | 'follow_request')[] = null, maxId: string = null, sinceId: string = null, limit: number = 15): Promise<Notification[]> {
+    getNotifications(account: AccountInfo, excludeTypes: ('follow' | 'favourite' | 'reblog' | 'mention' | 'poll' | 'follow_request' | 'move')[] = null, maxId: string = null, sinceId: string = null, limit: number = 15): Promise<Notification[]> {
         return this.refreshAccountIfNeeded(account)
             .then((refreshedAccount: AccountInfo) => {
                 return this.mastodonService.getNotifications(refreshedAccount, excludeTypes, maxId, sinceId, limit);
diff --git a/src/app/services/mastodon.service.ts b/src/app/services/mastodon.service.ts
index 09302276..f5e5973d 100644
--- a/src/app/services/mastodon.service.ts
+++ b/src/app/services/mastodon.service.ts
@@ -311,7 +311,7 @@ export class MastodonService {
         return this.httpClient.put<Attachment>(route, input, { headers: headers }).toPromise();
     }
 
-    getNotifications(account: AccountInfo, excludeTypes: ('follow' | 'favourite' | 'reblog' | 'mention' | 'poll' | 'follow_request')[] = null, maxId: string = null, sinceId: string = null, limit: number = 15): Promise<Notification[]> {
+    getNotifications(account: AccountInfo, excludeTypes: ('follow' | 'favourite' | 'reblog' | 'mention' | 'poll' | 'follow_request' | 'move')[] = null, maxId: string = null, sinceId: string = null, limit: number = 15): Promise<Notification[]> {
         let route = `https://${account.instance}${this.apiRoutes.getNotifications}?limit=${limit}`;
 
         if (maxId) {
diff --git a/src/app/services/models/mastodon.interfaces.ts b/src/app/services/models/mastodon.interfaces.ts
index 6aa2956a..c1668a7a 100644
--- a/src/app/services/models/mastodon.interfaces.ts
+++ b/src/app/services/models/mastodon.interfaces.ts
@@ -130,10 +130,11 @@ export interface Mention {
 
 export interface Notification {
     id: string;
-    type: 'mention' | 'reblog' | 'favourite' | 'follow' | 'poll' | 'follow_request';
+    type: 'mention' | 'reblog' | 'favourite' | 'follow' | 'poll' | 'follow_request' | 'move';
     created_at: string;
     account: Account;
     status?: Status;
+    target?: Account; //for move Pleroma's notification
 }
 
 export interface Relationship {
diff --git a/src/app/services/user-notification.service.ts b/src/app/services/user-notification.service.ts
index f8cc94cb..7110bafd 100644
--- a/src/app/services/user-notification.service.ts
+++ b/src/app/services/user-notification.service.ts
@@ -58,7 +58,7 @@ export class UserNotificationService {
     }
 
     private startFetchingNotifications(account: AccountInfo) {
-        let getMentionsPromise = this.mastodonService.getNotifications(account, ['favourite', 'follow', 'reblog', 'poll', 'follow_request'], null, null, 10)
+        let getMentionsPromise = this.mastodonService.getNotifications(account, ['favourite', 'follow', 'reblog', 'poll', 'follow_request', 'move'], null, null, 10)
             .then((notifications: Notification[]) => {
                 this.processMentionsAndNotifications(account, notifications, NotificationTypeEnum.UserMention);
             })