mirror of
https://akkoma.dev/lamp/akkoma-fe.git
synced 2026-06-05 06:40:04 -04:00
Compare commits
1 Commits
589d8ea29f
..
wtf
| Author | SHA1 | Date | |
|---|---|---|---|
| 18be86a8db |
@@ -118,13 +118,17 @@ const UserProfile = {
|
|||||||
media: 'media'
|
media: 'media'
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.favoritesTabVisible) timelineTabMap['favorites'] = 'favorites'
|
if (this.isUs) {
|
||||||
|
timelineTabMap['favorites'] = 'favorites'
|
||||||
|
} else if (!this.user.hide_favorites) {
|
||||||
|
timelineTabMap['favorites'] = 'publicFavorites'
|
||||||
|
}
|
||||||
|
|
||||||
const timeline = timelineTabMap[nextTab]
|
const timeline = timelineTabMap[nextTab]
|
||||||
|
|
||||||
if (timeline) {
|
if (timeline) {
|
||||||
this.stopFetching()
|
this.stopFetching()
|
||||||
this.$store.dispatch('startFetchingTimeline', { timeline: timeline, userId: nextTab == 'favorites' && this.isUs ? null : this.userId })
|
this.$store.dispatch('startFetchingTimeline', { timeline: timeline, userId: this.userId })
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
load (userNameOrId) {
|
load (userNameOrId) {
|
||||||
|
|||||||
@@ -172,7 +172,7 @@
|
|||||||
:title="$t('user_card.favorites')"
|
:title="$t('user_card.favorites')"
|
||||||
timeline-name="favorites"
|
timeline-name="favorites"
|
||||||
:timeline="favorites"
|
:timeline="favorites"
|
||||||
:user-id="isUs ? undefined : userId"
|
:user-id="userId"
|
||||||
:in-profile="true"
|
:in-profile="true"
|
||||||
:footer-slipgate="footerRef"
|
:footer-slipgate="footerRef"
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ export const defaultState = () => ({
|
|||||||
public: emptyTl(),
|
public: emptyTl(),
|
||||||
user: emptyTl(),
|
user: emptyTl(),
|
||||||
favorites: emptyTl(),
|
favorites: emptyTl(),
|
||||||
|
publicFavorites: emptyTl(),
|
||||||
media: emptyTl(),
|
media: emptyTl(),
|
||||||
publicAndExternal: emptyTl(),
|
publicAndExternal: emptyTl(),
|
||||||
friends: emptyTl(),
|
friends: emptyTl(),
|
||||||
@@ -314,7 +315,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
|
|||||||
})
|
})
|
||||||
|
|
||||||
// Keep the visible statuses sorted
|
// Keep the visible statuses sorted
|
||||||
if (timeline && !(['bookmarks', 'favorites'].includes(timeline))) {
|
if (timeline && !(['bookmarks', 'favorites', 'publicFavorites'].includes(timeline))) {
|
||||||
sortTimeline(timelineObject)
|
sortTimeline(timelineObject)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -719,10 +719,6 @@ const fetchTimeline = ({
|
|||||||
|
|
||||||
let url = timelineUrls[timeline]
|
let url = timelineUrls[timeline]
|
||||||
|
|
||||||
if (timeline === 'favorites' && userId) {
|
|
||||||
url = timelineUrls.publicFavorites(userId)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (timeline === 'user' || timeline === 'media' || timeline === 'replies') {
|
if (timeline === 'user' || timeline === 'media' || timeline === 'replies') {
|
||||||
url = url(userId)
|
url = url(userId)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user