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

make poll retrieval error silent

This commit is contained in:
Nicolas Constant 2020-07-12 18:36:18 -04:00
parent 031b1d5631
commit 95454e29a0
No known key found for this signature in database
GPG Key ID: 1E9F677FB01A5688
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/components/stream/status/poll/poll.component.html
View File

@ -27,4 +27,7 @@
<a href class="poll__refresh" *ngIf="(poll.voted || poll.expired) && !pollLocked" title="refresh poll" (click)="refresh()">refresh</a>
<div class="poll__statistics"><span *ngIf="(poll.voted || poll.expired) && !pollLocked" class="poll__separator">·</span>{{poll.votes_count}} votes<span *ngIf="!poll.expired" class="poll__separator" title="{{ poll.expires_at | timeLeft | async }}">· {{ poll.expires_at | timeLeft | async }}</span></div>
</div>
<div class="poll__error" *ngIf="errorOccuredWhenRetrievingPoll">
Error occured when retrieving the poll
</div>
</div>

5
src/app/components/stream/status/poll/poll.component.scss
View File

@ -27,6 +27,11 @@
margin-top: 10px;
}
&__error {
font-size: 12px;
color: red;
}
&__refresh {
font-size: 0.8em;
color: rgb(101, 121, 160);

16
src/app/components/stream/status/poll/poll.component.ts
View File

@ -22,6 +22,8 @@ export class PollComponent implements OnInit {
choiceType: string;
pollLocked: boolean;
errorOccuredWhenRetrievingPoll: boolean;
private pollSelection: number[] = [];
options: PollOptionWrapper[] = [];
@ -30,7 +32,7 @@ export class PollComponent implements OnInit {
private _poll: Poll;
@Input('poll')
set poll(value: Poll) {
if(!value) return;
if (!value) return;
this._poll = value;
@ -83,6 +85,7 @@ export class PollComponent implements OnInit {
private checkStatus(accounts: AccountInfo[]): void {
this.pollLocked = false;
this.errorOccuredWhenRetrievingPoll = false;
var newSelectedAccount = accounts.find(x => x.isSelected);
const accountChanged = this.selectedAccount.id !== newSelectedAccount.id;
@ -92,7 +95,7 @@ export class PollComponent implements OnInit {
let statusWrapper = new StatusWrapper(this.statusWrapper.status, this.statusWrapper.provider, this.statusWrapper.applyCw, this.statusWrapper.hide);
this.pollPerAccountId[newSelectedAccount.id] = this.toolsService.getStatusUsableByAccount(newSelectedAccount, statusWrapper)
.then((status: Status) => {
if(!status || !(status.poll)) return null;
if (!status || !(status.poll)) return null;
return this.mastodonService.getPoll(newSelectedAccount, status.poll.id);
})
.then((poll: Poll) => {
@ -100,7 +103,9 @@ export class PollComponent implements OnInit {
return poll;
})
.catch(err => {
this.notificationService.notifyHttpError(err, newSelectedAccount);
//this.notificationService.notifyHttpError(err, newSelectedAccount);
this.errorOccuredWhenRetrievingPoll = true;
this.pollPerAccountId[newSelectedAccount.id] = null;
return null;
});
} else if (this.statusWrapper.status.visibility !== 'public' && this.statusWrapper.status.visibility !== 'unlisted' && this.statusWrapper.provider.id !== newSelectedAccount.id) {
@ -115,8 +120,9 @@ export class PollComponent implements OnInit {
this.selectedAccount = newSelectedAccount;
}
vote(): boolean {
if (this.errorOccuredWhenRetrievingPoll) return false;
const selectedAccount = this.selectedAccount;
const pollPromise = this.pollPerAccountId[selectedAccount.id];
@ -140,6 +146,8 @@ export class PollComponent implements OnInit {
}
refresh(): boolean {
if (this.errorOccuredWhenRetrievingPoll) return false;
this.setStatsAtZero();
const selectedAccount = this.selectedAccount;