fix pinned/unpinned state of recently pinned statuses (#521)

* fix pinned/unpinned state of recently pinned statuses

* fixup

* fix test
This commit is contained in:
Nolan Lawson 2018-08-29 18:10:09 -07:00 committed by GitHub
parent b55c042ff4
commit 2449a27767
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 60 additions and 11 deletions

View File

@ -19,6 +19,7 @@ export async function setStatusPinnedOrUnpinned (statusId, pinned, toastOnSucces
toast.say('Unpinned status') toast.say('Unpinned status')
} }
} }
store.setStatusPinned(currentInstance, statusId, pinned)
await setStatusPinnedInDatabase(currentInstance, statusId, pinned) await setStatusPinnedInDatabase(currentInstance, statusId, pinned)
emit('updatePinnedStatuses') emit('updatePinnedStatuses')
} catch (e) { } catch (e) {

View File

@ -28,7 +28,12 @@ export default {
account: ({$currentAccountProfile}) => $currentAccountProfile, account: ({$currentAccountProfile}) => $currentAccountProfile,
verifyCredentials: ({$currentVerifyCredentials}) => $currentVerifyCredentials, verifyCredentials: ({$currentVerifyCredentials}) => $currentVerifyCredentials,
statusId: ({status}) => status.id, statusId: ({status}) => status.id,
pinned: ({status}) => status.pinned, pinned: ({statusId, $currentStatusModifications, status}) => {
if ($currentStatusModifications && statusId in $currentStatusModifications.pins) {
return $currentStatusModifications.pins[statusId]
}
return status.pinned
},
// //
// begin copypasta (StatusOptionsDialog.html / AccountProfileOptionsDialog.html) // begin copypasta (StatusOptionsDialog.html / AccountProfileOptionsDialog.html)
// //

View File

@ -2,21 +2,28 @@ function getStatusModifications (store, instanceName) {
let { statusModifications } = store.get() let { statusModifications } = store.get()
statusModifications[instanceName] = statusModifications[instanceName] || { statusModifications[instanceName] = statusModifications[instanceName] || {
favorites: {}, favorites: {},
reblogs: {} reblogs: {},
pins: {}
} }
return statusModifications return statusModifications
} }
function setStatusModification (store, instanceName, statusId, key, value) {
let statusModifications = getStatusModifications(store, instanceName)
statusModifications[instanceName][key][statusId] = value
store.set({ statusModifications })
}
export function statusMixins (Store) { export function statusMixins (Store) {
Store.prototype.setStatusFavorited = function (instanceName, statusId, favorited) { Store.prototype.setStatusFavorited = function (instanceName, statusId, favorited) {
let statusModifications = getStatusModifications(this, instanceName) setStatusModification(this, instanceName, statusId, 'favorites', favorited)
statusModifications[instanceName].favorites[statusId] = favorited
this.set({statusModifications})
} }
Store.prototype.setStatusReblogged = function (instanceName, statusId, reblogged) { Store.prototype.setStatusReblogged = function (instanceName, statusId, reblogged) {
let statusModifications = getStatusModifications(this, instanceName) setStatusModification(this, instanceName, statusId, 'reblogs', reblogged)
statusModifications[instanceName].reblogs[statusId] = reblogged }
this.set({statusModifications})
Store.prototype.setStatusPinned = function (instanceName, statusId, pinned) {
setStatusModification(this, instanceName, statusId, 'pins', pinned)
} }
} }

View File

@ -1,10 +1,14 @@
import { loginAsFoobar } from '../roles' import { loginAsFoobar } from '../roles'
import { import {
avatarInComposeBox, composeInput, getNthDialogOptionsOption, getNthPinnedStatus, getNthPinnedStatusFavoriteButton, avatarInComposeBox, closeDialogButton, composeInput, getNthDialogOptionsOption, getNthPinnedStatus,
getNthStatus, getNthPinnedStatusFavoriteButton,
getNthStatusOptionsButton, getUrl, postStatusButton getNthStatus, getNthStatusContent,
getNthStatusOptionsButton, getUrl, homeNavButton, postStatusButton, scrollContainerToTop, scrollToBottomOfTimeline,
scrollToTopOfTimeline,
settingsNavButton, sleep
} from '../utils' } from '../utils'
import { users } from '../users' import { users } from '../users'
import { postAs } from '../serverActions'
fixture`117-pin-unpin.js` fixture`117-pin-unpin.js`
.page`http://localhost:4002` .page`http://localhost:4002`
@ -49,3 +53,35 @@ test('Can favorite a pinned status', async t => {
.click(getNthPinnedStatusFavoriteButton(0)) .click(getNthPinnedStatusFavoriteButton(0))
.expect(getNthPinnedStatusFavoriteButton(0).getAttribute('aria-pressed')).eql('false') .expect(getNthPinnedStatusFavoriteButton(0).getAttribute('aria-pressed')).eql('false')
}) })
test('Saved pinned/unpinned state of status', async t => {
const timeout = 20000
await postAs('foobar', 'hey I am going to pin and unpin this')
await loginAsFoobar(t)
await t
.expect(getNthStatusContent(0).innerText).contains('hey I am going to pin and unpin this', { timeout })
.click(getNthStatusOptionsButton(0))
.expect(getNthDialogOptionsOption(2).innerText).contains('Pin to profile')
.click(getNthDialogOptionsOption(2))
await sleep(1)
await t
.click(getNthStatusOptionsButton(0))
.expect(getNthDialogOptionsOption(2).innerText).contains('Unpin from profile')
.click(closeDialogButton)
// scroll down and back up to force an unrender
await scrollToBottomOfTimeline(t)
await scrollToTopOfTimeline(t)
await scrollContainerToTop() // otherwise the ... button is obscured by the pen button
await t
.expect(getNthStatusContent(0).innerText).contains('hey I am going to pin and unpin this', { timeout })
.click(getNthStatusOptionsButton(0))
.expect(getNthDialogOptionsOption(2).innerText).contains('Unpin from profile', { timeout })
// navigate to another page and back to force another unrender
.click(settingsNavButton)
.click(homeNavButton)
.expect(getNthStatusContent(0).innerText).contains('hey I am going to pin and unpin this', { timeout })
.click(getNthStatusOptionsButton(0))
.expect(getNthDialogOptionsOption(2).innerText).contains('Unpin from profile', { timeout })
})