better clarification + thread_muting handling (fixed typo)
This commit is contained in:
parent
abe6af133f
commit
3589a5302e
1 changed files with 18 additions and 8 deletions
|
|
@ -136,13 +136,30 @@ const Status = {
|
||||||
useScrobblesStore().getLatestScrobble(this.status.user.id)
|
useScrobblesStore().getLatestScrobble(this.status.user.id)
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
// Whatever we're given to work with
|
||||||
status() {
|
status() {
|
||||||
return this.statusoid ?? useStatusesStore().allStatuses.get(this.statusId)
|
return this.statusoid ?? useStatusesStore().allStatuses.get(this.statusId)
|
||||||
},
|
},
|
||||||
|
// Status repeated
|
||||||
repeatedStatus() {
|
repeatedStatus() {
|
||||||
if (this.status.retweeted_status === undefined) return undefined
|
if (this.status.retweeted_status === undefined) return undefined
|
||||||
return useStatusesStore().allStatuses.get(this.status.retweeted_status.id)
|
return useStatusesStore().allStatuses.get(this.status.retweeted_status.id)
|
||||||
},
|
},
|
||||||
|
// THE repeat
|
||||||
|
repeatStatus() {
|
||||||
|
if (this.isRepeat) {
|
||||||
|
return this.status
|
||||||
|
} else {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
},
|
||||||
|
mainStatus() {
|
||||||
|
if (this.isRepeat) {
|
||||||
|
return this.repeatedStatus
|
||||||
|
} else {
|
||||||
|
return this.status
|
||||||
|
}
|
||||||
|
},
|
||||||
repeater() {
|
repeater() {
|
||||||
return useUsersStore().findUser(this.status.user.id)
|
return useUsersStore().findUser(this.status.user.id)
|
||||||
},
|
},
|
||||||
|
|
@ -151,7 +168,7 @@ const Status = {
|
||||||
},
|
},
|
||||||
showReasonMutedThread() {
|
showReasonMutedThread() {
|
||||||
return (
|
return (
|
||||||
(this.mainStatus.thread_muted || this.mainSatus.reblog?.thread_muted) &&
|
(this.mainStatus.thread_muted || this.repeatStatus?.thread_muted) &&
|
||||||
!this.inConversation
|
!this.inConversation
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
|
|
@ -217,13 +234,6 @@ const Status = {
|
||||||
this.repeater.screen_name,
|
this.repeater.screen_name,
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
mainStatus() {
|
|
||||||
if (this.isRepeat) {
|
|
||||||
return this.repeatedStatus
|
|
||||||
} else {
|
|
||||||
return this.status
|
|
||||||
}
|
|
||||||
},
|
|
||||||
loggedIn() {
|
loggedIn() {
|
||||||
return !!this.currentUser
|
return !!this.currentUser
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue