hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'users-statuses-pinia' into shigusegubu-themes3

Browse source
This commit is contained in:
Henry Jameson 2026-08-26 15:28:39 +03:00
commit 7bd01ca116
23 changed files with 144 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/api/public.js
View file

@ -184,7 +184,10 @@ export const fetchStatusHistory = ({ id, credentials }) =>
return {
...rest,
data: [...data].reverse().map((item) => {
item.originalStatus = status
// History data is missing a lot of stuff present in original
// but we're really only missing the id for the timeago, the
// rest seem to render just fine.
item.id = id
return parseStatus(item)
}),
}

7
src/components/chat_view/chat_view.js
View file

@ -127,6 +127,7 @@ const Chat = {
if (this.testMode) return
this.deactivate()
this.detachSocket()
},
computed: {
conversationId() {
@ -456,10 +457,16 @@ const Chat = {
// Sanity check
if (!this.isConversation && message.chat_id !== this.chat.id) {
// This is spammy, we get chat updates from a global chat update
// handler, which naturally receives updates for ALL chats.
// There is no way to subscribe to specific chat updates and listen
// to that in the API.
/*
console.warn(
`Chat message doesn't belong to current chat (id: ${this.chat.id})!!`,
message,
)
*/
return
}

6
src/components/list/list.js
View file

@ -21,8 +21,8 @@ const List = {
default: () => '',
},
preSelect: {
type: Array,
default: [],
type: Set,
default: new Set(),
},
nonInteractive: {
type: Boolean,
@ -48,7 +48,7 @@ const List = {
data() {
return {
items: [],
selected: new Set(this.preSelect),
selected: new Set(this.preSelect), // clone
loading: false,
bottomedOut: true,
error: null,

19
src/components/status/status.js
View file

@ -141,6 +141,7 @@ const Status = {
return this.statusoid ?? useStatusesStore().allStatuses.get(this.statusId)
},
repeatedStatus() {
if (this.status.retweeted_status === undefined) return undefined
return useStatusesStore().allStatuses.get(this.status.retweeted_status.id)
},
repeater() {
@ -198,7 +199,7 @@ const Status = {
}
},
isRepeat() {
return !!this.status.retweeted_status
return !!this.repeatedStatus
},
repeaterName() {
return this.status.user.name || this.status.user.screen_name_ui
@ -313,19 +314,19 @@ const Status = {
return !this.unmuted && !this.shouldNotMute && this.muteReasons.length > 0
},
userIsMuted() {
if (this.status.user.id === this.currentUser?.id) return false
const { reblog } = this.status
const relationship = useUsersStore().relationship(this.status.user.id)
const relationshipReblog =
reblog && useUsersStore().relationship(reblog.user.id)
if (!this.currentUser) return false
if (this.user === this.currentUser) return false
if (this.repeater === this.currentUser) return false
const relationship = useUsersStore().relationship(this.user.id)
const relationshipRepeat = useUsersStore().relationship(this.repeater?.id)
return (
(status.muted && !status.thread_muted) ||
(this.status.muted && !this.status.thread_muted) ||
// Reprööt of a muted post according to BE
(reblog?.muted && !reblog.thread_muted) ||
(this.repeatedStatus?.muted && !this.repeatedStatus.thread_muted) ||
// Muted user
relationship.muting ||
// Muted user of a reprööt
relationshipReblog?.muting
relationshipRepeat?.muting
)
},
shouldNotMute() {

15
src/components/status_action_buttons/buttons_definitions.js
View file

@ -174,20 +174,7 @@ export const BUTTONS = [
)
},
action({ status }) {
const originalStatus = { ...status }
const stripFieldsList = [
'attachments',
'created_at',
'emojis',
'text',
'raw_html',
'nsfw',
'poll',
'summary',
'summary_raw_html',
]
stripFieldsList.forEach((p) => delete originalStatus[p])
useStatusHistoryStore().openModal(originalStatus.id)
useStatusHistoryStore().openModal(status.id)
return Promise.resolve()
},
},

1
src/components/user_profile/user_profile.vue
View file

@ -87,7 +87,6 @@
v-if="favoritesTabVisible"
key="favorites"
:label="$t('user_card.favorites')"
:disabled="favorites.visibleStatusIds.size === 0"
:title="$t('user_card.favorites')"
:timeline-ref="{ name: 'favorites', argument: userId }"
:argument="isUs ? undefined : userId"

2
src/components/user_reporting_modal/user_reporting_modal.js
View file

@ -56,7 +56,7 @@ const UserReportingModal = {
// Reset state
this.comment = ''
this.forward = false
this.statusIdsToReport = new Set(this.reportModal.preTickedIds)
this.statusIdsToReport = new Set(this.reportModal.preTickedIds) // cloning
this.processing = false
this.error = false
},

5
src/components/user_reporting_modal/user_reporting_modal.vue
View file

@ -52,8 +52,9 @@
</div>
<div class="user-reporting-panel-right">
<List
:external-items="reportModal.statuses"
:external-items="reportModal.statusIds"
:pre-select="reportModal.preTickedIds"
:get-key="(item) => item"
selectable
@select="onListSelect"
>
@ -61,7 +62,7 @@
<Status
:in-conversation="false"
:focused="false"
:statusoid="item"
:status-id="item"
/>
</template>
</List>

90
src/components/who_to_follow_panel/who_to_follow_panel.js
View file

@ -1,58 +1,20 @@
import { shuffle } from 'lodash'
import { useInstanceStore } from 'src/stores/instance.js'
import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
import { useOAuthStore } from 'src/stores/oauth.js'
import { useUsersStore } from 'src/stores/users.js'
import { fetchUser, suggestions } from 'src/api/public.js'
import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
function showWhoToFollow(panel, reply) {
const shuffled = shuffle(reply)
panel.usersToFollow.forEach((toFollow, index) => {
const user = shuffled[index]
const img = user.avatar || useInstanceStore().instanceIdentity.defaultAvatar
const name = user.acct
toFollow.img = img
toFollow.name = name
fetchUser({
id: name,
credentials: useOAuthStore().token,
}).then((result) => {
const { data: externalUser } = result
useUsersStore().addNewUsers(result)
toFollow.id = externalUser.id
})
})
}
function getWhoToFollow(panel) {
const credentials = useOAuthStore().token
if (credentials) {
panel.usersToFollow.forEach((toFollow) => {
toFollow.name = 'Loading...'
})
suggestions({ credentials }).then(({ data: reply }) => {
showWhoToFollow(panel, reply)
})
}
}
const WhoToFollowPanel = {
data: () => ({
usersToFollow: [],
}),
computed: {
user: function () {
user() {
return useUsersStore().currentUser.screen_name
},
suggestionsEnabled() {
return useInstanceCapabilitiesStore().suggestionsEnabled
},
},
methods: {
userProfileLink(id, name) {
@ -62,23 +24,53 @@ const WhoToFollowPanel = {
useInstanceStore().restrictedNicknames,
)
},
},
watch: {
user: function () {
if (this.suggestionsEnabled) {
getWhoToFollow()
}
getWhoToFollow() {
this.usersToFollow.forEach((toFollow) => {
toFollow.name = 'Loading...'
})
suggestions({ credentials: useOAuthStore().token }).then(
({ data: reply }) => {
this.showWhoToFollow(reply)
},
)
},
showWhoToFollow(reply) {
const shuffled = shuffle(reply)
this.usersToFollow.forEach((toFollow, index) => {
const user = shuffled[index]
const img =
user.avatar || useInstanceStore().instanceIdentity.defaultAvatar
const name = user.acct
toFollow.img = img
toFollow.name = name
fetchUser({
id: name,
credentials: useOAuthStore().token,
}).then((result) => {
const { data: externalUser } = result
useUsersStore().addNewUsers(result)
toFollow.id = externalUser.id
})
})
},
},
mounted: function () {
watch: {
user() {
this.getWhoToFollow()
},
},
mounted() {
this.usersToFollow = new Array(3).fill().map(() => ({
img: useInstanceStore().instanceIdentity.defaultAvatar,
name: '',
id: 0,
}))
if (this.suggestionsEnabled) {
getWhoToFollow()
}
this.getWhoToFollow()
},
}

4
src/lib/push_notifications_plugin.js
View file

@ -6,7 +6,7 @@ import { useUsersStore } from 'src/stores/users.js'
export const piniaPushNotificationsPlugin = ({ store }) => {
const validActions = {
sync_config: new Set(['setPreference']),
interface: new Set(['setNotificationPermission', 'setLoginStatus']),
interface: new Set(['setNotificationPermission', 'onLogin', 'onLogout']),
}
if (!validActions[store.$id]) return // Not applicable to the store
@ -21,7 +21,7 @@ export const piniaPushNotificationsPlugin = ({ store }) => {
useInterfaceStore().notificationPermission === 'granted'
let permissionPresent =
useInterfaceStore().notificationPermission !== undefined
let user = !!useUsersStore().currentUser
let user = useUsersStore().loggedIn
if (store.$id === 'instance') {
if (actionName === 'set' && args[0].path === 'vapidPublicKey') {

1
src/services/chat_utils/chat_utils.js
View file

@ -4,6 +4,7 @@ import { useUsersStore } from 'src/stores/users.js'
export const maybeShowChatNotification = (chat) => {
if (!chat.lastMessage) return
if (chat.unread === 0) return
if (useUsersStore().currentUser.id === chat.lastMessage.account_id) return
const opts = {

4
src/services/entity_normalizer/entity_normalizer.service.js
View file

@ -342,10 +342,6 @@ export const parseStatus = (data) => {
output.favoritedBy = []
output.rebloggedBy = []
if (Object.hasOwn(data, 'originalStatus')) {
Object.assign(output, data.originalStatus)
}
return output
}

8
src/stores/admin_settings.js
View file

@ -430,11 +430,9 @@ export const useAdminSettingsStore = defineStore('adminSettings', {
})
resultUserIds.data.forEach((userId) => {
window.vuex.dispatch(
'markStatusesAsDeleted',
(status) => userId === status.user.id,
)
// TODO when migrated to pinia, also remove user
useStatusesStore().wipeUserStatuses(status.user.id)
// Users are technically never deleted, just deactivated
// so there's no real need to delete them from store.
})
return resultUserIds

77
src/stores/chats.js
View file

@ -1,4 +1,4 @@
import { find, omitBy, orderBy, sumBy } from 'lodash'
import { orderBy, sumBy } from 'lodash'
import { defineStore } from 'pinia'
import { maybeShowChatNotification } from '../services/chat_utils/chat_utils.js'
@ -10,28 +10,19 @@ import { useUsersStore } from 'src/stores/users.js'
import { chats } from 'src/api/chats.js'
const emptyChatList = () => ({
data: [],
idStore: {},
})
const defaultState = {
chatList: emptyChatList(),
chatListFetcher: null,
}
const getChatById = (state, id) => {
return find(state.chatList.data, { id })
data: new Map(),
fetcher: null,
}
export const useChatsStore = defineStore('chats', {
state: () => ({ ...defaultState }),
getters: {
sortedChatList(state) {
return orderBy(state.chatList.data, ['updated_at'], ['desc'])
return orderBy([...state.data.values()], ['updated_at'], ['desc'])
},
unreadChatsCount(state) {
return sumBy(state.chatList.data, 'unread')
return sumBy([...state.data.values()], 'unread')
},
},
actions: {
@ -42,16 +33,19 @@ export const useChatsStore = defineStore('chats', {
et,
}
et.addEventListener('pleroma:chat_update', this.updateChat)
et.addEventListener('pleroma:chat_update', ({ data: { chatUpdate } }) => {
this.updateChat(chatUpdate)
})
useStreamingStore().addSubscriber(socket)
},
startFetching() {
const fetcher = () => this.fetchChats()
this.setChatListFetcher(() => promiseInterval(fetcher, 5000))
this.fetcher = () => promiseInterval(() => this.fetchChats(), 5000)
this.fetcher()
},
stopFetching() {
this.setChatListFetcher(null)
this.fetcher?.stop()
this.fetcher = null
},
async fetchChats() {
this.addNewChats(
@ -60,16 +54,10 @@ export const useChatsStore = defineStore('chats', {
}),
)
},
setChatListFetcher(fetcher) {
const prevFetcher = this.chatListFetcher
if (prevFetcher) {
prevFetcher.stop()
}
this.chatListFetcher = fetcher?.()
},
resetChats() {
this.chatList = emptyChatList()
this.setChatListFetcher(null)
this.data = new Map()
this.stopFetching()
this.startFetching()
},
addNewChats(result) {
useUsersStore().addNewUsers({
@ -77,45 +65,30 @@ export const useChatsStore = defineStore('chats', {
data: result.data.map((k) => k.account).filter(Boolean),
})
result.data.forEach((updatedChat) => {
const chat = getChatById(this, updatedChat.id)
if (chat) {
chat.lastMessage = updatedChat.lastMessage
chat.unread = updatedChat.unread
chat.updated_at = updatedChat.updated_at
} else {
this.chatList.data.push(updatedChat)
this.chatList.idStore[updatedChat.id] = updatedChat
}
})
// We do unshift in update so we reverse the chat list here
result.data.forEach((chat) => this.updateChat(chat))
},
readChat(id) {
const chat = getChatById(this, id)
const chat = this.data.get(id)
if (chat) {
chat.unread = 0
} else {
console.error(`Chat ${id} not found!`)
}
},
updateChat({ data: { chatUpdate: updatedChat } }) {
const chat = getChatById(this, updatedChat.id)
updateChat(updatedChat) {
const chat = this.data.get(updatedChat.id)
if (chat) {
chat.lastMessage = updatedChat.lastMessage
chat.unread = updatedChat.unread
chat.updated_at = updatedChat.updated_at
} else {
this.chatList.data.unshift(updatedChat)
this.data.set(updatedChat.id, updatedChat)
}
maybeShowChatNotification(chat)
this.chatList.idStore[updatedChat.id] = updatedChat
maybeShowChatNotification(chat ?? updatedChat)
},
deleteChat(id) {
this.chats.data = this.chats.data.filter(
(conversation) => conversation.last_status.id !== id,
)
this.chats.idStore = omitBy(
this.chats.idStore,
(conversation) => conversation.last_status.id === id,
)
this.data.delete(id)
},
},
})

2
src/stores/fetchers/timeline_fetcher.js
View file

@ -77,7 +77,7 @@ const timelineFetcher = (timeline, argument, credentials) => {
return { statuses, pagination }
})
.catch((error) => {
if (error.statusCode === 403 && timeline === 'favorites') {
if (error.statusCode === 403 && timeline.name === 'favorites') {
useInstanceCapabilitiesStore().pleromaPublicFavouritesAvailable = false
return
}

24
src/stores/reports.js
View file

@ -1,4 +1,3 @@
import { filter } from 'lodash'
import { defineStore } from 'pinia'
import { useInterfaceStore } from 'src/stores/interface.js'
@ -11,28 +10,23 @@ export const useReportsStore = defineStore('reports', {
state: () => ({
reportModal: {
userId: null,
statuses: [],
preTickedIds: [],
statusIds: new Set(),
preTickedIds: new Set(),
activated: false,
},
reports: {},
}),
actions: {
openUserReportingModal({ userId, statusIds = [] }) {
const preTickedStatuses = statusIds.map((id) =>
useStatusesStore().allStatuses.get(id),
)
const preTickedIds = statusIds
const statuses = preTickedStatuses.concat(
filter(
window.vuex.state.statuses.allStatuses,
(status) =>
status.user.id === userId && !preTickedIds.includes(status.id),
),
)
const preTickedIds = new Set(statusIds)
// There shouldn't be a case where this is undefined
const userAllStatusesIds = useStatusesStore().statusesPerUser.get(userId)
// Set constructor should take care of duplicated IDs and order,
// later duplicated IDs will be dropped in favor of earlier
const sortedIds = new Set([...preTickedIds, ...userAllStatusesIds])
this.reportModal.userId = userId
this.reportModal.statuses = statuses
this.reportModal.statusIds = sortedIds
this.reportModal.preTickedIds = preTickedIds
this.reportModal.activated = true
},

24
src/stores/statuses.js
View file

@ -30,6 +30,7 @@ import {
export const defaultState = () => ({
allStatuses: new Map(),
statusesPerUser: new Map(),
timestamps: new WeakMap(),
scrobblesNextFetch: {},
conversations: new Map(),
@ -83,6 +84,12 @@ export const useStatusesStore = defineStore('statuses', {
// in case of likes (which are not statuses) it should return null
const addStatus = (data) => {
const [status] = this.mergeOrAdd(this.allStatuses, data, timestamp)
let userSet = this.statusesPerUser.get(status.user.id)
if (userSet === undefined) {
userSet = new Set()
this.statusesPerUser.set(status.user.id, userSet)
}
userSet.add(status.id)
// Add to conversation
const conversations = this.conversations
@ -527,14 +534,19 @@ export const useStatusesStore = defineStore('statuses', {
// For when blocking a user
wipeUserStatuses(userId) {
const removed = new Set()
this.allStatuses.forEach((status) => {
if (status.user.id === userId) {
this.allStatuses.delete(status.id)
removed.add(status.id)
const removed = this.statusesPerUser.get(userId)
removed.forEach((statusId) => {
const status = this.allStatuses.get(statusId)
this.allStatuses.delete(statusId)
const conversationSet = this.conversations.get(
status.statusnet_conversation_id,
)
conversationSet.delete(statusId)
if (conversationSet.size === 0) {
this.conversations.delete(status.statusnet_conversation_id)
}
})
this.statusesPerUser.delete(userId)
return removed
},
},

3
src/stores/streaming.js
View file

@ -101,7 +101,7 @@ export const useStreamingStore = defineStore('streaming', {
this.subscriptions.get(stream.name).delete(stream.argument)
}
if (this.state === WSConnectionStatus.JOINED) {
if (stream && this.state === WSConnectionStatus.JOINED) {
this.socket.unsubscribe(...this.getSubArgs(stream))
}
},
@ -131,7 +131,6 @@ export const useStreamingStore = defineStore('streaming', {
},
getSubArgs(stream) {
if (stream === undefined) return []
const argumentKey = ARGUMENT_MAP[stream.name]
const args = argumentKey
? {

2
src/stores/timelines.js
View file

@ -80,7 +80,7 @@ export const useTimelinesStore = defineStore('timelines', {
if (timeline.persistent && !persistent) return
if (
timelineName === 'favourites' &&
timelineName === 'favorites' &&
!useInstanceCapabilitiesStore().pleromaPublicFavouritesAvailable
) {
console.warn("Instance doesn't support public favorites timeline")

1
src/stores/users.js
View file

@ -561,6 +561,7 @@ export const useUsersStore = defineStore('users', {
const ids = useStatusesStore().wipeUserStatuses(id)
useTimelinesStore().wipeStatuses(ids)
useNotificationsStore().wipeStatuses(ids)
})
},
blockUsers(data = []) {

4
test/unit/specs/components/chat_view.spec.js
View file

@ -32,10 +32,6 @@ const global = {
$store: {
state: {
api: {},
users: {},
statuses: {
allStatusesObject: {},
},
},
},
$route: {

9
test/unit/specs/stores/user_highlight.spec.js
View file

@ -9,15 +9,6 @@ import {
describe('The UserHighlight store', () => {
beforeEach(() => {
setActivePinia(createPinia())
window.vuex = {
state: {
users: {
currentUser: {
fqn: 'foo@bar.tld',
},
},
},
}
})
describe('mutations', () => {

12
test/unit/specs/stores/users.spec.js
View file

@ -1124,6 +1124,12 @@ describe('Users store', () => {
},
)
vi.spyOn(useNotificationsStore(), 'wipeStatuses').mockImplementation(
async () => {
/* no-op */
},
)
const store = useUsersStore()
const { storeAction, apiUrl } = actionKeys(action)
await store[storeAction](userId)
@ -1155,6 +1161,12 @@ describe('Users store', () => {
},
)
vi.spyOn(useNotificationsStore(), 'wipeStatuses').mockImplementation(
async () => {
/* no-op */
},
)
const store = useUsersStore()
const { storeAction, apiUrl } = actionKeys(action)
await store[storeAction](userId, 20)