better approach to missing privileges
This commit is contained in:
parent
96c57a8ada
commit
70c89b0cb9
7 changed files with 9 additions and 9 deletions
|
|
@ -29,7 +29,7 @@ const Announcement = {
|
|||
currentUser: state => state.users.currentUser
|
||||
}),
|
||||
canEditAnnouncement () {
|
||||
return this.currentUser && this.currentUser.privileges?.includes('announcements_manage_announcements')
|
||||
return this.currentUser && this.currentUser.privileges.includes('announcements_manage_announcements')
|
||||
},
|
||||
content () {
|
||||
return this.announcement.content
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ const Interactions = {
|
|||
return {
|
||||
allowFollowingMove: this.$store.state.users.currentUser.allow_following_move,
|
||||
filterMode: tabModeDict.mentions,
|
||||
canSeeReports: this.$store.state.users.currentUser.privileges?.includes('reports_manage_reports')
|
||||
canSeeReports: this.$store.state.users.currentUser.privileges.includes('reports_manage_reports')
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ const ModerationTools = {
|
|||
return this.tagsSet.has(tagName)
|
||||
},
|
||||
privileged (privilege) {
|
||||
return this.$store.state.users.currentUser.privileges?.includes(privilege)
|
||||
return this.$store.state.users.currentUser.privileges.includes(privilege)
|
||||
},
|
||||
toggleTag (tag) {
|
||||
const store = this.$store
|
||||
|
|
|
|||
|
|
@ -204,7 +204,7 @@ export const BUTTONS = [{
|
|||
if ({ status, loggedIn, currentUser }) {
|
||||
return loggedIn && (
|
||||
status.user.id === currentUser.id ||
|
||||
currentUser.privileges?.includes('messages_delete')
|
||||
currentUser.privileges.includes('messages_delete')
|
||||
)
|
||||
},
|
||||
confirm: ({ getters }) => getters.mergedConfig.modalOnDelete,
|
||||
|
|
|
|||
|
|
@ -135,9 +135,9 @@ export default {
|
|||
showModerationMenu () {
|
||||
const privileges = this.loggedIn.privileges
|
||||
return this.loggedIn.role === 'admin' ||
|
||||
privileges?.includes('users_manage_activation_state') ||
|
||||
privileges?.includes('users_delete')||
|
||||
privileges?.includes('users_manage_tags')
|
||||
privileges.includes('users_manage_activation_state') ||
|
||||
privileges.includes('users_delete')||
|
||||
privileges.includes('users_manage_tags')
|
||||
},
|
||||
hasNote () {
|
||||
return this.relationship.note
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ export const parseUser = (data) => {
|
|||
output.birthday = data.pleroma.birthday
|
||||
|
||||
if (data.pleroma.privileges) {
|
||||
output.privileges = data.pleroma.privileges
|
||||
output.privileges = data.pleroma.privileges ?? []
|
||||
} else if (data.pleroma.is_admin) {
|
||||
output.privileges = [
|
||||
'users_read',
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ export const useAnnouncementsStore = defineStore('announcements', {
|
|||
}
|
||||
|
||||
const currentUser = window.vuex.state.users.currentUser
|
||||
const isAdmin = currentUser && currentUser.privileges?.includes('announcements_manage_announcements')
|
||||
const isAdmin = currentUser && currentUser.privileges.includes('announcements_manage_announcements')
|
||||
|
||||
const getAnnouncements = async () => {
|
||||
if (!isAdmin) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue