data.coop/pinafore
8
0
Fork 0
Code Issues 1 Pull requests Packages Projects Releases Wiki Activity

fix: Add "unfavorite/unboost" label (#1540)

Browse source 
* Add "unfavorite" label.

* fixup, also fix Boost/Unboost

* fix test
This commit is contained in:
Alex Berg 2019-09-26 07:24:05 -05:00 committed by Nolan Lawson
parent 038dc27163
commit 5e150b31df
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/routes/_components/status/StatusToolbar.html
View file

@ -19,7 +19,7 @@
ref:reblogIcon ref:reblogIcon
/> />
<IconButton <IconButton
label="Favorite" label={favoriteLabel}
pressable="true" pressable="true"
pressed={favorited} pressed={favorited}
href="#fa-star" href="#fa-star"
@ -164,14 +164,14 @@
replyShown ? 'Close reply' : inReplyToId ? 'Reply to thread' : 'Reply' replyShown ? 'Close reply' : inReplyToId ? 'Reply to thread' : 'Reply'
), ),
replyIcon: ({ inReplyToId }) => inReplyToId ? '#fa-reply-all' : '#fa-reply', replyIcon: ({ inReplyToId }) => inReplyToId ? '#fa-reply-all' : '#fa-reply',
reblogLabel: ({ visibility }) => { reblogLabel: ({ visibility, reblogged }) => {
switch (visibility) { switch (visibility) {
case 'private': case 'private':
return 'Cannot be boosted because this is followers-only' return 'Cannot be boosted because this is followers-only'
case 'direct': case 'direct':
return 'Cannot be boosted because this is a direct message' return 'Cannot be boosted because this is a direct message'
default: default:
return 'Boost' return reblogged ? 'Unboost' : 'Boost'
} }
}, },
reblogIcon: ({ visibility }) => { reblogIcon: ({ visibility }) => {
@ -193,6 +193,9 @@
} }
return originalStatus.reblogged return originalStatus.reblogged
}, },
favoriteLabel: ({ favorited }) => (
favorited ? 'Unfavorite' : 'Favorite'
),
favorited: ({ originalStatusId, $currentStatusModifications, originalStatus }) => { favorited: ({ originalStatusId, $currentStatusModifications, originalStatus }) => {
if ($currentStatusModifications && originalStatusId in $currentStatusModifications.favorites) { if ($currentStatusModifications && originalStatusId in $currentStatusModifications.favorites) {
return $currentStatusModifications.favorites[originalStatusId] return $currentStatusModifications.favorites[originalStatusId]

2
tests/spec/011-reblog-favorites-count.js
View file

@ -15,7 +15,7 @@ test('shows favorites', async t => {
.expect(getUrl()).contains('/statuses/') .expect(getUrl()).contains('/statuses/')
.expect(getFavoritesCount()).eql(2) .expect(getFavoritesCount()).eql(2)
.expect(favoritesCountElement.getAttribute('aria-label')).eql('Favorited 2 times') .expect(favoritesCountElement.getAttribute('aria-label')).eql('Favorited 2 times')
.expect($('.icon-button[aria-label="Favorite"]').getAttribute('aria-pressed')).eql('true') .expect($('.icon-button[aria-label="Unfavorite"]').getAttribute('aria-pressed')).eql('true')
.click(favoritesCountElement) .click(favoritesCountElement)
.expect(getUrl()).match(/\/statuses\/[^/]+\/favorites/) .expect(getUrl()).match(/\/statuses\/[^/]+\/favorites/)
.expect($('.search-result-account-name').nth(0).innerText).eql('foobar') .expect($('.search-result-account-name').nth(0).innerText).eql('foobar')