+
@@ -165,7 +165,7 @@
diff --git a/src/components/settings_modal/admin_tabs/admin_status_card.js b/src/components/settings_modal/admin_tabs/admin_status_card.js
index 249caf7f0..3aec8cf8e 100644
--- a/src/components/settings_modal/admin_tabs/admin_status_card.js
+++ b/src/components/settings_modal/admin_tabs/admin_status_card.js
@@ -4,27 +4,27 @@ import Status from 'src/components/status/status.vue'
import { parseStatus } from 'src/services/entity_normalizer/entity_normalizer.service.js'
const AdminStatusCard = {
- props: ['status_details'],
+ props: ['statusDetails'],
data () {
return {
- json_expanded: false,
- status_cache: undefined,
+ jsonExpanded: false,
+ statusCache: undefined,
}
},
computed: {
- is_sensitive () {
- return this.status_details.sensitive === true
+ isSensitive () {
+ return this.statusDetails.sensitive === true
},
visibility () {
- return this.status_details.visibility
+ return this.statusDetails.visibility
}
},
methods: {
- change_sensitivity (v) {
- this.$store.dispatch('adminChangeStatusScope', { opts: { id: this.status_details.id, sensitive: v }}).then(res => parseStatus(res)).then(s => this.status_cache = s)
+ changeSensitivity (v) {
+ this.$store.dispatch('adminChangeStatusScope', { opts: { id: this.statusDetails.id, sensitive: v }}).then(res => parseStatus(res)).then(s => this.statusCache = s)
},
- change_visibility (v) {
- this.$store.dispatch('adminChangeStatusScope', { opts: { id: this.status_details.id, visibility: v }}).then(res => parseStatus(res)).then(s => this.status_cache = s)
+ changeVisibility (v) {
+ this.$store.dispatch('adminChangeStatusScope', { opts: { id: this.statusDetails.id, visibility: v }}).then(res => parseStatus(res)).then(s => this.statusCache = s)
}
},
components: {
@@ -33,7 +33,7 @@ const AdminStatusCard = {
Status,
},
mounted () {
- this.$store.dispatch('adminChangeStatusScope', { opts: { id: this.status_details.id }}).then(res => parseStatus(res)).then(s => this.status_cache = s)
+ this.$store.dispatch('adminChangeStatusScope', { opts: { id: this.statusDetails.id }}).then(res => parseStatus(res)).then(s => this.statusCache = s)
}
}
diff --git a/src/components/settings_modal/admin_tabs/admin_status_card.vue b/src/components/settings_modal/admin_tabs/admin_status_card.vue
index 0dbe5958d..388d1c58f 100644
--- a/src/components/settings_modal/admin_tabs/admin_status_card.vue
+++ b/src/components/settings_modal/admin_tabs/admin_status_card.vue
@@ -5,13 +5,13 @@
class="setting-list"
>
- {{ $t('admin_dash.users.status_id') }}: {{ status_details.id }}
+ {{ $t('admin_dash.users.status_id') }}: {{ statusDetails.id }}
- {{ $t('admin_dash.users.created_at') }}: {{ new Date(status_details.created_at).toLocaleString() }}
+ {{ $t('admin_dash.users.created_at') }}: {{ new Date(statusDetails.created_at).toLocaleString() }}
- {{ $t('admin_dash.users.edited_at') }}: {{ new Date(status_details.edited_at).toLocaleString() }}
+ {{ $t('admin_dash.users.edited_at') }}: {{ new Date(statusDetails.edited_at).toLocaleString() }}
{{ $t('admin_dash.users.title_content') }}:
@@ -20,10 +20,10 @@
>
@@ -31,15 +31,15 @@
change_sensitivity(v)"
+ :model-value="isSensitive"
+ @update:model-value="v => changeSensitivity(v)"
>
{{ $t('admin_dash.users.content_nsfw') }}
@@ -47,7 +47,7 @@
- {{ $t('admin_dash.users.link_source') }}
+ {{ $t('admin_dash.users.link_source') }}
-
+
@@ -88,12 +88,12 @@
{{ $t('admin_dash.users.title_details') }}
-
{{ JSON.stringify(status_details, null, 2) }}
+
{{ JSON.stringify(statusDetails, null, 2) }}
diff --git a/src/components/settings_modal/admin_tabs/users_tab.js b/src/components/settings_modal/admin_tabs/users_tab.js
index 65ff11a30..0cc030fdb 100644
--- a/src/components/settings_modal/admin_tabs/users_tab.js
+++ b/src/components/settings_modal/admin_tabs/users_tab.js
@@ -16,34 +16,36 @@ const UsersTab = {
data() {
return {
init: false,
- filters_origin: 'local',
- filters_activity: 'all',
- filters_permission: 'all',
- filters_query: '',
- filters_name: '',
- filters_email: '',
+ filtersOrigin: 'local',
+ filtersActivity: 'all',
+ filtersPermission: 'all',
+ filtersNeedApproval: false,
+ filtersUnconfirmed: false,
+ filtersQuery: '',
+ filtersName: '',
+ filtersEmail: '',
expandedUser: null,
loading: false
}
},
computed: {
- filters_is_admin () {
- return this.filters_permission === 'admin' || this.filters_permission === 'modsnadmins'
+ filtersIsAdmin () {
+ return this.filtersPermission === 'admin' || this.filtersPermission === 'modsnadmins'
},
- filters_is_moderator () {
- return this.filters_permission === 'moderator' || this.filters_permission === 'modsnadmins'
+ filtersIsModerator () {
+ return this.filtersPermission === 'moderator' || this.filtersPermission === 'modsnadmins'
},
- filters_active () {
- return this.filters_activity === 'active'
+ filtersActive () {
+ return this.filtersActivity === 'active'
},
- filters_deactivated () {
- return this.filters_activity === 'deactivated'
+ filtersDeactivated () {
+ return this.filtersActivity === 'deactivated'
},
- filters_local () {
- return this.filters_origin === 'local'
+ filtersLocal () {
+ return this.filtersOrigin === 'local'
},
- filters_external () {
- return this.filters_origin === 'external'
+ filtersExternal () {
+ return this.filtersOrigin === 'external'
}
},
components: {
@@ -56,36 +58,38 @@ const UsersTab = {
TabSwitcher,
},
methods: {
- fetch_page (store, opts) {
+ fetchPage (store, opts) {
if(!this.init) return new Promise(() => [])
const filters = {
- is_admin: this.filters_is_admin,
- is_moderator: this.filters_is_moderator,
- active: this.filters_active,
- deactivated: this.filters_deactivated,
- local: this.filters_local,
- external: this.filters_external
+ isAdmin: this.filtersIsAdmin,
+ isModerator: this.filtersIsModerator,
+ active: this.filtersActive,
+ deactivated: this.filtersDeactivated,
+ local: this.filtersLocal,
+ external: this.filtersExternal,
+ needApproval: this.filtersNeedApproval,
+ unconfirmed: this.filtersUnconfirmeUnconfirmed
}
const users = store.dispatch('fetchAdminUsers', { ...opts, ...{
- query: this.filters_query,
+ query: this.filtersQuery,
filters,
- name: this.filters_name,
- email: this.filters_email
+ name: this.filtersName,
+ email: this.filtersEmail
}})
return users
},
reset () {
this.$refs.userList.reset()
},
- activate_selection () {
+ activateSelection () {
const s = this.$refs.userList.getSelected()
s.forEach(u => this.$store.dispatch('adminActivateUser', this.$store.getters.findUser(u.id)))
},
- deactivate_selection () {
+ deactivateSelection () {
const s = this.$refs.userList.getSelected()
s.forEach(u => this.$store.dispatch('adminDeactivateUser', this.$store.getters.findUser(u.id)))
},
- delete_selection () {
+ deleteSelection () {
const s = this.$refs.userList.getSelected()
s.forEach(u => this.$store.dispatch('adminDeleteUser', this.$store.getters.findUser(u.id)))
this.reset()
diff --git a/src/components/settings_modal/admin_tabs/users_tab.vue b/src/components/settings_modal/admin_tabs/users_tab.vue
index 22e584571..3abd5a1aa 100644
--- a/src/components/settings_modal/admin_tabs/users_tab.vue
+++ b/src/components/settings_modal/admin_tabs/users_tab.vue
@@ -7,7 +7,7 @@
>
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 34aca1450..44548344c 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -116,34 +116,34 @@ const PLEROMA_ADMIN_CONFIG_URL = '/api/v1/pleroma/admin/config'
const PLEROMA_ADMIN_DESCRIPTIONS_URL = '/api/v1/pleroma/admin/config/descriptions'
const PLEROMA_ADMIN_FRONTENDS_URL = '/api/v1/pleroma/admin/frontends'
const PLEROMA_ADMIN_FRONTENDS_INSTALL_URL = '/api/v1/pleroma/admin/frontends/install'
-const PLEROMA_ADMIN_USERS_URL = ({page, page_size, filters = {}, query = '', name = '', email = ''}) => {
+const PLEROMA_ADMIN_USERS_URL = ({page, pageSize, filters = {}, query = '', name = '', email = ''}) => {
const {
local = false,
external = false,
active = false,
- need_approval = false,
+ needApproval = false,
unconfirmed = false,
deactivated = false,
- is_admin = true,
- is_moderator = true,
+ isAdmin = true,
+ isModerator = true,
} = filters
const filters_str = [
local && 'local',
external && 'external',
active && 'active',
- need_approval && 'need_approval',
+ needApproval && 'need_approval',
unconfirmed && 'unconfirmed',
deactivated && 'deactivated',
- is_admin && 'is_admin',
- is_moderator && 'is_moderator'
+ isAdmin && 'is_admin',
+ isModerator && 'is_moderator'
].filter(x => x).join(',')
- return `/api/v1/pleroma/admin/users?page=${page}&page_size=${page_size}&filters=${filters_str}&query=${query}&name=${name}&email=${email}`
+ return `/api/v1/pleroma/admin/users?page=${page}&page_size=${pageSize}&filters=${filters_str}&query=${query}&name=${name}&email=${email}`
}
const PLEROMA_ADMIN_MODIFY_GROUP_URL = (nickname, group) => `/api/v1/pleroma/admin/users/${nickname}/permission_group/${group}`
const PLEROMA_ADMIN_CONFIRM_USER_URL = '/api/v1/pleroma/admin/users/confirm_email'
const PLEROMA_ADMIN_RESEND_CONFIRMATION_EMAIL_URL = '/api/v1/pleroma/admin/users/resend_confirmation_email'
const PLEROMA_ADMIN_APPROVE_URL = '/api/v1/pleroma/admin/users/approve'
-const PLEROMA_ADMIN_LIST_STATUSES_URL = (id, page_size, godmode, with_reblogs) => `/api/v1/pleroma/admin/users/${id}/statuses?page_size=${page_size}&godmode=${godmode}&with_reblogs=${with_reblogs}`
+const PLEROMA_ADMIN_LIST_STATUSES_URL = (id, page_size, godmode, with_reblogs) => `/api/v1/pleroma/admin/users/${id}/statuses?page_size=${pageSize}&godmode=${godmode}&with_reblogs=${withReblogs}`
const PLEROMA_ADMIN_CHANGE_STATUS_SCOPE_URL = (id) => `/api/v1/pleroma/admin/statuses/${id}`
const PLEROMA_EMOJI_RELOAD_URL = '/api/pleroma/admin/reload_emoji'
@@ -1563,8 +1563,8 @@ const adminApproveUser = ({user : { screen_name: nickname }, credentials }) => {
return r
}
-const adminListStatuses = ({user: { id }, opts: { page_size, godmode, with_reblogs }, credentials }) => {
- const url = PLEROMA_ADMIN_LIST_STATUSES_URL(id, page_size, godmode, with_reblogs)
+const adminListStatuses = ({user: { id }, opts: { pageSize, godmode, withReblogs }, credentials }) => {
+ const url = PLEROMA_ADMIN_LIST_STATUSES_URL(id, pageSize, godmode, withReblogs)
return promisedRequest({url: url,
credentials,
method: 'GET'