pleroma-fe

commit: 6238fe363351ca44887773d682bfe893e86506a7
parent: c43a5ab992dbf6d83edc24633db7317529861bd4
Author: Shpuld Shpludson <shp@cock.li>
Date:   Tue,  3 Sep 2019 04:48:24 +0000

Merge branch '652' into 'develop'

Fix "TypeError: Cannot set property 'pinned' of undefined"

Closes #652

See merge request pleroma/pleroma-fe!936
Diffstat:
M
src/modules/statuses.js
12
++++--------
M
src/modules/users.js
6
+++---

2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
@@ -426,10 +426,6 @@ export const mutations = {
       newStatus.favoritedBy.push(user)
     }
   },
-  setPinned (state, status) {
-    const newStatus = state.allStatusesObject[status.id]
-    newStatus.pinned = status.pinned
-  },
   setMuted (state, status) {
     const newStatus = state.allStatusesObject[status.id]
     newStatus.muted = status.muted
@@ -560,13 +556,13 @@ const statuses = {
       rootState.api.backendInteractor.fetchPinnedStatuses(userId)
         .then(statuses => dispatch('addNewStatuses', { statuses, timeline: 'user', userId, showImmediately: true, noIdUpdate: true }))
     },
-    pinStatus ({ rootState, commit }, statusId) {
+    pinStatus ({ rootState, dispatch }, statusId) {
       return rootState.api.backendInteractor.pinOwnStatus(statusId)
-        .then((status) => commit('setPinned', status))
+        .then((status) => dispatch('addNewStatuses', { statuses: [status] }))
     },
-    unpinStatus ({ rootState, commit }, statusId) {
+    unpinStatus ({ rootState, dispatch }, statusId) {
       rootState.api.backendInteractor.unpinOwnStatus(statusId)
-        .then((status) => commit('setPinned', status))
+        .then((status) => dispatch('addNewStatuses', { statuses: [status] }))
     },
     muteConversation ({ rootState, commit }, statusId) {
       return rootState.api.backendInteractor.muteConversation(statusId)
diff --git a/src/modules/users.js b/src/modules/users.js
@@ -164,7 +164,7 @@ export const mutations = {
       state.currentUser.muteIds.push(muteId)
     }
   },
-  setPinned (state, status) {
+  setPinnedToUser (state, status) {
     const user = state.usersObject[status.user.id]
     const index = user.pinnedStatusIds.indexOf(status.id)
     if (status.pinned && index === -1) {
@@ -338,13 +338,13 @@ const users = {
         // Reconnect users to statuses
         store.commit('setUserForStatus', status)
         // Set pinned statuses to user
-        store.commit('setPinned', status)
+        store.commit('setPinnedToUser', status)
       })
       each(compact(map(statuses, 'retweeted_status')), (status) => {
         // Reconnect users to retweets
         store.commit('setUserForStatus', status)
         // Set pinned retweets to user
-        store.commit('setPinned', status)
+        store.commit('setPinnedToUser', status)
       })
     },
     addNewNotifications (store, { notifications }) {