diff --git a/src/components/announcement/announcement.js b/src/components/announcement/announcement.js index a1b20bf60..d1b8257d8 100644 --- a/src/components/announcement/announcement.js +++ b/src/components/announcement/announcement.js @@ -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 diff --git a/src/components/interactions/interactions.js b/src/components/interactions/interactions.js index 458dca859..fc441b908 100644 --- a/src/components/interactions/interactions.js +++ b/src/components/interactions/interactions.js @@ -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: { diff --git a/src/components/moderation_tools/moderation_tools.js b/src/components/moderation_tools/moderation_tools.js index a0c5884d4..bd57a353a 100644 --- a/src/components/moderation_tools/moderation_tools.js +++ b/src/components/moderation_tools/moderation_tools.js @@ -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 diff --git a/src/components/status_action_buttons/buttons_definitions.js b/src/components/status_action_buttons/buttons_definitions.js index 4e07839a2..bc1e45a98 100644 --- a/src/components/status_action_buttons/buttons_definitions.js +++ b/src/components/status_action_buttons/buttons_definitions.js @@ -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, diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js index 634d48502..f4ae5f12e 100644 --- a/src/components/user_card/user_card.js +++ b/src/components/user_card/user_card.js @@ -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 diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index 6d9afdc96..99ad2b30a 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -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', diff --git a/src/stores/announcements.js b/src/stores/announcements.js index 02b5b7cdd..5ee279835 100644 --- a/src/stores/announcements.js +++ b/src/stores/announcements.js @@ -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) {