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

Merge remote-tracking branch 'origin/develop' into shigusegubu-themes3

Browse source
This commit is contained in:
Henry Jameson 2026-08-04 23:15:53 +03:00
commit f1e850ef8c
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/components/conversation/conversation.js
View file

@ -305,10 +305,11 @@ const conversation = {
topLevel() { topLevel() {
const topLevel = this.conversation.reduce( const topLevel = this.conversation.reduce(
(tl, cur) => (tl, cur) =>
tl.filter((k) => tl.filter(
this.getReplies(cur.id) (k) =>
.map((v) => v.id) !this.getReplies(cur.id)
.includes(k.id), .map((v) => v.id)
.includes(k.id),
), ),
this.conversation, this.conversation,
) )

2
src/i18n/messages.js
View file

@ -18,7 +18,7 @@ const hasLanguageFile = (code) => languages.includes(code)
const languageFileMap = import.meta.glob(['./*.json', '!./en.json']) const languageFileMap = import.meta.glob(['./*.json', '!./en.json'])
const loadLanguageFile = (code) => { const loadLanguageFile = async (code) => {
const jsonName = langCodeToJsonName(code) const jsonName = langCodeToJsonName(code)
if (jsonName === 'en') return { default: enMessages } if (jsonName === 'en') return { default: enMessages }
return languageFileMap[`./${jsonName}.json`]() return languageFileMap[`./${jsonName}.json`]()

4
src/modules/users.js
View file

@ -73,7 +73,7 @@ const mergeArrayLength = (oldValue, newValue) => {
} }
} }
const getNotificationPermission = () => { const getNotificationPermission = async () => {
const Notification = window.Notification const Notification = window.Notification
if (!Notification) return null if (!Notification) return null
@ -383,7 +383,7 @@ const users = {
mutations, mutations,
getters, getters,
actions: { actions: {
fetchUserIfMissing(store, id) { async fetchUserIfMissing(store, id) {
const user = store.getters.findUser(id) const user = store.getters.findUser(id)
if (!user) { if (!user) {
return store.dispatch('fetchUser', id) return store.dispatch('fetchUser', id)