zio/elk
2
0
Fork 0
Code Releases 2 Packages 1 Activity

refactor: upgrade masto

Browse source
This commit is contained in:
三咲智子 2023-01-10 14:10:20 +08:00
parent e1332345ad
commit caa02446c7
No known key found for this signature in database
GPG key ID: 69992F2250DFD93E
6 changed files with 34 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/status/StatusCard.vue
View file

@ -67,11 +67,9 @@ const timeago = useTimeAgo(() => status.createdAt, timeAgoOptions)
// Content Filter logic
const filterResult = $computed(() => status.filtered?.length ? status.filtered[0] : null)
const filter = $computed(() => filterResult?.filter as mastodon.v2.Filter)
const filter = $computed(() => filterResult?.filter)
// a bit of a hack due to Filter being different in v1 and v2
// clean up when masto.js supports explicit versions: https://github.com/neet/masto.js/issues/722
const filterPhrase = $computed(() => filter?.phrase || (filter as any)?.title)
const filterPhrase = $computed(() => filter?.title)
const isFiltered = $computed(() => filterPhrase && (props.context ? filter?.context.includes(props.context) : false))
const isSelfReply = $computed(() => status.inReplyToAccountId === status.account.id)

4
components/status/StatusContent.vue
View file

@ -13,9 +13,7 @@ const isDetails = $computed(() => context === 'details')
const filterResult = $computed(() => status.filtered?.length ? status.filtered[0] : null)
const filter = $computed(() => filterResult?.filter)
// a bit of a hack due to Filter being different in v1 and v2
// clean up when masto.js supports explicit versions: https://github.com/neet/masto.js/issues/722
const filterPhrase = $computed(() => filter?.phrase || (filter as any)?.title)
const filterPhrase = $computed(() => filter?.title)
const isFiltered = $computed(() => filterPhrase && (context && context !== 'details' ? filter?.context.includes(context) : false))
</script>