diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 4421d977..5465db44 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1,2 @@ patreon: nicolasconstant +ko_fi: nicolasconstant diff --git a/package.json b/package.json index 38eb107b..e74aa311 100644 --- a/package.json +++ b/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", diff --git a/src/app/components/stream/status/quote/quote.component.html b/src/app/components/stream/status/quote/quote.component.html index b75b0a55..a857ca89 100644 --- a/src/app/components/stream/status/quote/quote.component.html +++ b/src/app/components/stream/status/quote/quote.component.html @@ -24,9 +24,9 @@ Quoted another post -
+
{{ getReadableStatus(quoteState) }}
-
+
{{ error }}
\ No newline at end of file diff --git a/src/app/components/stream/status/quote/quote.component.scss b/src/app/components/stream/status/quote/quote.component.scss index f6392139..91ca6fd6 100644 --- a/src/app/components/stream/status/quote/quote.component.scss +++ b/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; diff --git a/src/app/components/stream/status/quote/quote.component.ts b/src/app/components/stream/status/quote/quote.component.ts index 4a96912d..0cfdfb33 100644 --- a/src/app/components/stream/status/quote/quote.component.ts +++ b/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(); @Output() browseHashtagEvent = new EventEmitter(); @@ -54,7 +54,9 @@ export class QuoteComponent implements OnInit { } else { // ShallowQuote this.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); diff --git a/src/app/themes/implementations/default.ts b/src/app/themes/implementations/default.ts index 3ec03828..bed972f4 100644 --- a/src/app/themes/implementations/default.ts +++ b/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" } diff --git a/src/app/themes/implementations/light.ts b/src/app/themes/implementations/light.ts index f195c1d0..f957ec91 100644 --- a/src/app/themes/implementations/light.ts +++ b/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" } diff --git a/src/sass/_variables.scss b/src/sass/_variables.scss index 2f1b1940..804f31c6 100644 --- a/src/sass/_variables.scss +++ b/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); \ No newline at end of file