Merge pull request #679 from NicolasConstant/develop

1.9.1 PR

Author: NicolasConstant

.github/FUNDING.yml

@@ -1 +1,2 @@
 patreon: nicolasconstant
+ko_fi: nicolasconstant

package.json

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

src/app/components/stream/status/quote/quote.component.html

@@ -24,9 +24,9 @@
     Quoted another post
   </div>
 </div>
-<div class="quote quote__unaccepted" *ngIf="quoteState != 'accepted'">
+<div class="quote quote__unaccepted" *ngIf="quoteState != 'accepted' && !error">
   {{ getReadableStatus(quoteState) }}
 </div>
-<div class="quote quote__unaccepted" *ngIf="error">
+<div class="quote quote__error" *ngIf="error">
   {{ error }}
 </div>

src/app/components/stream/status/quote/quote.component.scss

@@ -15,6 +15,13 @@
         padding: 5px 10px;
     }
 
+    &__error {
+        color: $quote-error-color;
+        text-align: center;
+        font-size: 12px;
+        padding: 5px 10px;
+    }
+
     &__open-quote-btn {
         position: absolute;
         top: 0px;

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

@@ -23,8 +23,8 @@ export class QuoteComponent implements OnInit {
   quoteState: 'pending' | 'accepted' | 'rejected' | 'revoked' | 'deleted' | 'unauthorized' | 'blocked_account' | 'blocked_domain' | 'muted_account';
   error: string;
 
-  private quote: Quote;
-  private shallowQuote: ShallowQuote;
+  quote: Quote;
+  shallowQuote: ShallowQuote;
 
   @Output() browseAccountEvent = new EventEmitter<string>();
   @Output() browseHashtagEvent = new EventEmitter<string>();
@@ -54,7 +54,9 @@ export class QuoteComponent implements OnInit {
 
     } else { // ShallowQuote
       this.shallowQuote = <ShallowQuote>value;
-      this.mastodonService.getStatus(this.accountInfo, this.shallowQuote.quoted_status_id)
+
+      if(this.shallowQuote.quoted_status_id){
+        this.mastodonService.getStatus(this.accountInfo, this.shallowQuote.quoted_status_id)
         .then(status => {
           this.displayStatus = status;
           this.appRef.tick();
@@ -64,6 +66,7 @@ export class QuoteComponent implements OnInit {
           this.error = "Error retrieving status.";
           this.appRef.tick();
         });
+      }     
     }
 
     this.displayStatusWrapper = new StatusWrapper(this.displayStatus, this.accountInfo, false, false);

src/app/themes/implementations/default.ts

@@ -328,7 +328,8 @@ export const defaultTheme: Theme = {
         "--attachment-icon-shadow-hover": "#4e4e4e",
 
         "--quote-border-color": "#222736",
-        "--quote-unaccepted-color": "#e46161",
+        "--quote-unaccepted-color": "#ffffff",
+        "--quote-error-color": "#e46161",
         "--quote-sub-quote-color": "#4e5572",
         "--quote-sub-quote-background": "#0c0c10"
     }

src/app/themes/implementations/light.ts

@@ -336,7 +336,8 @@ export const lightTheme: Theme = {
         "--attachment-icon-shadow-hover": "#6b7280",
 
         "--quote-border-color": "#9ca7b3",
-        "--quote-unaccepted-color": "#e00b0b",
+        "--quote-unaccepted-color": "#080b1b",
+        "--quote-error-color": "#e00b0b",
         "--quote-sub-quote-color": "#ffffff",
         "--quote-sub-quote-background": "#bdc1ca"
     }

src/sass/_variables.scss

@@ -295,7 +295,8 @@
     --attachment-icon-shadow-hover: #4e4e4e;
 
     --quote-border-color: orange;
-    --quote-unaccepted-color: orangered;
+    --quote-unaccepted-color: #ffffff;
+    --quote-error-color: orangered;
     --quote-sub-quote-color: purple;
     --quote-sub-quote-background: aqua;
 
@@ -523,5 +524,6 @@ $attachment-icon-shadow-hover: var(--attachment-icon-shadow-hover);
 
 $quote-border-color: var(--quote-border-color);
 $quote-unaccepted-color: var(--quote-unaccepted-color);
+$quote-error-color: var(--quote-error-color);
 $quote-sub-quote-color: var(--quote-sub-quote-color);
 $quote-sub-quote-background: var(--quote-sub-quote-background);