Add thread muting to context menu of status
This commit is contained in:
parent
54b0f90133
commit
7ed9d17ce7
8 changed files with 69 additions and 6 deletions
|
@ -34,6 +34,18 @@ const ExtraButtons = {
|
||||||
.then(() => this.$emit('onSuccess'))
|
.then(() => this.$emit('onSuccess'))
|
||||||
.catch(err => this.$emit('onError', err.error.error))
|
.catch(err => this.$emit('onError', err.error.error))
|
||||||
},
|
},
|
||||||
|
muteConversation () {
|
||||||
|
this.refreshPopper()
|
||||||
|
this.$store.dispatch('muteConversation', this.status.id)
|
||||||
|
.then(() => this.$emit('onSuccess'))
|
||||||
|
.catch(err => this.$emit('onError', err.error.error))
|
||||||
|
},
|
||||||
|
unmuteConversation () {
|
||||||
|
this.refreshPopper()
|
||||||
|
this.$store.dispatch('unmuteConversation', this.status.id)
|
||||||
|
.then(() => this.$emit('onSuccess'))
|
||||||
|
.catch(err => this.$emit('onError', err.error.error))
|
||||||
|
},
|
||||||
refreshPopper () {
|
refreshPopper () {
|
||||||
this.showPopper = false
|
this.showPopper = false
|
||||||
this.showDropDown = false
|
this.showDropDown = false
|
||||||
|
@ -54,9 +66,6 @@ const ExtraButtons = {
|
||||||
},
|
},
|
||||||
canPin () {
|
canPin () {
|
||||||
return this.ownStatus && (this.status.visibility === 'public' || this.status.visibility === 'unlisted')
|
return this.ownStatus && (this.status.visibility === 'public' || this.status.visibility === 'unlisted')
|
||||||
},
|
|
||||||
enabled () {
|
|
||||||
return this.canPin || this.canDelete
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<template>
|
<template>
|
||||||
<Popper
|
<Popper
|
||||||
v-if="enabled && showPopper"
|
v-if="showPopper"
|
||||||
trigger="click"
|
trigger="click"
|
||||||
append-to-body
|
append-to-body
|
||||||
:options="{
|
:options="{
|
||||||
|
@ -14,6 +14,20 @@
|
||||||
>
|
>
|
||||||
<div class="popper-wrapper">
|
<div class="popper-wrapper">
|
||||||
<div class="dropdown-menu">
|
<div class="dropdown-menu">
|
||||||
|
<button
|
||||||
|
v-if="!status.muted"
|
||||||
|
class="dropdown-item dropdown-item-icon"
|
||||||
|
@click.prevent="muteConversation"
|
||||||
|
>
|
||||||
|
<i class="icon-eye-off" /><span>{{ $t("status.mute_conversation") }}</span>
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
v-if="status.muted"
|
||||||
|
class="dropdown-item dropdown-item-icon"
|
||||||
|
@click.prevent="unmuteConversation"
|
||||||
|
>
|
||||||
|
<i class="icon-eye-off" /><span>{{ $t("status.unmute_conversation") }}</span>
|
||||||
|
</button>
|
||||||
<button
|
<button
|
||||||
v-if="!status.pinned && canPin"
|
v-if="!status.pinned && canPin"
|
||||||
class="dropdown-item dropdown-item-icon"
|
class="dropdown-item dropdown-item-icon"
|
||||||
|
|
|
@ -504,7 +504,9 @@
|
||||||
"pinned": "Pinned",
|
"pinned": "Pinned",
|
||||||
"delete_confirm": "Do you really want to delete this status?",
|
"delete_confirm": "Do you really want to delete this status?",
|
||||||
"reply_to": "Reply to",
|
"reply_to": "Reply to",
|
||||||
"replies_list": "Replies:"
|
"replies_list": "Replies:",
|
||||||
|
"mute_conversation": "Mute conversation",
|
||||||
|
"unmute_conversation": "Unmute conversation"
|
||||||
},
|
},
|
||||||
"user_card": {
|
"user_card": {
|
||||||
"approve": "Approve",
|
"approve": "Approve",
|
||||||
|
|
|
@ -278,8 +278,15 @@
|
||||||
"status": {
|
"status": {
|
||||||
"favorites": "Tykkäykset",
|
"favorites": "Tykkäykset",
|
||||||
"repeats": "Toistot",
|
"repeats": "Toistot",
|
||||||
|
"delete": "Poista",
|
||||||
|
"pin": "Kiinnitä profiiliisi",
|
||||||
|
"unpin": "Poista kiinnitys",
|
||||||
|
"pinned": "Kiinnitetty",
|
||||||
|
"delete_confirm": "Haluatko varmasti postaa viestin?",
|
||||||
"reply_to": "Vastaus",
|
"reply_to": "Vastaus",
|
||||||
"replies_list": "Vastaukset:"
|
"replies_list": "Vastaukset:",
|
||||||
|
"mute_conversation": "Hiljennä keskustelu",
|
||||||
|
"unmute_conversation": "Poista hiljennys"
|
||||||
},
|
},
|
||||||
"user_card": {
|
"user_card": {
|
||||||
"approve": "Hyväksy",
|
"approve": "Hyväksy",
|
||||||
|
|
|
@ -430,6 +430,10 @@ export const mutations = {
|
||||||
const newStatus = state.allStatusesObject[status.id]
|
const newStatus = state.allStatusesObject[status.id]
|
||||||
newStatus.pinned = status.pinned
|
newStatus.pinned = status.pinned
|
||||||
},
|
},
|
||||||
|
setMuted (state, status) {
|
||||||
|
const newStatus = state.allStatusesObject[status.id]
|
||||||
|
newStatus.muted = status.muted
|
||||||
|
},
|
||||||
setRetweeted (state, { status, value }) {
|
setRetweeted (state, { status, value }) {
|
||||||
const newStatus = state.allStatusesObject[status.id]
|
const newStatus = state.allStatusesObject[status.id]
|
||||||
|
|
||||||
|
@ -555,6 +559,14 @@ const statuses = {
|
||||||
rootState.api.backendInteractor.unpinOwnStatus(statusId)
|
rootState.api.backendInteractor.unpinOwnStatus(statusId)
|
||||||
.then((status) => commit('setPinned', status))
|
.then((status) => commit('setPinned', status))
|
||||||
},
|
},
|
||||||
|
muteConversation ({ rootState, commit }, statusId) {
|
||||||
|
return rootState.api.backendInteractor.muteConversation(statusId)
|
||||||
|
.then((status) => commit('setMuted', status))
|
||||||
|
},
|
||||||
|
unmuteConversation ({ rootState, commit }, statusId) {
|
||||||
|
return rootState.api.backendInteractor.unmuteConversation(statusId)
|
||||||
|
.then((status) => commit('setMuted', status))
|
||||||
|
},
|
||||||
retweet ({ rootState, commit }, status) {
|
retweet ({ rootState, commit }, status) {
|
||||||
// Optimistic retweeting...
|
// Optimistic retweeting...
|
||||||
commit('setRetweeted', { status, value: true })
|
commit('setRetweeted', { status, value: true })
|
||||||
|
|
|
@ -65,6 +65,8 @@ const MASTODON_PROFILE_UPDATE_URL = '/api/v1/accounts/update_credentials'
|
||||||
const MASTODON_REPORT_USER_URL = '/api/v1/reports'
|
const MASTODON_REPORT_USER_URL = '/api/v1/reports'
|
||||||
const MASTODON_PIN_OWN_STATUS = id => `/api/v1/statuses/${id}/pin`
|
const MASTODON_PIN_OWN_STATUS = id => `/api/v1/statuses/${id}/pin`
|
||||||
const MASTODON_UNPIN_OWN_STATUS = id => `/api/v1/statuses/${id}/unpin`
|
const MASTODON_UNPIN_OWN_STATUS = id => `/api/v1/statuses/${id}/unpin`
|
||||||
|
const MASTODON_MUTE_CONVERSATION = id => `/api/v1/statuses/${id}/mute`
|
||||||
|
const MASTODON_UNMUTE_CONVERSATION = id => `/api/v1/statuses/${id}/unmute`
|
||||||
|
|
||||||
const oldfetch = window.fetch
|
const oldfetch = window.fetch
|
||||||
|
|
||||||
|
@ -244,6 +246,16 @@ const unpinOwnStatus = ({ id, credentials }) => {
|
||||||
.then((data) => parseStatus(data))
|
.then((data) => parseStatus(data))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const muteConversation = ({ id, credentials }) => {
|
||||||
|
return promisedRequest({ url: MASTODON_MUTE_CONVERSATION(id), credentials, method: 'POST' })
|
||||||
|
.then((data) => parseStatus(data))
|
||||||
|
}
|
||||||
|
|
||||||
|
const unmuteConversation = ({ id, credentials }) => {
|
||||||
|
return promisedRequest({ url: MASTODON_UNMUTE_CONVERSATION(id), credentials, method: 'POST' })
|
||||||
|
.then((data) => parseStatus(data))
|
||||||
|
}
|
||||||
|
|
||||||
const blockUser = ({ id, credentials }) => {
|
const blockUser = ({ id, credentials }) => {
|
||||||
return fetch(MASTODON_BLOCK_USER_URL(id), {
|
return fetch(MASTODON_BLOCK_USER_URL(id), {
|
||||||
headers: authHeaders(credentials),
|
headers: authHeaders(credentials),
|
||||||
|
@ -850,6 +862,8 @@ const apiService = {
|
||||||
unfollowUser,
|
unfollowUser,
|
||||||
pinOwnStatus,
|
pinOwnStatus,
|
||||||
unpinOwnStatus,
|
unpinOwnStatus,
|
||||||
|
muteConversation,
|
||||||
|
unmuteConversation,
|
||||||
blockUser,
|
blockUser,
|
||||||
unblockUser,
|
unblockUser,
|
||||||
fetchUser,
|
fetchUser,
|
||||||
|
|
|
@ -115,6 +115,8 @@ const backendInteractorService = credentials => {
|
||||||
const fetchPinnedStatuses = (id) => apiService.fetchPinnedStatuses({ credentials, id })
|
const fetchPinnedStatuses = (id) => apiService.fetchPinnedStatuses({ credentials, id })
|
||||||
const pinOwnStatus = (id) => apiService.pinOwnStatus({ credentials, id })
|
const pinOwnStatus = (id) => apiService.pinOwnStatus({ credentials, id })
|
||||||
const unpinOwnStatus = (id) => apiService.unpinOwnStatus({ credentials, id })
|
const unpinOwnStatus = (id) => apiService.unpinOwnStatus({ credentials, id })
|
||||||
|
const muteConversation = (id) => apiService.muteConversation({ credentials, id })
|
||||||
|
const unmuteConversation = (id) => apiService.unmuteConversation({ credentials, id })
|
||||||
|
|
||||||
const getCaptcha = () => apiService.getCaptcha()
|
const getCaptcha = () => apiService.getCaptcha()
|
||||||
const register = (params) => apiService.register({ credentials, params })
|
const register = (params) => apiService.register({ credentials, params })
|
||||||
|
@ -171,6 +173,8 @@ const backendInteractorService = credentials => {
|
||||||
fetchPinnedStatuses,
|
fetchPinnedStatuses,
|
||||||
pinOwnStatus,
|
pinOwnStatus,
|
||||||
unpinOwnStatus,
|
unpinOwnStatus,
|
||||||
|
muteConversation,
|
||||||
|
unmuteConversation,
|
||||||
tagUser,
|
tagUser,
|
||||||
untagUser,
|
untagUser,
|
||||||
addRight,
|
addRight,
|
||||||
|
|
|
@ -239,6 +239,7 @@ export const parseStatus = (data) => {
|
||||||
output.external_url = data.url
|
output.external_url = data.url
|
||||||
output.poll = data.poll
|
output.poll = data.poll
|
||||||
output.pinned = data.pinned
|
output.pinned = data.pinned
|
||||||
|
output.muted = data.muted
|
||||||
} else {
|
} else {
|
||||||
output.favorited = data.favorited
|
output.favorited = data.favorited
|
||||||
output.fave_num = data.fave_num
|
output.fave_num = data.fave_num
|
||||||
|
|
Loading…
Reference in a new issue