added support hide\show reblogs from a specific user
This commit is contained in:
parent
9b163d2816
commit
8721fb57fc
8 changed files with 58 additions and 6 deletions
|
@ -7,7 +7,9 @@ import { requestFollow, requestUnfollow } from '../../services/follow_manipulate
|
||||||
import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
|
import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
props: [ 'user', 'switcher', 'selected', 'hideBio', 'rounded', 'bordered', 'allowZoomingAvatar' ],
|
props: [
|
||||||
|
'user', 'switcher', 'selected', 'hideBio', 'rounded', 'bordered', 'allowZoomingAvatar'
|
||||||
|
],
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
followRequestInProgress: false,
|
followRequestInProgress: false,
|
||||||
|
@ -108,6 +110,12 @@ export default {
|
||||||
ProgressButton
|
ProgressButton
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
showReblogs () {
|
||||||
|
this.$store.dispatch('showReblogs', this.user.id)
|
||||||
|
},
|
||||||
|
hideReblogs () {
|
||||||
|
this.$store.dispatch('hideReblogs', this.user.id)
|
||||||
|
},
|
||||||
followUser () {
|
followUser () {
|
||||||
const store = this.$store
|
const store = this.$store
|
||||||
this.followRequestInProgress = true
|
this.followRequestInProgress = true
|
||||||
|
@ -156,7 +164,10 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
userProfileLink (user) {
|
userProfileLink (user) {
|
||||||
return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames)
|
return generateProfileLink(
|
||||||
|
user.id, user.screen_name,
|
||||||
|
this.$store.state.instance.restrictedNicknames
|
||||||
|
)
|
||||||
},
|
},
|
||||||
reportUser () {
|
reportUser () {
|
||||||
this.$store.dispatch('openUserReportingModal', this.user.id)
|
this.$store.dispatch('openUserReportingModal', this.user.id)
|
||||||
|
|
|
@ -186,6 +186,22 @@
|
||||||
>
|
>
|
||||||
<i class="icon-bell-ringing-o" />
|
<i class="icon-bell-ringing-o" />
|
||||||
</ProgressButton>
|
</ProgressButton>
|
||||||
|
<button
|
||||||
|
v-if="user.showing_reblogs"
|
||||||
|
class="btn btn-default"
|
||||||
|
:title="$t('user_card.hide_boosts', {user: user.screen_name})"
|
||||||
|
@click="hideReblogs"
|
||||||
|
>
|
||||||
|
<i class="icon-eye" />
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
v-if="!user.showing_reblogs"
|
||||||
|
class="btn btn-default pressed"
|
||||||
|
:title="$t('user_card.show_boosts', {user: user.screen_name})"
|
||||||
|
@click="showReblogs"
|
||||||
|
>
|
||||||
|
<i class="icon-eye-off" />
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
|
|
|
@ -543,6 +543,8 @@
|
||||||
"unmute": "Unmute",
|
"unmute": "Unmute",
|
||||||
"unmute_progress": "Unmuting...",
|
"unmute_progress": "Unmuting...",
|
||||||
"mute_progress": "Muting...",
|
"mute_progress": "Muting...",
|
||||||
|
"hide_boosts": "Hide boosts from {user}",
|
||||||
|
"show_boosts": "Show boosts from {user}",
|
||||||
"admin_menu": {
|
"admin_menu": {
|
||||||
"moderation": "Moderation",
|
"moderation": "Moderation",
|
||||||
"grant_admin": "Grant Admin",
|
"grant_admin": "Grant Admin",
|
||||||
|
|
|
@ -60,6 +60,18 @@ const unmuteUser = (store, id) => {
|
||||||
.then((relationship) => store.commit('updateUserRelationship', [relationship]))
|
.then((relationship) => store.commit('updateUserRelationship', [relationship]))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const hideReblogs = (store, userId) => {
|
||||||
|
return store.rootState.api.backendInteractor.followUser({ id: userId, reblogs: false })
|
||||||
|
.then((relationship) => {
|
||||||
|
store.commit('updateUserRelationship', [relationship])
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
const showReblogs = (store, userId) => {
|
||||||
|
return store.rootState.api.backendInteractor.followUser({ id: userId, reblogs: true })
|
||||||
|
.then((relationship) => store.commit('updateUserRelationship', [relationship]))
|
||||||
|
}
|
||||||
|
|
||||||
export const mutations = {
|
export const mutations = {
|
||||||
setMuted (state, { user: { id }, muted }) {
|
setMuted (state, { user: { id }, muted }) {
|
||||||
const user = state.usersObject[id]
|
const user = state.usersObject[id]
|
||||||
|
@ -135,6 +147,7 @@ export const mutations = {
|
||||||
user.muted = relationship.muting
|
user.muted = relationship.muting
|
||||||
user.statusnet_blocking = relationship.blocking
|
user.statusnet_blocking = relationship.blocking
|
||||||
user.subscribed = relationship.subscribing
|
user.subscribed = relationship.subscribing
|
||||||
|
user.showing_reblogs = relationship.showing_reblogs
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
@ -272,6 +285,12 @@ const users = {
|
||||||
unmuteUser (store, id) {
|
unmuteUser (store, id) {
|
||||||
return unmuteUser(store, id)
|
return unmuteUser(store, id)
|
||||||
},
|
},
|
||||||
|
hideReblogs (store, id) {
|
||||||
|
return hideReblogs(store, id)
|
||||||
|
},
|
||||||
|
showReblogs (store, id) {
|
||||||
|
return showReblogs(store, id)
|
||||||
|
},
|
||||||
muteUsers (store, ids = []) {
|
muteUsers (store, ids = []) {
|
||||||
return Promise.all(ids.map(id => muteUser(store, id)))
|
return Promise.all(ids.map(id => muteUser(store, id)))
|
||||||
},
|
},
|
||||||
|
|
|
@ -219,9 +219,12 @@ const authHeaders = (accessToken) => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const followUser = ({ id, credentials }) => {
|
const followUser = ({ id, reblogs, credentials }) => {
|
||||||
let url = MASTODON_FOLLOW_URL(id)
|
let url = MASTODON_FOLLOW_URL(id)
|
||||||
|
const form = new FormData()
|
||||||
|
if (reblogs !== undefined) { form.append('reblogs', reblogs) }
|
||||||
return fetch(url, {
|
return fetch(url, {
|
||||||
|
body: form,
|
||||||
headers: authHeaders(credentials),
|
headers: authHeaders(credentials),
|
||||||
method: 'POST'
|
method: 'POST'
|
||||||
}).then((data) => data.json())
|
}).then((data) => data.json())
|
||||||
|
|
|
@ -31,8 +31,8 @@ const backendInteractorService = credentials => {
|
||||||
return apiService.fetchUserRelationship({ id, credentials })
|
return apiService.fetchUserRelationship({ id, credentials })
|
||||||
}
|
}
|
||||||
|
|
||||||
const followUser = (id) => {
|
const followUser = ({ id, reblogs }) => {
|
||||||
return apiService.followUser({ credentials, id })
|
return apiService.followUser({ credentials, id, reblogs })
|
||||||
}
|
}
|
||||||
|
|
||||||
const unfollowUser = (id) => {
|
const unfollowUser = (id) => {
|
||||||
|
|
|
@ -69,6 +69,7 @@ export const parseUser = (data) => {
|
||||||
output.following = relationship.following
|
output.following = relationship.following
|
||||||
output.statusnet_blocking = relationship.blocking
|
output.statusnet_blocking = relationship.blocking
|
||||||
output.muted = relationship.muting
|
output.muted = relationship.muting
|
||||||
|
output.showing_reblogs = relationship.showing_reblogs
|
||||||
output.subscribed = relationship.subscribing
|
output.subscribed = relationship.subscribing
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ const fetchUser = (attempt, user, store) => new Promise((resolve, reject) => {
|
||||||
})
|
})
|
||||||
|
|
||||||
export const requestFollow = (user, store) => new Promise((resolve, reject) => {
|
export const requestFollow = (user, store) => new Promise((resolve, reject) => {
|
||||||
store.state.api.backendInteractor.followUser(user.id)
|
store.state.api.backendInteractor.followUser({ id: user.id })
|
||||||
.then((updated) => {
|
.then((updated) => {
|
||||||
store.commit('updateUserRelationship', [updated])
|
store.commit('updateUserRelationship', [updated])
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue