Commit e8abe127 authored by Tae Hoon's avatar Tae Hoon

filter pinned statuses based on pinned entity instead of a separate user entity

parent cd0a7afa
import get from 'lodash/get'
import filter from 'lodash/filter'
import UserCard from '../user_card/user_card.vue'
import FollowCard from '../follow_card/follow_card.vue'
import Timeline from '../timeline/timeline.vue'
......@@ -41,6 +42,9 @@ const UserProfile = {
timeline () {
return this.$store.state.statuses.timelines.user
},
pinnedStatuses () {
return filter(this.timeline.statuses, { pinned: true })
},
favorites () {
return this.$store.state.statuses.timelines.favorites
},
......@@ -54,9 +58,6 @@ const UserProfile = {
user () {
return this.$store.getters.findUser(this.userId)
},
pinnedStatuses () {
return this.user.pinnedStatusIds.map(id => this.$store.state.statuses.allStatusesObject[id])
},
isExternal () {
return this.$route.name === 'external-user-profile'
},
......@@ -99,6 +100,7 @@ const UserProfile = {
if (this.isUs) {
this.$store.dispatch('startFetchingTimeline', { timeline: 'favorites', userId })
}
// Fetch all pinned statuses immediately
this.$store.dispatch('fetchPinnedStatuses', userId)
},
cleanUp () {
......
import { remove, slice, each, findIndex, find, maxBy, minBy, merge, first, last, isArray, omitBy, map } from 'lodash'
import { remove, slice, each, findIndex, find, maxBy, minBy, merge, first, last, isArray, omitBy } from 'lodash'
import { set } from 'vue'
import apiService from '../services/api/api.service.js'
// import parse from '../services/status_parser/status_parser.js'
......@@ -541,12 +541,9 @@ const statuses = {
rootState.api.backendInteractor.unfavorite(status.id)
.then(status => commit('setFavoritedConfirm', { status, user: rootState.users.currentUser }))
},
fetchPinnedStatuses ({ rootState, dispatch, commit }, userId) {
fetchPinnedStatuses ({ rootState, dispatch }, userId) {
rootState.api.backendInteractor.fetchPinnedStatuses(userId)
.then(statuses => {
dispatch('addNewStatuses', { statuses })
commit('savePinnedStatusIds', { userId, statusIds: map(statuses, 'id') })
})
.then(statuses => dispatch('addNewStatuses', { statuses, timeline: 'user', userId }))
},
updatePinned ({ rootState, commit }, status) {
commit('setPinned', { status })
......
......@@ -160,9 +160,6 @@ export const mutations = {
saveMuteIds (state, muteIds) {
state.currentUser.muteIds = muteIds
},
savePinnedStatusIds (state, { userId, statusIds }) {
state.usersObject[userId].pinnedStatusIds = statusIds
},
addMuteId (state, muteId) {
if (state.currentUser.muteIds.indexOf(muteId) === -1) {
state.currentUser.muteIds.push(muteId)
......
......@@ -131,7 +131,6 @@ export const parseUser = (data) => {
output.statuses_count = data.statuses_count
output.friendIds = []
output.followerIds = []
output.pinnedStatusIds = []
if (data.pleroma) {
output.follow_request_count = data.pleroma.follow_request_count
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment