Merge pull request #574 from NicolasConstant/topic_fixing-things

Topic fixing things

README.md

@@ -12,6 +12,8 @@ It is strongly focused on the following points:
 
 It is released as a **browser webapp** and also packaged as an **cross-platform desktop application** (Mac, Windows, and Linux).
 
+The Electron code isn't hosted here anymore, and you'll find it [here](https://github.com/NicolasConstant/sengi-electron).
+
 ## Official project page
 
 [Discover Sengi](https://nicolasconstant.github.io/sengi/)

package.json

@@ -1,6 +1,6 @@
 {
     "name": "sengi",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "license": "AGPL-3.0-or-later",
     "main": "main-electron.js",
     "description": "A multi-account desktop client for Mastodon and Pleroma",

src/app/components/create-status/create-status.component.html

@@ -8,7 +8,9 @@
         </a>
 
     <textarea #reply [(ngModel)]="status" name="status" class="form-control form-control-sm status-editor__content" (paste)="onPaste($event)"
-        rows="5" required title="content" placeholder="What's on your mind?" (keydown.control.enter)="onCtrlEnter()"
+        rows="5" required title="content" placeholder="What's on your mind?" 
+        (keydown.control.enter)="onCtrlEnter()"
+        (keydown.meta.enter)="onCtrlEnter()"
         (keydown)="handleKeyDown($event)" (blur)="statusTextEditorLostFocus()" dir="auto">
     </textarea>
 

src/app/components/create-status/create-status.component.ts

@@ -89,6 +89,7 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
             this.isEditing = true;
             this.editingStatusId = value.status.id;
             this.redraftedStatus = value;
+            this.mediaService.loadMedia(value.status.media_attachments);
         }
     }
 
@@ -537,7 +538,7 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
         return false;
     }
 
-    onSubmit(): boolean {
+    async onSubmit(): Promise<boolean> {
         if (this.isSending || this.mentionTooFarAwayError) return false;
 
         this.isSending = true;
@@ -558,9 +559,10 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
                 break;
         }
 
-        const mediaAttachments = this.mediaService.mediaSubject.value.map(x => x.attachment);
-
         const acc = this.toolsService.getSelectedAccounts()[0];
+
+        const mediaAttachments = (await this.mediaService.retrieveUpToDateMedia(acc)).map(x => x.attachment);
+
         let usableStatus: Promise<Status>;
         if (this.statusReplyingToWrapper) {
             usableStatus = this.toolsService.getStatusUsableByAccount(acc, this.statusReplyingToWrapper);
@@ -628,7 +630,7 @@ export class CreateStatusComponent implements OnInit, OnDestroy {
                         let postPromise: Promise<Status>;
 
                         if (this.isEditing) {
-                            postPromise = this.mastodonService.editStatus(account, editingStatusId, s, visibility, title, inReplyToId, attachments.map(x => x.id), poll, scheduledAt);
+                            postPromise = this.mastodonService.editStatus(account, editingStatusId, s, visibility, title, inReplyToId, attachments, poll, scheduledAt);
                         } else {
                             postPromise = this.mastodonService.postNewStatus(account, s, visibility, title, inReplyToId, attachments.map(x => x.id), poll, scheduledAt);
                         }

src/app/components/create-status/media/media.component.html

@@ -1,8 +1,8 @@
 <div *ngFor="let m of media" class="media">
-    <div *ngIf="m.attachment === null" class="media__loading" title="{{m.file.name}}">
+    <div *ngIf="m.attachment === null" class="media__loading" title="{{getName(m)}}">
         <app-waiting-animation class="waiting-icon"></app-waiting-animation>
     </div>
-    <div *ngIf="m.attachment !== null && m.attachment.type !== 'audio'" class="media__loaded" title="{{m.file.name}}"
+    <div *ngIf="m.attachment !== null && m.attachment.type !== 'audio'" class="media__loaded" title="{{getName(m)}}"
         (mouseleave)="updateMedia(m)">
         <div class="media__loaded--migrating" *ngIf="m.isMigrating">
             <app-waiting-animation class="waiting-icon"></app-waiting-animation>

src/app/components/create-status/media/media.component.ts

@@ -56,4 +56,13 @@ export class MediaComponent implements OnInit, OnDestroy {
         this.mediaService.update(account, media);
         return false;
     }
+
+    getName(media: MediaWrapper): string {
+        if(media && media.file && media.file.name){
+            return media.file.name;
+        }
+        if(media.attachment && media.attachment.description){
+            return media.attachment.description;
+        }
+    }
 }

src/app/components/floating-column/manage-account/mentions/mentions.component.ts

@@ -82,7 +82,7 @@ export class MentionsComponent extends TimelineBase {
     }
 
     protected getNextStatuses(): Promise<Status[]> {
-        return this.mastodonService.getNotifications(this.account, ['follow', 'favourite', 'reblog', 'poll', 'move'], this.lastId)
+        return this.mastodonService.getNotifications(this.account, ['follow', 'favourite', 'reblog', 'poll', 'move', 'update'], this.lastId)
              .then((result: Notification[]) => {
                 const statuses = result.map(x => x.status);
 

src/app/components/floating-column/manage-account/notifications/notifications.component.ts

@@ -101,7 +101,7 @@ export class NotificationsComponent extends BrowseBase {
         this.isLoading = true;
         this.isProcessingInfiniteScroll = true;
 
-        this.mastodonService.getNotifications(this.account.info, ['mention'], this.lastId)
+        this.mastodonService.getNotifications(this.account.info, ['mention', 'update'], this.lastId)
             .then((notifications: Notification[]) => {
                 if (notifications.length === 0) {
                     this.maxReached = true;
@@ -168,5 +168,5 @@ export class NotificationWrapper {
     account: Account;
     target: Account;
     status: StatusWrapper;
-    type: 'mention' | 'reblog' | 'favourite' | 'follow' | 'poll' | 'follow_request' | 'move';
+    type: 'mention' | 'reblog' | 'favourite' | 'follow' | 'poll' | 'follow_request' | 'move' | 'update';
 }

src/app/components/stream/status/action-bar/status-user-context-menu/status-user-context-menu.component.html

@@ -28,11 +28,17 @@
         Unmute conversation
     </ng-template>
     <ng-template contextMenuItem divider="true"></ng-template>
-    <ng-template contextMenuItem (execute)="muteAccount()" *ngIf="!isOwnerSelected">
+    <ng-template contextMenuItem (execute)="muteAccount()" *ngIf="!isOwnerSelected && this.relationship && !this.relationship.muting">
         Mute @{{ this.username }}
     </ng-template>
-    <ng-template contextMenuItem (execute)="blockAccount()" *ngIf="!isOwnerSelected">
+    <ng-template contextMenuItem (execute)="unmuteAccount()" *ngIf="!isOwnerSelected && this.relationship && this.relationship.muting">
+        Unmute @{{ this.username }}
+    </ng-template>
+    <ng-template contextMenuItem (execute)="blockAccount()" *ngIf="!isOwnerSelected && this.relationship && !this.relationship.blocking">
         Block @{{ this.username }}
+    </ng-template>   
+    <ng-template contextMenuItem (execute)="unblockAccount()" *ngIf="!isOwnerSelected && this.relationship && this.relationship.blocking">
+        Unblock @{{ this.username }}
     </ng-template>
     <ng-template contextMenuItem (execute)="pinOnProfile()" *ngIf="statusWrapper && isOwnerSelected && !displayedStatus.pinned && displayedStatus.visibility === 'public'">
         Pin on profile

src/app/components/stream/status/action-bar/status-user-context-menu/status-user-context-menu.component.ts

@@ -4,7 +4,7 @@ import { ContextMenuComponent, ContextMenuService } from 'ngx-contextmenu';
 import { Observable, Subscription } from 'rxjs';
 import { Store } from '@ngxs/store';
 
-import { Status, Account, Results } from '../../../../../services/models/mastodon.interfaces';
+import { Status, Account, Results, Relationship } from '../../../../../services/models/mastodon.interfaces';
 import { ToolsService, OpenThreadEvent, InstanceInfo } from '../../../../../services/tools.service';
 import { StatusWrapper } from '../../../../../models/common.model';
 import { NavigationService } from '../../../../../services/navigation.service';
@@ -31,8 +31,10 @@ export class StatusUserContextMenuComponent implements OnInit, OnDestroy {
 
     @Input() statusWrapper: StatusWrapper;
     @Input() displayedAccount: Account;
+    @Input() relationship: Relationship;
 
     @Output() browseThreadEvent = new EventEmitter<OpenThreadEvent>();
+    @Output() relationshipChanged = new EventEmitter<Relationship>();
 
     @ViewChild(ContextMenuComponent) public contextMenu: ContextMenuComponent;
 
@@ -166,37 +168,75 @@ export class StatusUserContextMenuComponent implements OnInit, OnDestroy {
     }
 
     muteAccount(): boolean {
-        this.loadedAccounts.forEach(acc => {
-            this.toolsService.findAccount(acc, this.fullHandle)
-                .then((target: Account) => {
-                    this.mastodonService.mute(acc, target.id);
-                    return target;
-                })
-                .then((target: Account) => {
-                    this.notificationService.hideAccount(target);
-                })
-                .catch(err => {
-                    this.notificationService.notifyHttpError(err, acc);
-                });
-        });
+        const acc = this.toolsService.getSelectedAccounts()[0];
+
+        this.toolsService.findAccount(acc, this.fullHandle)
+            .then(async (target: Account) => {
+                const relationship = await this.mastodonService.mute(acc, target.id);
+                this.relationship = relationship;
+                this.relationshipChanged.next(relationship);
+                return target;
+            })
+            .then((target: Account) => {
+                this.notificationService.hideAccount(target);
+            })
+            .catch(err => {
+                this.notificationService.notifyHttpError(err, acc);
+            });
+
+        return false;
+    }
+
+    unmuteAccount(): boolean {
+        const acc = this.toolsService.getSelectedAccounts()[0];
+
+        this.toolsService.findAccount(acc, this.fullHandle)
+            .then(async (target: Account) => {
+                const relationship = await this.mastodonService.unmute(acc, target.id);
+                this.relationship = relationship;
+                this.relationshipChanged.next(relationship);
+                return target;
+            })
+            .catch(err => {
+                this.notificationService.notifyHttpError(err, acc);
+            });
 
         return false;
     }
 
     blockAccount(): boolean {
-        this.loadedAccounts.forEach(acc => {
-            this.toolsService.findAccount(acc, this.fullHandle)
-                .then((target: Account) => {
-                    this.mastodonService.block(acc, target.id);
-                    return target;
-                })
-                .then((target: Account) => {
-                    this.notificationService.hideAccount(target);
-                })
-                .catch(err => {
-                    this.notificationService.notifyHttpError(err, acc);
-                });
-        });
+        const acc = this.toolsService.getSelectedAccounts()[0];
+
+        this.toolsService.findAccount(acc, this.fullHandle)
+            .then(async (target: Account) => {
+                const relationship = await this.mastodonService.block(acc, target.id);
+                this.relationship = relationship;
+                this.relationshipChanged.next(relationship);
+                return target;
+            })
+            .then((target: Account) => {
+                this.notificationService.hideAccount(target);
+            })
+            .catch(err => {
+                this.notificationService.notifyHttpError(err, acc);
+            });
+
+        return false;
+    }
+
+    unblockAccount(): boolean {
+        const acc = this.toolsService.getSelectedAccounts()[0];
+
+        this.toolsService.findAccount(acc, this.fullHandle)
+            .then(async (target: Account) => {
+                const relationship = await this.mastodonService.unblock(acc, target.id);
+                this.relationship = relationship;
+                this.relationshipChanged.next(relationship);
+                return target;
+            })
+            .catch(err => {
+                this.notificationService.notifyHttpError(err, acc);
+            });
 
         return false;
     }

src/app/components/stream/status/attachements/attachements.component.ts

@@ -30,6 +30,10 @@ export class AttachementsComponent implements OnInit {
 
     @Input('attachments')
     set attachments(value: Attachment[]) {
+        this.imageAttachments = [];
+        this.videoAttachments = [];
+        this.audioAttachments = [];
+
         this._attachments = value;
         this.setAttachments(value);
     }

src/app/components/stream/stream-notifications/stream-notifications.component.ts

@@ -126,7 +126,7 @@ export class StreamNotificationsComponent extends BrowseBase {
             this.loadMentions(userNotifications);
         });
 
-        this.mastodonService.getNotifications(this.account, null, null, null, 10)
+        this.mastodonService.getNotifications(this.account, ['update'], null, null, 10) //FIXME: disable edition update until supported
             .then((notifications: Notification[]) => {
                 this.isNotificationsLoading = false;
 
@@ -201,7 +201,7 @@ export class StreamNotificationsComponent extends BrowseBase {
 
         this.isNotificationsLoading = true;
 
-        this.mastodonService.getNotifications(this.account, null, this.lastNotificationId)
+        this.mastodonService.getNotifications(this.account, ['update'], this.lastNotificationId)
             .then((result: Notification[]) => {
                 if (result.length === 0) {
                     this.notificationsMaxReached = true;
@@ -235,7 +235,7 @@ export class StreamNotificationsComponent extends BrowseBase {
 
         this.isMentionsLoading = true;
 
-        this.mastodonService.getNotifications(this.account, ['follow', 'favourite', 'reblog', 'poll', 'follow_request', 'move'], this.lastMentionId)
+        this.mastodonService.getNotifications(this.account, ['follow', 'favourite', 'reblog', 'poll', 'follow_request', 'move', 'update'], this.lastMentionId)
             .then((result: Notification[]) => {
                 if (result.length === 0) {
                     this.mentionsMaxReached = true;

src/app/components/stream/user-profile/user-profile.component.html

@@ -107,7 +107,9 @@ <h2 class="profile-header__fullhandle"><a href="{{displayedAccount.url}}" target
                 </div>
             </div>
 
-            <app-status-user-context-menu class="profile-header__more" [displayedAccount]="displayedAccount">
+            <app-status-user-context-menu class="profile-header__more" 
+                [displayedAccount]="displayedAccount" [relationship]="relationship"
+                (relationshipChanged)="relationshipChanged($event)">
             </app-status-user-context-menu>
         </div>
 

src/app/components/stream/user-profile/user-profile.component.ts

@@ -268,6 +268,10 @@ export class UserProfileComponent extends BrowseBase {
         this.showFloatingStatusMenu = false;
         this.load(this.lastAccountName);
     }
+
+    relationshipChanged(relationship: Relationship){
+        this.relationship = relationship;
+    }
 
     browseAccount(accountName: string): void {
         if (accountName === this.toolsService.getAccountFullHandle(this.displayedAccount)) return;

src/app/services/instances-info.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 
 import { VisibilityEnum } from './mastodon.service';
 import { MastodonWrapperService } from './mastodon-wrapper.service';
-import { Instance, Account } from './models/mastodon.interfaces';
+import { Instance, Instancev1, Instancev2, Account } from './models/mastodon.interfaces';
 import { AccountInfo } from '../states/accounts.state';
 
 @Injectable({
@@ -19,11 +19,20 @@ export class InstancesInfoService {
         if (!this.cachedMaxInstanceChar[instance]) {
             this.cachedMaxInstanceChar[instance] = this.mastodonService.getInstance(instance)
                 .then((instance: Instance) => {
-                    if (instance.max_toot_chars) {
-                        return instance.max_toot_chars;
+                    if (+instance.version.split('.')[0] >= 4) {
+                        const instanceV2 = <Instancev2>instance;
+                        if (instanceV2
+                            && instanceV2.configuration
+                            && instanceV2.configuration.statuses
+                            && instanceV2.configuration.statuses.max_characters)
+                            return instanceV2.configuration.statuses.max_characters;
                     } else {
-                        return this.defaultMaxChars;
+                        const instanceV1 = <Instancev1>instance;
+                        if (instanceV1 && instanceV1.max_toot_chars)
+                            return instanceV1.max_toot_chars;
                     }
+
+                    return this.defaultMaxChars;
                 })
                 .catch(() => {
                     return this.defaultMaxChars;