mirror of
https://akkoma.dev/lamp/akkoma-fe.git
synced 2026-06-04 14:20:05 -04:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 18be86a8db | |||
| 589d8ea29f | |||
| 4d91a7b2c3 |
@@ -97,6 +97,9 @@ const UserProfile = {
|
||||
followersTabVisible () {
|
||||
return this.isUs || !this.user.hide_followers
|
||||
},
|
||||
favoritesTabVisible () {
|
||||
return this.isUs || !this.user.hide_favorites
|
||||
},
|
||||
currentUser () {
|
||||
return this.$store.state.users.currentUser
|
||||
},
|
||||
@@ -114,8 +117,12 @@ const UserProfile = {
|
||||
replies: 'replies',
|
||||
media: 'media'
|
||||
}
|
||||
// only we can see our own favourites
|
||||
if (this.isUs) timelineTabMap['favorites'] = 'favorites'
|
||||
|
||||
if (this.isUs) {
|
||||
timelineTabMap['favorites'] = 'favorites'
|
||||
} else if (!this.user.hide_favorites) {
|
||||
timelineTabMap['favorites'] = 'publicFavorites'
|
||||
}
|
||||
|
||||
const timeline = timelineTabMap[nextTab]
|
||||
|
||||
|
||||
@@ -165,14 +165,14 @@
|
||||
:footer-slipgate="footerRef"
|
||||
/>
|
||||
<Timeline
|
||||
v-if="isUs"
|
||||
v-if="favoritesTabVisible"
|
||||
key="favorites"
|
||||
:label="$t('user_card.favorites')"
|
||||
:disabled="!isUs"
|
||||
:embedded="true"
|
||||
:title="$t('user_card.favorites')"
|
||||
timeline-name="favorites"
|
||||
:timeline="favorites"
|
||||
:user-id="userId"
|
||||
:in-profile="true"
|
||||
:footer-slipgate="footerRef"
|
||||
/>
|
||||
|
||||
@@ -57,6 +57,7 @@ export const defaultState = () => ({
|
||||
public: emptyTl(),
|
||||
user: emptyTl(),
|
||||
favorites: emptyTl(),
|
||||
publicFavorites: emptyTl(),
|
||||
media: emptyTl(),
|
||||
publicAndExternal: emptyTl(),
|
||||
friends: emptyTl(),
|
||||
@@ -314,7 +315,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
|
||||
})
|
||||
|
||||
// Keep the visible statuses sorted
|
||||
if (timeline && !(['bookmarks', 'favorites'].includes(timeline))) {
|
||||
if (timeline && !(['bookmarks', 'favorites', 'publicFavorites'].includes(timeline))) {
|
||||
sortTimeline(timelineObject)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -107,6 +107,7 @@ const PLEROMA_ANNOUNCEMENTS_URL = '/api/v1/pleroma/admin/announcements'
|
||||
const PLEROMA_POST_ANNOUNCEMENT_URL = '/api/v1/pleroma/admin/announcements'
|
||||
const PLEROMA_EDIT_ANNOUNCEMENT_URL = id => `/api/v1/pleroma/admin/announcements/${id}`
|
||||
const PLEROMA_DELETE_ANNOUNCEMENT_URL = id => `/api/v1/pleroma/admin/announcements/${id}`
|
||||
const PLEROMA_USER_FAVORITES_TIMELINE_URL = id => `/api/v1/pleroma/accounts/${id}/favourites`
|
||||
const AKKOMA_SETTING_PROFILE_URL = (name) => `/api/v1/akkoma/frontend_settings/pleroma-fe/${name}`
|
||||
const AKKOMA_SETTING_PROFILE_LIST = `/api/v1/akkoma/frontend_settings/pleroma-fe`
|
||||
const MASTODON_TAG_URL = (name) => `/api/v1/tags/${name}`
|
||||
@@ -709,6 +710,7 @@ const fetchTimeline = ({
|
||||
media: MASTODON_USER_TIMELINE_URL,
|
||||
list: MASTODON_LIST_TIMELINE_URL,
|
||||
favorites: MASTODON_USER_FAVORITES_TIMELINE_URL,
|
||||
publicFavorites: PLEROMA_USER_FAVORITES_TIMELINE_URL,
|
||||
tag: MASTODON_TAG_TIMELINE_URL,
|
||||
bookmarks: MASTODON_BOOKMARK_TIMELINE_URL
|
||||
}
|
||||
|
||||
@@ -110,6 +110,7 @@ export const parseUser = (data) => {
|
||||
|
||||
output.allow_following_move = data.pleroma.allow_following_move
|
||||
|
||||
output.hide_favorites = data.pleroma.hide_favorites
|
||||
output.hide_follows = data.pleroma.hide_follows
|
||||
output.hide_followers = data.pleroma.hide_followers
|
||||
output.hide_follows_count = data.pleroma.hide_follows_count
|
||||
|
||||
Reference in New Issue
Block a user