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

Merge branch 'setttingssync' into shigusegubu-themes3

Browse source
This commit is contained in:
Henry Jameson 2026-03-27 01:24:25 +02:00
commit 8a47252d33
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/post_status_form/post_status_form.vue
View file

@ -13,7 +13,7 @@
v-if="!$store.state.users.currentUser.locked && newStatus.visibility == 'private' && !disableLockWarning" v-if="!$store.state.users.currentUser.locked && newStatus.visibility == 'private' && !disableLockWarning"
keypath="post_status.account_not_locked_warning" keypath="post_status.account_not_locked_warning"
tag="p" tag="p"
class="visibility-notice" class="visibility-notice notice-dismissible"
scope="global" scope="global"
> >
<button <button
@ -70,7 +70,7 @@
</p> </p>
<p <p
v-else-if="newStatus.visibility === 'direct'" v-else-if="newStatus.visibility === 'direct'"
class="visibility-notice" class="visibility-notice notice-dismissible"
> >
<span v-if="safeDMEnabled">{{ $t('post_status.direct_warning_to_first_only') }}</span> <span v-if="safeDMEnabled">{{ $t('post_status.direct_warning_to_first_only') }}</span>
<span v-else>{{ $t('post_status.direct_warning_to_all') }}</span> <span v-else>{{ $t('post_status.direct_warning_to_all') }}</span>

5
src/stores/user_highlight.js
View file

@ -153,7 +153,7 @@ const _mergeJournal = (...journals) => {
export const _mergeHighlights = (recent, stale) => { export const _mergeHighlights = (recent, stale) => {
if (!stale) return recent if (!stale) return recent
if (!recent) return stale if (!recent) return stale
const { _journal: recentJournal, highlight: recentHighlight } = recent const { _journal: recentJournal, ...recentHighlight } = recent
const { _journal: staleJournal } = stale const { _journal: staleJournal } = stale
console.log(recentHighlight) console.log(recentHighlight)
/** Journal entry format: /** Journal entry format:
@ -184,7 +184,7 @@ export const _mergeHighlights = (recent, stale) => {
return console.error(`Unknown journal operation: '${operation}'`) return console.error(`Unknown journal operation: '${operation}'`)
} }
}) })
return { highlight: resultHighlight, _journal: Journal } return { ...resultHighlight, _journal: Journal }
} }
export const useUserHighlightStore = defineStore('user_highlight', { export const useUserHighlightStore = defineStore('user_highlight', {
@ -333,6 +333,7 @@ export const useUserHighlightStore = defineStore('user_highlight', {
if (stale && recent && !this.dirty) { if (stale && recent && !this.dirty) {
this.cache._timestamp = Math.min(stale._timestamp, recent._timestamp) this.cache._timestamp = Math.min(stale._timestamp, recent._timestamp)
} }
console.log('CACHE', this.cache)
this.highlight = this.cache.highlight this.highlight = this.cache.highlight
}, },
pushHighlight({ force = false } = {}) { pushHighlight({ force = false } = {}) {