mark as interacted on any click on status, not specific actions
This commit is contained in:
parent
99d9b57240
commit
cbc492a939
9 changed files with 3 additions and 14 deletions
|
|
@ -144,7 +144,6 @@ const Notification = {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
doApprove() {
|
doApprove() {
|
||||||
this.$emit('interacted')
|
|
||||||
this.$store.state.api.backendInteractor.approveUser({ id: this.user.id })
|
this.$store.state.api.backendInteractor.approveUser({ id: this.user.id })
|
||||||
this.$store.dispatch('removeFollowRequest', this.user)
|
this.$store.dispatch('removeFollowRequest', this.user)
|
||||||
this.$store.dispatch('markSingleNotificationAsSeen', {
|
this.$store.dispatch('markSingleNotificationAsSeen', {
|
||||||
|
|
@ -166,7 +165,6 @@ const Notification = {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
doDeny() {
|
doDeny() {
|
||||||
this.$emit('interacted')
|
|
||||||
this.$store.state.api.backendInteractor
|
this.$store.state.api.backendInteractor
|
||||||
.denyUser({ id: this.user.id })
|
.denyUser({ id: this.user.id })
|
||||||
.then(() => {
|
.then(() => {
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
class="Notification"
|
class="Notification"
|
||||||
:compact="true"
|
:compact="true"
|
||||||
:statusoid="notification.status"
|
:statusoid="notification.status"
|
||||||
@interacted="interacted"
|
@click="interacted"
|
||||||
/>
|
/>
|
||||||
</article>
|
</article>
|
||||||
<article
|
<article
|
||||||
|
|
|
||||||
|
|
@ -167,7 +167,7 @@ const Status = {
|
||||||
'controlledMediaPlaying',
|
'controlledMediaPlaying',
|
||||||
'controlledSetMediaPlaying',
|
'controlledSetMediaPlaying',
|
||||||
],
|
],
|
||||||
emits: ['interacted', 'goto', 'toggleExpanded'],
|
emits: ['goto', 'toggleExpanded'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
uncontrolledReplying: false,
|
uncontrolledReplying: false,
|
||||||
|
|
@ -560,11 +560,9 @@ const Status = {
|
||||||
this.error = error
|
this.error = error
|
||||||
},
|
},
|
||||||
clearError() {
|
clearError() {
|
||||||
this.$emit('interacted')
|
|
||||||
this.error = undefined
|
this.error = undefined
|
||||||
},
|
},
|
||||||
toggleReplying() {
|
toggleReplying() {
|
||||||
this.$emit('interacted')
|
|
||||||
if (this.replying) {
|
if (this.replying) {
|
||||||
this.$refs.postStatusForm.requestClose()
|
this.$refs.postStatusForm.requestClose()
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -520,7 +520,6 @@
|
||||||
:status="status"
|
:status="status"
|
||||||
:replying="replying"
|
:replying="replying"
|
||||||
@toggle-replying="toggleReplying"
|
@toggle-replying="toggleReplying"
|
||||||
@interacted="e => $emit('interacted')"
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,6 @@ export default {
|
||||||
'doAction',
|
'doAction',
|
||||||
'outerClose',
|
'outerClose',
|
||||||
],
|
],
|
||||||
emits: ['interacted'],
|
|
||||||
components: {
|
components: {
|
||||||
StatusBookmarkFolderMenu,
|
StatusBookmarkFolderMenu,
|
||||||
EmojiPicker,
|
EmojiPicker,
|
||||||
|
|
@ -138,7 +137,6 @@ export default {
|
||||||
this.button.interactive ? !this.button.interactive(this.funcArg) : false
|
this.button.interactive ? !this.button.interactive(this.funcArg) : false
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
this.$emit('interacted')
|
|
||||||
if (button.name === 'emoji') {
|
if (button.name === 'emoji') {
|
||||||
this.$refs.picker.showPicker()
|
this.$refs.picker.showPicker()
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,6 @@ export default {
|
||||||
UserTimedFilterModal,
|
UserTimedFilterModal,
|
||||||
},
|
},
|
||||||
props: ['button', 'status'],
|
props: ['button', 'status'],
|
||||||
emits: ['interacted'],
|
|
||||||
mounted() {
|
mounted() {
|
||||||
if (this.button.name === 'mute') {
|
if (this.button.name === 'mute') {
|
||||||
this.$store.dispatch('fetchDomainMutes')
|
this.$store.dispatch('fetchDomainMutes')
|
||||||
|
|
|
||||||
|
|
@ -79,7 +79,6 @@
|
||||||
:button="button"
|
:button="button"
|
||||||
:status="status"
|
:status="status"
|
||||||
v-bind="$attrs"
|
v-bind="$attrs"
|
||||||
@interacted="e => $emit('interacted')"
|
|
||||||
/>
|
/>
|
||||||
<teleport to="#modal">
|
<teleport to="#modal">
|
||||||
<MuteConfirm
|
<MuteConfirm
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ library.add(faEllipsisH)
|
||||||
|
|
||||||
const StatusActionButtons = {
|
const StatusActionButtons = {
|
||||||
props: ['status', 'replying'],
|
props: ['status', 'replying'],
|
||||||
emits: ['toggleReplying', 'interacted'],
|
emits: ['toggleReplying'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
showPin: false,
|
showPin: false,
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,6 @@
|
||||||
:get-component="getComponent"
|
:get-component="getComponent"
|
||||||
:close="() => { /* no-op */ }"
|
:close="() => { /* no-op */ }"
|
||||||
:do-action="doAction"
|
:do-action="doAction"
|
||||||
@interacted="e => $emit('interacted')"
|
|
||||||
/>
|
/>
|
||||||
<button
|
<button
|
||||||
v-if="showPin && currentUser"
|
v-if="showPin && currentUser"
|
||||||
|
|
@ -75,7 +74,6 @@
|
||||||
:get-component="getComponent"
|
:get-component="getComponent"
|
||||||
:outer-close="close"
|
:outer-close="close"
|
||||||
:do-action="doAction"
|
:do-action="doAction"
|
||||||
@interacted="e => $emit('interacted')"
|
|
||||||
/>
|
/>
|
||||||
<button
|
<button
|
||||||
v-if="showPin && currentUser"
|
v-if="showPin && currentUser"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue