Mastodon
/
Sengi-Windows-MacOS-Linux
mirror of https://github.com/NicolasConstant/sengi
1
0
Fork 0
Code Issues Releases Wiki Activity

better displaying of favs and boosts states

This commit is contained in:
Nicolas Constant 2018-10-03 20:58:39 -04:00
parent afed572916
commit a4c32b3464
No known key found for this signature in database
GPG Key ID: 1E9F677FB01A5688
2 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/app/components/stream/status/action-bar/action-bar.component.ts
View File

@ -26,6 +26,9 @@ export class ActionBarComponent implements OnInit, OnDestroy {
private isProviderSelected: boolean; private isProviderSelected: boolean;
private selectedAccounts: AccountInfo[]; private selectedAccounts: AccountInfo[];
private favoriteStatePerAccountId: { [id: string]: boolean; } = {};
private bootedStatePerAccountId: { [id: string]: boolean; } = {};
private accounts$: Observable<AccountInfo[]>; private accounts$: Observable<AccountInfo[]>;
private accountSub: Subscription; private accountSub: Subscription;
@ -40,8 +43,12 @@ export class ActionBarComponent implements OnInit, OnDestroy {
// const selectedAccounts = this.getSelectedAccounts(); // const selectedAccounts = this.getSelectedAccounts();
// this.checkStatus(selectedAccounts); // this.checkStatus(selectedAccounts);
const status = this.statusWrapper.status;
const account = this.statusWrapper.provider;
this.favoriteStatePerAccountId[account.id] = status.favourited;
this.bootedStatePerAccountId[account.id] = status.reblogged;
this.accountSub = this.accounts$.subscribe((accounts: AccountInfo[]) => { this.accountSub = this.accounts$.subscribe((accounts: AccountInfo[]) => {
console.warn('selectedAccounts');
this.checkStatus(accounts); this.checkStatus(accounts);
}); });
} }
@ -67,6 +74,9 @@ export class ActionBarComponent implements OnInit, OnDestroy {
} else { } else {
this.isLocked = false; this.isLocked = false;
} }
this.checkIfFavorited();
this.checkIfBoosted();
} }
reply(): boolean { reply(): boolean {
@ -99,8 +109,10 @@ export class ActionBarComponent implements OnInit, OnDestroy {
return this.mastodonService.reblog(account, status); return this.mastodonService.reblog(account, status);
} }
}) })
.then(() => { .then((boostedStatus: Status) => {
this.isBoosted = !this.isBoosted; this.bootedStatePerAccountId[account.id] = boostedStatus.reblogged;
this.checkIfBoosted();
// this.isBoosted = !this.isBoosted;
}) })
.catch(err => { .catch(err => {
console.error(err); console.error(err);
@ -135,8 +147,10 @@ export class ActionBarComponent implements OnInit, OnDestroy {
return this.mastodonService.favorite(account, status); return this.mastodonService.favorite(account, status);
} }
}) })
.then(() => { .then((favoritedStatus: Status) => {
this.isFavorited = !this.isFavorited; this.favoriteStatePerAccountId[account.id] = favoritedStatus.favourited;
this.checkIfFavorited();
// this.isFavorited = !this.isFavorited;
}) })
.catch(err => { .catch(err => {
console.error(err); console.error(err);
@ -145,6 +159,25 @@ export class ActionBarComponent implements OnInit, OnDestroy {
return false; return false;
} }
private checkIfBoosted() {
const selectedAccount = <AccountInfo>this.selectedAccounts[0];
if (selectedAccount) {
this.isBoosted = this.bootedStatePerAccountId[selectedAccount.id];
} else {
this.isBoosted = false;
}
}
private checkIfFavorited() {
const selectedAccount = <AccountInfo>this.selectedAccounts[0];
if (selectedAccount) {
this.isFavorited = this.favoriteStatePerAccountId[selectedAccount.id];
} else {
this.isFavorited = false;
}
}
more(): boolean { more(): boolean {
console.warn('more'); console.warn('more');
return false; return false;

7
src/app/services/models/mastodon.interfaces.ts
View File

@ -116,15 +116,16 @@ export interface Status {
created_at: string; created_at: string;
reblogs_count: string; reblogs_count: string;
favourites_count: string; favourites_count: string;
reblogged: string; reblogged: boolean;
favourited: string; favourited: boolean;
sensitive: string; sensitive: boolean;
spoiler_text: string; spoiler_text: string;
visibility: string; visibility: string;
media_attachments: Attachment[]; media_attachments: Attachment[];
mentions: string; mentions: string;
tags: string; tags: string;
application: Application; application: Application;
emojis: any[];
} }
export interface Tag { export interface Tag {
name: string; name: string;