no more "broken favorite"
This commit is contained in:
parent
562c68a51c
commit
5c2030e467
7 changed files with 3 additions and 54 deletions
|
@ -46,9 +46,6 @@ const api = {
|
|||
store.commit('addFetcher', {timeline, fetcher})
|
||||
}
|
||||
},
|
||||
fetchOldPost (store, { postId }) {
|
||||
store.state.backendInteractor.fetchOldPost({ store, postId })
|
||||
},
|
||||
stopFetching (store, timeline) {
|
||||
const fetcher = store.state.fetchers[timeline]
|
||||
window.clearInterval(fetcher)
|
||||
|
|
|
@ -27,8 +27,7 @@ export const defaultState = {
|
|||
maxId: 0,
|
||||
minId: Number.POSITIVE_INFINITY,
|
||||
data: [],
|
||||
error: false,
|
||||
brokenFavorites: {}
|
||||
error: false
|
||||
},
|
||||
favorites: new Set(),
|
||||
error: false,
|
||||
|
@ -36,7 +35,6 @@ export const defaultState = {
|
|||
mentions: emptyTl(),
|
||||
public: emptyTl(),
|
||||
user: emptyTl(),
|
||||
own: emptyTl(),
|
||||
publicAndExternal: emptyTl(),
|
||||
friends: emptyTl(),
|
||||
tag: emptyTl(),
|
||||
|
@ -158,12 +156,6 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
|
|||
const result = mergeOrAdd(allStatuses, allStatusesObject, status)
|
||||
status = result.item
|
||||
|
||||
const brokenFavorites = state.notifications.brokenFavorites[status.id] || []
|
||||
brokenFavorites.forEach((fav) => {
|
||||
fav.status = status
|
||||
})
|
||||
delete state.notifications.brokenFavorites[status.id]
|
||||
|
||||
if (result.new) {
|
||||
// We are mentioned in a post
|
||||
if (statusType(status) === 'status' && find(status.attentions, { id: user.id })) {
|
||||
|
@ -304,7 +296,7 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
|
|||
|
||||
const fresh = !notification.is_seen
|
||||
const status = notification.ntype === 'like'
|
||||
? find(allStatuses, { id: action.in_reply_to_status_id })
|
||||
? action.favorited_status
|
||||
: action
|
||||
|
||||
const result = {
|
||||
|
@ -314,17 +306,6 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
|
|||
seen: !fresh
|
||||
}
|
||||
|
||||
if (notification.ntype === 'like' && !status) {
|
||||
let broken = state.notifications.brokenFavorites[action.in_reply_to_status_id]
|
||||
if (broken) {
|
||||
broken.push(result)
|
||||
} else {
|
||||
dispatch('fetchOldPost', { postId: action.in_reply_to_status_id })
|
||||
broken = [ result ]
|
||||
state.notifications.brokenFavorites[action.in_reply_to_status_id] = broken
|
||||
}
|
||||
}
|
||||
|
||||
state.notifications.data.push(result)
|
||||
|
||||
if ('Notification' in window && window.Notification.permission === 'granted') {
|
||||
|
|
|
@ -195,8 +195,6 @@ const users = {
|
|||
|
||||
// Start getting fresh tweets.
|
||||
store.dispatch('startFetching', 'friends')
|
||||
// Start getting our own posts, only really needed for mitigating broken favorites
|
||||
store.dispatch('startFetching', ['own', user.id])
|
||||
|
||||
// Get user mutes and follower info
|
||||
store.rootState.api.backendInteractor.fetchMutes().then((mutedUsers) => {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue