mirrors/pinafore
mirrors
/
pinafore
mirror of https://github.com/nolanlawson/pinafore.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: fix votes count on Misskey polls

This commit is contained in:
Nolan Lawson 2022-05-01 09:57:19 -07:00
parent 1a7bbe19a2
commit 23bcdab208
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/routes/_components/status/StatusPoll.html
View File

@ -292,13 +292,16 @@
computed: { computed: {
pollId: ({ originalStatus }) => originalStatus.poll.id, pollId: ({ originalStatus }) => originalStatus.poll.id,
poll: ({ originalStatus, $polls, pollId }) => $polls[pollId] || originalStatus.poll, poll: ({ originalStatus, $polls, pollId }) => $polls[pollId] || originalStatus.poll,
options: ({ poll, originalStatusEmojis, $autoplayGifs, votersCount }) => ( options: ({ poll, originalStatusEmojis, $autoplayGifs, votersOrVotesCount }) => (
poll.options.map(({ title, votes_count: optionsVotesCount }) => ({ poll.options.map(({ title, votes_count: optionsVotesCount }) => ({
title: emojifyText(escapeHtml(title), originalStatusEmojis, $autoplayGifs), title: emojifyText(escapeHtml(title), originalStatusEmojis, $autoplayGifs),
share: votersCount ? Math.round(optionsVotesCount / votersCount * 100) : 0 share: votersOrVotesCount ? Math.round(optionsVotesCount / votersOrVotesCount * 100) : 0
})) }))
), ),
votersCount: ({ poll }) => poll.voters_count, votersCount: ({ poll }) => poll.voters_count,
votesCount: ({ poll }) => poll.votes_count,
// Misskey reports the "voters_count" as null, so just use the "votes_count"
votersOrVotesCount: ({ votersCount, votesCount }) => typeof votersCount === 'number' ? votersCount : votesCount,
voted: ({ poll }) => poll.voted, voted: ({ poll }) => poll.voted,
multiple: ({ poll }) => poll.multiple, multiple: ({ poll }) => poll.multiple,
expired: ({ poll }) => poll.expired, expired: ({ poll }) => poll.expired,
@ -314,8 +317,8 @@
!isStatusInOwnThread && $isMobileSize && !expired !isStatusInOwnThread && $isMobileSize && !expired
), ),
formDisabled: ({ choices }) => !choices.length, formDisabled: ({ choices }) => !choices.length,
votesText: ({ votersCount }) => ( votesText: ({ votersOrVotesCount }) => (
formatIntl('intl.voteCount', { count: votersCount }) formatIntl('intl.voteCount', { count: votersOrVotesCount })
), ),
computedClass: ({ isStatusInNotification, isStatusInOwnThread, loading, shown }) => ( computedClass: ({ isStatusInNotification, isStatusInOwnThread, loading, shown }) => (
classname( classname(