+
+ u.adminData)
+ },
+ entries() {
+ return ENTRIES.map(({ check, label, separator, conditions }) => {
+ if (separator) return 'separator'
+ const [, negateToken, group, name] =
+ /^([!~]?)([a-z-_]+):([a-z-_]+)$/.exec(check)
+
+ const hasTag = this.tagsSet.has(`${group}:${name}`)
+ const noTag = this.tagsSet.has(`!${group}:${name}`)
+ const maybeTag = this.tagsSet.has(`~${group}:${name}`)
+
+ // We are checking for condition to show element, i.e. only show "activate" if user is "deactivated"
+ const checkNegated = negateToken === '!' || negateToken === '~'
+
+ // Naturally, new value should also be the same
+ const value = checkNegated
+
+ const action = (() => {
+ switch (group) {
+ case 'rights':
+ return () => this.setRight(name, value)
+ case 'state':
+ return () => this.setStatus(name, value)
+ case 'mrf_tag':
+ return () => this.setTag(`${group}:${name}`, noTag)
+ case 'action': {
+ switch (name) {
+ case 'delete':
+ return () => this.deleteUsers()
+ case 'resend_confirmation':
+ return () => this.resendConfirmationEmail()
+ case 'disable_mfa':
+ return () => this.disableMFA()
+ case 'statuses':
+ return () =>
+ this.$router.push(`/users/\$${this.users[0].id}/admin_view`)
+ case 'require_password_change':
+ return () => this.requirePasswordChange()
+ default:
+ throw new Error(`Unknown action group: ${name}`)
+ }
+ }
+ default:
+ throw new Error(`Unknown moderation group: ${group}`)
+ }
+ })()
+
+ let checkboxClass = ''
+ if (maybeTag) {
+ checkboxClass = 'menu-checkbox-indeterminate'
+ } else if (hasTag) {
+ checkboxClass = 'menu-checkbox-checked'
+ }
+
+ return {
+ check,
+ negateToken,
+ checkbox: group === 'mrf_tag',
+ checkboxClass,
+ conditions,
+ group,
+ name,
+ action,
+ label,
+ value,
+ }
+ })
+ .filter((entry) => {
+ if (entry === 'separator') return true
+ const { group, name, value, conditions } = entry
+
+ if (conditions) {
+ // Checking that all items match positive criteria
+ const positive = conditions.every((condition) =>
+ this.totalSet.has(condition),
+ )
+ // Checking that there are no items that don't match criteria
+ const negative = conditions.some((condition) =>
+ this.totalSet.has('!' + condition),
+ )
+ if (!(positive && !negative)) return false
+ }
+
+ switch (group) {
+ case 'action':
+ if (name === 'statuses') return this.privileged('users_read')
+ else return true
+ case 'rights':
+ return this.canGrantRole(name, value)
+ case 'state':
+ return this.canChangeState(name, value)
+ case 'mrf_tag':
+ return this.canUseTagPolicy
+ default: {
+ throw new Error(`Unknown moderation group: ${group}`)
+ }
+ }
+ })
+ .reduce((acc, entry, index) => {
+ // Removing any double separators as well
+ // as separators at very end and bery beginning
+ if (entry === 'separator') {
+ if (
+ acc.length === 0 ||
+ last(acc) === 'separator' ||
+ index === ENTRIES.length - 1
+ ) {
+ return acc
+ }
+ }
+ return [...acc, entry]
+ }, [])
+ },
+ rightsSet() {
+ return this.users.reduce((acc, user) => {
+ if (user.rights.admin) {
+ acc.add('rights:admin')
+ } else {
+ acc.add('!rights:admin')
+ }
+ if (user.rights.moderator) {
+ acc.add('rights:moderator')
+ } else {
+ acc.add('!rights:moderator')
+ }
+ return acc
+ }, new Set())
+ },
+ stateSet() {
+ return this.users.reduce((acc, user) => {
+ if (!user.deactivated) {
+ acc.add('state:activated')
+ } else {
+ acc.add('!state:activated')
+ }
+ if (user.adminData?.is_confirmed) {
+ acc.add('state:confirmed')
+ } else {
+ acc.add('!state:confirmed')
+ }
+ if (user.adminData?.is_approved) {
+ acc.add('state:approved')
+ } else {
+ acc.add('!state:approved')
+ }
+ if (user.adminData?.is_suggested) {
+ acc.add('state:suggested')
+ } else {
+ acc.add('!state:suggested')
+ }
+ return acc
+ }, new Set())
+ },
tagsSet() {
- return new Set(this.user.tags)
+ const present = new Set()
+ const missing = new Set()
+
+ this.users.forEach((user) => {
+ TAGS.forEach((tag) => {
+ if (user.tags.has(tag)) {
+ present.add(tag)
+ } else {
+ missing.add(tag)
+ }
+ })
+ })
+
+ const result = new Set()
+
+ // Each tag can have three states for given group of users
+ TAGS.forEach((tag) => {
+ if (present.has(tag) && missing.has(tag)) {
+ // Some users have tag, some don't: "~tag"
+ result.add(`~${tag}`)
+ } else if (missing.has(tag)) {
+ // No users have tag: "!tag"
+ result.add(`!${tag}`)
+ } else {
+ // All users have tag: "tag"
+ result.add(tag)
+ }
+ })
+
+ return result
},
- canGrantRole() {
- return (
- this.user.is_local &&
- !this.user.deactivated &&
- this.$store.state.users.currentUser.role === 'admin'
- )
+ propertySet() {
+ return this.users.reduce((acc, user) => {
+ if (user.is_local) {
+ acc.add('property:local')
+ } else {
+ acc.add('!property:local')
+ }
+ return acc
+ }, new Set())
},
- canChangeActivationState() {
- return this.privileged('users_manage_activation_state')
+ disabled() {
+ return !this.ready || this.users.length === 0
+ },
+ totalSet() {
+ return new Set([
+ ...this.rightsSet,
+ ...this.stateSet,
+ ...this.tagsSet,
+ ...this.propertySet,
+ `count:${this.users.length}`,
+ ])
},
canDeleteAccount() {
return this.privileged('users_delete')
@@ -61,89 +405,266 @@ const ModerationTools = {
this.privileged('users_manage_tags')
)
},
+ isAdmin() {
+ this.$store.state.users.currentUser.role === 'admin'
+ },
},
methods: {
- hasTag(tagName) {
- return this.tagsSet.has(tagName)
+ canGrantRole(name, value) {
+ const setEntry = `${value ? '!' : ''}rights:${name}`
+
+ return this.isAdmin && this.totalSet.has(setEntry)
+ },
+ canChangeState(name, value) {
+ const setEntry = `${value ? '!' : ''}state:${name}`
+ const privilege = (() => {
+ switch (name) {
+ case 'activated':
+ return 'users_manage_activation_state'
+ case 'approved':
+ return 'users_manage_invites'
+ case 'confirmed':
+ return 'users_manage_credentials'
+ default:
+ return null
+ }
+ })()
+
+ return this.privileged(privilege) && this.totalSet.has(setEntry)
+ },
+ doConfirmDialogAction() {
+ if (typeof this.confirmDialogAction !== 'function') {
+ console.error('Confirm Dialog action is not a function!!')
+ }
+
+ this.confirmDialogAction()
+ this.clearConfirmDialog()
+ },
+ clearConfirmDialog() {
+ this.confirmDialogShow = false
+ this.confirmDialogTitle = null
+ this.confirmDialogContent = null
+ this.confirmDialogContent2 = null
+ this.confirmDialogDanger = false
+ this.confirmDialogConfirm = null
+ this.confirmDialogAction = null
+ this.confirmDialogGroup = null
+ this.confirmDialogName = null
},
privileged(privilege) {
- return this.$store.state.users.currentUser.privileges.includes(privilege)
+ if (this.isAdmin) return true
+ return this.$store.state.users.currentUser.privileges.has(privilege)
},
- toggleTag(tag) {
- const store = this.$store
- if (this.tagsSet.has(tag)) {
- store.state.api.backendInteractor
- .untagUser({ user: this.user, tag })
- .then((response) => {
- if (!response.ok) {
- return
- }
- store.commit('untagUser', { user: this.user, tag })
- })
- } else {
- store.state.api.backendInteractor
- .tagUser({ user: this.user, tag })
- .then((response) => {
- if (!response.ok) {
- return
- }
- store.commit('tagUser', { user: this.user, tag })
- })
- }
- },
- toggleRight(right) {
- const store = this.$store
- if (this.user.rights[right]) {
- store.state.api.backendInteractor
- .deleteRight({ user: this.user, right })
- .then((response) => {
- if (!response.ok) {
- return
- }
- store.commit('updateRight', {
- user: this.user,
- right,
- value: false,
- })
- })
- } else {
- store.state.api.backendInteractor
- .addRight({ user: this.user, right })
- .then((response) => {
- if (!response.ok) {
- return
- }
- store.commit('updateRight', { user: this.user, right, value: true })
- })
- }
- },
- toggleActivationStatus() {
- this.$store.dispatch('toggleActivationStatus', { user: this.user })
- },
- deleteUserDialog(show) {
- this.showDeleteUserDialog = show
- },
- deleteUser() {
- const store = this.$store
- const user = this.user
- const { id, name } = user
- store.state.api.backendInteractor.deleteUser({ user }).then(() => {
- this.$store.dispatch(
- 'markStatusesAsDeleted',
- (status) => user.id === status.user.id,
- )
- const isProfile =
- this.$route.name === 'external-user-profile' ||
- this.$route.name === 'user-profile'
- const isTargetUser =
- this.$route.params.name === name || this.$route.params.id === id
- if (isProfile && isTargetUser) {
- window.history.back()
- }
+ setTag(tag, value) {
+ useAdminSettingsStore().setUsersTags({
+ users: this.users,
+ value,
+ tags: [tag],
})
},
- setToggled(value) {
- this.toggled = value
+ setRight(right, value) {
+ useAdminSettingsStore().setUsersRight({ users: this.users, value, right })
+ },
+ setStatus(name, value) {
+ const noun = (() => {
+ switch (name) {
+ case 'activated':
+ return 'Activation'
+ case 'confirmed':
+ return 'Confirmation'
+ case 'approved':
+ return 'Approval'
+ case 'suggested':
+ return 'Suggestion'
+ }
+ })()
+
+ useAdminSettingsStore()[`setUsers${noun}Status`]({
+ users: this.users,
+ value,
+ })
+ },
+ resendConfirmationEmail() {
+ useAdminSettingsStore().resendConfirmationEmail({ users: this.users })
+ },
+ requirePasswordChange() {
+ useAdminSettingsStore().requirePasswordChange({ users: this.users })
+ },
+ disableMFA() {
+ this.users.forEach((user) => {
+ useAdminSettingsStore().disableMFA({ user })
+ })
+ },
+ deleteUsers() {
+ const { id, name } = this.users[0]
+
+ useAdminSettingsStore()
+ .deleteUsers({ users: this.users })
+ .then((userIds) => {
+ if (userIds.length > 1) return
+
+ const isProfile =
+ this.$route.name === 'external-user-profile' ||
+ this.$route.name === 'user-profile'
+ const isTargetUser =
+ this.$route.params.name === name || this.$route.params.id === id
+
+ if (isProfile && isTargetUser) {
+ window.history.back()
+ }
+ })
+ },
+ setOpen(value) {
+ this.open = value
+ },
+ maybeShowConfirm(close, { group, name, action, value }) {
+ close()
+ this.confirmDialogName = name
+ this.confirmDialogGroup = group
+ this.confirmDialogAction = () => action()
+
+ switch (group) {
+ case 'action': {
+ switch (name) {
+ case 'delete': {
+ this.confirmDialogShow = true
+ this.confirmDialogTitle = this.$t(
+ 'user_card.admin_menu.confirm_modal.delete_title',
+ )
+ this.confirmDialogDanger = true
+ this.confirmDialogContent =
+ 'user_card.admin_menu.confirm_modal.delete_content'
+ this.confirmDialogContent2 =
+ 'user_card.admin_menu.confirm_modal.delete_content_2'
+ this.confirmDialogConfirm = this.$t(
+ 'user_card.admin_menu.confirm_modal.delete',
+ )
+ break
+ }
+ case 'resend_confirmation': {
+ this.confirmDialogShow = true
+ this.confirmDialogTitle = this.$t(
+ 'user_card.admin_menu.confirm_modal.resend_confirmation_title',
+ )
+ this.confirmDialogContent =
+ 'user_card.admin_menu.confirm_modal.resend_confirmation_content'
+ this.confirmDialogConfirm = this.$t(
+ 'user_card.admin_menu.confirm_modal.send',
+ )
+ break
+ }
+ case 'disable_mfa': {
+ this.confirmDialogShow = true
+ this.confirmDialogTitle = this.$t(
+ 'user_card.admin_menu.confirm_modal.disable_mfa_title',
+ )
+ this.confirmDialogContent =
+ 'user_card.admin_menu.confirm_modal.disable_mfa_content'
+ this.confirmDialogConfirm = this.$t('settings.confirm')
+ break
+ }
+ case 'require_password_change': {
+ this.confirmDialogShow = true
+ this.confirmDialogTitle = this.$t(
+ 'user_card.admin_menu.confirm_modal.require_password_change_title',
+ )
+ this.confirmDialogContent =
+ 'user_card.admin_menu.confirm_modal.require_password_change_content'
+ this.confirmDialogConfirm = this.$t('settings.confirm')
+ break
+ }
+ }
+ break
+ }
+ case 'state': {
+ switch (name) {
+ case 'activated': {
+ this.confirmDialogShow = true
+
+ this.confirmDialogTitle = this.$t(
+ 'user_card.admin_menu.confirm_modal.activate_title',
+ )
+ this.confirmDialogContent = value
+ ? 'user_card.admin_menu.confirm_modal.activate_content'
+ : 'user_card.admin_menu.confirm_modal.deactivate_content'
+ this.confirmDialogConfirm = value
+ ? this.$t('user_card.admin_menu.confirm_modal.activate')
+ : this.$t('user_card.admin_menu.confirm_modal.deactivate')
+ break
+ }
+ // Confirmation and Approval statuses cannot be revokedn(no API)
+ case 'confirmed': {
+ this.confirmDialogTitle = this.$t(
+ 'user_card.admin_menu.confirm_modal.confirm_title',
+ )
+ this.confirmDialogContent = //value
+ /*?*/ 'user_card.admin_menu.confirm_modal.confirm_content'
+ //: 'user_card.admin_menu.confirm_modal.confirm_revoke_content'
+ this.confirmDialogConfirm = value
+ /*?*/ this.$t('user_card.admin_menu.confirm_modal.confirm')
+ //: this.$t('user_card.admin_menu.confirm_modal.revoke')
+ break
+ }
+ case 'approved': {
+ this.confirmDialogTitle = this.$t(
+ 'user_card.admin_menu.confirm_modal.approval_title',
+ )
+ this.confirmDialogContent = //value
+ /*?*/ 'user_card.admin_menu.confirm_modal.approval_content'
+ //: 'user_card.admin_menu.confirm_modal.approval_revoke_content'
+ this.confirmDialogConfirm = value
+ /*?*/ this.$t('user_card.admin_menu.confirm_modal.approve')
+ //: this.$t('user_card.admin_menu.confirm_modal.revoke')
+ break
+ }
+ case 'suggested': {
+ this.confirmDialogTitle = this.$t(
+ 'user_card.admin_menu.confirm_modal.suggest_title',
+ )
+ this.confirmDialogContent = value
+ ? 'user_card.admin_menu.confirm_modal.add_suggest_content'
+ : 'user_card.admin_menu.confirm_modal.remove_suggest_content'
+ this.confirmDialogConfirm = value
+ ? this.$t('user_card.admin_menu.confirm_modal.add')
+ : this.$t('user_card.admin_menu.confirm_modal.remove')
+ break
+ }
+ }
+ break
+ }
+ case 'rights': {
+ this.confirmDialogTitle = this.$t(
+ 'user_card.admin_menu.confirm_modal.user_rights_title',
+ )
+ this.confirmDialogContent = value
+ ? 'user_card.admin_menu.confirm_modal.grant_role_content'
+ : 'user_card.admin_menu.confirm_modal.revoke_role_content'
+ this.confirmDialogConfirm = value
+ ? this.$t('user_card.admin_menu.confirm_modal.grant')
+ : this.$t('user_card.admin_menu.confirm_modal.revoke')
+ break
+ }
+ case 'mrf_tag': {
+ this.confirmDialogTitle = this.$t(
+ 'user_card.admin_menu.user_tag_title',
+ )
+ this.confirmDialogContent = value
+ ? 'user_card.admin_menu.confirm_modal.assign_tag_content'
+ : 'user_card.admin_menu.confirm_modal.unassign_tag_content'
+ this.confirmDialogConfirm = value
+ ? this.$t('user_card.admin_menu.confirm_modal.assign')
+ : this.$t('user_card.admin_menu.confirm_modal.unassign')
+ break
+ }
+ }
+
+ if (this.users.length > 1) {
+ this.confirmDialogShow = true
+ }
+
+ if (!this.confirmDialogShow) {
+ this.doConfirmDialogAction()
+ }
},
},
}
diff --git a/src/components/moderation_tools/moderation_tools.vue b/src/components/moderation_tools/moderation_tools.vue
index da33b89dc..4da0be0ee 100644
--- a/src/components/moderation_tools/moderation_tools.vue
+++ b/src/components/moderation_tools/moderation_tools.vue
@@ -3,154 +3,37 @@
-
+
diff --git a/src/components/mute_card/mute_card.vue b/src/components/mute_card/mute_card.vue
index 83520dc22..a9418cffa 100644
--- a/src/components/mute_card/mute_card.vue
+++ b/src/components/mute_card/mute_card.vue
@@ -1,5 +1,5 @@
-
+
-
+
diff --git a/src/components/popover/popover.scss b/src/components/popover/popover.scss
index a166e2196..7dfaa28a5 100644
--- a/src/components/popover/popover.scss
+++ b/src/components/popover/popover.scss
@@ -96,6 +96,11 @@
content: "✓";
}
+ &.menu-checkbox-indeterminate::after {
+ font-size: 1.25em;
+ content: "–";
+ }
+
&.-radio {
border-radius: 9999px;
@@ -103,6 +108,11 @@
font-size: 2em;
content: "•";
}
+
+ &.menu-checkbox-indeterminate::after {
+ font-size: 2em;
+ content: "–";
+ }
}
}
}
diff --git a/src/components/selectable_list/selectable_list.js b/src/components/selectable_list/selectable_list.js
deleted file mode 100644
index b82b3d40c..000000000
--- a/src/components/selectable_list/selectable_list.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import Checkbox from 'src/components/checkbox/checkbox.vue'
-import List from 'src/components/list/list.vue'
-
-const SelectableList = {
- components: {
- List,
- Checkbox,
- },
- props: {
- items: {
- type: Array,
- default: () => [],
- },
- getKey: {
- type: Function,
- default: (item) => item.id,
- },
- },
- data() {
- return {
- selected: [],
- }
- },
- computed: {
- allKeys() {
- return this.items.map(this.getKey)
- },
- filteredSelected() {
- return this.allKeys.filter((key) => this.selected.indexOf(key) !== -1)
- },
- allSelected() {
- return this.filteredSelected.length === this.items.length
- },
- noneSelected() {
- return this.filteredSelected.length === 0
- },
- someSelected() {
- return !this.allSelected && !this.noneSelected
- },
- },
- methods: {
- isSelected(item) {
- return this.filteredSelected.indexOf(this.getKey(item)) !== -1
- },
- toggle(checked, item) {
- const key = this.getKey(item)
- const oldChecked = this.isSelected(key)
- if (checked !== oldChecked) {
- if (checked) {
- this.selected.push(key)
- } else {
- this.selected.splice(this.selected.indexOf(key), 1)
- }
- }
- },
- toggleAll(value) {
- if (value) {
- this.selected = this.allKeys.slice(0)
- } else {
- this.selected = []
- }
- },
- },
-}
-
-export default SelectableList
diff --git a/src/components/selectable_list/selectable_list.vue b/src/components/selectable_list/selectable_list.vue
deleted file mode 100644
index 3d3a5ff04..000000000
--- a/src/components/selectable_list/selectable_list.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
+
+
+
+
+
+
+
diff --git a/src/components/settings_modal/admin_tabs/auth_tab.js b/src/components/settings_modal/admin_tabs/auth_tab.js
index 627150587..7ccae2ca0 100644
--- a/src/components/settings_modal/admin_tabs/auth_tab.js
+++ b/src/components/settings_modal/admin_tabs/auth_tab.js
@@ -9,6 +9,8 @@ import SharedComputedObject from '../helpers/shared_computed_object.js'
import StringSetting from '../helpers/string_setting.vue'
import TupleSetting from '../helpers/tuple_setting.vue'
+import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
+
const AuthTab = {
provide() {
return {
@@ -30,9 +32,7 @@ const AuthTab = {
computed: {
...SharedComputedObject(),
LDAPEnabled() {
- return this.$store.state.adminSettings.draft[':pleroma'][':ldap'][
- ':enabled'
- ]
+ return useAdminSettingsStore().draft[':pleroma'][':ldap'][':enabled']
},
},
}
diff --git a/src/components/settings_modal/admin_tabs/emoji_tab.scss b/src/components/settings_modal/admin_tabs/emoji_tab.scss
index 2f3b5aa40..fd5b53caa 100644
--- a/src/components/settings_modal/admin_tabs/emoji_tab.scss
+++ b/src/components/settings_modal/admin_tabs/emoji_tab.scss
@@ -3,6 +3,11 @@
margin: 0.5em 2em;
}
+ .setting-section {
+ margin-left: 0.5em;
+ margin-right: 0.5em;
+ }
+
.toolbar {
display: flex;
flex-wrap: wrap;
diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.js b/src/components/settings_modal/admin_tabs/frontends_tab.js
index b76cd9015..9bec3d763 100644
--- a/src/components/settings_modal/admin_tabs/frontends_tab.js
+++ b/src/components/settings_modal/admin_tabs/frontends_tab.js
@@ -7,6 +7,7 @@ import IntegerSetting from '../helpers/integer_setting.vue'
import SharedComputedObject from '../helpers/shared_computed_object.js'
import StringSetting from '../helpers/string_setting.vue'
+import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
import { useInterfaceStore } from 'src/stores/interface.js'
import { library } from '@fortawesome/fontawesome-svg-core'
@@ -37,13 +38,13 @@ const FrontendsTab = {
},
created() {
if (this.user.rights.admin) {
- this.$store.dispatch('loadFrontendsStuff')
+ useAdminSettingsStore().loadFrontendsStuff()
}
},
computed: {
...SharedComputedObject(),
frontends() {
- return this.$store.state.adminSettings.frontends
+ return useAdminSettingsStore().frontends
},
},
methods: {
@@ -76,7 +77,7 @@ const FrontendsTab = {
this.working = false
})
.then(async (response) => {
- this.$store.dispatch('loadFrontendsStuff')
+ useAdminSettingsStore().loadFrontendsStuff()
if (response.error) {
const reason = await response.error.json()
useInterfaceStore().pushGlobalNotice({
@@ -104,7 +105,7 @@ const FrontendsTab = {
const ref = suggestRef || this.getSuggestedRef(frontend)
const { name } = frontend
- this.$store.commit('updateAdminDraft', {
+ useAdminSettingsStore().updateAdminDraft({
path: [':pleroma', ':frontends', ':primary'],
value: { name, ref },
})
diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.scss b/src/components/settings_modal/admin_tabs/frontends_tab.scss
index 27c1fdc55..8b7b1f4e3 100644
--- a/src/components/settings_modal/admin_tabs/frontends_tab.scss
+++ b/src/components/settings_modal/admin_tabs/frontends_tab.scss
@@ -1,4 +1,6 @@
.FrontendsTab {
+ padding: 0 1em;
+
.cards-list {
padding: 0;
}
@@ -34,7 +36,8 @@
h5 {
margin: 0;
- font-size: 1.15em
+ font-size: 1.15em;
+ text-transform: capitalize;
}
dl {
diff --git a/src/components/settings_modal/admin_tabs/http_tab.js b/src/components/settings_modal/admin_tabs/http_tab.js
index ea76ebe6f..1e45763f9 100644
--- a/src/components/settings_modal/admin_tabs/http_tab.js
+++ b/src/components/settings_modal/admin_tabs/http_tab.js
@@ -12,6 +12,8 @@ import SharedComputedObject from '../helpers/shared_computed_object.js'
import StringSetting from '../helpers/string_setting.vue'
import TupleSetting from '../helpers/tuple_setting.vue'
+import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
+
const HTTPTab = {
provide() {
return {
@@ -35,7 +37,7 @@ const HTTPTab = {
...SharedComputedObject(),
sslOptions() {
const desc = get(
- this.$store.state.adminSettings.descriptions,
+ useAdminSettingsStore().descriptions,
':pleroma.:http.:adapter.:ssl_options.:versions',
)
return new Set(
diff --git a/src/components/settings_modal/admin_tabs/instance_tab.js b/src/components/settings_modal/admin_tabs/instance_tab.js
index 67d04c303..a428a78f9 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.js
+++ b/src/components/settings_modal/admin_tabs/instance_tab.js
@@ -12,6 +12,8 @@ import PWAManifestIconsSetting from '../helpers/pwa_manifest_icons_setting.vue'
import SharedComputedObject from '../helpers/shared_computed_object.js'
import StringSetting from '../helpers/string_setting.vue'
+import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
+
const InstanceTab = {
provide() {
return {
@@ -34,7 +36,7 @@ const InstanceTab = {
computed: {
...SharedComputedObject(),
providersOptions() {
- const desc = get(this.$store.state.adminSettings.descriptions, [
+ const desc = get(useAdminSettingsStore().descriptions, [
':pleroma',
'Pleroma.Web.Metadata',
':providers',
@@ -47,7 +49,7 @@ const InstanceTab = {
)
},
limitLocalContentOptions() {
- const desc = get(this.$store.state.adminSettings.descriptions, [
+ const desc = get(useAdminSettingsStore().descriptions, [
':pleroma',
':instance',
':limit_to_local_content',
diff --git a/src/components/settings_modal/admin_tabs/links_tab.js b/src/components/settings_modal/admin_tabs/links_tab.js
index b3b5f1f2e..a6b99483b 100644
--- a/src/components/settings_modal/admin_tabs/links_tab.js
+++ b/src/components/settings_modal/admin_tabs/links_tab.js
@@ -10,6 +10,8 @@ import ListSetting from '../helpers/list_setting.vue'
import SharedComputedObject from '../helpers/shared_computed_object.js'
import StringSetting from '../helpers/string_setting.vue'
+import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
+
const LinksTab = {
provide() {
return {
@@ -30,27 +32,27 @@ const LinksTab = {
computed: {
classIsPresent() {
return (
- this.$store.state.adminSettings.draft[':pleroma']['Pleroma.Formatter'][
+ useAdminSettingsStore().draft[':pleroma']['Pleroma.Formatter'][
':class'
] !== false
)
},
relIsPresent() {
return (
- this.$store.state.adminSettings.draft[':pleroma']['Pleroma.Formatter'][
+ useAdminSettingsStore().draft[':pleroma']['Pleroma.Formatter'][
':rel'
] !== false
)
},
truncateIsPresent() {
return (
- this.$store.state.adminSettings.draft[':pleroma']['Pleroma.Formatter'][
+ useAdminSettingsStore().draft[':pleroma']['Pleroma.Formatter'][
':truncate'
] !== false
)
},
truncateDescription() {
- return get(this.$store.state.adminSettings.descriptions, [
+ return get(useAdminSettingsStore().descriptions, [
':pleroma',
'Pleroma.Formatter',
':truncate',
@@ -58,7 +60,7 @@ const LinksTab = {
},
ttlSettersOptions() {
const desc = get(
- this.$store.state.adminSettings.descriptions,
+ useAdminSettingsStore().descriptions,
':pleroma.:rich_media.:ttl_setters',
)
return new Set(
@@ -70,7 +72,7 @@ const LinksTab = {
},
parsersOptions() {
const desc = get(
- this.$store.state.adminSettings.descriptions,
+ useAdminSettingsStore().descriptions,
':pleroma.:rich_media.:parsers',
)
return new Set(
@@ -97,12 +99,12 @@ const LinksTab = {
]
},
mediaProxyEnabled() {
- return this.$store.state.adminSettings.draft[':pleroma'][':media_proxy'][
+ return useAdminSettingsStore().draft[':pleroma'][':media_proxy'][
':enabled'
]
},
mediaInvalidationProvider() {
- return this.$store.state.adminSettings.draft[':pleroma'][':media_proxy'][
+ return useAdminSettingsStore().draft[':pleroma'][':media_proxy'][
':invalidation'
][':provider']
},
@@ -110,19 +112,19 @@ const LinksTab = {
},
methods: {
checkRel(e) {
- this.$store.commit('updateAdminDraft', {
+ useAdminSettingsStore().updateAdminDraft({
path: [':pleroma', 'Pleroma.Formatter', ':rel'],
value: e ? '' : false,
})
},
checkClass(e) {
- this.$store.commit('updateAdminDraft', {
+ useAdminSettingsStore().updateAdminDraft({
path: [':pleroma', 'Pleroma.Formatter', ':class'],
value: e ? '' : false,
})
},
checkTruncate(e) {
- this.$store.commit('updateAdminDraft', {
+ useAdminSettingsStore().updateAdminDraft({
path: [':pleroma', 'Pleroma.Formatter', ':truncate'],
value: e ? 20 : false,
})
diff --git a/src/components/settings_modal/admin_tabs/mailer_tab.js b/src/components/settings_modal/admin_tabs/mailer_tab.js
index 0b909334b..b0750474b 100644
--- a/src/components/settings_modal/admin_tabs/mailer_tab.js
+++ b/src/components/settings_modal/admin_tabs/mailer_tab.js
@@ -7,6 +7,8 @@ import IntegerSetting from '../helpers/integer_setting.vue'
import SharedComputedObject from '../helpers/shared_computed_object.js'
import StringSetting from '../helpers/string_setting.vue'
+import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
+
const MailerTab = {
provide() {
return {
@@ -26,7 +28,7 @@ const MailerTab = {
computed: {
adaptersLabels() {
const prefix = 'Swoosh.Adapters.'
- const descriptions = this.$store.state.adminSettings.descriptions
+ const descriptions = useAdminSettingsStore().descriptions
const options =
descriptions[':pleroma']['Pleroma.Emails.Mailer'][':adapter']
.suggestions
@@ -46,20 +48,20 @@ const MailerTab = {
// ]))
},
adapter() {
- return this.$store.state.adminSettings.draft[':pleroma'][
- 'Pleroma.Emails.Mailer'
- ][':adapter']
+ return useAdminSettingsStore().draft[':pleroma']['Pleroma.Emails.Mailer'][
+ ':adapter'
+ ]
},
mailerEnabled() {
- return this.$store.state.adminSettings.draft[':pleroma'][
- 'Pleroma.Emails.Mailer'
- ][':enabled']
+ return useAdminSettingsStore().draft[':pleroma']['Pleroma.Emails.Mailer'][
+ ':enabled'
+ ]
},
...SharedComputedObject(),
},
methods: {
adapterHasKey(key) {
- const descriptions = this.$store.state.adminSettings.descriptions
+ const descriptions = useAdminSettingsStore().descriptions
const mailerStuff = descriptions[':pleroma']['Pleroma.Emails.Mailer']
const adapterStuff = mailerStuff[':subgroup,' + this.adapter]
return Object.hasOwn(adapterStuff, key)
diff --git a/src/components/settings_modal/admin_tabs/media_proxy_tab.js b/src/components/settings_modal/admin_tabs/media_proxy_tab.js
index 6c7231312..9f8a7140e 100644
--- a/src/components/settings_modal/admin_tabs/media_proxy_tab.js
+++ b/src/components/settings_modal/admin_tabs/media_proxy_tab.js
@@ -7,6 +7,8 @@ import ListSetting from '../helpers/list_setting.vue'
import SharedComputedObject from '../helpers/shared_computed_object.js'
import StringSetting from '../helpers/string_setting.vue'
+import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
+
const MediaProxyTab = {
provide() {
return {
@@ -25,12 +27,12 @@ const MediaProxyTab = {
},
computed: {
mediaProxyEnabled() {
- return this.$store.state.adminSettings.draft[':pleroma'][':media_proxy'][
+ return useAdminSettingsStore().draft[':pleroma'][':media_proxy'][
':enabled'
]
},
mediaInvalidationProvider() {
- return this.$store.state.adminSettings.draft[':pleroma'][':media_proxy'][
+ return useAdminSettingsStore().draft[':pleroma'][':media_proxy'][
':invalidation'
][':provider']
},
diff --git a/src/components/settings_modal/admin_tabs/uploads_tab.js b/src/components/settings_modal/admin_tabs/uploads_tab.js
index 760206499..90be43a17 100644
--- a/src/components/settings_modal/admin_tabs/uploads_tab.js
+++ b/src/components/settings_modal/admin_tabs/uploads_tab.js
@@ -4,6 +4,8 @@ import IntegerSetting from '../helpers/integer_setting.vue'
import SharedComputedObject from '../helpers/shared_computed_object.js'
import StringSetting from '../helpers/string_setting.vue'
+import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
+
const UploadsTab = {
provide() {
return {
@@ -40,9 +42,9 @@ const UploadsTab = {
},
computed: {
uploader() {
- return this.$store.state.adminSettings.draft[':pleroma'][
- 'Pleroma.Upload'
- ][':uploader']
+ return useAdminSettingsStore().draft[':pleroma']['Pleroma.Upload'][
+ ':uploader'
+ ]
},
...SharedComputedObject(),
},
diff --git a/src/components/settings_modal/admin_tabs/users_tab.js b/src/components/settings_modal/admin_tabs/users_tab.js
new file mode 100644
index 000000000..ab40c723a
--- /dev/null
+++ b/src/components/settings_modal/admin_tabs/users_tab.js
@@ -0,0 +1,119 @@
+import { isEmpty } from 'lodash'
+
+import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue'
+import Checkbox from 'src/components/checkbox/checkbox.vue'
+import List from 'src/components/list/list.vue'
+import ModerationTools from 'src/components/moderation_tools/moderation_tools.vue'
+import Select from 'src/components/select/select.vue'
+import AdminUserCard from 'src/components/settings_modal/admin_tabs/admin_user_card.vue'
+
+import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
+
+const UsersTab = {
+ components: {
+ Checkbox,
+ Select,
+ BasicUserCard,
+ List,
+ AdminUserCard,
+ ModerationTools,
+ },
+ data() {
+ return {
+ filtersOrigin: 'local',
+ filtersActivity: 'all',
+ filtersPrivileges: 'all',
+ filtersNeedApproval: false,
+ filtersUnconfirmed: false,
+ filtersQuery: '',
+ filtersName: '',
+ filtersEmail: '',
+ expandedUser: null,
+ }
+ },
+ computed: {
+ /**
+ * do we filter for admins?
+ * @returns {boolean}
+ */
+ filtersIsAdmin() {
+ return (
+ this.filtersPrivileges === 'admin' ||
+ this.filtersPrivileges === 'modsnadmins'
+ )
+ },
+ /**
+ * do we filter for moderators?
+ * @returns {boolean}
+ */
+ filtersIsModerator() {
+ return (
+ this.filtersPrivileges === 'moderator' ||
+ this.filtersPrivileges === 'modsnadmins'
+ )
+ },
+ /**
+ * do we filter for active users?
+ * @returns {boolean}
+ */
+ filtersActive() {
+ return this.filtersActivity === 'active'
+ },
+ /**
+ * do we filter for deactivated users?
+ * @returns {boolean}
+ */
+ filtersDeactivated() {
+ return this.filtersActivity === 'deactivated'
+ },
+ /**
+ * do we filter for local users?
+ * @returns {boolean}
+ */
+ filtersLocal() {
+ return this.filtersOrigin === 'local'
+ },
+ /**
+ * do we filter for external users?
+ * @return {boolean}
+ */
+ filtersExternal() {
+ return this.filtersOrigin === 'external'
+ },
+ fetchOptions() {
+ const filters = {
+ isAdmin: this.filtersIsAdmin,
+ isModerator: this.filtersIsModerator,
+ active: this.filtersActive,
+ deactivated: this.filtersDeactivated,
+ local: this.filtersLocal,
+ external: this.filtersExternal,
+ needApproval: this.filtersNeedApproval,
+ unconfirmed: this.filtersUnconfirmed,
+ }
+
+ return {
+ query: this.filtersQuery,
+ name: this.filtersName,
+ email: this.filtersEmail,
+ pageSize: 50,
+ filters,
+ }
+ },
+ },
+ methods: {
+ fetchUsers(page) {
+ return useAdminSettingsStore().fetchUsers({
+ ...this.fetchOptions,
+ page,
+ })
+ },
+ },
+ watch: {
+ fetchOptions() {
+ this.$refs.usersList?.reset()
+ },
+ },
+}
+
+export default UsersTab
diff --git a/src/components/settings_modal/admin_tabs/users_tab.scss b/src/components/settings_modal/admin_tabs/users_tab.scss
new file mode 100644
index 000000000..fe370cd71
--- /dev/null
+++ b/src/components/settings_modal/admin_tabs/users_tab.scss
@@ -0,0 +1,49 @@
+.UsersTab {
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ padding: 0;
+
+ h3 {
+ margin-left: 0.5em;
+ margin-right: 0.5em;
+ }
+
+ .splitter {
+ height: 100%;
+ display: flex;
+ overflow-y: hidden;
+ }
+
+ .filters-section {
+ display: flex;
+ flex-direction: column;
+ gap: 1em;
+ border-right: 1px solid var(--border);
+ padding: 1em;
+ margin-right: 1em;
+ overflow: auto visible;
+ flex: 0 0 auto;
+
+ > div {
+ flex: 0 1 auto;
+ }
+
+ .filter {
+ display: block;
+ min-width: 14em;
+
+ .query-label {
+ margin-bottom: 0.5em;
+ }
+
+ > input {
+ width: 100%;
+ }
+ }
+ }
+
+ .users-list {
+ flex: 1 0 30em;
+ }
+}
diff --git a/src/components/settings_modal/admin_tabs/users_tab.vue b/src/components/settings_modal/admin_tabs/users_tab.vue
new file mode 100644
index 000000000..a40d6f995
--- /dev/null
+++ b/src/components/settings_modal/admin_tabs/users_tab.vue
@@ -0,0 +1,143 @@
+
+
-
-
-
-
-
-
diff --git a/src/components/settings_modal/admin_tabs/admin_user_card.js b/src/components/settings_modal/admin_tabs/admin_user_card.js
new file mode 100644
index 000000000..a075db010
--- /dev/null
+++ b/src/components/settings_modal/admin_tabs/admin_user_card.js
@@ -0,0 +1,32 @@
+import { defineAsyncComponent } from 'vue'
+
+import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue'
+import ModerationTools from 'src/components/moderation_tools/moderation_tools.vue'
+
+const AdminUserCard = {
+ props: {
+ userId: {
+ type: String,
+ },
+ },
+ components: {
+ BasicUserCard,
+ ModerationTools,
+ },
+ computed: {
+ user() {
+ return this.$store.getters.findUser(this.userId)
+ },
+ isAdmin() {
+ return this.user.rights.admin
+ },
+ isModerator() {
+ return this.user.rights.moderator
+ },
+ isActivated() {
+ return !this.user.deactivated
+ },
+ },
+}
+
+export default AdminUserCard
diff --git a/src/components/settings_modal/admin_tabs/admin_user_card.scss b/src/components/settings_modal/admin_tabs/admin_user_card.scss
new file mode 100644
index 000000000..a9010afdc
--- /dev/null
+++ b/src/components/settings_modal/admin_tabs/admin_user_card.scss
@@ -0,0 +1,14 @@
+.AdminUserCard {
+ .right-side {
+ align-items: baseline;
+ justify-content: end;
+ display: flex;
+ flex-wrap: wrap;
+ gap: 0.5em;
+ margin-top: 0.5em;
+
+ .alert {
+ margin: 0;
+ }
+ }
+}
diff --git a/src/components/settings_modal/admin_tabs/admin_user_card.vue b/src/components/settings_modal/admin_tabs/admin_user_card.vue
new file mode 100644
index 000000000..00405dfa1
--- /dev/null
+++ b/src/components/settings_modal/admin_tabs/admin_user_card.vue
@@ -0,0 +1,107 @@
+
+
+
-
-
-
- {{ $t('selectable_list.select_all') }}
-
-
-
-
- -
-
-
-
-
-
-
-
-
+
+ {{ $t('admin_dash.users.labels.email_colon') }}
+
+ {{ ' ' }}
+
+ {{ $t('general.not_available') }}
+
+
+ {{ user.adminData.email }}
+
+
+
+
+ + {{ $t('user_card.admin_data.registration_reason') }} +
+ + {{ user.adminData.registration_reason }} + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js
index af8ebecbd..b9ff08bb5 100644
--- a/src/components/settings_modal/helpers/setting.js
+++ b/src/components/settings_modal/helpers/setting.js
@@ -4,6 +4,7 @@ import DraftButtons from './draft_buttons.vue'
import LocalSettingIndicator from './local_setting_indicator.vue'
import ModifiedIndicator from './modified_indicator.vue'
+import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
import { useInstanceStore } from 'src/stores/instance.js'
import { useInterfaceStore } from 'src/stores/interface.js'
import { useLocalConfigStore } from 'src/stores/local_config.js'
@@ -125,14 +126,14 @@ export default {
draft: {
get() {
if (this.realSource === 'admin' || this.path == null) {
- return get(this.$store.state.adminSettings.draft, this.canonPath)
+ return get(useAdminSettingsStore().draft, this.canonPath)
} else {
return this.localDraft
}
},
set(value) {
if (this.realSource === 'admin' || this.path == null) {
- this.$store.commit('updateAdminDraft', {
+ useAdminSettingsStore().updateAdminDraft({
path: this.canonPath,
value,
})
@@ -164,10 +165,7 @@ export default {
: this.draftMode
},
backendDescription() {
- return get(
- this.$store.state.adminSettings.descriptions,
- this.descriptionPath,
- )
+ return get(useAdminSettingsStore().descriptions, this.descriptionPath)
},
backendDescriptionLabel() {
if (this.realSource !== 'admin') return ''
@@ -221,10 +219,7 @@ export default {
let parentValue = null
if (this.parentPath !== undefined && this.realSource === 'admin') {
if (this.realDraftMode) {
- parentValue = get(
- this.$store.state.adminSettings.draft,
- this.parentPath,
- )
+ parentValue = get(useAdminSettingsStore().draft, this.parentPath)
} else {
parentValue = get(this.configSource, this.parentPath)
}
@@ -243,7 +238,7 @@ export default {
case 'profile':
return this.$store.state.profileConfig
case 'admin':
- return this.$store.state.adminSettings.config
+ return useAdminSettingsStore().config
default:
return useMergedConfigStore().mergedConfig
}
@@ -259,7 +254,7 @@ export default {
this.$store.dispatch('setProfileOption', { name: k, value: v })
case 'admin':
return (k, v) =>
- this.$store.dispatch('pushAdminSetting', { path: k, value: v })
+ useAdminSettingsStore().pushAdminSetting({ path: k, value: v })
default:
return (readPath, value) => {
const writePath = `${readPath}`
@@ -372,9 +367,7 @@ export default {
canHardReset() {
return (
this.realSource === 'admin' &&
- this.$store.state.adminSettings.modifiedPaths?.has(
- this.canonPath.join(' -> '),
- )
+ useAdminSettingsStore().modifiedPaths?.has(this.canonPath.join(' -> '))
)
},
matchesExpertLevel() {
diff --git a/src/components/settings_modal/helpers/shared_computed_object.js b/src/components/settings_modal/helpers/shared_computed_object.js
index 39e0b5b9c..4a3b9d4f8 100644
--- a/src/components/settings_modal/helpers/shared_computed_object.js
+++ b/src/components/settings_modal/helpers/shared_computed_object.js
@@ -1,6 +1,7 @@
import { mapState as mapPiniaState } from 'pinia'
import { mapState } from 'vuex'
+import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
import { useMergedConfigStore } from 'src/stores/merged_config.js'
const SharedComputedObject = () => ({
@@ -8,9 +9,11 @@ const SharedComputedObject = () => ({
...mapPiniaState(useMergedConfigStore, {
expertLevel: (store) => store.mergedConfig.expertLevel,
}),
+ ...mapPiniaState(useAdminSettingsStore, {
+ adminConfig: (store) => store.config,
+ adminDraft: (store) => store.draft,
+ }),
...mapState({
- adminConfig: (state) => state.adminSettings.config,
- adminDraft: (state) => state.adminSettings.draft,
user: (state) => state.users.currentUser,
}),
})
diff --git a/src/components/settings_modal/helpers/vertical_tab_switcher.jsx b/src/components/settings_modal/helpers/vertical_tab_switcher.jsx
index e407d29e5..cbe1be158 100644
--- a/src/components/settings_modal/helpers/vertical_tab_switcher.jsx
+++ b/src/components/settings_modal/helpers/vertical_tab_switcher.jsx
@@ -160,19 +160,25 @@ export default {
'tab-content-wrapper',
active ? '-active' : '-hidden',
]
+ const slotWrapperClasses = [
+ 'tab-slot-wrapper',
+ active ? '-active' : '-hidden',
+ ]
const contentClasses = ['tab-content']
- if (props['full-width'] || props['full-width'] === '') {
+ if (props['full-width'] || props['full-width'] != null) {
contentClasses.push('-full-width')
wrapperClasses.push('-full-width')
+ slotWrapperClasses.push('-full-width')
}
- if (props['full-height'] || props['full-width'] === '') {
+ if (props['full-height'] || props['full-width'] != null) {
contentClasses.push('-full-height')
wrapperClasses.push('-full-height')
+ slotWrapperClasses.push('-full-height')
}
return (
+
+
+
+
+
+
+
+
+
+ {{ $t('admin_dash.users.labels.origin') }}
+
+
+
+
+
+ {{ $t('admin_dash.users.labels.activity') }}
+
+
+
+
+
+ {{ $t('admin_dash.users.labels.privileges') }}
+
+
+
+
+ {{ $t('admin_dash.users.options.only_unapproved') }}
+
+
+
+
+ {{ $t('admin_dash.users.options.only_unconfirmed') }}
+
+
+ -
+
+
{header}
-
+
diff --git a/src/components/settings_modal/helpers/vertical_tab_switcher.scss b/src/components/settings_modal/helpers/vertical_tab_switcher.scss
index 67da9305b..3fff96688 100644
--- a/src/components/settings_modal/helpers/vertical_tab_switcher.scss
+++ b/src/components/settings_modal/helpers/vertical_tab_switcher.scss
@@ -40,6 +40,7 @@
.tab-slot-wrapper {
flex: 1 1 auto;
+ position: relative;
height: 100%;
padding: 0 1em;
overflow-y: auto;
@@ -48,6 +49,16 @@
grid-template-areas: ". content .";
flex-direction: column;
+ &.-full-width {
+ padding-left: 0;
+ padding-right: 0;
+ }
+
+ &.-full-height {
+ padding-top: 0;
+ padding-bottom: 0;
+ }
+
.tab-content {
grid-area: content;
@@ -56,10 +67,19 @@
}
&.-full-height {
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+
> * {
height: 100%;
}
}
+
+ &.-full-width.-full-height {
+ position: absolute;
+ inset: 0;
+ }
}
}
diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index e2df79c26..216ce1b7c 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -8,6 +8,7 @@ import Modal from 'src/components/modal/modal.vue'
import PanelLoading from 'src/components/panel_loading/panel_loading.vue'
import Popover from 'src/components/popover/popover.vue'
+import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
import { useInterfaceStore } from 'src/stores/interface.js'
import { useLocalConfigStore } from 'src/stores/local_config.js'
import { useMergedConfigStore } from 'src/stores/merged_config.js'
@@ -92,8 +93,11 @@ const SettingsModal = {
closeModal() {
useInterfaceStore().closeSettingsModal()
},
- peekModal() {
- useInterfaceStore().togglePeekSettingsModal()
+ toggleMinimizeModal(state) {
+ useInterfaceStore().toggleMinimizeSettingsModal()
+ },
+ minimizeModal() {
+ useInterfaceStore().setSettingsModalState('minimized')
},
importValidator(data) {
if (!Array.isArray(data._pleroma_settings_version)) {
@@ -232,10 +236,10 @@ const SettingsModal = {
return clone
},
resetAdminDraft() {
- this.$store.commit('resetAdminDraft')
+ useAdminSettingsStore().resetAdminDraft()
},
pushAdminDraft() {
- this.$store.dispatch('pushAdminDraft')
+ useAdminSettingsStore().pushAdminDraft()
},
...mapActions(useInterfaceStore, [
'temporaryChangesRevert',
@@ -250,7 +254,7 @@ const SettingsModal = {
modalMode: (store) => store.settingsModalMode,
modalOpenedOnceUser: (store) => store.settingsModalLoadedUser,
modalOpenedOnceAdmin: (store) => store.settingsModalLoadedAdmin,
- modalPeeked: (store) => store.settingsModalState === 'minimized',
+ modalMinimized: (store) => store.settingsModalState === 'minimized',
}),
expertLevel: {
get() {
@@ -265,11 +269,16 @@ const SettingsModal = {
},
adminDraftAny() {
return !isEqual(
- this.$store.state.adminSettings.config,
- this.$store.state.adminSettings.draft,
+ useAdminSettingsStore().config,
+ useAdminSettingsStore().draft,
)
},
},
+ watch: {
+ $route(r) {
+ this.minimizeModal()
+ },
+ },
}
export default SettingsModal
diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index 7d6e17244..b4f644065 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -36,6 +36,38 @@
margin-top: 0.75em;
}
+ .toolbar {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 0.5em;
+ align-items: end;
+
+ .header-buttons {
+ display: flex;
+ flex: 1 0 auto;
+ justify-content: end;
+ align-items: end;
+
+ &:not(.btn-group) {
+ gap: 0.5em;
+ }
+
+ .header-text {
+ flex: 1 0 auto;
+ }
+ }
+
+ .button-default {
+ flex: 0 0 auto;
+ padding: 0.5em;
+ font-size: 1rem;
+ }
+
+ .popover-wrapper {
+ display: flex;
+ }
+ }
+
p {
line-height: 1.5;
margin-left: 2em;
@@ -268,7 +300,7 @@
}
}
- &.peek {
+ &.minimize {
.settings-modal-panel {
/* Explanation:
* Modal is positioned vertically centered.
diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue
index d2b4f60ee..d5d0a93d9 100644
--- a/src/components/settings_modal/settings_modal.vue
+++ b/src/components/settings_modal/settings_modal.vue
@@ -2,8 +2,8 @@
{renderSlot}
@@ -22,8 +22,8 @@
+
+
+
diff --git a/src/components/settings_modal/tabs/mutes_and_blocks_tab.js b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
index 3b82bbb4c..0d889ce54 100644
--- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
@@ -1,45 +1,17 @@
-import { get, map, reject } from 'lodash'
+import { get, isEmpty, map, reject } from 'lodash'
-import withLoadMore from 'src/components/../hocs/with_load_more/with_load_more'
-import withSubscription from 'src/components/../hocs/with_subscription/with_subscription'
import Autosuggest from 'src/components/autosuggest/autosuggest.vue'
import BlockCard from 'src/components/block_card/block_card.vue'
import Checkbox from 'src/components/checkbox/checkbox.vue'
import DomainMuteCard from 'src/components/domain_mute_card/domain_mute_card.vue'
+import List from 'src/components/list/list.vue'
import MuteCard from 'src/components/mute_card/mute_card.vue'
import ProgressButton from 'src/components/progress_button/progress_button.vue'
-import SelectableList from 'src/components/selectable_list/selectable_list.vue'
import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
import { useInstanceStore } from 'src/stores/instance.js'
import { useOAuthTokensStore } from 'src/stores/oauth_tokens.js'
-const BlockList = withLoadMore({
- fetch: (props, $store) => $store.dispatch('fetchBlocks'),
- select: (props, $store) =>
- get($store.state.users.currentUser, 'blockIds', []),
- destroy: () => {
- /* no-op */
- },
- childPropName: 'items',
-})(SelectableList)
-
-const MuteList = withLoadMore({
- fetch: (props, $store) => $store.dispatch('fetchMutes'),
- select: (props, $store) => get($store.state.users.currentUser, 'muteIds', []),
- destroy: () => {
- /* no-op */
- },
- childPropName: 'items',
-})(SelectableList)
-
-const DomainMuteList = withSubscription({
- fetch: (props, $store) => $store.dispatch('fetchDomainMutes'),
- select: (props, $store) =>
- get($store.state.users.currentUser, 'domainMutes', []),
- childPropName: 'items',
-})(SelectableList)
-
const MutesAndBlocks = {
data() {
return {
@@ -52,12 +24,10 @@ const MutesAndBlocks = {
},
components: {
TabSwitcher,
- BlockList,
- MuteList,
- DomainMuteList,
- BlockCard,
- MuteCard,
DomainMuteCard,
+ BlockCard,
+ List,
+ MuteCard,
ProgressButton,
Autosuggest,
Checkbox,
@@ -69,8 +39,20 @@ const MutesAndBlocks = {
user() {
return this.$store.state.users.currentUser
},
+ blocks() {
+ return get(this.$store.state.users.currentUser, 'blockIds', [])
+ },
+ mutes() {
+ return get(this.$store.state.users.currentUser, 'muteIds', [])
+ },
+ domains() {
+ return get(this.$store.state.users.currentUser, 'domainMutes', [])
+ },
},
methods: {
+ fetchItems(group) {
+ return () => this.$store.dispatch('fetch' + group, this.userId)
+ },
importFollows(file) {
return this.$store.state.api.backendInteractor
.importFollows({ file })
diff --git a/src/components/settings_modal/tabs/mutes_and_blocks_tab.scss b/src/components/settings_modal/tabs/mutes_and_blocks_tab.scss
index 5fa3a27b1..c07de6be1 100644
--- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.scss
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.scss
@@ -1,5 +1,5 @@
.mutes-and-blocks-tab {
- height: 100%;
+ min-height: 100%;
.usersearch-wrapper {
padding: 1em;
@@ -26,4 +26,13 @@
margin-top: 1em;
width: 10em;
}
+
+ .blocks,
+ .mutes {
+ display: flex;
+ flex-direction: column;
+ min-height: 100%;
+ position: absolute;
+ inset: 0;
+ }
}
diff --git a/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue b/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
index ed4b15a49..5b8066ef7 100644
--- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
@@ -1,9 +1,12 @@
-
-
+
diff --git a/src/components/user_profile/user_profile_admin_view.js b/src/components/user_profile/user_profile_admin_view.js
new file mode 100644
index 000000000..94092b155
--- /dev/null
+++ b/src/components/user_profile/user_profile_admin_view.js
@@ -0,0 +1,71 @@
+import { get } from 'lodash'
+import { mapState } from 'pinia'
+
+import Checkbox from 'src/components/checkbox/checkbox.vue'
+import List from 'src/components/list/list.vue'
+import Status from 'src/components/status/status.vue'
+import UserCard from 'src/components/user_card/user_card.vue'
+
+import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
+import { useInterfaceStore } from 'src/stores/interface.js'
+
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
+
+library.add(faCircleNotch)
+
+const UserProfileAdminView = {
+ data() {
+ return {
+ godmode: false,
+ showReblogs: false,
+ }
+ },
+ created() {
+ this.$store.dispatch('fetchUserIfMissing', this.userId)
+ useInterfaceStore().setForeignProfileBackground(this.user?.background_image)
+ },
+ updated() {
+ useInterfaceStore().setForeignProfileBackground(this.user?.background_image)
+ },
+ unmounted() {
+ useInterfaceStore().setForeignProfileBackground(null)
+ },
+ computed: {
+ fetchOptions() {
+ return {
+ pageSize: 20,
+ godmode: this.godmode,
+ id: this.userId,
+ withReblogs: this.showReblogs,
+ }
+ },
+ user() {
+ return this.$store.getters.findUser(this.userId)
+ },
+ userId() {
+ return this.$route.params.id
+ },
+ },
+ methods: {
+ fetchStatuses(page) {
+ return useAdminSettingsStore().fetchStatuses({
+ ...this.fetchOptions,
+ page,
+ })
+ },
+ },
+ components: {
+ UserCard,
+ List,
+ Status,
+ Checkbox,
+ },
+ watch: {
+ fetchOptions() {
+ this.$refs.list.reset()
+ },
+ },
+}
+
+export default UserProfileAdminView
diff --git a/src/components/user_profile/user_profile_admin_view.vue b/src/components/user_profile/user_profile_admin_view.vue
new file mode 100644
index 000000000..e5118f474
--- /dev/null
+++ b/src/components/user_profile/user_profile_admin_view.vue
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
diff --git a/src/components/user_reporting_modal/user_reporting_modal.js b/src/components/user_reporting_modal/user_reporting_modal.js
index d55b5a962..12d548054 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.js
+++ b/src/components/user_reporting_modal/user_reporting_modal.js
@@ -1,3 +1,5 @@
+import { mapState } from 'pinia'
+
import Checkbox from 'src/components/checkbox/checkbox.vue'
import List from 'src/components/list/list.vue'
import Modal from 'src/components/modal/modal.vue'
@@ -16,15 +18,12 @@ const UserReportingModal = {
return {
comment: '',
forward: false,
- statusIdsToReport: [],
+ statusIdsToReport: new Set(),
processing: false,
error: false,
}
},
computed: {
- reportModal() {
- return useReportsStore().reportModal
- },
isLoggedIn() {
return !!this.$store.state.users.currentUser
},
@@ -43,31 +42,26 @@ const UserReportingModal = {
this.user.screen_name.substr(this.user.screen_name.indexOf('@') + 1)
)
},
- statuses() {
- return this.reportModal.statuses
- },
- preTickedIds() {
- return this.reportModal.preTickedIds
- },
+ ...mapState(useReportsStore, ['reportModal']),
},
watch: {
userId: 'resetState',
- preTickedIds(newValue) {
- this.statusIdsToReport = newValue
- },
},
methods: {
resetState() {
// Reset state
this.comment = ''
this.forward = false
- this.statusIdsToReport = this.preTickedIds
+ this.statusIdsToReport = new Set(this.reportModal.preTickedIds)
this.processing = false
this.error = false
},
closeModal() {
useReportsStore().closeUserReportingModal()
},
+ onListSelect(selected) {
+ this.statusIdsToReport = selected
+ },
reportUser() {
this.processing = true
this.error = false
@@ -75,7 +69,7 @@ const UserReportingModal = {
userId: this.userId,
comment: this.comment,
forward: this.forward,
- statusIds: this.statusIdsToReport,
+ statusIds: [...this.statusIdsToReport],
}
this.$store.state.api.backendInteractor
.reportUser({ ...params })
@@ -92,23 +86,6 @@ const UserReportingModal = {
clearError() {
this.error = false
},
- isChecked(statusId) {
- return this.statusIdsToReport.indexOf(statusId) !== -1
- },
- toggleStatus(checked, statusId) {
- if (checked === this.isChecked(statusId)) {
- return
- }
-
- if (checked) {
- this.statusIdsToReport.push(statusId)
- } else {
- this.statusIdsToReport.splice(
- this.statusIdsToReport.indexOf(statusId),
- 1,
- )
- }
- },
resize(e) {
const target = e.target || e
if (!(target instanceof window.Element)) {
diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index aa5704a97..a028ebeb6 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -51,19 +51,18 @@
+
-
+
{{ $t('settings.bio') }}
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 2c3878292..d2d766a7f 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -1,13 +1,11 @@
import { get } from 'lodash'
import { mapState } from 'pinia'
-import Conversation from 'src/components/conversation/conversation.vue'
import FollowCard from 'src/components/follow_card/follow_card.vue'
import List from 'src/components/list/list.vue'
import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
import Timeline from 'src/components/timeline/timeline.vue'
import UserCard from 'src/components/user_card/user_card.vue'
-import withLoadMore from '../../hocs/with_load_more/with_load_more'
import { useInstanceStore } from 'src/stores/instance.js'
import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
@@ -19,28 +17,6 @@ import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
library.add(faCircleNotch)
-const FollowerList = withLoadMore({
- fetch: (props, $store) => $store.dispatch('fetchFollowers', props.userId),
- select: (props, $store) =>
- get($store.getters.findUser(props.userId), 'followerIds', []).map((id) =>
- $store.getters.findUser(id),
- ),
- destroy: (props, $store) => $store.dispatch('clearFollowers', props.userId),
- childPropName: 'items',
- additionalPropNames: ['userId'],
-})(List)
-
-const FriendList = withLoadMore({
- fetch: (props, $store) => $store.dispatch('fetchFriends', props.userId),
- select: (props, $store) =>
- get($store.getters.findUser(props.userId), 'friendIds', []).map((id) =>
- $store.getters.findUser(id),
- ),
- destroy: (props, $store) => $store.dispatch('clearFriends', props.userId),
- childPropName: 'items',
- additionalPropNames: ['userId'],
-})(List)
-
const defaultTabKey = 'statuses'
const UserProfile = {
@@ -64,6 +40,8 @@ const UserProfile = {
unmounted() {
this.stopFetching()
useInterfaceStore().setForeignProfileBackground(null)
+ this.$store.dispatch('clearFollowers', this.userId)
+ this.$store.dispatch('clearFriends', this.userId)
},
computed: {
timeline() {
@@ -104,11 +82,31 @@ const UserProfile = {
compactProfiles() {
return useMergedConfigStore().mergedConfig.compactProfiles
},
+ friends() {
+ return get(
+ this.$store.getters.findUser(this.userId),
+ 'friendIds',
+ [],
+ ).map((id) => this.$store.getters.findUser(id))
+ },
+ followers() {
+ return get(
+ this.$store.getters.findUser(this.userId),
+ 'followerIds',
+ [],
+ ).map((id) => this.$store.getters.findUser(id))
+ },
},
methods: {
setFooterRef(el) {
this.footerRef = el
},
+ fetchUsers(group) {
+ return () =>
+ this.$store
+ .dispatch('fetch' + group, this.userId)
+ .then((result) => ({ items: result }))
+ },
load(userNameOrId) {
const startFetchingTimeline = (timeline, userId) => {
// Clear timeline only if load another user's profile
@@ -203,11 +201,9 @@ const UserProfile = {
components: {
UserCard,
Timeline,
- FollowerList,
- FriendList,
+ List,
FollowCard,
TabSwitcher,
- Conversation,
},
}
diff --git a/src/components/user_profile/user_profile.scss b/src/components/user_profile/user_profile.scss
new file mode 100644
index 000000000..4b68b46b0
--- /dev/null
+++ b/src/components/user_profile/user_profile.scss
@@ -0,0 +1,65 @@
+.user-profile {
+ flex: 2;
+
+ .card-wrapper {
+ border-top-left-radius: var(--roundness);
+ border-top-right-radius: var(--roundness);
+ }
+
+ .panel-footer {
+ border-bottom-left-radius: var(--roundness);
+ border-bottom-right-radius: var(--roundness);
+ }
+
+ // No sticky header on user profile
+ --currentPanelStack: 0;
+
+ .userlist-placeholder {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding: 2em;
+ }
+
+ .user-info {
+ margin: 1.2em;
+ }
+
+ &.-admin-view {
+ .filter {
+ padding: 1em;
+ }
+
+ .list-item {
+ padding: 0;
+ border-bottom: 1px solid var(--border);
+
+ .Status{
+ width: 100%
+ }
+ }
+
+ .footer {
+ background: var(--background);
+ }
+ }
+}
+
+.user-profile-placeholder {
+ .panel-body {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding: 7em;
+ }
+
+ .alert {
+ padding: 0.75em 5em;
+ border-width: 2px;
+
+ .error-message {
+ color: var(--text);
+ font-weight: bold;
+ }
+ }
+}
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 72515c90d..6ca0c39bd 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -39,14 +39,14 @@
:label="$t('user_card.followees')"
:disabled="!user.friends_count"
>
-
@@ -51,103 +57,109 @@
{{ $t('settings.no_blocks') }}
-
+
-
-
-
diff --git a/src/components/settings_modal/tabs/notifications_tab.js b/src/components/settings_modal/tabs/notifications_tab.js
index c863a7b9f..5114012a8 100644
--- a/src/components/settings_modal/tabs/notifications_tab.js
+++ b/src/components/settings_modal/tabs/notifications_tab.js
@@ -21,7 +21,7 @@ const NotificationsTab = {
if (!this.user) {
return false
}
- return this.user.privileges.includes('reports_manage_reports')
+ return this.user.privileges.has('reports_manage_reports')
},
...SharedComputedObject(),
},
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 0107bde3c..01d7facfc 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -131,40 +131,41 @@ const Status = {
Quote: defineAsyncComponent(() => import('src/components/quote/quote.vue')),
StatusActionButtons,
},
- props: [
- 'statusoid',
- 'replies',
+ props: {
+ statusoid: Object,
+ replies: Array,
- 'expandable',
- 'focused',
- 'highlight',
- 'compact',
- 'isPreview',
- 'noHeading',
- 'inlineExpanded',
- 'showPinned',
- 'inProfile',
- 'inConversation',
- 'inQuote',
- 'profileUserId',
- 'simpleTree',
- 'showOtherRepliesAsButton',
- 'dive',
- 'ignoreMute',
+ expandable: Boolean,
+ focused: Boolean,
+ highlight: Boolean,
+ compact: Boolean,
+ isPreview: Boolean,
+ noHeading: Boolean,
+ inlineExpanded: Boolean,
+ showPinned: Boolean,
+ inProfile: Boolean,
+ inConversation: Boolean,
+ inQuote: Boolean,
- 'controlledThreadDisplayStatus',
- 'controlledToggleThreadDisplay',
- 'controlledShowingTall',
- 'controlledToggleShowingTall',
- 'controlledExpandingSubject',
- 'controlledToggleExpandingSubject',
- 'controlledShowingLongSubject',
- 'controlledToggleShowingLongSubject',
- 'controlledReplying',
- 'controlledToggleReplying',
- 'controlledMediaPlaying',
- 'controlledSetMediaPlaying',
- ],
+ profileUserId: String,
+ simpleTree: Boolean,
+ showOtherRepliesAsButton: Boolean,
+ dive: Function,
+ ignoreMute: Boolean,
+
+ controlledThreadDisplayStatus: String,
+ controlledToggleThreadDisplay: Function,
+ controlledShowingTall: Boolean,
+ controlledToggleShowingTall: Function,
+ controlledExpandingSubject: Boolean,
+ controlledToggleExpandingSubject: Function,
+ controlledShowingLongSubject: Boolean,
+ controlledToggleShowingLongSubject: Function,
+ controlledReplying: Boolean,
+ controlledToggleReplying: Function,
+ controlledMediaPlaying: Boolean,
+ controlledSetMediaPlaying: Function,
+ },
emits: ['goto', 'toggleExpanded'],
data() {
return {
diff --git a/src/components/status_action_buttons/action_button.js b/src/components/status_action_buttons/action_button.js
index 661d1befd..e3cdf1fb1 100644
--- a/src/components/status_action_buttons/action_button.js
+++ b/src/components/status_action_buttons/action_button.js
@@ -19,6 +19,7 @@ import {
faChevronDown,
faChevronRight,
faExternalLinkAlt,
+ faEye,
faEyeSlash,
faHistory,
faMinus,
@@ -51,6 +52,7 @@ library.add(
faBookmark,
faBookmarkRegular,
faEyeSlash,
+ faEye,
faThumbtack,
faShareAlt,
faExternalLinkAlt,
diff --git a/src/components/status_action_buttons/action_button_container.js b/src/components/status_action_buttons/action_button_container.js
index 012844dc8..1f4cfc3f6 100644
--- a/src/components/status_action_buttons/action_button_container.js
+++ b/src/components/status_action_buttons/action_button_container.js
@@ -3,14 +3,30 @@ import { defineAsyncComponent } from 'vue'
import Popover from 'src/components/popover/popover.vue'
import ActionButton from './action_button.vue'
+import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
+
import { library } from '@fortawesome/fontawesome-svg-core'
import {
+ faEnvelope,
+ faEye,
+ faEyeSlash,
faFolderTree,
faGlobe,
+ faLock,
+ faLockOpen,
faUser,
} from '@fortawesome/free-solid-svg-icons'
-library.add(faUser, faGlobe, faFolderTree)
+library.add(
+ faUser,
+ faGlobe,
+ faFolderTree,
+ faEye,
+ faEyeSlash,
+ faLock,
+ faLockOpen,
+ faEnvelope,
+)
export default {
components: {
@@ -61,8 +77,27 @@ export default {
this.domain,
)
},
+ availableScopes() {
+ return ['private', 'unlisted', 'direct', 'public'].filter((scope) => {
+ return scope !== this.status.visibility
+ })
+ },
},
methods: {
+ visibilityIcon(visibility) {
+ switch (visibility) {
+ case 'private':
+ return 'lock'
+ case 'unlisted':
+ return 'lock-open'
+ case 'direct':
+ return 'envelope'
+ case 'local':
+ return 'igloo'
+ default:
+ return 'globe'
+ }
+ },
unmuteUser() {
return this.$store.dispatch('unmuteUser', this.user.id)
},
@@ -79,6 +114,18 @@ export default {
this.$refs.confirmUser.optionallyPrompt()
}
},
+ setScope(visibility) {
+ return useAdminSettingsStore().changeStatusScope({
+ id: this.status.id,
+ visibility,
+ })
+ },
+ setSensitive(sensitive) {
+ useAdminSettingsStore().changeStatusScope({
+ id: this.status.id,
+ sensitive,
+ })
+ },
toggleConversationMute() {
if (this.conversationIsMuted) {
this.unmuteConversation()
diff --git a/src/components/status_action_buttons/action_button_container.vue b/src/components/status_action_buttons/action_button_container.vue
index da0beed79..24f9a3c3b 100644
--- a/src/components/status_action_buttons/action_button_container.vue
+++ b/src/components/status_action_buttons/action_button_container.vue
@@ -14,6 +14,59 @@
/>
+
-
-
-
+
+
+
+
+
+
+
+
+ -
+
+
+
-
-
+
+ {{ $t('user_card.unmute') }}
+
+ {{ $t('user_card.unmute_progress') }}
+
+
-
-
- {{ $t('user_card.mute') }}
-
- {{ $t('user_card.mute_progress') }}
-
-
-
- {{ $t('user_card.unmute') }}
-
- {{ $t('user_card.unmute_progress') }}
-
-
-
-
-
-
-
-
+
-
+
+
+ {{ item }}
+
+
+
+
+
+ -
+
+
+
-
-
-
-
- {{ $t('domain_mute_card.unmute') }}
-
- {{ $t('domain_mute_card.unmute_progress') }}
-
-
-
-
-
- useMergedConfigStore().mergedConfig.modalOnDelete,
@@ -243,6 +243,26 @@ export const BUTTONS = [
return dispatch('deleteStatus', { id: status.id })
},
},
+ {
+ // =========
+ // CHANGE SCOPE
+ // =========
+ name: 'changeScope',
+ icon: 'eye',
+ label: 'status.admin_change_scope',
+ if({ status, loggedIn, currentUser }) {
+ return (
+ loggedIn &&
+ (status.user.id === currentUser.id ||
+ currentUser.privileges.has('messages_delete'))
+ )
+ },
+ toggleable: false,
+ dropdown: true,
+ action({ status, dispatch, emit }) {
+ /* prevent hiding */
+ },
+ },
{
// =========
// SHARE/COPY
@@ -279,10 +299,12 @@ export const BUTTONS = [
label: 'user_card.report',
if: ({ loggedIn }) => loggedIn,
action({ status }) {
- return useReportsStore().openUserReportingModal({
+ useReportsStore().openUserReportingModal({
userId: status.user.id,
statusIds: [status.id],
})
+
+ return Promise.resolve()
},
},
].map((button) => {
diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss
index f788ea30e..755ff9a78 100644
--- a/src/components/tab_switcher/tab_switcher.scss
+++ b/src/components/tab_switcher/tab_switcher.scss
@@ -49,12 +49,14 @@
.contents.scrollable-tabs {
flex-basis: 0;
+ position: relative;
}
}
.contents {
flex: 1 0 auto;
min-height: 0;
+ position: relative;
.hidden {
display: none;
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index d987695dd..acb2c4ea1 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -84,6 +84,12 @@ export default {
default: false,
type: Boolean,
},
+ // Hide action buttons
+ hideButtons: {
+ required: false,
+ default: false,
+ type: Boolean,
+ },
// default - open profile, 'zoom' - zoom, function - call function
avatarAction: {
required: false,
@@ -280,7 +286,7 @@ export default {
},
},
visibleRole() {
- if (!this.newShowRole) {
+ if (!this.user.show_role && !this.user.adminData) {
return
}
const rights = this.user.rights
diff --git a/src/components/user_card/user_card.scss b/src/components/user_card/user_card.scss
index e676db766..b724c335b 100644
--- a/src/components/user_card/user_card.scss
+++ b/src/components/user_card/user_card.scss
@@ -22,6 +22,23 @@
}
}
+ summary {
+ font-weight: bold;
+ cursor: pointer;
+ }
+
+ details {
+ margin: 0.5em 0;
+
+ &[open] summary {
+ margin-bottom: 0.5em;
+ }
+
+ ul {
+ margin: 0;
+ }
+ }
+
.input.bio {
height: auto; // override settings default textarea size
}
@@ -56,7 +73,7 @@
.user-card-bio {
text-align: center;
- margin: 0 0.6em;
+ margin: 0.6em;
&.input {
margin: 0 1em;
@@ -81,15 +98,18 @@
--_still-image-label-visibility: hidden;
}
+ .admin-data,
.personal-marks {
- margin: 0.6em;
- padding: 0.6em;
+ margin: 0 0.6em;
+ padding: 0 0.6em;
&:not(:last-child) {
border-bottom: 1px dotted var(--border);
}
.highlighter {
+ margin-bottom: 0.5em;
+
h4 {
margin-top: 0.6em;
}
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 3eb142954..af779823c 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -104,7 +104,7 @@
/>
@@ -291,8 +291,7 @@
+
+
+ + {{ $t('user_card.admin_data.data') }} +
+ +
{{ $t('settings.bio') }}
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 2c3878292..d2d766a7f 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -1,13 +1,11 @@
import { get } from 'lodash'
import { mapState } from 'pinia'
-import Conversation from 'src/components/conversation/conversation.vue'
import FollowCard from 'src/components/follow_card/follow_card.vue'
import List from 'src/components/list/list.vue'
import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
import Timeline from 'src/components/timeline/timeline.vue'
import UserCard from 'src/components/user_card/user_card.vue'
-import withLoadMore from '../../hocs/with_load_more/with_load_more'
import { useInstanceStore } from 'src/stores/instance.js'
import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
@@ -19,28 +17,6 @@ import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
library.add(faCircleNotch)
-const FollowerList = withLoadMore({
- fetch: (props, $store) => $store.dispatch('fetchFollowers', props.userId),
- select: (props, $store) =>
- get($store.getters.findUser(props.userId), 'followerIds', []).map((id) =>
- $store.getters.findUser(id),
- ),
- destroy: (props, $store) => $store.dispatch('clearFollowers', props.userId),
- childPropName: 'items',
- additionalPropNames: ['userId'],
-})(List)
-
-const FriendList = withLoadMore({
- fetch: (props, $store) => $store.dispatch('fetchFriends', props.userId),
- select: (props, $store) =>
- get($store.getters.findUser(props.userId), 'friendIds', []).map((id) =>
- $store.getters.findUser(id),
- ),
- destroy: (props, $store) => $store.dispatch('clearFriends', props.userId),
- childPropName: 'items',
- additionalPropNames: ['userId'],
-})(List)
-
const defaultTabKey = 'statuses'
const UserProfile = {
@@ -64,6 +40,8 @@ const UserProfile = {
unmounted() {
this.stopFetching()
useInterfaceStore().setForeignProfileBackground(null)
+ this.$store.dispatch('clearFollowers', this.userId)
+ this.$store.dispatch('clearFriends', this.userId)
},
computed: {
timeline() {
@@ -104,11 +82,31 @@ const UserProfile = {
compactProfiles() {
return useMergedConfigStore().mergedConfig.compactProfiles
},
+ friends() {
+ return get(
+ this.$store.getters.findUser(this.userId),
+ 'friendIds',
+ [],
+ ).map((id) => this.$store.getters.findUser(id))
+ },
+ followers() {
+ return get(
+ this.$store.getters.findUser(this.userId),
+ 'followerIds',
+ [],
+ ).map((id) => this.$store.getters.findUser(id))
+ },
},
methods: {
setFooterRef(el) {
this.footerRef = el
},
+ fetchUsers(group) {
+ return () =>
+ this.$store
+ .dispatch('fetch' + group, this.userId)
+ .then((result) => ({ items: result }))
+ },
load(userNameOrId) {
const startFetchingTimeline = (timeline, userId) => {
// Clear timeline only if load another user's profile
@@ -203,11 +201,9 @@ const UserProfile = {
components: {
UserCard,
Timeline,
- FollowerList,
- FriendList,
+ List,
FollowCard,
TabSwitcher,
- Conversation,
},
}
diff --git a/src/components/user_profile/user_profile.scss b/src/components/user_profile/user_profile.scss
new file mode 100644
index 000000000..4b68b46b0
--- /dev/null
+++ b/src/components/user_profile/user_profile.scss
@@ -0,0 +1,65 @@
+.user-profile {
+ flex: 2;
+
+ .card-wrapper {
+ border-top-left-radius: var(--roundness);
+ border-top-right-radius: var(--roundness);
+ }
+
+ .panel-footer {
+ border-bottom-left-radius: var(--roundness);
+ border-bottom-right-radius: var(--roundness);
+ }
+
+ // No sticky header on user profile
+ --currentPanelStack: 0;
+
+ .userlist-placeholder {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding: 2em;
+ }
+
+ .user-info {
+ margin: 1.2em;
+ }
+
+ &.-admin-view {
+ .filter {
+ padding: 1em;
+ }
+
+ .list-item {
+ padding: 0;
+ border-bottom: 1px solid var(--border);
+
+ .Status{
+ width: 100%
+ }
+ }
+
+ .footer {
+ background: var(--background);
+ }
+ }
+}
+
+.user-profile-placeholder {
+ .panel-body {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding: 7em;
+ }
+
+ .alert {
+ padding: 0.75em 5em;
+ border-width: 2px;
+
+ .error-message {
+ color: var(--text);
+ font-weight: bold;
+ }
+ }
+}
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 72515c90d..6ca0c39bd 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -39,14 +39,14 @@
:label="$t('user_card.followees')"
:disabled="!user.friends_count"
>
-
+
-
+
-
@@ -136,20 +135,6 @@
overflow-y: auto;
}
- &-sitem {
- display: flex;
- justify-content: space-between;
-
- /* TODO cleanup this */
- > .Status {
- flex: 1;
- }
-
- > .checkbox {
- margin: 0.75em;
- }
- }
-
@media all and (width >= 801px) {
.panel-body {
flex-direction: row;
diff --git a/src/components/user_timed_filter_modal/user_timed_filter_modal.vue b/src/components/user_timed_filter_modal/user_timed_filter_modal.vue
index 055c2f7f4..f9b23076c 100644
--- a/src/components/user_timed_filter_modal/user_timed_filter_modal.vue
+++ b/src/components/user_timed_filter_modal/user_timed_filter_modal.vue
@@ -11,62 +11,64 @@
-
+
-
-
-
+ {{ $t(isMute ? 'user_card.expire_mute_message' : 'user_card.expire_block_message', [user.screen_name]) }}
-
- {{ $t('user_card.expire_in') }}
-
-
-
+
diff --git a/src/hocs/with_load_more/with_load_more.jsx b/src/hocs/with_load_more/with_load_more.jsx
deleted file mode 100644
index e839f796f..000000000
--- a/src/hocs/with_load_more/with_load_more.jsx
+++ /dev/null
@@ -1,119 +0,0 @@
-// eslint-disable-next-line no-unused
-
-import { isEmpty } from 'lodash'
-import { h } from 'vue'
-
-import { getComponentProps } from '../../services/component_utils/component_utils'
-import './with_load_more.scss'
-
-import { library } from '@fortawesome/fontawesome-svg-core'
-import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
-import { FontAwesomeIcon as FAIcon } from '@fortawesome/vue-fontawesome'
-
-library.add(faCircleNotch)
-
-const withLoadMore =
- ({
- fetch, // function to fetch entries and return a promise
- select, // function to select data from store
- unmounted, // function called at "destroyed" lifecycle
- childPropName = 'entries', // name of the prop to be passed into the wrapped component
- additionalPropNames = [], // additional prop name list of the wrapper component
- }) =>
- (WrappedComponent) => {
- const originalProps = Object.keys(getComponentProps(WrappedComponent))
- const props = originalProps
- .filter((v) => v !== childPropName)
- .concat(additionalPropNames)
-
- return {
- props,
- data() {
- return {
- loading: false,
- bottomedOut: false,
- error: false,
- entries: [],
- }
- },
- created() {
- window.addEventListener('scroll', this.scrollLoad)
- if (this.entries.length === 0) {
- this.fetchEntries()
- }
- },
- unmounted() {
- window.removeEventListener('scroll', this.scrollLoad)
- unmounted && unmounted(this.$props, this.$store)
- },
- methods: {
- // Entries is not a computed because computed can't track the dynamic
- // selector for changes and won't trigger after fetch.
- updateEntries() {
- this.entries = select(this.$props, this.$store) || []
- },
- fetchEntries() {
- if (!this.loading) {
- this.loading = true
- this.error = false
- fetch(this.$props, this.$store)
- .then((newEntries) => {
- this.loading = false
- this.bottomedOut = isEmpty(newEntries)
- })
- .catch(() => {
- this.loading = false
- this.error = true
- })
- .finally(() => {
- this.updateEntries()
- })
- }
- },
- scrollLoad(e) {
- const bodyBRect = document.body.getBoundingClientRect()
- const height = Math.max(bodyBRect.height, -bodyBRect.y)
- if (
- this.loading === false &&
- this.bottomedOut === false &&
- this.$el.offsetHeight > 0 &&
- window.innerHeight + window.pageYOffset >= height - 750
- ) {
- this.fetchEntries()
- }
- },
- },
- render() {
- const props = {
- ...this.$props,
- [childPropName]: this.entries,
- }
- const children = this.$slots
- return (
- ', group, suggestions },
- path,
- acc,
- ) => {
- const newPath = group ? [group, key] : [key]
- const obj = { description, label, suggestions }
- if (Array.isArray(children)) {
- children.forEach((c) => {
- convert(c, newPath, obj)
- })
- }
- set(acc, newPath, obj)
- }
-
- const descriptions = {}
-
- backendDescriptions.forEach((d) => convert(d, '', descriptions))
- commit('updateAdminDescriptions', { descriptions })
- },
-
- // This action takes draft state, diffs it with live config state and then pushes
- // only differences between the two. Difference detection only work up to subkey (third) level.
- pushAdminDraft({ rootState, state, dispatch }) {
- // TODO cleanup paths in modifiedPaths
- const convert = (value) => {
- if (typeof value !== 'object') {
- return value
- } else if (Array.isArray(value)) {
- return value.map(convert)
- } else {
- return Object.entries(value).map(([k, v]) => ({ tuple: [k, v] }))
- }
- }
-
- // Getting all group-keys used in config
- const allGroupKeys = flatten(
- Object.entries(state.config).map(([group, lv1data]) =>
- Object.keys(lv1data).map((key) => ({ group, key })),
- ),
- )
-
- // Only using group-keys where there are changes detected
- const changedGroupKeys = allGroupKeys.filter(({ group, key }) => {
- return !isEqual(state.config[group][key], state.draft[group][key])
- })
-
- // Here we take all changed group-keys and get all changed subkeys
- const changed = changedGroupKeys.map(({ group, key }) => {
- const config = state.config[group][key]
- const draft = state.draft[group][key]
-
- // We convert group-key value into entries arrays
- const eConfig = Object.entries(config)
- const eDraft = Object.entries(draft)
-
- // Then those entries array we diff so only changed subkey entries remain
- // We use the diffed array to reconstruct the object and then shove it into convert()
- return {
- group,
- key,
- value: convert(
- Object.fromEntries(differenceWith(eDraft, eConfig, isEqual)),
- ),
- }
- })
-
- rootState.api.backendInteractor
- .pushInstanceDBConfig({
- payload: {
- configs: changed,
- },
- })
- .then(() => rootState.api.backendInteractor.fetchInstanceDBConfig())
- .then((backendDbConfig) =>
- dispatch('setInstanceAdminSettings', { backendDbConfig }),
- )
- },
- pushAdminSetting({ rootState, dispatch }, { path, value }) {
- const [group, key, ...rest] = Array.isArray(path)
- ? path
- : path.split(/\./g)
- const clone = {} // not actually cloning the entire thing to avoid excessive writes
- set(clone, rest, value)
-
- // TODO cleanup paths in modifiedPaths
- const convert = (value) => {
- if (typeof value !== 'object') {
- return value
- } else if (Array.isArray(value)) {
- return value.map(convert)
- } else {
- return Object.entries(value).map(([k, v]) => ({ tuple: [k, v] }))
- }
- }
-
- rootState.api.backendInteractor
- .pushInstanceDBConfig({
- payload: {
- configs: [
- {
- group,
- key,
- value: convert(clone),
- },
- ],
- },
- })
- .then(() => rootState.api.backendInteractor.fetchInstanceDBConfig())
- .then((backendDbConfig) =>
- dispatch('setInstanceAdminSettings', { backendDbConfig }),
- )
- },
- resetAdminSetting({ rootState, state, dispatch }, { path }) {
- const [group, key, subkey] = Array.isArray(path)
- ? path
- : path.split(/\./g)
-
- state.modifiedPaths.delete(path)
-
- return rootState.api.backendInteractor
- .pushInstanceDBConfig({
- payload: {
- configs: [
- {
- group,
- key,
- delete: true,
- subkeys: [subkey],
- },
- ],
- },
- })
- .then(() => rootState.api.backendInteractor.fetchInstanceDBConfig())
- .then((backendDbConfig) =>
- dispatch('setInstanceAdminSettings', { backendDbConfig }),
- )
- },
- },
-}
-
-export default adminSettingsStorage
diff --git a/src/modules/index.js b/src/modules/index.js
index 76bdbf7f3..e42260c06 100644
--- a/src/modules/index.js
+++ b/src/modules/index.js
@@ -1,4 +1,3 @@
-import adminSettings from './adminSettings.js'
import api from './api.js'
import chats from './chats.js'
import drafts from './drafts.js'
@@ -13,7 +12,6 @@ export default {
users,
api,
profileConfig,
- adminSettings,
drafts,
chats,
}
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 99652a104..b4f0a93bf 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -591,7 +591,7 @@ const statuses = {
pagination,
},
) {
- commit('addNewStatuses', {
+ return commit('addNewStatuses', {
statuses,
showImmediately,
timeline,
@@ -683,7 +683,7 @@ const statuses = {
.then((status) => dispatch('addNewStatuses', { statuses: [status] }))
},
unpinStatus({ rootState, dispatch }, statusId) {
- rootState.api.backendInteractor
+ return rootState.api.backendInteractor
.unpinOwnStatus({ id: statusId })
.then((status) => dispatch('addNewStatuses', { statuses: [status] }))
},
@@ -822,7 +822,9 @@ const statuses = {
'addNewUsers',
data.statuses.map((s) => s.user).filter((u) => u),
)
- store.commit('addNewStatuses', { statuses: data.statuses })
+ data.statuses = store.commit('addNewStatuses', {
+ statuses: data.statuses,
+ })
return data
})
},
diff --git a/src/modules/users.js b/src/modules/users.js
index db5b16ccc..ec70f8105 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -170,15 +170,11 @@ const unmuteDomain = (store, domain) => {
export const mutations = {
tagUser(state, { user: { id }, tag }) {
const user = state.usersObject[id]
- const tags = user.tags || []
- const newTags = tags.concat([tag])
- user.tags = newTags
+ user.tags.add(tag)
},
untagUser(state, { user: { id }, tag }) {
const user = state.usersObject[id]
- const tags = user.tags || []
- const newTags = tags.filter((t) => t !== tag)
- user.tags = newTags
+ user.tags.delete(tag)
},
updateRight(state, { user: { id }, right, value }) {
const user = state.usersObject[id]
@@ -186,9 +182,12 @@ export const mutations = {
newRights[right] = value
user.rights = newRights
},
- updateActivationStatus(state, { user: { id }, deactivated }) {
- const user = state.usersObject[id]
- user.deactivated = deactivated
+ updateUserAdminData(state, { user }) {
+ const { id } = user
+ const localUser = state.usersObject[id]
+ localUser.adminData = user
+ localUser.deactivated = !user.is_active
+ localUser.tags = new Set(user.tags)
},
setCurrentUser(state, user) {
state.lastLoginName = user.screen_name
@@ -369,10 +368,22 @@ const users = {
getters,
actions: {
fetchUserIfMissing(store, id) {
- if (!store.getters.findUser(id)) {
- store.dispatch('fetchUser', id)
+ const user = store.getters.findUser(id)
+ if (!user) {
+ return store.dispatch('fetchUser', id)
+ } else {
+ return Promise.resolve(user)
}
},
+ updateUserAdminData(store, { userAdminData }) {
+ return store
+ .dispatch('fetchUserIfMissing', userAdminData.id)
+ .then((user) => {
+ user.adminData = userAdminData
+ store.commit('addNewUsers', [user])
+ return user
+ })
+ },
fetchUser(store, id) {
return store.rootState.api.backendInteractor
.fetchUser({ id })
@@ -541,15 +552,6 @@ const users = {
commit('updateUserRelationship', [relationship]),
)
},
- toggleActivationStatus({ rootState, commit }, { user }) {
- const api = user.deactivated
- ? rootState.api.backendInteractor.activateUser
- : rootState.api.backendInteractor.deactivateUser
- api({ user }).then((user) => {
- const deactivated = !user.is_active
- commit('updateActivationStatus', { user, deactivated })
- })
- },
registerPushNotifications(store) {
const token = store.state.currentUser.credentials
const vapidPublicKey = useInstanceStore().vapidPublicKey
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 899978132..5ab1fa18e 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -1,4 +1,4 @@
-import { concat, each, get, last, map } from 'lodash'
+import { concat, each, last, map } from 'lodash'
import {
parseAttachment,
@@ -20,12 +20,6 @@ const CHANGE_EMAIL_URL = '/api/pleroma/change_email'
const CHANGE_PASSWORD_URL = '/api/pleroma/change_password'
const MOVE_ACCOUNT_URL = '/api/pleroma/move_account'
const ALIASES_URL = '/api/pleroma/aliases'
-const TAG_USER_URL = '/api/pleroma/admin/users/tag'
-const PERMISSION_GROUP_URL = (screenName, right) =>
- `/api/pleroma/admin/users/${screenName}/permission_group/${right}`
-const ACTIVATE_USER_URL = '/api/pleroma/admin/users/activate'
-const DEACTIVATE_USER_URL = '/api/pleroma/admin/users/deactivate'
-const ADMIN_USERS_URL = '/api/v1/pleroma/admin/users'
const SUGGESTIONS_URL = '/api/v1/suggestions'
const NOTIFICATION_SETTINGS_URL = '/api/pleroma/notification_settings'
const NOTIFICATION_READ_URL = '/api/v1/pleroma/notifications/read'
@@ -121,7 +115,6 @@ const PLEROMA_CHAT_MESSAGES_URL = (id) => `/api/v1/pleroma/chats/${id}/messages`
const PLEROMA_CHAT_READ_URL = (id) => `/api/v1/pleroma/chats/${id}/read`
const PLEROMA_DELETE_CHAT_MESSAGE_URL = (chatId, messageId) =>
`/api/v1/pleroma/chats/${chatId}/messages/${messageId}`
-const PLEROMA_ADMIN_REPORTS = '/api/v1/pleroma/admin/reports'
const PLEROMA_BACKUP_URL = '/api/v1/pleroma/backups'
const PLEROMA_ANNOUNCEMENTS_URL = '/api/v1/pleroma/admin/announcements'
const PLEROMA_POST_ANNOUNCEMENT_URL = '/api/v1/pleroma/admin/announcements'
@@ -138,6 +131,7 @@ const PLEROMA_BOOKMARK_FOLDERS_URL = '/api/v1/pleroma/bookmark_folders'
const PLEROMA_BOOKMARK_FOLDER_URL = (id) =>
`/api/v1/pleroma/bookmark_folders/${id}`
+const PLEROMA_ADMIN_REPORTS = '/api/v1/pleroma/admin/reports'
const PLEROMA_ADMIN_CONFIG_URL = '/api/v1/pleroma/admin/config'
const PLEROMA_ADMIN_DESCRIPTIONS_URL =
'/api/v1/pleroma/admin/config/descriptions'
@@ -145,6 +139,66 @@ 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 = '/api/v1/pleroma/admin/users'
+const PLEROMA_ADMIN_USERS_URL_SHOW = (nickname) =>
+ `/api/v1/pleroma/admin/users/${nickname}`
+const PLEROMA_ADMIN_USERS_URL_LIST = ({
+ page,
+ pageSize,
+ filters = {},
+ query = '',
+ name = '',
+ email = '',
+}) => {
+ const {
+ local = false,
+ external = false,
+ active = false,
+ needApproval = false,
+ unconfirmed = false,
+ deactivated = false,
+ isAdmin = true,
+ isModerator = true,
+ } = filters
+ const filters_str = [
+ local && 'local',
+ external && 'external',
+ active && 'active',
+ needApproval && 'need_approval',
+ unconfirmed && 'unconfirmed',
+ deactivated && 'deactivated',
+ isAdmin && 'is_admin',
+ isModerator && 'is_moderator',
+ ]
+ .filter((x) => x)
+ .join(',')
+ return `/api/v1/pleroma/admin/users?page=${page}&page_size=${pageSize}&filters=${filters_str}&query=${query}&name=${name}&email=${email}`
+}
+const PLEROMA_ADMIN_TAG_USER_URL = '/api/pleroma/admin/users/tag'
+const PLEROMA_ADMIN_PERMISSION_GROUP_URL = (right) =>
+ `/api/pleroma/admin/users/permission_group/${right}`
+const PLEROMA_ADMIN_ACTIVATE_USERS_URL = '/api/pleroma/admin/users/activate'
+const PLEROMA_ADMIN_DEACTIVATE_USERS_URL = '/api/pleroma/admin/users/deactivate'
+const PLEROMA_ADMIN_SUGGEST_USERS_URL = '/api/pleroma/admin/users/suggest'
+const PLEROMA_ADMIN_UNSUGGEST_USERS_URL = '/api/pleroma/admin/users/unsuggest'
+const PLEROMA_ADMIN_APPROVE_USERS_URL = '/api/v1/pleroma/admin/users/approve'
+const PLEROMA_ADMIN_CONFIRM_USERS_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_LIST_STATUSES_URL = ({
+ id,
+ page,
+ pageSize,
+ godmode,
+ withReblogs,
+}) =>
+ `/api/v1/pleroma/admin/users/${id}/statuses?page_size=${pageSize}&page=${page}&godmode=${godmode}&with_reblogs=${withReblogs}`
+const PLEROMA_ADMIN_CHANGE_STATUS_SCOPE_URL = (id) =>
+ `/api/v1/pleroma/admin/statuses/${id}`
+const PLEROMA_ADMIN_REQUIRE_PASSWORD_CHANGE_URL =
+ '/api/v1/pleroma/admin/users/force_password_reset'
+const PLEROMA_ADMIN_DISABLE_MFA_URL = '/api/v1/pleroma/admin/users/disable_mfa'
const PLEROMA_EMOJI_RELOAD_URL = '/api/pleroma/admin/reload_emoji'
const PLEROMA_EMOJI_IMPORT_FS_URL = '/api/pleroma/emoji/packs/import'
const PLEROMA_EMOJI_PACKS_URL = (page, pageSize) =>
@@ -205,8 +259,11 @@ const promisedRequest = ({
}
}
return fetch(url, options).then((response) => {
- return new Promise((resolve, reject) =>
- response
+ return new Promise((resolve, reject) => {
+ // 204 is "No content", which fails to parse json (as you'd might think)
+ if (response.ok && response.status === 204) resolve()
+
+ return response
.json()
.then((json) => {
if (!response.ok) {
@@ -230,8 +287,8 @@ const promisedRequest = ({
response,
),
)
- }),
- )
+ })
+ })
})
}
@@ -723,89 +780,117 @@ const fetchStatusHistory = ({ status, credentials }) => {
})
}
-const tagUser = ({ tag, credentials, user }) => {
- const screenName = user.screen_name
- const form = {
- nicknames: [screenName],
- tags: [tag],
- }
-
- const headers = authHeaders(credentials)
- headers['Content-Type'] = 'application/json'
-
- return fetch(TAG_USER_URL, {
- method: 'PUT',
- headers,
- body: JSON.stringify(form),
- })
-}
-
-const untagUser = ({ tag, credentials, user }) => {
- const screenName = user.screen_name
- const body = {
- nicknames: [screenName],
- tags: [tag],
- }
-
- const headers = authHeaders(credentials)
- headers['Content-Type'] = 'application/json'
-
- return fetch(TAG_USER_URL, {
- method: 'DELETE',
- headers,
- body: JSON.stringify(body),
- })
-}
-
-const addRight = ({ right, credentials, user }) => {
- const screenName = user.screen_name
-
- return fetch(PERMISSION_GROUP_URL(screenName, right), {
- method: 'POST',
- headers: authHeaders(credentials),
- body: {},
- })
-}
-
-const deleteRight = ({ right, credentials, user }) => {
- const screenName = user.screen_name
-
- return fetch(PERMISSION_GROUP_URL(screenName, right), {
- method: 'DELETE',
- headers: authHeaders(credentials),
- body: {},
- })
-}
-
-const activateUser = ({ credentials, user: { screen_name: nickname } }) => {
+const adminSetUsersTags = ({
+ tags,
+ credentials,
+ value,
+ screen_names: nicknames,
+}) => {
return promisedRequest({
- url: ACTIVATE_USER_URL,
+ url: PLEROMA_ADMIN_TAG_USER_URL,
+ method: value ? 'PUT' : 'DELETE',
+ credentials,
+ payload: {
+ nicknames,
+ tags,
+ },
+ })
+}
+
+const adminSetUsersRight = ({
+ right,
+ credentials,
+ value,
+ screen_names: nicknames,
+}) => {
+ return promisedRequest({
+ url: PLEROMA_ADMIN_PERMISSION_GROUP_URL(right),
+ method: value ? 'POST' : 'DELETE',
+ credentials,
+ payload: {
+ nicknames,
+ },
+ })
+}
+
+const adminSetUsersActivationStatus = ({
+ credentials,
+ screen_names: nicknames,
+ value,
+}) => {
+ return promisedRequest({
+ url: value
+ ? PLEROMA_ADMIN_ACTIVATE_USERS_URL
+ : PLEROMA_ADMIN_DEACTIVATE_USERS_URL,
method: 'PATCH',
credentials,
payload: {
- nicknames: [nickname],
+ nicknames,
},
- }).then((response) => get(response, 'users.0'))
+ }).then((response) => response.users)
}
-const deactivateUser = ({ credentials, user: { screen_name: nickname } }) => {
+const adminSetUsersApprovalStatus = ({
+ credentials,
+ screen_names: nicknames,
+}) => {
return promisedRequest({
- url: DEACTIVATE_USER_URL,
+ url: PLEROMA_ADMIN_APPROVE_USERS_URL,
method: 'PATCH',
credentials,
payload: {
- nicknames: [nickname],
+ nicknames,
},
- }).then((response) => get(response, 'users.0'))
+ }).then((response) => response.users)
}
-const deleteUser = ({ credentials, user }) => {
- const screenName = user.screen_name
- const headers = authHeaders(credentials)
+const adminSetUsersConfirmationStatus = ({
+ credentials,
+ screen_names: nicknames,
+}) => {
+ return promisedRequest({
+ url: PLEROMA_ADMIN_CONFIRM_USERS_URL,
+ method: 'PATCH',
+ credentials,
+ payload: {
+ nicknames,
+ },
+ }).then((response) => response.users)
+}
- return fetch(`${ADMIN_USERS_URL}?nickname=${screenName}`, {
+const adminSetUsersSuggestionStatus = ({
+ credentials,
+ screen_names: nicknames,
+ value,
+}) => {
+ return promisedRequest({
+ url: value
+ ? PLEROMA_ADMIN_SUGGEST_USERS_URL
+ : PLEROMA_ADMIN_UNSUGGEST_USERS_URL,
+ method: 'PATCH',
+ credentials,
+ payload: {
+ nicknames,
+ },
+ }).then((response) => response.users)
+}
+
+const adminGetUserData = ({ credentials, screen_name: nickname }) => {
+ return promisedRequest({
+ url: PLEROMA_ADMIN_USERS_URL_SHOW(nickname),
+ method: 'GET',
+ credentials,
+ })
+}
+
+const adminDeleteAccounts = ({ credentials, screen_names: nicknames }) => {
+ return promisedRequest({
+ url: PLEROMA_ADMIN_USERS_URL,
method: 'DELETE',
- headers,
+ credentials,
+ payload: {
+ nicknames,
+ },
})
}
@@ -1617,6 +1702,90 @@ const dismissAnnouncement = ({ id, credentials }) => {
})
}
+const adminListUsers = ({ opts, credentials }) => {
+ // the reported list is hardly useful because standards are for dating i guess,
+ // so make sure to fetchIfMissing right afterward using this call
+ const url = PLEROMA_ADMIN_USERS_URL_LIST(opts)
+
+ return promisedRequest({
+ url,
+ credentials,
+ method: 'GET',
+ })
+}
+
+const adminResendConfirmationEmail = ({
+ screen_names: nicknames,
+ credentials,
+}) => {
+ const url = PLEROMA_ADMIN_RESEND_CONFIRMATION_EMAIL_URL
+ return promisedRequest({
+ url,
+ credentials,
+ method: 'PATCH',
+ payload: {
+ nicknames,
+ },
+ })
+}
+
+const adminRequirePasswordChange = ({
+ screen_names: nicknames,
+ credentials,
+}) => {
+ const url = PLEROMA_ADMIN_REQUIRE_PASSWORD_CHANGE_URL
+ return promisedRequest({
+ url,
+ credentials,
+ method: 'PATCH',
+ payload: {
+ nicknames,
+ },
+ })
+}
+
+const adminDisableMFA = ({ screen_name: nickname, credentials }) => {
+ const url = PLEROMA_ADMIN_DISABLE_MFA_URL
+ return promisedRequest({
+ url,
+ credentials,
+ method: 'PUT',
+ payload: {
+ nickname,
+ },
+ })
+}
+
+const adminListStatuses = ({ opts, credentials }) => {
+ const url = PLEROMA_ADMIN_LIST_STATUSES_URL(opts)
+
+ return promisedRequest({
+ url,
+ credentials,
+ method: 'GET',
+ })
+}
+
+const adminChangeStatusScope = ({
+ opts: { id, sensitive, visibility },
+ credentials,
+}) => {
+ const url = PLEROMA_ADMIN_CHANGE_STATUS_SCOPE_URL(id)
+ var payload = {}
+ if (typeof sensitive !== 'undefined') {
+ payload['sensitive'] = sensitive
+ }
+ if (typeof visibility !== 'undefined') {
+ payload['visibility'] = visibility
+ }
+ return promisedRequest({
+ url,
+ credentials,
+ method: 'PUT',
+ payload,
+ })
+}
+
const announcementToPayload = ({ content, startsAt, endsAt, allDay }) => {
const payload = { content }
@@ -2089,7 +2258,6 @@ const listEmojiPacks = ({ page, pageSize }) => {
}
const listRemoteEmojiPacks = ({ instance, page, pageSize }) => {
- console.log(instance)
if (!instance.startsWith('http')) {
instance = 'https://' + instance
}
@@ -2253,13 +2421,6 @@ const apiService = {
fetchBlocks,
fetchOAuthTokens,
revokeOAuthToken,
- tagUser,
- untagUser,
- deleteUser,
- addRight,
- deleteRight,
- activateUser,
- deactivateUser,
register,
getCaptcha,
updateProfileImages,
@@ -2347,6 +2508,20 @@ const apiService = {
createBookmarkFolder,
updateBookmarkFolder,
deleteBookmarkFolder,
+ adminListUsers,
+ adminGetUserData,
+ adminResendConfirmationEmail,
+ adminDeleteAccounts,
+ adminSetUsersRight,
+ adminSetUsersTags,
+ adminSetUsersApprovalStatus,
+ adminSetUsersConfirmationStatus,
+ adminSetUsersActivationStatus,
+ adminSetUsersSuggestionStatus,
+ adminListStatuses,
+ adminChangeStatusScope,
+ adminRequirePasswordChange,
+ adminDisableMFA,
}
export default apiService
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 1d90617fc..94a5681be 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -15,234 +15,154 @@ import { isStatusNotification } from '../notification_utils/notification_utils.j
* it would be reverted back to []
*/
-const qvitterStatusType = (status) => {
- if (status.is_post_verb) {
- return 'status'
- }
-
- if (status.retweeted_status) {
- return 'retweet'
- }
-
- if (
- (typeof status.uri === 'string' &&
- status.uri.match(/(fave|objectType=Favourite)/)) ||
- (typeof status.text === 'string' && status.text.match(/favorited/))
- ) {
- return 'favorite'
- }
-
- if (
- status.text.match(/deleted notice {{tag/) ||
- status.qvitter_delete_notice
- ) {
- return 'deletion'
- }
-
- if (
- status.text.match(/started following/) ||
- status.activity_type === 'follow'
- ) {
- return 'follow'
- }
-
- return 'unknown'
-}
-
export const parseUser = (data) => {
const output = {}
- const masto = Object.hasOwn(data, 'acct')
+ output._original = data // used for server-side settings
+
// case for users in "mentions" property for statuses in MastoAPI
- const mastoShort = masto && !Object.hasOwn(data, 'avatar')
+ const mastoShort = !Object.hasOwn(data, 'avatar')
output.inLists = null
output.id = String(data.id)
- output._original = data // used for server-side settings
- if (masto) {
- output.screen_name = data.acct
- output.fqn = data.fqn
- output.statusnet_profile_url = data.url
+ output.screen_name = data.acct
+ output.fqn = data.fqn
+ output.statusnet_profile_url = data.url
- if (Object.hasOwn(data, 'mute_expires_at')) {
- output.mute_expires_at =
- data.mute_expires_at == null ? false : data.mute_expires_at
+ if (Object.hasOwn(data, 'mute_expires_at')) {
+ output.mute_expires_at =
+ data.mute_expires_at == null ? false : data.mute_expires_at
+ }
+
+ if (Object.hasOwn(data, 'block_expires_at')) {
+ output.block_expires_at =
+ data.block_expires_at == null ? false : data.block_expires_at
+ }
+
+ // There's nothing else to get
+ if (mastoShort) {
+ return output
+ }
+
+ output.emoji = data.emojis
+ output.name = escapeHtml(data.display_name)
+ output.name_html = output.name
+ output.name_unescaped = data.display_name
+
+ output.description = data.note
+ // TODO cleanup this shit, output.description is overriden with source data
+ output.description_html = data.note
+
+ output.fields = data.fields
+ output.fields_html = data.fields.map((field) => {
+ return {
+ name: escapeHtml(field.name),
+ value: field.value,
+ }
+ })
+ output.fields_text = data.fields.map((field) => {
+ return {
+ name: unescape(field.name.replace(/<[^>]*>/g, '')),
+ value: unescape(field.value.replace(/<[^>]*>/g, '')),
+ }
+ })
+
+ // Utilize avatar_static for gif avatars?
+ output.profile_image_url = data.avatar
+ output.profile_image_url_original = data.avatar
+
+ // Same, utilize header_static?
+ output.cover_photo = data.header
+
+ output.friends_count = data.following_count
+
+ output.bot = data.bot
+
+ output.privileges = []
+
+ if (data.pleroma) {
+ if (data.pleroma.settings_store) {
+ output.storage = data.pleroma.settings_store['pleroma-fe']
+ output.user_highlight = data.pleroma.settings_store['user_highlight']
+ }
+ const relationship = data.pleroma.relationship
+
+ output.background_image = data.pleroma.background_image
+ output.favicon = data.pleroma.favicon
+ output.token = data.pleroma.chat_token
+
+ if (relationship) {
+ output.relationship = relationship
}
- if (Object.hasOwn(data, 'block_expires_at')) {
- output.block_expires_at =
- data.block_expires_at == null ? false : data.block_expires_at
+ output.allow_following_move = data.pleroma.allow_following_move
+
+ output.hide_favorites = data.pleroma.hide_favorites
+ output.hide_follows = data.pleroma.hide_follows
+ output.hide_followers = data.pleroma.hide_followers
+ output.hide_follows_count = data.pleroma.hide_follows_count
+ output.hide_followers_count = data.pleroma.hide_followers_count
+
+ output.rights = {
+ moderator: data.pleroma.is_moderator,
+ admin: data.pleroma.is_admin,
+ }
+ // TODO: Clean up in UI? This is duplication from what BE does for qvitterapi
+ if (output.rights.admin) {
+ output.role = 'admin'
+ } else if (output.rights.moderator) {
+ output.role = 'moderator'
+ } else {
+ output.role = 'member'
}
- // There's nothing else to get
- if (mastoShort) {
- return output
- }
+ output.birthday = data.pleroma.birthday
- output.emoji = data.emojis
- output.name = escapeHtml(data.display_name)
- output.name_html = output.name
- output.name_unescaped = data.display_name
-
- output.description = data.note
- // TODO cleanup this shit, output.description is overriden with source data
- output.description_html = data.note
-
- output.fields = data.fields
- output.fields_html = data.fields.map((field) => {
- return {
- name: escapeHtml(field.name),
- value: field.value,
- }
- })
- output.fields_text = data.fields.map((field) => {
- return {
- name: unescape(field.name.replace(/<[^>]*>/g, '')),
- value: unescape(field.value.replace(/<[^>]*>/g, '')),
- }
- })
-
- // Utilize avatar_static for gif avatars?
- output.profile_image_url = data.avatar
- output.profile_image_url_original = data.avatar
-
- // Same, utilize header_static?
- output.cover_photo = data.header
-
- output.friends_count = data.following_count
-
- output.bot = data.bot
-
- output.privileges = []
-
- if (data.pleroma) {
- if (data.pleroma.settings_store) {
- output.storage = data.pleroma.settings_store['pleroma-fe']
- output.user_highlight = data.pleroma.settings_store['user_highlight']
- }
- const relationship = data.pleroma.relationship
-
- output.background_image = data.pleroma.background_image
- output.favicon = data.pleroma.favicon
- output.token = data.pleroma.chat_token
-
- if (relationship) {
- output.relationship = relationship
- }
-
- output.allow_following_move = data.pleroma.allow_following_move
-
- output.hide_favorites = data.pleroma.hide_favorites
- output.hide_follows = data.pleroma.hide_follows
- output.hide_followers = data.pleroma.hide_followers
- output.hide_follows_count = data.pleroma.hide_follows_count
- output.hide_followers_count = data.pleroma.hide_followers_count
-
- output.rights = {
- moderator: data.pleroma.is_moderator,
- admin: data.pleroma.is_admin,
- }
- // TODO: Clean up in UI? This is duplication from what BE does for qvitterapi
- if (output.rights.admin) {
- output.role = 'admin'
- } else if (output.rights.moderator) {
- output.role = 'moderator'
- } else {
- output.role = 'member'
- }
-
- output.birthday = data.pleroma.birthday
-
- if (data.pleroma.privileges) {
- output.privileges = data.pleroma.privileges
- } else if (data.pleroma.is_admin) {
- output.privileges = [
- 'users_read',
- 'users_manage_invites',
- 'users_manage_activation_state',
- 'users_manage_tags',
- 'users_manage_credentials',
- 'users_delete',
- 'messages_read',
- 'messages_delete',
- 'instances_delete',
- 'reports_manage_reports',
- 'moderation_log_read',
- 'announcements_manage_announcements',
- 'emoji_manage_emoji',
- 'statistics_read',
- ]
- } else if (data.pleroma.is_moderator) {
- output.privileges = ['messages_delete', 'reports_manage_reports']
- } else {
- output.privileges = []
- }
- }
-
- if (data.source) {
- output.description = data.source.note
- output.default_scope = data.source.privacy
- output.fields = data.source.fields
- if (data.source.pleroma) {
- output.no_rich_text = data.source.pleroma.no_rich_text
- output.show_role = data.source.pleroma.show_role
- output.discoverable = data.source.pleroma.discoverable
- output.show_birthday = data.pleroma.show_birthday
- output.actor_type = data.source.pleroma.actor_type
- }
- }
-
- // TODO: handle is_local
- output.is_local = !output.screen_name.includes('@')
- } else {
- output.screen_name = data.screen_name
-
- output.name = data.name
- output.name_html = data.name_html
-
- output.description = data.description
- output.description_html = data.description_html
-
- output.profile_image_url = data.profile_image_url
- output.profile_image_url_original = data.profile_image_url_original
-
- output.cover_photo = data.cover_photo
-
- output.friends_count = data.friends_count
-
- // output.bot = ??? missing
-
- output.statusnet_profile_url = data.statusnet_profile_url
-
- output.is_local = data.is_local
- output.role = data.role
- output.show_role = data.show_role
-
- if (data.rights) {
- output.rights = {
- moderator: data.rights.delete_others_notice,
- admin: data.rights.admin,
- }
- }
- output.no_rich_text = data.no_rich_text
- output.default_scope = data.default_scope
- output.hide_follows = data.hide_follows
- output.hide_followers = data.hide_followers
- output.hide_follows_count = data.hide_follows_count
- output.hide_followers_count = data.hide_followers_count
- output.background_image = data.background_image
- // Websocket token
- output.token = data.token
-
- // Convert relationsip data to expected format
- output.relationship = {
- muting: data.muted,
- blocking: data.statusnet_blocking,
- followed_by: data.follows_you,
- following: data.following,
+ if (data.pleroma.privileges) {
+ output.privileges = new Set(data.pleroma.privileges)
+ } else if (data.pleroma.is_admin) {
+ output.privileges = new Set([
+ 'users_read',
+ 'users_manage_invites',
+ 'users_manage_activation_state',
+ 'users_manage_tags',
+ 'users_manage_credentials',
+ 'users_delete',
+ 'messages_read',
+ 'messages_delete',
+ 'instances_delete',
+ 'reports_manage_reports',
+ 'moderation_log_read',
+ 'announcements_manage_announcements',
+ 'emoji_manage_emoji',
+ 'statistics_read',
+ ])
+ } else if (data.pleroma.is_moderator) {
+ output.privileges = new Set(['messages_delete', 'reports_manage_reports'])
+ } else {
+ output.privileges = new Set()
}
}
+ if (data.source) {
+ output.description = data.source.note
+ output.default_scope = data.source.privacy
+ output.fields = data.source.fields
+ if (data.source.pleroma) {
+ output.no_rich_text = data.source.pleroma.no_rich_text
+ output.show_role =
+ typeof data.source.pleroma.show_role === 'boolean'
+ ? data.source.pleroma.show_role
+ : true
+ output.discoverable = data.source.pleroma.discoverable
+ output.show_birthday = data.pleroma.show_birthday
+ output.actor_type = data.source.pleroma.actor_type
+ }
+ }
+
+ // TODO: handle is_local
+ output.is_local = !output.screen_name.includes('@')
+
output.created_at = new Date(data.created_at)
output.locked = data.locked
output.last_status_at = new Date(data.last_status_at)
@@ -252,7 +172,7 @@ export const parseUser = (data) => {
if (data.pleroma) {
output.follow_request_count = data.pleroma.follow_request_count
- output.tags = data.pleroma.tags
+ output.tags = new Set(data.pleroma.tags)
// deactivated was changed to is_active in Pleroma 2.3.0
// so check if is_active is present
@@ -265,7 +185,7 @@ export const parseUser = (data) => {
output.unread_chat_count = data.pleroma.unread_chat_count
}
- output.tags = output.tags || []
+ output.tags = output.tags || new Set()
output.rights = output.rights || {}
output.notification_settings = output.notification_settings || {}
@@ -289,17 +209,11 @@ export const parseUser = (data) => {
export const parseAttachment = (data) => {
const output = {}
- const masto = !Object.hasOwn(data, 'oembed')
- if (masto) {
- // Not exactly same...
- output.mimetype = data.pleroma ? data.pleroma.mime_type : data.type
- output.meta = data.meta // not present in BE yet
- output.id = data.id
- } else {
- output.mimetype = data.mimetype
- // output.meta = ??? missing
- }
+ // Not exactly same...
+ output.mimetype = data.pleroma ? data.pleroma.mime_type : data.type
+ output.meta = data.meta // not present in BE yet
+ output.id = data.id
if (data.type !== 'unknown') {
// treat gifv like it is "video"
@@ -326,116 +240,76 @@ export const parseSource = (data) => {
export const parseStatus = (data) => {
const output = {}
- const masto = Object.hasOwn(data, 'account')
- if (masto) {
- output.favorited = data.favourited
- output.fave_num = data.favourites_count
+ output.favorited = data.favourited
+ output.fave_num = data.favourites_count
- output.repeated = data.reblogged
- output.repeat_num = data.reblogs_count
+ output.repeated = data.reblogged
+ output.repeat_num = data.reblogs_count
- output.bookmarked = data.bookmarked
+ output.bookmarked = data.bookmarked
- output.type = data.reblog ? 'retweet' : 'status'
- output.nsfw = data.sensitive
+ output.type = data.reblog ? 'retweet' : 'status'
+ output.nsfw = data.sensitive
- output.raw_html = data.content
- output.emojis = data.emojis
+ output.raw_html = data.content
+ output.emojis = data.emojis
- output.tags = data.tags
+ output.tags = data.tags
- output.edited_at = data.edited_at
+ output.edited_at = data.edited_at
- const { pleroma } = data
+ const { pleroma } = data
- if (data.pleroma) {
- output.text = pleroma.content
- ? data.pleroma.content['text/plain']
- : data.content
- output.summary = pleroma.spoiler_text
- ? data.pleroma.spoiler_text['text/plain']
- : data.spoiler_text
- output.statusnet_conversation_id = data.pleroma.conversation_id
- output.is_local = pleroma.local
- output.in_reply_to_screen_name = pleroma.in_reply_to_account_acct
- output.thread_muted = pleroma.thread_muted
- output.emoji_reactions = pleroma.emoji_reactions
- output.parent_visible =
- pleroma.parent_visible === undefined ? true : pleroma.parent_visible
- output.quote_visible = pleroma.quote_visible || true
- output.quotes_count = pleroma.quotes_count
- output.bookmark_folder_id = pleroma.bookmark_folder
- } else {
- output.text = data.content
- output.summary = data.spoiler_text
- }
-
- const quoteRaw = pleroma?.quote || data.quote
- const quoteData = quoteRaw ? parseStatus(quoteRaw) : undefined
- output.quote = quoteData
- output.quote_id =
- data.quote?.id ?? data.quote_id ?? quoteData?.id ?? pleroma?.quote_id
- output.quote_url = data.quote?.url ?? quoteData?.url ?? pleroma?.quote_url
-
- output.in_reply_to_status_id = data.in_reply_to_id
- output.in_reply_to_user_id = data.in_reply_to_account_id
- output.replies_count = data.replies_count
-
- if (output.type === 'retweet') {
- output.retweeted_status = parseStatus(data.reblog)
- }
-
- output.summary_raw_html = escapeHtml(data.spoiler_text)
- output.external_url = data.uri || data.url
- output.poll = data.poll
- if (output.poll) {
- output.poll.options = (output.poll.options || []).map((field) => ({
- ...field,
- title_html: escapeHtml(field.title),
- }))
- }
- output.pinned = data.pinned
- output.muted = data.muted
+ if (data.pleroma) {
+ output.text = pleroma.content
+ ? data.pleroma.content['text/plain']
+ : data.content
+ output.summary = pleroma.spoiler_text
+ ? data.pleroma.spoiler_text['text/plain']
+ : data.spoiler_text
+ output.statusnet_conversation_id = data.pleroma.conversation_id
+ output.is_local = pleroma.local
+ output.in_reply_to_screen_name = pleroma.in_reply_to_account_acct
+ output.thread_muted = pleroma.thread_muted
+ output.emoji_reactions = pleroma.emoji_reactions
+ output.parent_visible =
+ pleroma.parent_visible === undefined ? true : pleroma.parent_visible
+ output.quote_visible = pleroma.quote_visible || true
+ output.quotes_count = pleroma.quotes_count
+ output.bookmark_folder_id = pleroma.bookmark_folder
} else {
- output.favorited = data.favorited
- output.fave_num = data.fave_num
-
- output.repeated = data.repeated
- output.repeat_num = data.repeat_num
-
- // catchall, temporary
- // Object.assign(output, data)
-
- output.type = qvitterStatusType(data)
-
- if (data.nsfw === undefined) {
- output.nsfw = isNsfw(data)
- if (data.retweeted_status) {
- output.nsfw = data.retweeted_status.nsfw
- }
- } else {
- output.nsfw = data.nsfw
- }
-
- output.raw_html = data.statusnet_html
- output.text = data.text
-
- output.in_reply_to_status_id = data.in_reply_to_status_id
- output.in_reply_to_user_id = data.in_reply_to_user_id
- output.in_reply_to_screen_name = data.in_reply_to_screen_name
- output.statusnet_conversation_id = data.statusnet_conversation_id
-
- if (output.type === 'retweet') {
- output.retweeted_status = parseStatus(data.retweeted_status)
- }
-
- output.summary = data.summary
- output.summary_html = data.summary_html
- output.external_url = data.external_url
- output.is_local = data.is_local
+ output.text = data.content
+ output.summary = data.spoiler_text
}
+ const quoteRaw = pleroma?.quote || data.quote
+ const quoteData = quoteRaw ? parseStatus(quoteRaw) : undefined
+ output.quote = quoteData
+ output.quote_id =
+ data.quote?.id ?? data.quote_id ?? quoteData?.id ?? pleroma?.quote_id
+ output.quote_url = data.quote?.url ?? quoteData?.url ?? pleroma?.quote_url
+
+ output.in_reply_to_status_id = data.in_reply_to_id
+ output.in_reply_to_user_id = data.in_reply_to_account_id
+ output.replies_count = data.replies_count
+
+ if (output.type === 'retweet') {
+ output.retweeted_status = parseStatus(data.reblog)
+ }
+
+ output.summary_raw_html = escapeHtml(data.spoiler_text)
+ output.external_url = data.uri || data.url
+ output.poll = data.poll
+ if (output.poll) {
+ output.poll.options = (output.poll.options || []).map((field) => ({
+ ...field,
+ title_html: escapeHtml(field.title),
+ }))
+ }
+ output.pinned = data.pinned
+ output.muted = data.muted
+
output.id = String(data.id)
output.visibility = data.visibility
output.card = data.card
@@ -449,17 +323,13 @@ export const parseStatus = (data) => {
? String(output.in_reply_to_user_id)
: null
- output.user = parseUser(masto ? data.account : data.user)
+ output.user = parseUser(data.account)
- output.attentions = ((masto ? data.mentions : data.attentions) || []).map(
- parseUser,
- )
+ output.attentions = (data.mentions || []).map(parseUser)
- output.attachments = (
- (masto ? data.media_attachments : data.attachments) || []
- ).map(parseAttachment)
+ output.attachments = (data.media_attachments || []).map(parseAttachment)
- const retweetedStatus = masto ? data.reblog : data.retweeted_status
+ const retweetedStatus = data.reblog
if (retweetedStatus) {
output.retweeted_status = parseStatus(retweetedStatus)
}
@@ -479,42 +349,26 @@ export const parseNotification = (data) => {
favourite: 'like',
reblog: 'repeat',
}
- const masto = !Object.hasOwn(data, 'ntype')
const output = {}
- if (masto) {
- output.type = mastoDict[data.type] || data.type
- output.seen = data.pleroma.is_seen
- // TODO: null check should be a temporary fix, I guess.
- // Investigate why backend does this.
- output.status =
- isStatusNotification(output.type) && data.status !== null
- ? parseStatus(data.status)
- : null
- output.target = output.type !== 'move' ? null : parseUser(data.target)
- output.from_profile = parseUser(data.account)
- output.emoji = data.emoji
- output.emoji_url = data.emoji_url
- if (data.report) {
- output.report = data.report
- output.report.content = data.report.content
- output.report.acct = parseUser(data.report.account)
- output.report.actor = parseUser(data.report.actor)
- output.report.statuses = data.report.statuses.map(parseStatus)
- }
- } else {
- const parsedNotice = parseStatus(data.notice)
- output.type = data.ntype
- output.seen = Boolean(data.is_seen)
- output.status =
- output.type === 'like'
- ? parseStatus(data.notice.favorited_status)
- : parsedNotice
- output.action = parsedNotice
- output.from_profile =
- output.type === 'pleroma:chat_mention'
- ? parseUser(data.account)
- : parseUser(data.from_profile)
+ output.type = mastoDict[data.type] || data.type
+ output.seen = data.pleroma.is_seen
+ // TODO: null check should be a temporary fix, I guess.
+ // Investigate why backend does this.
+ output.status =
+ isStatusNotification(output.type) && data.status !== null
+ ? parseStatus(data.status)
+ : null
+ output.target = output.type !== 'move' ? null : parseUser(data.target)
+ output.from_profile = parseUser(data.account)
+ output.emoji = data.emoji
+ output.emoji_url = data.emoji_url
+ if (data.report) {
+ output.report = data.report
+ output.report.content = data.report.content
+ output.report.acct = parseUser(data.report.account)
+ output.report.actor = parseUser(data.report.actor)
+ output.report.statuses = data.report.statuses.map(parseStatus)
}
output.created_at = new Date(data.created_at)
@@ -523,14 +377,6 @@ export const parseNotification = (data) => {
return output
}
-const isNsfw = (status) => {
- const nsfwRegex = /#nsfw/i
- return (
- (status.tags || []).includes('nsfw') ||
- !!(status.text || '').match(nsfwRegex)
- )
-}
-
export const parseLinkHeaderPagination = (linkHeader, opts = {}) => {
const flakeId = opts.flakeId
const parsedLinkHeader = parseLinkHeader(linkHeader)
diff --git a/src/stores/admin_settings.js b/src/stores/admin_settings.js
new file mode 100644
index 000000000..b07315034
--- /dev/null
+++ b/src/stores/admin_settings.js
@@ -0,0 +1,466 @@
+import { cloneDeep, differenceWith, flatten, get, isEqual, set } from 'lodash'
+import { defineStore } from 'pinia'
+
+import { parseStatus } from 'src/services/entity_normalizer/entity_normalizer.service.js'
+
+export const defaultState = {
+ frontends: [],
+ loaded: false,
+ needsReboot: null,
+ config: null,
+ modifiedPaths: null,
+ descriptions: null,
+ draft: null,
+ dbConfigEnabled: null,
+}
+
+export const newUserFlags = {
+ ...defaultState.flagStorage,
+}
+
+export const useAdminSettingsStore = defineStore('adminSettings', {
+ state: () => ({
+ ...cloneDeep(defaultState),
+ backendInteractor: window.vuex.state.api.backendInteractor,
+ }),
+ actions: {
+ // Configuration Stuff
+ setInstanceAdminNoDbConfig() {
+ this.loaded = false
+ this.dbConfigEnabled = false
+ },
+ updateAdminSettings({ config, modifiedPaths }) {
+ this.loaded = true
+ this.dbConfigEnabled = true
+ this.config = config
+ this.modifiedPaths = modifiedPaths
+ },
+ updateAdminDescriptions({ descriptions }) {
+ this.descriptions = descriptions
+ },
+ updateAdminDraft({ path, value }) {
+ const [group, key, subkey] = path
+ const parent = [group, key, subkey]
+
+ set(this.draft, path, value)
+
+ // force-updating grouped draft to trigger refresh of group settings
+ if (path.length > parent.length) {
+ set(this.draft, parent, cloneDeep(get(this.draft, parent)))
+ }
+ },
+ resetAdminDraft() {
+ this.draft = cloneDeep(this.config)
+ },
+
+ loadAdminStuff() {
+ this.backendInteractor.fetchInstanceDBConfig().then((backendDbConfig) => {
+ if (backendDbConfig.error) {
+ if (backendDbConfig.error.status === 400) {
+ backendDbConfig.error.json().then((errorJson) => {
+ if (/configurable_from_database/.test(errorJson.error)) {
+ this.setInstanceAdminNoDbConfig()
+ }
+ })
+ }
+ } else {
+ this.setInstanceAdminSettings({ backendDbConfig })
+ }
+ })
+ if (this.descriptions === null) {
+ this.backendInteractor
+ .fetchInstanceConfigDescriptions()
+ .then((backendDescriptions) =>
+ this.setInstanceAdminDescriptions({ backendDescriptions }),
+ )
+ }
+ },
+ setInstanceAdminSettings({ backendDbConfig }) {
+ const config = this.config || {}
+ const modifiedPaths = new Set()
+
+ backendDbConfig.configs.forEach((c) => {
+ const path = [c.group, c.key]
+ if (c.db) {
+ // Path elements can contain dot, therefore we use ' -> ' as a separator instead
+ // Using strings for modified paths for easier searching
+ c.db.forEach((x) => modifiedPaths.add([...path, x].join(' -> ')))
+ }
+
+ // we need to preserve tuples on second level only, possibly third
+ // but it's not a case right now.
+ const convert = (value, preserveTuples, preserveTuplesLv2) => {
+ if (Array.isArray(value) && value.length > 0 && value[0].tuple) {
+ if (!preserveTuples) {
+ return value.reduce((acc, c) => {
+ if (c.tuple == null) {
+ return {
+ ...acc,
+ [c]: c,
+ }
+ }
+ return {
+ ...acc,
+ [c.tuple[0]]: convert(c.tuple[1], preserveTuplesLv2),
+ }
+ }, {})
+ } else {
+ return value.map((x) => x.tuple)
+ }
+ } else {
+ if (!preserveTuples) {
+ return value
+ } else {
+ return value.tuple
+ }
+ }
+ }
+ // for most stuff we want maps since those are more convenient
+ // however this doesn't allow for multiple values per same key
+ // so for those cases we want to preserve tuples as-is
+ // right now it's made exclusively for :pleroma.:rate_limit
+ // so it might not work properly elsewhere
+ const preserveTuples = path.find((x) => x === ':rate_limit')
+ set(config, path, convert(c.value, false, preserveTuples))
+ })
+ // patching http adapter config to be easier to handle
+ const adapter = config[':pleroma'][':http'][':adapter']
+ if (Array.isArray(adapter)) {
+ config[':pleroma'][':http'][':adapter'] = {
+ [':ssl_options']: {
+ [':versions']: [],
+ },
+ }
+ }
+ this.updateAdminSettings({ config, modifiedPaths })
+ this.resetAdminDraft()
+ },
+ setInstanceAdminDescriptions({ backendDescriptions }) {
+ const convert = (
+ { children, description, label, key = '', group, suggestions },
+ path,
+ acc,
+ ) => {
+ const newPath = group ? [group, key] : [key]
+ const obj = { description, label, suggestions }
+ if (Array.isArray(children)) {
+ children.forEach((c) => {
+ convert(c, newPath, obj)
+ })
+ }
+ set(acc, newPath, obj)
+ }
+
+ const descriptions = {}
+
+ backendDescriptions.forEach((d) => convert(d, '', descriptions))
+ this.updateAdminDescriptions({ descriptions })
+ },
+
+ // This action takes draft state, diffs it with live config state and then pushes
+ // only differences between the two. Difference detection only work up to subkey (third) level.
+ pushAdminDraft() {
+ // TODO cleanup paths in modifiedPaths
+ const convert = (value) => {
+ if (typeof value !== 'object') {
+ return value
+ } else if (Array.isArray(value)) {
+ return value.map(convert)
+ } else {
+ return Object.entries(value).map(([k, v]) => ({ tuple: [k, v] }))
+ }
+ }
+
+ // Getting all group-keys used in config
+ const allGroupKeys = flatten(
+ Object.entries(this.config).map(([group, lv1data]) =>
+ Object.keys(lv1data).map((key) => ({ group, key })),
+ ),
+ )
+
+ // Only using group-keys where there are changes detected
+ const changedGroupKeys = allGroupKeys.filter(({ group, key }) => {
+ return !isEqual(this.config[group][key], this.draft[group][key])
+ })
+
+ // Here we take all changed group-keys and get all changed subkeys
+ const changed = changedGroupKeys.map(({ group, key }) => {
+ const config = this.config[group][key]
+ const draft = this.draft[group][key]
+
+ // We convert group-key value into entries arrays
+ const eConfig = Object.entries(config)
+ const eDraft = Object.entries(draft)
+
+ // Then those entries array we diff so only changed subkey entries remain
+ // We use the diffed array to reconstruct the object and then shove it into convert()
+ return {
+ group,
+ key,
+ value: convert(
+ Object.fromEntries(differenceWith(eDraft, eConfig, isEqual)),
+ ),
+ }
+ })
+
+ window.vuex.state.api.backendInteractor
+ .pushInstanceDBConfig({
+ payload: {
+ configs: changed,
+ },
+ })
+ .then(() =>
+ window.vuex.state.api.backendInteractor.fetchInstanceDBConfig(),
+ )
+ .then((backendDbConfig) =>
+ this.setInstanceAdminSettings({ backendDbConfig }),
+ )
+ },
+ pushAdminSetting({ path, value }) {
+ const [group, key, ...rest] = Array.isArray(path)
+ ? path
+ : path.split(/\./g)
+ const clone = {} // not actually cloning the entire thing to avoid excessive writes
+ set(clone, rest, value)
+
+ // TODO cleanup paths in modifiedPaths
+ const convert = (value) => {
+ if (typeof value !== 'object') {
+ return value
+ } else if (Array.isArray(value)) {
+ return value.map(convert)
+ } else {
+ return Object.entries(value).map(([k, v]) => ({ tuple: [k, v] }))
+ }
+ }
+
+ window.vuex.state.api.backendInteractor
+ .pushInstanceDBConfig({
+ payload: {
+ configs: [
+ {
+ group,
+ key,
+ value: convert(clone),
+ },
+ ],
+ },
+ })
+ .then(() =>
+ window.vuex.state.api.backendInteractor.fetchInstanceDBConfig(),
+ )
+ .then((backendDbConfig) =>
+ this.setInstanceAdminSettings({ backendDbConfig }),
+ )
+ },
+ resetAdminSetting({ path }) {
+ const [group, key, subkey] = Array.isArray(path)
+ ? path
+ : path.split(/\./g)
+
+ this.modifiedPaths.delete(path)
+
+ return window.vuex.state.api.backendInteractor
+ .pushInstanceDBConfig({
+ payload: {
+ configs: [
+ {
+ group,
+ key,
+ delete: true,
+ subkeys: [subkey],
+ },
+ ],
+ },
+ })
+ .then(() =>
+ window.vuex.state.api.backendInteractor.fetchInstanceDBConfig(),
+ )
+ .then((backendDbConfig) =>
+ this.setInstanceAdminSettings({ backendDbConfig }),
+ )
+ },
+
+ // Frontends Stuff
+ loadFrontendsStuff() {
+ this.backendInteractor
+ .fetchAvailableFrontends()
+ .then((frontends) => this.setAvailableFrontends({ frontends }))
+ },
+
+ setAvailableFrontends({ frontends }) {
+ this.frontends = frontends.map((f) => {
+ f.installedRefs = f.installed_refs
+ if (f.name === 'pleroma-fe') {
+ f.refs = ['master', 'develop']
+ } else {
+ f.refs = [f.ref]
+ }
+ return f
+ })
+ },
+
+ // Statuses stuff
+ async fetchStatuses(opts) {
+ const { total, activities } =
+ await this.backendInteractor.adminListStatuses({
+ opts,
+ })
+
+ const statuses = activities.map(parseStatus)
+
+ await window.vuex.dispatch('addNewStatuses', { statuses })
+
+ return {
+ items: statuses,
+ count: total,
+ }
+ },
+ async changeStatusScope(opts) {
+ const raw = await this.backendInteractor.adminChangeStatusScope({
+ opts,
+ })
+ const status = parseStatus(raw)
+
+ await window.vuex.dispatch('addNewStatuses', { statuses: [status] })
+ },
+
+ // Users stuff
+ async fetchUsers(opts) {
+ const { users, count } = await this.backendInteractor.adminListUsers({
+ opts,
+ })
+
+ return {
+ items: await Promise.all(
+ users.map(
+ async (userAdminData) =>
+ await window.vuex.dispatch('updateUserAdminData', {
+ userAdminData,
+ }),
+ ),
+ ),
+ count,
+ }
+ },
+ async getUserData({ user }) {
+ const api = this.backendInteractor.adminGetUserData
+ const { screen_name } = user
+
+ const result = await api({ screen_name })
+ window.vuex.commit('updateUserAdminData', { user: result })
+ },
+ async deleteUsers({ users }) {
+ const screen_names = users.map((u) => u.screen_name)
+ const api = this.backendInteractor.adminDeleteAccounts
+
+ const resultUserIds = await api({ screen_names })
+
+ resultUserIds.forEach((userId) => {
+ window.vuex.dispatch(
+ 'markStatusesAsDeleted',
+ (status) => userId === status.user.id,
+ )
+ // TODO when migrated to pinia, also remove user
+ })
+
+ return resultUserIds
+ },
+ resendConfirmationEmail({ users }) {
+ const screen_names = users.map((u) => u.screen_name)
+
+ return this.backendInteractor.adminResendConfirmationEmail({
+ screen_names,
+ })
+ },
+ requirePasswordChange({ users }) {
+ const screen_names = users.map((u) => u.screen_name)
+
+ return this.backendInteractor.adminRequirePasswordChange({
+ screen_names,
+ })
+ },
+ // Singular only!
+ disableMFA({ user }) {
+ const { screen_name } = user
+
+ return this.backendInteractor.adminDisableMFA({ screen_name })
+ },
+ async setUsersTags({ users, tags, value }) {
+ const screen_names = users.map((u) => u.screen_name)
+ const api = this.backendInteractor.adminSetUsersTags
+
+ await api({
+ screen_names,
+ tags,
+ value,
+ })
+
+ users.forEach((user) => {
+ this.getUserData({ user })
+ })
+ },
+ async setUsersRight({ users, right, value }) {
+ const screen_names = users.map((u) => u.screen_name)
+ const api = this.backendInteractor.adminSetUsersRight
+
+ await api({
+ screen_names,
+ right,
+ value,
+ })
+
+ users.forEach((user) => {
+ window.vuex.commit('updateRight', { user, right, value })
+ })
+ },
+ async setUsersActivationStatus({ users, value }) {
+ const screen_names = users.map((u) => u.screen_name)
+ const api = this.backendInteractor.adminSetUsersActivationStatus
+
+ const resultUsers = await api({
+ screen_names,
+ value,
+ })
+
+ resultUsers.forEach((user) => {
+ window.vuex.commit('updateUserAdminData', { user })
+ })
+ },
+ async setUsersSuggestionStatus({ users, value }) {
+ const screen_names = users.map((u) => u.screen_name)
+ const api = this.backendInteractor.adminSetUsersSuggestionStatus
+
+ const resultUsers = await api({
+ screen_names,
+ value,
+ })
+
+ resultUsers.forEach((user) => {
+ window.vuex.commit('updateUserAdminData', { user })
+ })
+ },
+ async setUsersConfirmationStatus({ users }) {
+ const screen_names = users.map((u) => u.screen_name)
+ const api = this.backendInteractor.adminSetUsersConfirmationStatus
+
+ await api({ screen_names })
+
+ users.forEach((user) => {
+ this.getUserData({ user })
+ })
+ },
+ async setUsersApprovalStatus({ users }) {
+ const screen_names = users.map((u) => u.screen_name)
+ const api = this.backendInteractor.adminSetUsersApprovalStatus
+
+ const resultUsers = await api({
+ screen_names,
+ })
+
+ resultUsers.forEach((user) => {
+ window.vuex.commit('updateUserAdminData', { user })
+ })
+ },
+ },
+})
diff --git a/src/stores/announcements.js b/src/stores/announcements.js
index bf88666c6..cb325dadd 100644
--- a/src/stores/announcements.js
+++ b/src/stores/announcements.js
@@ -29,7 +29,7 @@ export const useAnnouncementsStore = defineStore('announcements', {
const currentUser = window.vuex.state.users.currentUser
const isAdmin =
currentUser &&
- currentUser.privileges.includes('announcements_manage_announcements')
+ currentUser.privileges.has('announcements_manage_announcements')
const getAnnouncements = async () => {
if (!isAdmin) {
diff --git a/src/stores/interface.js b/src/stores/interface.js
index 01ff07533..21c1e9f8a 100644
--- a/src/stores/interface.js
+++ b/src/stores/interface.js
@@ -133,7 +133,24 @@ export const useInterfaceStore = defineStore('interface', {
}
}
},
- togglePeekSettingsModal() {
+ setSettingsModalState(newState) {
+ const oldState = this.settingsModalState
+ const legal = (() => {
+ switch (oldState) {
+ case 'minimized':
+ return true
+ case 'visible':
+ return true
+ case 'hidden':
+ return newState === 'visible'
+ }
+ })()
+
+ if (legal) {
+ this.settingsModalState = newState
+ }
+ },
+ toggleMinimizeSettingsModal() {
switch (this.settingsModalState) {
case 'minimized':
this.settingsModalState = 'visible'
@@ -141,8 +158,12 @@ export const useInterfaceStore = defineStore('interface', {
case 'visible':
this.settingsModalState = 'minimized'
return
+ case 'hidden':
+ return
default:
- throw new Error('Illegal minimization state of settings modal')
+ throw new Error(
+ `Illegal minimization state of settings modal: ${this.settingsModalState}`,
+ )
}
},
clearSettingsModalTargetTab() {
diff --git a/test/fixtures/statuses.json b/test/fixtures/statuses.json
deleted file mode 100644
index 76faf9746..000000000
--- a/test/fixtures/statuses.json
+++ /dev/null
@@ -1,1640 +0,0 @@
-[
- {
- "text": "@gameragodzilla @verius This is why you let the military run the theater of operations, not the cameras, PR handlers, and politicians.",
- "truncated": false,
- "created_at": "Sun Aug 21 16:56:30 +0000 2016",
- "in_reply_to_status_id": "247026",
- "uri": "tag:community.highlandarrow.com,2016-08-21:noticeId=255500:objectType=comment",
- "source": "ostatus",
- "id": 247029,
- "in_reply_to_user_id": 23253,
- "in_reply_to_screen_name": "gameragodzilla",
- "geo": null,
- "user": {
- "id": 23258,
- "name": "Maiyannah Bishop",
- "screen_name": "maiyannah",
- "location": "Canada",
- "description": "Admin of the HA community \u2022 Editor-in-chief of Highland Arrow \u2022 Lead Developer of !postActiv \u2022 FSF Associate Member \u2022 Email: maiyannah@highlandarrow.com",
- "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23258-48-20160819164757.jpeg",
- "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23258-48-20160819164757.jpeg",
- "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23258-original-20160819160607.jpeg",
- "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23258-original-20160819160607.jpeg",
- "groups_count": 0,
- "linkcolor": false,
- "backgroundcolor": false,
- "url": "http:\/\/www.highlandarrow.com",
- "protected": false,
- "followers_count": 1,
- "friends_count": 0,
- "created_at": "Wed Jul 27 21:36:53 +0000 2016",
- "utc_offset": "0",
- "time_zone": "UTC",
- "statuses_count": 937,
- "following": true,
- "statusnet_blocking": false,
- "notifications": true,
- "statusnet_profile_url": "https:\/\/community.highlandarrow.com\/maiyannah",
- "cover_photo": false,
- "background_image": false,
- "profile_link_color": false,
- "profile_background_color": false,
- "profile_banner_url": false,
- "follows_you": false,
- "blocks_you": false,
- "is_local": false,
- "is_silenced": false,
- "rights": {
- "delete_user": false,
- "delete_others_notice": false,
- "silence": false,
- "sandbox": false
- },
- "is_sandboxed": false,
- "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/1",
- "favourites_count": 37
- },
- "statusnet_html": "@gameragodzilla<\/a> @verius<\/a> This is why you let the military run the theater of operations, not the cameras, PR handlers, and politicians.",
- "statusnet_conversation_id": 200682,
- "statusnet_in_groups": false,
- "external_url": "https:\/\/community.highlandarrow.com\/notice\/255500",
- "in_reply_to_profileurl": "https:\/\/community.highlandarrow.com\/gameragodzilla",
- "in_reply_to_ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/73",
- "attentions": [
- {
- "id": 23250,
- "screen_name": "verius",
- "fullname": "Verius",
- "profileurl": "https:\/\/community.highlandarrow.com\/verius",
- "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/500"
- },
- {
- "id": 23253,
- "screen_name": "gameragodzilla",
- "fullname": "Gamera Godzilla",
- "profileurl": "https:\/\/community.highlandarrow.com\/gameragodzilla",
- "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/73"
- }
- ],
- "fave_num": 0,
- "repeat_num": 0,
- "is_post_verb": true,
- "is_local": false,
- "favorited": false,
- "repeated": false
- },
- {
- "text": "fl0wn favorited something by moonman: important: https:\/\/shitposter.club\/attachment\/182769",
- "truncated": false,
- "created_at": "Sun Aug 21 16:55:32 +0000 2016",
- "in_reply_to_status_id": "246906",
- "uri": "tag:sealion.club,2016-08-21:fave:238:note:957678:2016-08-21T12:55:32-04:00",
- "source": "ostatus",
- "id": 247028,
- "in_reply_to_user_id": 23220,
- "in_reply_to_screen_name": "moonman",
- "geo": null,
- "user": {
- "id": 23205,
- "name": "fl0wn",
- "screen_name": "fl0wn",
- "location": "Jack's House",
- "description": "the all seeing all dancing crap of the world",
- "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23205-48-20160730095757.jpeg",
- "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23205-48-20160730095757.jpeg",
- "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23205-original-20160730095636.jpeg",
- "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23205-original-20160730095636.jpeg",
- "groups_count": 0,
- "linkcolor": false,
- "backgroundcolor": false,
- "url": null,
- "protected": false,
- "followers_count": 1,
- "friends_count": 0,
- "created_at": "Tue Jul 26 23:04:47 +0000 2016",
- "utc_offset": "0",
- "time_zone": "UTC",
- "statuses_count": 1160,
- "following": true,
- "statusnet_blocking": false,
- "notifications": true,
- "statusnet_profile_url": "https:\/\/sealion.club\/fl0wn",
- "cover_photo": false,
- "background_image": false,
- "profile_link_color": false,
- "profile_background_color": false,
- "profile_banner_url": false,
- "follows_you": true,
- "blocks_you": false,
- "is_local": false,
- "is_silenced": false,
- "rights": {
- "delete_user": false,
- "delete_others_notice": false,
- "silence": false,
- "sandbox": false
- },
- "is_sandboxed": false,
- "ostatus_uri": "https:\/\/sealion.club\/user\/238",
- "favourites_count": 672
- },
- "statusnet_html": "fl0wn favorited something by moonman: important: https:\/\/shitposter.club\/attachment\/182769<\/a>",
- "statusnet_conversation_id": 200703,
- "statusnet_in_groups": false,
- "external_url": "https:\/\/sealion.club\/notice\/957950",
- "in_reply_to_profileurl": "https:\/\/shitposter.club\/moonman",
- "in_reply_to_ostatus_uri": "https:\/\/shitposter.club\/user\/1",
- "attentions": [],
- "fave_num": 0,
- "repeat_num": 0,
- "is_post_verb": false,
- "is_local": false,
- "favorited": false,
- "repeated": false
- },
- {
- "text": "#furry #nsfw https:\/\/soykaf.com\/attachment\/64411",
- "truncated": false,
- "created_at": "Sun Aug 21 16:55:41 +0000 2016",
- "in_reply_to_status_id": null,
- "uri": "tag:soykaf.com,2016-08-21:noticeId=339506:objectType=note",
- "source": "ostatus",
- "id": 247027,
- "in_reply_to_user_id": null,
- "in_reply_to_screen_name": null,
- "geo": null,
- "attachments": [
- {
- "url": "https:\/\/soykaf.com\/file\/21105283b95c5db2c3ac38d06f0d34093a35dd6a965cec89c7950a786351d6a4.jpg",
- "mimetype": "image\/jpeg",
- "size": "614464",
- "oembed": false,
- "id": "103984",
- "version": "1.2",
- "thumb_url": "https:\/\/social.heldscal.la\/attachment\/103984\/thumbnail?w=438&h=600",
- "large_thumb_url": "https:\/\/social.heldscal.la\/attachment\/103984\/thumbnail?w=438&h=600",
- "width": "982",
- "height": "1348"
- }
- ],
- "user": {
- "id": 24329,
- "name": "Mouse",
- "screen_name": "mouse",
- "location": "Somewhere in the US",
- "description": "Furry. Lover of animals and good food. Coffee keeps me sane.",
- "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/24329-48-20160821162822.jpeg",
- "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/24329-48-20160821162822.jpeg",
- "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/24329-original-20160821162818.jpeg",
- "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/24329-original-20160821162818.jpeg",
- "groups_count": 0,
- "linkcolor": false,
- "backgroundcolor": false,
- "url": null,
- "protected": false,
- "followers_count": 1,
- "friends_count": 0,
- "created_at": "Mon Aug 15 23:12:20 +0000 2016",
- "utc_offset": "0",
- "time_zone": "UTC",
- "statuses_count": 124,
- "following": true,
- "statusnet_blocking": false,
- "notifications": true,
- "statusnet_profile_url": "https:\/\/soykaf.com\/mouse",
- "cover_photo": false,
- "background_image": false,
- "profile_link_color": false,
- "profile_background_color": false,
- "profile_banner_url": false,
- "follows_you": true,
- "blocks_you": false,
- "is_local": false,
- "is_silenced": false,
- "rights": {
- "delete_user": false,
- "delete_others_notice": false,
- "silence": false,
- "sandbox": false
- },
- "is_sandboxed": false,
- "ostatus_uri": "https:\/\/soykaf.com\/user\/2558",
- "favourites_count": 11
- },
- "statusnet_html": "#furry<\/a><\/span> #nsfw<\/a><\/span> https:\/\/soykaf.com\/attachment\/64411<\/a>",
- "statusnet_conversation_id": 200729,
- "statusnet_in_groups": false,
- "external_url": "https:\/\/soykaf.com\/notice\/339506",
- "in_reply_to_profileurl": null,
- "in_reply_to_ostatus_uri": null,
- "attentions": [],
- "fave_num": 0,
- "repeat_num": 0,
- "is_post_verb": true,
- "is_local": false,
- "favorited": false,
- "repeated": false
- },
- {
- "text": "@maiyannah @verius I mean I do sympathize on a moral level because Hussein is indeed a monster. We just didn't do the level of nation building we did post-WW2 with Germany and Japan to ensure they don't turn into chaotic hellholes as soon as the old regime was toppled. We half assed our way in and half assed our way out. And now ISIS has become a far bigger threat than Hussein ever was.",
- "truncated": false,
- "created_at": "Sun Aug 21 16:55:24 +0000 2016",
- "in_reply_to_status_id": "247021",
- "uri": "tag:community.highlandarrow.com,2016-08-21:noticeId=255499:objectType=comment",
- "source": "ostatus",
- "id": 247026,
- "in_reply_to_user_id": 23258,
- "in_reply_to_screen_name": "maiyannah",
- "geo": null,
- "user": {
- "id": 23253,
- "name": "Gamera Godzilla",
- "screen_name": "gameragodzilla",
- "location": null,
- "description": "Hopefully I wont be banned by Staffan here.",
- "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg",
- "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg",
- "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg",
- "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg",
- "groups_count": 0,
- "linkcolor": false,
- "backgroundcolor": false,
- "url": null,
- "protected": false,
- "followers_count": 1,
- "friends_count": 0,
- "created_at": "Wed Jul 27 20:05:23 +0000 2016",
- "utc_offset": "0",
- "time_zone": "UTC",
- "statuses_count": 691,
- "following": true,
- "statusnet_blocking": false,
- "notifications": true,
- "statusnet_profile_url": "https:\/\/community.highlandarrow.com\/gameragodzilla",
- "cover_photo": false,
- "background_image": false,
- "profile_link_color": false,
- "profile_background_color": false,
- "profile_banner_url": false,
- "follows_you": false,
- "blocks_you": false,
- "is_local": false,
- "is_silenced": false,
- "rights": {
- "delete_user": false,
- "delete_others_notice": false,
- "silence": false,
- "sandbox": false
- },
- "is_sandboxed": false,
- "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/73",
- "favourites_count": 30
- },
- "statusnet_html": "@maiyannah<\/a> @verius<\/a> I mean I do sympathize on a moral level because Hussein is indeed a monster. We just didn't do the level of nation building we did post-WW2 with Germany and Japan to ensure they don't turn into chaotic hellholes as soon as the old regime was toppled. We half assed our way in and half assed our way out. And now ISIS has become a far bigger threat than Hussein ever was.",
- "statusnet_conversation_id": 200682,
- "statusnet_in_groups": false,
- "external_url": "https:\/\/community.highlandarrow.com\/notice\/255499",
- "in_reply_to_profileurl": "https:\/\/community.highlandarrow.com\/maiyannah",
- "in_reply_to_ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/1",
- "attentions": [
- {
- "id": 23250,
- "screen_name": "verius",
- "fullname": "Verius",
- "profileurl": "https:\/\/community.highlandarrow.com\/verius",
- "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/500"
- },
- {
- "id": 23258,
- "screen_name": "maiyannah",
- "fullname": "Maiyannah Bishop",
- "profileurl": "https:\/\/community.highlandarrow.com\/maiyannah",
- "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/1"
- }
- ],
- "fave_num": 0,
- "repeat_num": 0,
- "is_post_verb": true,
- "is_local": false,
- "favorited": false,
- "repeated": false
- },
- {
- "text": "whew!",
- "truncated": false,
- "created_at": "Sun Aug 21 16:54:59 +0000 2016",
- "in_reply_to_status_id": "247016",
- "uri": "tag:soykaf.com,2016-08-21:noticeId=339504:objectType=note",
- "source": "ostatus",
- "id": 247025,
- "in_reply_to_user_id": 23236,
- "in_reply_to_screen_name": "jimrusell01",
- "geo": null,
- "user": {
- "id": 24329,
- "name": "Mouse",
- "screen_name": "mouse",
- "location": "Somewhere in the US",
- "description": "Furry. Lover of animals and good food. Coffee keeps me sane.",
- "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/24329-48-20160821162822.jpeg",
- "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/24329-48-20160821162822.jpeg",
- "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/24329-original-20160821162818.jpeg",
- "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/24329-original-20160821162818.jpeg",
- "groups_count": 0,
- "linkcolor": false,
- "backgroundcolor": false,
- "url": null,
- "protected": false,
- "followers_count": 1,
- "friends_count": 0,
- "created_at": "Mon Aug 15 23:12:20 +0000 2016",
- "utc_offset": "0",
- "time_zone": "UTC",
- "statuses_count": 124,
- "following": true,
- "statusnet_blocking": false,
- "notifications": true,
- "statusnet_profile_url": "https:\/\/soykaf.com\/mouse",
- "cover_photo": false,
- "background_image": false,
- "profile_link_color": false,
- "profile_background_color": false,
- "profile_banner_url": false,
- "follows_you": true,
- "blocks_you": false,
- "is_local": false,
- "is_silenced": false,
- "rights": {
- "delete_user": false,
- "delete_others_notice": false,
- "silence": false,
- "sandbox": false
- },
- "is_sandboxed": false,
- "ostatus_uri": "https:\/\/soykaf.com\/user\/2558",
- "favourites_count": 11
- },
- "statusnet_html": "whew!",
- "statusnet_conversation_id": 200726,
- "statusnet_in_groups": false,
- "external_url": "https:\/\/soykaf.com\/notice\/339504",
- "in_reply_to_profileurl": "https:\/\/gs.smuglo.li\/jimrusell01",
- "in_reply_to_ostatus_uri": "https:\/\/gs.smuglo.li\/user\/1987",
- "attentions": [
- {
- "id": 23236,
- "screen_name": "jimrusell01",
- "fullname": "Jim Rusell",
- "profileurl": "https:\/\/gs.smuglo.li\/jimrusell01",
- "ostatus_uri": "https:\/\/gs.smuglo.li\/user\/1987"
- }
- ],
- "fave_num": 0,
- "repeat_num": 0,
- "is_post_verb": true,
- "is_local": false,
- "favorited": false,
- "repeated": false
- },
- {
- "text": "@verius @gameragodzilla Sure, we'll just let them eat up other countries. \u00a0How'd that work out for Britain prior to WW2, remind me?",
- "truncated": false,
- "created_at": "Sun Aug 21 16:54:12 +0000 2016",
- "in_reply_to_status_id": null,
- "uri": "tag:community.highlandarrow.com,2016-08-21:noticeId=255498:objectType=comment",
- "source": "ostatus",
- "id": 247024,
- "in_reply_to_user_id": null,
- "in_reply_to_screen_name": null,
- "geo": null,
- "user": {
- "id": 23258,
- "name": "Maiyannah Bishop",
- "screen_name": "maiyannah",
- "location": "Canada",
- "description": "Admin of the HA community \u2022 Editor-in-chief of Highland Arrow \u2022 Lead Developer of !postActiv \u2022 FSF Associate Member \u2022 Email: maiyannah@highlandarrow.com",
- "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23258-48-20160819164757.jpeg",
- "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23258-48-20160819164757.jpeg",
- "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23258-original-20160819160607.jpeg",
- "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23258-original-20160819160607.jpeg",
- "groups_count": 0,
- "linkcolor": false,
- "backgroundcolor": false,
- "url": "http:\/\/www.highlandarrow.com",
- "protected": false,
- "followers_count": 1,
- "friends_count": 0,
- "created_at": "Wed Jul 27 21:36:53 +0000 2016",
- "utc_offset": "0",
- "time_zone": "UTC",
- "statuses_count": 937,
- "following": true,
- "statusnet_blocking": false,
- "notifications": true,
- "statusnet_profile_url": "https:\/\/community.highlandarrow.com\/maiyannah",
- "cover_photo": false,
- "background_image": false,
- "profile_link_color": false,
- "profile_background_color": false,
- "profile_banner_url": false,
- "follows_you": false,
- "blocks_you": false,
- "is_local": false,
- "is_silenced": false,
- "rights": {
- "delete_user": false,
- "delete_others_notice": false,
- "silence": false,
- "sandbox": false
- },
- "is_sandboxed": false,
- "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/1",
- "favourites_count": 37
- },
- "statusnet_html": "@verius<\/a> @gameragodzilla<\/a> Sure, we'll just let them eat up other countries. \u00a0How'd that work out for Britain prior to WW2, remind me?",
- "statusnet_conversation_id": 200682,
- "statusnet_in_groups": false,
- "external_url": "https:\/\/community.highlandarrow.com\/notice\/255498",
- "in_reply_to_profileurl": null,
- "in_reply_to_ostatus_uri": null,
- "attentions": [
- {
- "id": 23250,
- "screen_name": "verius",
- "fullname": "Verius",
- "profileurl": "https:\/\/community.highlandarrow.com\/verius",
- "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/500"
- },
- {
- "id": 23253,
- "screen_name": "gameragodzilla",
- "fullname": "Gamera Godzilla",
- "profileurl": "https:\/\/community.highlandarrow.com\/gameragodzilla",
- "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/73"
- }
- ],
- "fave_num": 0,
- "repeat_num": 0,
- "is_post_verb": true,
- "is_local": false,
- "favorited": false,
- "repeated": false
- },
- {
- "text": "@verius @maiyannah The Middle East supplies more of Europe's oil than the US's, actually. Most of our oil comes from our hat, Canada. So if anything, you guys should be more concerned about the Middle East than us.",
- "truncated": false,
- "created_at": "Sun Aug 21 16:54:01 +0000 2016",
- "in_reply_to_status_id": null,
- "uri": "tag:community.highlandarrow.com,2016-08-21:noticeId=255497:objectType=comment",
- "source": "ostatus",
- "id": 247023,
- "in_reply_to_user_id": null,
- "in_reply_to_screen_name": null,
- "geo": null,
- "user": {
- "id": 23253,
- "name": "Gamera Godzilla",
- "screen_name": "gameragodzilla",
- "location": null,
- "description": "Hopefully I wont be banned by Staffan here.",
- "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg",
- "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg",
- "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg",
- "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg",
- "groups_count": 0,
- "linkcolor": false,
- "backgroundcolor": false,
- "url": null,
- "protected": false,
- "followers_count": 1,
- "friends_count": 0,
- "created_at": "Wed Jul 27 20:05:23 +0000 2016",
- "utc_offset": "0",
- "time_zone": "UTC",
- "statuses_count": 691,
- "following": true,
- "statusnet_blocking": false,
- "notifications": true,
- "statusnet_profile_url": "https:\/\/community.highlandarrow.com\/gameragodzilla",
- "cover_photo": false,
- "background_image": false,
- "profile_link_color": false,
- "profile_background_color": false,
- "profile_banner_url": false,
- "follows_you": false,
- "blocks_you": false,
- "is_local": false,
- "is_silenced": false,
- "rights": {
- "delete_user": false,
- "delete_others_notice": false,
- "silence": false,
- "sandbox": false
- },
- "is_sandboxed": false,
- "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/73",
- "favourites_count": 30
- },
- "statusnet_html": "@verius<\/a> @maiyannah<\/a> The Middle East supplies more of Europe's oil than the US's, actually. Most of our oil comes from our hat, Canada. So if anything, you guys should be more concerned about the Middle East than us.",
- "statusnet_conversation_id": 200682,
- "statusnet_in_groups": false,
- "external_url": "https:\/\/community.highlandarrow.com\/notice\/255497",
- "in_reply_to_profileurl": null,
- "in_reply_to_ostatus_uri": null,
- "attentions": [
- {
- "id": 23250,
- "screen_name": "verius",
- "fullname": "Verius",
- "profileurl": "https:\/\/community.highlandarrow.com\/verius",
- "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/500"
- },
- {
- "id": 23258,
- "screen_name": "maiyannah",
- "fullname": "Maiyannah Bishop",
- "profileurl": "https:\/\/community.highlandarrow.com\/maiyannah",
- "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/1"
- }
- ],
- "fave_num": 0,
- "repeat_num": 0,
- "is_post_verb": true,
- "is_local": false,
- "favorited": false,
- "repeated": false
- },
- {
- "text": "mouse favorited something by jimrusell01: #nsfw https:\/\/gs.smuglo.li\/attachment\/111717",
- "truncated": false,
- "created_at": "Sun Aug 21 16:54:04 +0000 2016",
- "in_reply_to_status_id": "247016",
- "uri": "tag:soykaf.com,2016-08-21:fave:2558:note:339495:2016-08-21T16:54:04+00:00",
- "source": "ostatus",
- "id": 247022,
- "in_reply_to_user_id": 23236,
- "in_reply_to_screen_name": "jimrusell01",
- "geo": null,
- "user": {
- "id": 24329,
- "name": "Mouse",
- "screen_name": "mouse",
- "location": "Somewhere in the US",
- "description": "Furry. Lover of animals and good food. Coffee keeps me sane.",
- "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/24329-48-20160821162822.jpeg",
- "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/24329-48-20160821162822.jpeg",
- "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/24329-original-20160821162818.jpeg",
- "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/24329-original-20160821162818.jpeg",
- "groups_count": 0,
- "linkcolor": false,
- "backgroundcolor": false,
- "url": null,
- "protected": false,
- "followers_count": 1,
- "friends_count": 0,
- "created_at": "Mon Aug 15 23:12:20 +0000 2016",
- "utc_offset": "0",
- "time_zone": "UTC",
- "statuses_count": 124,
- "following": true,
- "statusnet_blocking": false,
- "notifications": true,
- "statusnet_profile_url": "https:\/\/soykaf.com\/mouse",
- "cover_photo": false,
- "background_image": false,
- "profile_link_color": false,
- "profile_background_color": false,
- "profile_banner_url": false,
- "follows_you": true,
- "blocks_you": false,
- "is_local": false,
- "is_silenced": false,
- "rights": {
- "delete_user": false,
- "delete_others_notice": false,
- "silence": false,
- "sandbox": false
- },
- "is_sandboxed": false,
- "ostatus_uri": "https:\/\/soykaf.com\/user\/2558",
- "favourites_count": 11
- },
- "statusnet_html": "mouse favorited something by jimrusell01: #nsfw<\/a><\/span> https:\/\/gs.smuglo.li\/attachment\/111717<\/a>",
- "statusnet_conversation_id": 200726,
- "statusnet_in_groups": false,
- "external_url": "https:\/\/soykaf.com\/notice\/339502",
- "in_reply_to_profileurl": "https:\/\/gs.smuglo.li\/jimrusell01",
- "in_reply_to_ostatus_uri": "https:\/\/gs.smuglo.li\/user\/1987",
- "attentions": [],
- "fave_num": 0,
- "repeat_num": 0,
- "is_post_verb": false,
- "is_local": false,
- "favorited": false,
- "repeated": false
- },
- {
- "text": "@gameragodzilla @verius I think I tend to be more charitible to George Bush than most are, because the problems he had were inherited from elsewhere. \u00a0Was he really up to them? \u00a0Not really, but it was Clinton that authorized the CIA missions that messed up that region.",
- "truncated": false,
- "created_at": "Sun Aug 21 16:53:29 +0000 2016",
- "in_reply_to_status_id": "247019",
- "uri": "tag:community.highlandarrow.com,2016-08-21:noticeId=255495:objectType=comment",
- "source": "ostatus",
- "id": 247021,
- "in_reply_to_user_id": 23253,
- "in_reply_to_screen_name": "gameragodzilla",
- "geo": null,
- "user": {
- "id": 23258,
- "name": "Maiyannah Bishop",
- "screen_name": "maiyannah",
- "location": "Canada",
- "description": "Admin of the HA community \u2022 Editor-in-chief of Highland Arrow \u2022 Lead Developer of !postActiv \u2022 FSF Associate Member \u2022 Email: maiyannah@highlandarrow.com",
- "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23258-48-20160819164757.jpeg",
- "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23258-48-20160819164757.jpeg",
- "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23258-original-20160819160607.jpeg",
- "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23258-original-20160819160607.jpeg",
- "groups_count": 0,
- "linkcolor": false,
- "backgroundcolor": false,
- "url": "http:\/\/www.highlandarrow.com",
- "protected": false,
- "followers_count": 1,
- "friends_count": 0,
- "created_at": "Wed Jul 27 21:36:53 +0000 2016",
- "utc_offset": "0",
- "time_zone": "UTC",
- "statuses_count": 937,
- "following": true,
- "statusnet_blocking": false,
- "notifications": true,
- "statusnet_profile_url": "https:\/\/community.highlandarrow.com\/maiyannah",
- "cover_photo": false,
- "background_image": false,
- "profile_link_color": false,
- "profile_background_color": false,
- "profile_banner_url": false,
- "follows_you": false,
- "blocks_you": false,
- "is_local": false,
- "is_silenced": false,
- "rights": {
- "delete_user": false,
- "delete_others_notice": false,
- "silence": false,
- "sandbox": false
- },
- "is_sandboxed": false,
- "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/1",
- "favourites_count": 37
- },
- "statusnet_html": "@gameragodzilla<\/a> @verius<\/a> I think I tend to be more charitible to George Bush than most are, because the problems he had were inherited from elsewhere. \u00a0Was he really up to them? \u00a0Not really, but it was Clinton that authorized the CIA missions that messed up that region.",
- "statusnet_conversation_id": 200682,
- "statusnet_in_groups": false,
- "external_url": "https:\/\/community.highlandarrow.com\/notice\/255495",
- "in_reply_to_profileurl": "https:\/\/community.highlandarrow.com\/gameragodzilla",
- "in_reply_to_ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/73",
- "attentions": [
- {
- "id": 23250,
- "screen_name": "verius",
- "fullname": "Verius",
- "profileurl": "https:\/\/community.highlandarrow.com\/verius",
- "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/500"
- },
- {
- "id": 23253,
- "screen_name": "gameragodzilla",
- "fullname": "Gamera Godzilla",
- "profileurl": "https:\/\/community.highlandarrow.com\/gameragodzilla",
- "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/73"
- }
- ],
- "fave_num": 0,
- "repeat_num": 0,
- "is_post_verb": true,
- "is_local": false,
- "favorited": false,
- "repeated": false
- },
- {
- "text": "\u50cd\u304d\u65b9\u3068\u516c\u5171\u6027\u304c\u4eca\u5f8c\u5909\u308f\u308b\u793e\u4f1a\u306b\u306a\u308b\u3060\u308d\u3046\u304b\u3002 http:\/\/togetter.com\/li\/1013965",
- "truncated": false,
- "created_at": "Sun Aug 21 16:51:38 +0000 2016",
- "in_reply_to_status_id": null,
- "uri": "tag:status.akionux.net,2016-08-21:noticeId=359563:objectType=note",
- "source": "ostatus",
- "id": 247020,
- "in_reply_to_user_id": null,
- "in_reply_to_screen_name": null,
- "geo": null,
- "attachments": [
- {
- "url": "http:\/\/togetter.com\/li\/1013965",
- "mimetype": "text\/html; charset=UTF-8",
- "size": null,
- "oembed": {
- "type": "article",
- "provider": "Togetter",
- "provider_url": null,
- "oembedHTML": "\u65b0\u3057\u3044\u50cd\u304d\u65b9\u3002",
- "title": "\u300c\u597d\u304d\u306a\u65e5\u306b\u9023\u7d61\u306a\u3057\u3067\u51fa\u52e4\u30fb\u6b20\u52e4\u3067\u304d\u308b\u300d\u30b7\u30b9\u30c6\u30e0\u3092\u78ba\u7acb\u3057\u305f\u5de5\u5834\u9577\u306e\u8a71\u306b\u3055\u307e\u3056\u307e\u306a\u58f0\u304c\u96c6\u307e\u308b",
- "author_name": "",
- "author_url": null
- },
- "id": "103983",
- "version": "1.2",
- "thumb_url": "https:\/\/social.heldscal.la\/file\/thumb-103983-450x237-f4bfa5cd6a67ab53d1bf602234f666003acea4b0615d436b61e9e36dff0eece0.jpg.jpg",
- "large_thumb_url": "https:\/\/social.heldscal.la\/file\/thumb-103983-1000x525-f4bfa5cd6a67ab53d1bf602234f666003acea4b0615d436b61e9e36dff0eece0.jpg.jpg",
- "width": null,
- "height": null
- }
- ],
- "user": {
- "id": 24161,
- "name": "\u041c\u0430\u0440\u0443\u043e\u043a\u0430 \u0425\u0438\u0440\u043e\u043a\u0430\u0434\u0437\u0443",
- "screen_name": "kamiyajing",
- "location": "Tokyo",
- "description": "Reserach : Complex Chemical Physics. Interest : mathematics, linguistics, Phenomenology, Vedas. Impressed by free software movement and would like to learn about PC, especially GNU\/LINUX while I'm super-beginner!",
- "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/24161-48-20160812083104.jpeg",
- "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/24161-48-20160812083104.jpeg",
- "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/24161-original-20160812082954.jpeg",
- "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/24161-original-20160812082954.jpeg",
- "groups_count": 0,
- "linkcolor": false,
- "backgroundcolor": false,
- "url": null,
- "protected": false,
- "followers_count": 1,
- "friends_count": 0,
- "created_at": "Fri Aug 12 08:29:52 +0000 2016",
- "utc_offset": "0",
- "time_zone": "UTC",
- "statuses_count": 96,
- "following": true,
- "statusnet_blocking": false,
- "notifications": true,
- "statusnet_profile_url": "https:\/\/status.akionux.net\/kamiyajing",
- "cover_photo": false,
- "background_image": false,
- "profile_link_color": false,
- "profile_background_color": false,
- "profile_banner_url": false,
- "follows_you": false,
- "blocks_you": false,
- "is_local": false,
- "is_silenced": false,
- "rights": {
- "delete_user": false,
- "delete_others_notice": false,
- "silence": false,
- "sandbox": false
- },
- "is_sandboxed": false,
- "ostatus_uri": "https:\/\/status.akionux.net\/user\/2695",
- "favourites_count": 3
- },
- "statusnet_html": "\u50cd\u304d\u65b9\u3068\u516c\u5171\u6027\u304c\u4eca\u5f8c\u5909\u308f\u308b\u793e\u4f1a\u306b\u306a\u308b\u3060\u308d\u3046\u304b\u3002
\n
\nhttp:\/\/togetter.com\/li\/1013965<\/a>", - "statusnet_conversation_id": 200728, - "statusnet_in_groups": false, - "external_url": "https:\/\/status.akionux.net\/notice\/359563", - "in_reply_to_profileurl": null, - "in_reply_to_ostatus_uri": null, - "attentions": [], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": true, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "@maiyannah @verius Bush's issue was more mission creep and failing to think long term. He just thought about toppeling Hussein, which was indeed easily accomplished within the span of a few months. It was the guerilla fighting afterwards that caused major problems. Clinton was just being an idiot and failed to apprehend Bin Laden prior to 9\/11.", - "truncated": false, - "created_at": "Sun Aug 21 16:52:31 +0000 2016", - "in_reply_to_status_id": "247013", - "uri": "tag:community.highlandarrow.com,2016-08-21:noticeId=255493:objectType=comment", - "source": "ostatus", - "id": 247019, - "in_reply_to_user_id": 23258, - "in_reply_to_screen_name": "maiyannah", - "geo": null, - "user": { - "id": 23253, - "name": "Gamera Godzilla", - "screen_name": "gameragodzilla", - "location": null, - "description": "Hopefully I wont be banned by Staffan here.", - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": null, - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Wed Jul 27 20:05:23 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 691, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/community.highlandarrow.com\/gameragodzilla", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": false, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/73", - "favourites_count": 30 - }, - "statusnet_html": "@maiyannah<\/a> @verius<\/a> Bush's issue was more mission creep and failing to think long term. He just thought about toppeling Hussein, which was indeed easily accomplished within the span of a few months. It was the guerilla fighting afterwards that caused major problems.
\n
\nClinton was just being an idiot and failed to apprehend Bin Laden prior to 9\/11.", - "statusnet_conversation_id": 200682, - "statusnet_in_groups": false, - "external_url": "https:\/\/community.highlandarrow.com\/notice\/255493", - "in_reply_to_profileurl": "https:\/\/community.highlandarrow.com\/maiyannah", - "in_reply_to_ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/1", - "attentions": [ - { - "id": 23250, - "screen_name": "verius", - "fullname": "Verius", - "profileurl": "https:\/\/community.highlandarrow.com\/verius", - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/500" - }, - { - "id": 23258, - "screen_name": "maiyannah", - "fullname": "Maiyannah Bishop", - "profileurl": "https:\/\/community.highlandarrow.com\/maiyannah", - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/1" - } - ], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": true, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "How flat is flat enough? https:\/\/gs.smuglo.li\/attachment\/111716", - "truncated": false, - "created_at": "Sun Aug 21 16:52:11 +0000 2016", - "in_reply_to_status_id": null, - "uri": "tag:gs.smuglo.li,2016-08-21:noticeId=589590:objectType=note", - "source": "ostatus", - "id": 247018, - "in_reply_to_user_id": null, - "in_reply_to_screen_name": null, - "geo": null, - "attachments": [ - { - "url": "https:\/\/gs.smuglo.li\/file\/c1835c05ee3a2f7f2dcf9bdbb0100330842b46819dc78f2a390c790ad8a203fc.jpg", - "mimetype": "image\/jpeg", - "size": "3808766", - "oembed": false, - "id": "103982", - "version": "1.2", - "thumb_url": "https:\/\/social.heldscal.la\/file\/thumb-103982-450x321-c1835c05ee3a2f7f2dcf9bdbb0100330842b46819dc78f2a390c790ad8a203fc.jpg", - "large_thumb_url": "https:\/\/social.heldscal.la\/file\/thumb-103982-1000x712-c1835c05ee3a2f7f2dcf9bdbb0100330842b46819dc78f2a390c790ad8a203fc.jpg", - "width": "5031", - "height": "3579" - } - ], - "user": { - "id": 23266, - "name": "\u3059\u307f", - "screen_name": "sumi", - "location": "The Bunker", - "description": null, - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23266-48-20160814155800.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23266-48-20160814155800.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23266-original-20160814155757.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23266-original-20160814155757.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": null, - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Wed Jul 27 23:10:58 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 74, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/gs.smuglo.li\/sumi", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": false, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/gs.smuglo.li\/user\/580", - "favourites_count": 1 - }, - "statusnet_html": "How flat is flat enough? https:\/\/gs.smuglo.li\/attachment\/111716<\/a>", - "statusnet_conversation_id": 200727, - "statusnet_in_groups": false, - "external_url": "https:\/\/gs.smuglo.li\/notice\/589590", - "in_reply_to_profileurl": null, - "in_reply_to_ostatus_uri": null, - "attentions": [], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": true, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "1iceloops123 favorited something by jimrusell01: #nsfw https:\/\/gs.smuglo.li\/attachment\/111717", - "truncated": false, - "created_at": "Sun Aug 21 16:52:15 +0000 2016", - "in_reply_to_status_id": "247016", - "uri": "tag:shitposter.club,2016-08-21:fave:3895:note:773501:2016-08-21T16:52:15+00:00", - "source": "ostatus", - "id": 247017, - "in_reply_to_user_id": 23236, - "in_reply_to_screen_name": "jimrusell01", - "geo": null, - "user": { - "id": 23212, - "name": "iceloops123", - "screen_name": "1iceloops123", - "location": "backup account", - "description": "loves videogames,art,music,comics,cartoons nothing new. sealion.club\/iceloops123 freezepeach.xyz\/iceloops123 gs.smuglo.li\/iceloops123", - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23212-48-20160727103811.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23212-48-20160727103811.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23212-original-20160727103801.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23212-original-20160727103801.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": "http:\/\/iceloops123.tumblr.com\/", - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Wed Jul 27 10:38:01 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 2092, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/shitposter.club\/1iceloops123", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": true, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/shitposter.club\/user\/3895", - "favourites_count": 643 - }, - "statusnet_html": "1iceloops123 favorited something by jimrusell01: #nsfw<\/a><\/span> https:\/\/gs.smuglo.li\/attachment\/111717<\/a>", - "statusnet_conversation_id": 200726, - "statusnet_in_groups": false, - "external_url": "https:\/\/shitposter.club\/notice\/773502", - "in_reply_to_profileurl": "https:\/\/gs.smuglo.li\/jimrusell01", - "in_reply_to_ostatus_uri": "https:\/\/gs.smuglo.li\/user\/1987", - "attentions": [], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": false, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "#nsfw https:\/\/gs.smuglo.li\/attachment\/111717", - "truncated": false, - "created_at": "Sun Aug 21 16:51:44 +0000 2016", - "in_reply_to_status_id": null, - "uri": "tag:gs.smuglo.li,2016-08-21:noticeId=589587:objectType=note", - "source": "ostatus", - "id": 247016, - "in_reply_to_user_id": null, - "in_reply_to_screen_name": null, - "geo": null, - "attachments": [ - { - "url": "https:\/\/gs.smuglo.li\/file\/13688381b409df69aa11f0469fe19fcc932734d70ddbf8f39249364e205a08f2.jpg", - "mimetype": "image\/jpeg", - "size": "155985", - "oembed": false, - "id": "103981", - "version": "1.2", - "thumb_url": "https:\/\/social.heldscal.la\/file\/thumb-103981-428x600-13688381b409df69aa11f0469fe19fcc932734d70ddbf8f39249364e205a08f2.jpg", - "large_thumb_url": "https:\/\/social.heldscal.la\/file\/thumb-103981-712x1000-13688381b409df69aa11f0469fe19fcc932734d70ddbf8f39249364e205a08f2.jpg", - "width": "712", - "height": "1000" - } - ], - "user": { - "id": 23236, - "name": "Jim Rusell", - "screen_name": "jimrusell01", - "location": "The Internet", - "description": "I once was a normal human, but i'm now just a simple bot.", - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23236-48-20160727155842.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23236-48-20160727155842.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23236-original-20160727155834.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23236-original-20160727155834.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": null, - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Wed Jul 27 15:58:34 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 919, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/gs.smuglo.li\/jimrusell01", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": true, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/gs.smuglo.li\/user\/1987", - "favourites_count": 33 - }, - "statusnet_html": "#nsfw<\/a><\/span> https:\/\/gs.smuglo.li\/attachment\/111717<\/a>", - "statusnet_conversation_id": 200726, - "statusnet_in_groups": false, - "external_url": "https:\/\/gs.smuglo.li\/notice\/589587", - "in_reply_to_profileurl": null, - "in_reply_to_ostatus_uri": null, - "attentions": [], - "fave_num": 2, - "repeat_num": 0, - "is_post_verb": true, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "https:\/\/www.youtube.com\/watch?v=cV9BtuPpW9w&feature=share", - "truncated": false, - "created_at": "Sun Aug 21 16:51:49 +0000 2016", - "in_reply_to_status_id": null, - "uri": "tag:shitposter.club,2016-08-21:noticeId=773500:objectType=note", - "source": "ostatus", - "id": 247015, - "in_reply_to_user_id": null, - "in_reply_to_screen_name": null, - "geo": null, - "attachments": [ - { - "url": "https:\/\/www.youtube.com\/watch?v=cV9BtuPpW9w&feature=share", - "mimetype": "text\/html; charset=utf-8", - "size": null, - "oembed": { - "type": "video", - "provider": "YouTube", - "provider_url": "https:\/\/www.youtube.com\/", - "oembedHTML": "", - "title": "PASSPORT.MID played on a Roland Sound Canvas SC-55", - "author_name": "rerolledDK", - "author_url": "https:\/\/www.youtube.com\/user\/rerolledDK" - }, - "id": "103980", - "version": "1.2", - "thumb_url": "https:\/\/social.heldscal.la\/file\/thumb-103980-450x338-95067907509a4f756e4317c47e8dc38738148e9b915f673c34bbef8de47d283e.jpg.jpg", - "large_thumb_url": "https:\/\/social.heldscal.la\/file\/95067907509a4f756e4317c47e8dc38738148e9b915f673c34bbef8de47d283e.jpg", - "width": null, - "height": null - } - ], - "user": { - "id": 23212, - "name": "iceloops123", - "screen_name": "1iceloops123", - "location": "backup account", - "description": "loves videogames,art,music,comics,cartoons nothing new. sealion.club\/iceloops123 freezepeach.xyz\/iceloops123 gs.smuglo.li\/iceloops123", - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23212-48-20160727103811.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23212-48-20160727103811.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23212-original-20160727103801.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23212-original-20160727103801.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": "http:\/\/iceloops123.tumblr.com\/", - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Wed Jul 27 10:38:01 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 2092, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/shitposter.club\/1iceloops123", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": true, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/shitposter.club\/user\/3895", - "favourites_count": 643 - }, - "statusnet_html": "https:\/\/www.youtube.com\/watch?v=cV9BtuPpW9w&feature=share<\/a>", - "statusnet_conversation_id": 200725, - "statusnet_in_groups": false, - "external_url": "https:\/\/shitposter.club\/notice\/773500", - "in_reply_to_profileurl": null, - "in_reply_to_ostatus_uri": null, - "attentions": [], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": true, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "@verius @maiyannah Good thing you don't vote. :P Of course, it's also incredibly naive to think that corruption and shady things in one country won't impact another country. The bullshit surrounding Brussels is why the UK decided to leave the EU after all.", - "truncated": false, - "created_at": "Sun Aug 21 16:51:16 +0000 2016", - "in_reply_to_status_id": null, - "uri": "tag:community.highlandarrow.com,2016-08-21:noticeId=255491:objectType=comment", - "source": "ostatus", - "id": 247014, - "in_reply_to_user_id": null, - "in_reply_to_screen_name": null, - "geo": null, - "user": { - "id": 23253, - "name": "Gamera Godzilla", - "screen_name": "gameragodzilla", - "location": null, - "description": "Hopefully I wont be banned by Staffan here.", - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": null, - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Wed Jul 27 20:05:23 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 691, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/community.highlandarrow.com\/gameragodzilla", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": false, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/73", - "favourites_count": 30 - }, - "statusnet_html": "@verius<\/a> @maiyannah<\/a> Good thing you don't vote. :P
\n
\nOf course, it's also incredibly naive to think that corruption and shady things in one country won't impact another country. The bullshit surrounding Brussels is why the UK decided to leave the EU after all.", - "statusnet_conversation_id": 200682, - "statusnet_in_groups": false, - "external_url": "https:\/\/community.highlandarrow.com\/notice\/255491", - "in_reply_to_profileurl": null, - "in_reply_to_ostatus_uri": null, - "attentions": [ - { - "id": 23250, - "screen_name": "verius", - "fullname": "Verius", - "profileurl": "https:\/\/community.highlandarrow.com\/verius", - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/500" - }, - { - "id": 23258, - "screen_name": "maiyannah", - "fullname": "Maiyannah Bishop", - "profileurl": "https:\/\/community.highlandarrow.com\/maiyannah", - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/1" - } - ], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": true, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "@verius @gameragodzilla Yeah it's not like her husband was the one that fucked up the middle east situation or anything. \u00a0George Bush just wishes he had as much a hand in that as Bill Clinton did.", - "truncated": false, - "created_at": "Sun Aug 21 16:50:53 +0000 2016", - "in_reply_to_status_id": null, - "uri": "tag:community.highlandarrow.com,2016-08-21:noticeId=255490:objectType=comment", - "source": "ostatus", - "id": 247013, - "in_reply_to_user_id": null, - "in_reply_to_screen_name": null, - "geo": null, - "user": { - "id": 23258, - "name": "Maiyannah Bishop", - "screen_name": "maiyannah", - "location": "Canada", - "description": "Admin of the HA community \u2022 Editor-in-chief of Highland Arrow \u2022 Lead Developer of !postActiv \u2022 FSF Associate Member \u2022 Email: maiyannah@highlandarrow.com", - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23258-48-20160819164757.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23258-48-20160819164757.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23258-original-20160819160607.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23258-original-20160819160607.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": "http:\/\/www.highlandarrow.com", - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Wed Jul 27 21:36:53 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 937, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/community.highlandarrow.com\/maiyannah", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": false, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/1", - "favourites_count": 37 - }, - "statusnet_html": "@verius<\/a> @gameragodzilla<\/a> Yeah it's not like her husband was the one that fucked up the middle east situation or anything. \u00a0George Bush just wishes he had as much a hand in that as Bill Clinton did.", - "statusnet_conversation_id": 200682, - "statusnet_in_groups": false, - "external_url": "https:\/\/community.highlandarrow.com\/notice\/255490", - "in_reply_to_profileurl": null, - "in_reply_to_ostatus_uri": null, - "attentions": [ - { - "id": 23250, - "screen_name": "verius", - "fullname": "Verius", - "profileurl": "https:\/\/community.highlandarrow.com\/verius", - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/500" - }, - { - "id": 23253, - "screen_name": "gameragodzilla", - "fullname": "Gamera Godzilla", - "profileurl": "https:\/\/community.highlandarrow.com\/gameragodzilla", - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/73" - } - ], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": true, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "@maiyannah @verius Trump's issue is his tendency to blurt out whatever the fuck he has in mind at any given time. Sure, that may be a quality that people admire about him, and even I have a sneaky sense of humor at the fact that he just doesn't give a shit, but that does mean the media tend to try and focus on the stupid shit he says while desperately burying the myriad of shady things Clinton has done.", - "truncated": false, - "created_at": "Sun Aug 21 16:48:50 +0000 2016", - "in_reply_to_status_id": "247009", - "uri": "tag:community.highlandarrow.com,2016-08-21:noticeId=255488:objectType=comment", - "source": "ostatus", - "id": 247012, - "in_reply_to_user_id": 23258, - "in_reply_to_screen_name": "maiyannah", - "geo": null, - "user": { - "id": 23253, - "name": "Gamera Godzilla", - "screen_name": "gameragodzilla", - "location": null, - "description": "Hopefully I wont be banned by Staffan here.", - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": null, - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Wed Jul 27 20:05:23 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 691, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/community.highlandarrow.com\/gameragodzilla", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": false, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/73", - "favourites_count": 30 - }, - "statusnet_html": "@maiyannah<\/a> @verius<\/a> Trump's issue is his tendency to blurt out whatever the fuck he has in mind at any given time. Sure, that may be a quality that people admire about him, and even I have a sneaky sense of humor at the fact that he just doesn't give a shit, but that does mean the media tend to try and focus on the stupid shit he says while desperately burying the myriad of shady things Clinton has done.", - "statusnet_conversation_id": 200682, - "statusnet_in_groups": false, - "external_url": "https:\/\/community.highlandarrow.com\/notice\/255488", - "in_reply_to_profileurl": "https:\/\/community.highlandarrow.com\/maiyannah", - "in_reply_to_ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/1", - "attentions": [ - { - "id": 23250, - "screen_name": "verius", - "fullname": "Verius", - "profileurl": "https:\/\/community.highlandarrow.com\/verius", - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/500" - }, - { - "id": 23258, - "screen_name": "maiyannah", - "fullname": "Maiyannah Bishop", - "profileurl": "https:\/\/community.highlandarrow.com\/maiyannah", - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/1" - } - ], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": true, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "#furry #nsfw https:\/\/soykaf.com\/attachment\/64406", - "truncated": false, - "created_at": "Sun Aug 21 16:47:50 +0000 2016", - "in_reply_to_status_id": null, - "uri": "tag:soykaf.com,2016-08-21:noticeId=339493:objectType=note", - "source": "ostatus", - "id": 247011, - "in_reply_to_user_id": null, - "in_reply_to_screen_name": null, - "geo": null, - "attachments": [ - { - "url": "https:\/\/soykaf.com\/file\/135f7f53bfcfe1730b68d1608db4e303355fd7c25acd2402197bc33da552d227.jpg", - "mimetype": "image\/jpeg", - "size": "191078", - "oembed": false, - "id": "103979", - "version": "1.2", - "thumb_url": "https:\/\/social.heldscal.la\/attachment\/103979\/thumbnail?w=417&h=600", - "large_thumb_url": "https:\/\/social.heldscal.la\/attachment\/103979\/thumbnail?w=417&h=600", - "width": "710", - "height": "1024" - } - ], - "user": { - "id": 24329, - "name": "Mouse", - "screen_name": "mouse", - "location": "Somewhere in the US", - "description": "Furry. Lover of animals and good food. Coffee keeps me sane.", - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/24329-48-20160821162822.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/24329-48-20160821162822.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/24329-original-20160821162818.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/24329-original-20160821162818.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": null, - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Mon Aug 15 23:12:20 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 124, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/soykaf.com\/mouse", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": true, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/soykaf.com\/user\/2558", - "favourites_count": 11 - }, - "statusnet_html": "#furry<\/a><\/span> #nsfw<\/a><\/span> https:\/\/soykaf.com\/attachment\/64406<\/a>", - "statusnet_conversation_id": 200724, - "statusnet_in_groups": false, - "external_url": "https:\/\/soykaf.com\/notice\/339493", - "in_reply_to_profileurl": null, - "in_reply_to_ostatus_uri": null, - "attentions": [], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": true, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "@verius @maiyannah Considering the almost cult-like devotion certain people have for him, I doubt it. Oh well, my main concern right now is still keeping Hillary out of office. I'll still take a crazy, unreliable narcissist over Hillary's corruption.", - "truncated": false, - "created_at": "Sun Aug 21 16:47:26 +0000 2016", - "in_reply_to_status_id": null, - "uri": "tag:community.highlandarrow.com,2016-08-21:noticeId=255486:objectType=comment", - "source": "ostatus", - "id": 247010, - "in_reply_to_user_id": null, - "in_reply_to_screen_name": null, - "geo": null, - "user": { - "id": 23253, - "name": "Gamera Godzilla", - "screen_name": "gameragodzilla", - "location": null, - "description": "Hopefully I wont be banned by Staffan here.", - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": null, - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Wed Jul 27 20:05:23 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 691, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/community.highlandarrow.com\/gameragodzilla", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": false, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/73", - "favourites_count": 30 - }, - "statusnet_html": "@verius<\/a> @maiyannah<\/a> Considering the almost cult-like devotion certain people have for him, I doubt it.
\n
\nOh well, my main concern right now is still keeping Hillary out of office. I'll still take a crazy, unreliable narcissist over Hillary's corruption.", - "statusnet_conversation_id": 200682, - "statusnet_in_groups": false, - "external_url": "https:\/\/community.highlandarrow.com\/notice\/255486", - "in_reply_to_profileurl": null, - "in_reply_to_ostatus_uri": null, - "attentions": [ - { - "id": 23250, - "screen_name": "verius", - "fullname": "Verius", - "profileurl": "https:\/\/community.highlandarrow.com\/verius", - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/500" - }, - { - "id": 23258, - "screen_name": "maiyannah", - "fullname": "Maiyannah Bishop", - "profileurl": "https:\/\/community.highlandarrow.com\/maiyannah", - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/1" - } - ], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": true, - "is_local": false, - "favorited": false, - "repeated": false - } -] diff --git a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js index cd877b05e..43ce4da5d 100644 --- a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js +++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js @@ -5,76 +5,6 @@ import { parseUser, } from '../../../../../src/services/entity_normalizer/entity_normalizer.service.js' import mastoapidata from '../../../../fixtures/mastoapi.json' -import qvitterapidata from '../../../../fixtures/statuses.json' - -const makeMockStatusQvitter = (overrides = {}) => { - return Object.assign( - { - activity_type: 'post', - attachments: [], - attentions: [], - created_at: 'Tue Jan 15 13:57:56 +0000 2019', - external_url: 'https://ap.example/whatever', - fave_num: 1, - favorited: false, - id: '10335970', - in_reply_to_ostatus_uri: null, - in_reply_to_profileurl: null, - in_reply_to_screen_name: null, - in_reply_to_status_id: null, - in_reply_to_user_id: null, - is_local: false, - is_post_verb: true, - possibly_sensitive: false, - repeat_num: 0, - repeated: false, - statusnet_conversation_id: '16300488', - summary: null, - tags: [], - text: 'haha benis', - uri: 'https://ap.example/whatever', - user: makeMockUserQvitter(), - visibility: 'public', - }, - overrides, - ) -} - -const makeMockUserQvitter = (overrides = {}) => { - return Object.assign( - { - background_image: null, - cover_photo: '', - created_at: 'Mon Jan 14 13:56:51 +0000 2019', - default_scope: 'public', - description: 'ebin', - description_html: '
',
- no_rich_text: false,
- pleroma: { confirmation_pending: false, tags: [] },
- profile_image_url: 'https://ap.example/whatever',
- profile_image_url_https: 'https://ap.example/whatever',
- profile_image_url_original: 'https://ap.example/whatever',
- profile_image_url_profile_size: 'https://ap.example/whatever',
- rights: { delete_others_notice: false },
- screen_name: 'spurdo@ap.example',
- statuses_count: 46,
- statusnet_blocking: false,
- statusnet_profile_url: '',
- },
- overrides,
- )
-}
const makeMockUserMasto = (overrides = {}) => {
return Object.assign(
@@ -151,19 +81,6 @@ const makeMockStatusMasto = (overrides = {}) => {
)
}
-const makeMockNotificationQvitter = (overrides = {}) => {
- return Object.assign(
- {
- notice: makeMockStatusQvitter(),
- ntype: 'follow',
- from_profile: makeMockUserQvitter(),
- is_seen: 0,
- id: 123,
- },
- overrides,
- )
-}
-
const makeMockEmojiMasto = (overrides = [{}]) => {
return [
Object.assign(
@@ -189,78 +106,6 @@ const makeMockEmojiMasto = (overrides = [{}]) => {
describe('API Entities normalizer', () => {
describe('parseStatus', () => {
- describe('QVitter preprocessing', () => {
- it("doesn't blow up", () => {
- const parsed = qvitterapidata.map(parseStatus)
- expect(parsed.length).to.eq(qvitterapidata.length)
- })
-
- it('identifies favorites', () => {
- const fav = {
- uri: 'tag:soykaf.com,2016-08-21:fave:2558:note:339495:2016-08-21T16:54:04+00:00',
- is_post_verb: false,
- }
-
- const mastoFav = {
- uri: 'tag:mastodon.social,2016-11-27:objectId=73903:objectType=Favourite',
- is_post_verb: false,
- }
-
- expect(parseStatus(makeMockStatusQvitter(fav))).to.have.property(
- 'type',
- 'favorite',
- )
- expect(parseStatus(makeMockStatusQvitter(mastoFav))).to.have.property(
- 'type',
- 'favorite',
- )
- })
-
- it('processes repeats correctly', () => {
- const post = makeMockStatusQvitter({
- retweeted_status: null,
- id: 'deadbeef',
- })
- const repeat = makeMockStatusQvitter({
- retweeted_status: post,
- is_post_verb: false,
- id: 'foobar',
- })
-
- const parsedPost = parseStatus(post)
- const parsedRepeat = parseStatus(repeat)
-
- expect(parsedPost).to.have.property('type', 'status')
- expect(parsedRepeat).to.have.property('type', 'retweet')
- expect(parsedRepeat).to.have.property('retweeted_status')
- expect(parsedRepeat).to.have.nested.property(
- 'retweeted_status.id',
- 'deadbeef',
- )
- })
-
- it('sets nsfw for statuses with the #nsfw tag', () => {
- const safe = makeMockStatusQvitter({ id: '1', text: 'Hello oniichan' })
- const nsfw = makeMockStatusQvitter({
- id: '1',
- text: 'Hello oniichan #nsfw',
- })
-
- expect(parseStatus(safe).nsfw).to.eq(false)
- expect(parseStatus(nsfw).nsfw).to.eq(true)
- })
-
- it('leaves existing nsfw settings alone', () => {
- const nsfw = makeMockStatusQvitter({
- id: '1',
- text: 'Hello oniichan #nsfw',
- nsfw: false,
- })
-
- expect(parseStatus(nsfw).nsfw).to.eq(false)
- })
- })
-
describe('Mastoapi preprocessing and converting', () => {
it("doesn't blow up", () => {
const parsed = mastoapidata.map(parseStatus)
@@ -344,60 +189,6 @@ describe('API Entities normalizer', () => {
})
})
- // We currently use QvitterAPI notifications only, and especially due to MastoAPI lacking is_seen, support for MastoAPI
- // is more of an afterthought
- describe('parseNotifications (QvitterAPI)', () => {
- it("correctly normalizes data to FE's format", () => {
- const notif = makeMockNotificationQvitter({
- id: 123,
- notice: makeMockStatusQvitter({ id: 444 }),
- from_profile: makeMockUserQvitter({ id: 'spurdo' }),
- })
- expect(parseNotification(notif)).to.have.property('id', 123)
- expect(parseNotification(notif)).to.have.property('seen', false)
- expect(parseNotification(notif)).to.have.nested.property(
- 'status.id',
- '444',
- )
- expect(parseNotification(notif)).to.have.nested.property(
- 'action.id',
- '444',
- )
- expect(parseNotification(notif)).to.have.nested.property(
- 'from_profile.id',
- 'spurdo',
- )
- })
-
- it('correctly normalizes favorite notifications', () => {
- const notif = makeMockNotificationQvitter({
- id: 123,
- ntype: 'like',
- notice: makeMockStatusQvitter({
- id: 444,
- favorited_status: makeMockStatusQvitter({ id: 4412 }),
- }),
- is_seen: 1,
- from_profile: makeMockUserQvitter({ id: 'spurdo' }),
- })
- expect(parseNotification(notif)).to.have.property('id', 123)
- expect(parseNotification(notif)).to.have.property('type', 'like')
- expect(parseNotification(notif)).to.have.property('seen', true)
- expect(parseNotification(notif)).to.have.nested.property(
- 'status.id',
- '4412',
- )
- expect(parseNotification(notif)).to.have.nested.property(
- 'action.id',
- '444',
- )
- expect(parseNotification(notif)).to.have.nested.property(
- 'from_profile.id',
- 'spurdo',
- )
- })
- })
-
describe('Link header pagination', () => {
it('Parses min and max ids as integers', () => {
const linkHeader =
- {children}
-
-
- )
- },
- }
- }
-
-export default withLoadMore
diff --git a/src/hocs/with_load_more/with_load_more.scss b/src/hocs/with_load_more/with_load_more.scss
deleted file mode 100644
index 6b007ac2e..000000000
--- a/src/hocs/with_load_more/with_load_more.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-.with-load-more {
- &-footer {
- padding: 0.9em;
- text-align: center;
- border-top: 1px solid;
- border-top-color: var(--border);
-
- .error {
- font-size: 1rem;
- }
-
- a {
- cursor: pointer;
- }
- }
-}
diff --git a/src/hocs/with_subscription/with_subscription.jsx b/src/hocs/with_subscription/with_subscription.jsx
deleted file mode 100644
index 7805161c6..000000000
--- a/src/hocs/with_subscription/with_subscription.jsx
+++ /dev/null
@@ -1,94 +0,0 @@
-// eslint-disable-next-line no-unused
-
-import { isEmpty } from 'lodash'
-import { h } from 'vue'
-
-import { getComponentProps } from '../../services/component_utils/component_utils'
-import './with_subscription.scss'
-
-import { library } from '@fortawesome/fontawesome-svg-core'
-import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
-import { FontAwesomeIcon as FAIcon } from '@fortawesome/vue-fontawesome'
-
-library.add(faCircleNotch)
-
-const withSubscription =
- ({
- fetch, // function to fetch entries and return a promise
- select, // function to select data from store
- childPropName = 'content', // name of the prop to be passed into the wrapped component
- additionalPropNames = [], // additional prop name list of the wrapper component
- }) =>
- (WrappedComponent) => {
- const originalProps = Object.keys(getComponentProps(WrappedComponent))
- const props = originalProps
- .filter((v) => v !== childPropName)
- .concat(additionalPropNames)
-
- return {
- props: [
- ...props,
- 'refresh', // boolean saying to force-fetch data whenever created
- ],
- data() {
- return {
- loading: false,
- error: false,
- }
- },
- computed: {
- fetchedData() {
- return select(this.$props, this.$store)
- },
- },
- created() {
- if (this.refresh || isEmpty(this.fetchedData)) {
- this.fetchData()
- }
- },
- methods: {
- fetchData() {
- if (!this.loading) {
- this.loading = true
- this.error = false
- fetch(this.$props, this.$store)
- .then(() => {
- this.loading = false
- })
- .catch(() => {
- this.error = true
- this.loading = false
- })
- }
- },
- },
- render() {
- if (!this.error && !this.loading) {
- const props = {
- ...this.$props,
- [childPropName]: this.fetchedData,
- }
- const children = this.$slots
- return (
-
- {children}
-
- )
- } else {
- return (
-
- {this.error ? (
-
- {this.$t('general.generic_error')}
-
- ) : (
-
- )
- }
- },
- }
- }
-
-export default withSubscription
diff --git a/src/hocs/with_subscription/with_subscription.scss b/src/hocs/with_subscription/with_subscription.scss
deleted file mode 100644
index 8c0af336c..000000000
--- a/src/hocs/with_subscription/with_subscription.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-.with-subscription {
- &-loading {
- padding: 0.7em;
- text-align: center;
-
- .error {
- font-size: 1rem;
- }
- }
-}
diff --git a/src/i18n/en.json b/src/i18n/en.json
index e03e21403..10ce5704b 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -86,6 +86,7 @@
"apply": "Apply",
"submit": "Submit",
"more": "More",
+ "no_more": "No more items",
"loading": "Loading…",
"generic_error": "An error occured",
"generic_error_message": "An error occured: {0}",
@@ -105,6 +106,9 @@
"undo": "Undo",
"yes": "Yes",
"no": "No",
+ "none": "None",
+ "not_applicable": "N/A",
+ "not_available": "N/A",
"peek": "Peek",
"scroll_to_top": "Scroll to top",
"role": {
@@ -584,6 +588,9 @@
"move_account_error": "Error moving account: {error}",
"discoverable": "Allow discovery of this account in search results and other services",
"domain_mutes": "Domains",
+ "domain_mutes2": "Excluded domains",
+ "user_mutes2": "Muted users",
+ "user_blocks": "Blocked users",
"avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels. Recommended aspect ratio is 1:1",
"banner_size_instruction": "The recommended minimum size for banner images is 450x150 pixels. Recommended aspect ratio is 3:1",
"pad_emoji": "Pad emoji with spaces when adding from picker",
@@ -1156,6 +1163,7 @@
"tabs": {
"nodb": "No DB Config",
"instance": "Instance",
+ "users": "Users",
"limits": "Limits",
"frontends": "Front-ends",
"mailer": "EMails",
@@ -1284,6 +1292,56 @@
"adapter": "Mailing Adapter",
"auth": "Authentication"
},
+ "users": {
+ "title": "Users",
+ "local_id": "Local ID",
+ "no_users_found": "No users found",
+ "labels": {
+ "query": "Search",
+ "nickname": "{'@'}handle",
+ "name": "Display Name",
+ "name_colon": "Name:",
+ "email": "Email",
+ "email_colon": "Email:",
+ "handle_colon": "Handle:",
+ "origin": "Origin",
+ "activity": "Activity",
+ "privileges": "Privileges"
+ },
+ "tags": {
+ "add_new": "Add New Tag",
+ "new_title": "Enter New Tag And Confirm",
+ "yes": "Add",
+ "no": "Abort"
+ },
+ "options": {
+ "all": "All",
+ "only_local": "Only Local",
+ "only_external": "Only External",
+ "only_active": "Only Active",
+ "only_deactivated": "Only Deactivated",
+ "only_admins": "Only Admins",
+ "only_privileged": "Only Privileged",
+ "only_moderators": "Only Moderators",
+ "only_unapproved": "Exclude Approved",
+ "only_unconfirmed": "Exclude Confirmed"
+ },
+ "filters": {
+ "show_direct": "Show Direct Messages",
+ "show_reblogs": "Show Reblogs"
+ },
+ "indicator": {
+ "admin": "Admin",
+ "moderator": "Moderator",
+ "active": "Active",
+ "deactivated": "Deactivated",
+ "confirmed": "Confirmed",
+ "unconfirmed": "Pending confirmation",
+ "approved": "Approved",
+ "suggested": "Suggested",
+ "unapproved": "Pending approval"
+ }
+ },
"limits": {
"arbitrary_limits": "Arbitrary limits",
"posts": "Post limits",
@@ -1628,7 +1686,10 @@
"invisible_quote": "Quoted status unavailable: {link}",
"more_actions": "More actions on this status",
"loading": "Loading...",
- "load_error": "Unable to load status: {error}"
+ "load_error": "Unable to load status: {error}",
+ "admin_change_scope": "Change visibility",
+ "mark_as_sensitive": "Sensitive",
+ "mark_as_non-sensitive": "Non-sensitive"
},
"user_card": {
"approve": "Approve",
@@ -1716,15 +1777,28 @@
"group": "Group",
"birthday": "Born {birthday}",
"joined": "Joined",
+ "admin_data": {
+ "data": "Administrative info",
+ "registration_reason": "Registration reason",
+ "tags": "Tags"
+ },
"admin_menu": {
"moderation": "Moderation",
"grant_admin": "Grant Admin",
"revoke_admin": "Revoke Admin",
"grant_moderator": "Grant Moderator",
"revoke_moderator": "Revoke Moderator",
- "activate_account": "Activate account",
- "deactivate_account": "Deactivate account",
- "delete_account": "Delete account",
+ "activate_account": "Activate",
+ "deactivate_account": "Deactivate",
+ "delete_account": "Delete",
+ "suggest_account": "Add to suggested",
+ "remove_suggested_account": "Remove from suggested",
+ "approve_account": "Approve",
+ "confirm_account": "Confirm",
+ "show_statuses": "Show all posts",
+
+ "disable_mfa": "Disable MFA",
+
"force_nsfw": "Mark all posts as NSFW",
"strip_media": "Remove media from posts",
"force_unlisted": "Force posts to be unlisted",
@@ -1732,8 +1806,48 @@
"disable_remote_subscription": "Disallow following user from remote instances",
"disable_any_subscription": "Disallow following user at all",
"quarantine": "Disallow user posts from federating",
- "delete_user": "Delete user",
- "delete_user_data_and_deactivate_confirmation": "This will permanently delete the data from this account and deactivate it. Are you absolutely sure?"
+
+ "require_password_change": "Require Password Change",
+ "resend_confirmation": "Resend Confirmation Email",
+ "confirm_modal": {
+ "delete_title": "User deletion",
+ "delete_content": "Delete user {user}? | Delete {count} users?",
+ "delete_content_2": "This will permanently delete the data from this accounts and deactivate it. Are you absolutely sure?",
+ "activate_title": "User activation",
+ "activate_content": "Activate user {user}? | Activate {count} users?",
+ "deactivate_content": "Dectivate user {user}? | Dectivate {count} users?",
+ "approval_title": "Approve users",
+ "approval_content": "Approve user {user}? | Approve {count} users?",
+ "confirm_title": "Confirm users",
+ "confirm_content": "Approve user {user}? | Approve {count} users?",
+ "suggest_title": "Suggest users",
+ "add_suggest_content": "Add user {user} to suggested users list? | Add {count} users to suggested users list?",
+ "remove_suggest_content": "Remove user {user} from suggested users list? | Add {count} users to suggested users list?",
+ "rights_title": "Promote users",
+ "grant_rights_content": "Grant user {user} {name} role? | Grant {count} users {name} role?",
+ "revoke_rights_content": "Revoke {name} role from user {user}? | Revoke {name} from {count} users?",
+ "tag_title": "Assign user policy",
+ "assign_tag_content": "Assign {user} a {name} policy? | Assign {name} policy to {count} users?",
+ "unassign_tag_content": "Unassign policy {name} from {user}? | Unassign policy {name} from {count} users?",
+ "resend_confirmation_title": "Email confirmation resend",
+ "resend_confirmation_content": "Resend confirmation email to {count} users?",
+ "disable_mfa_title": "Disable MFA",
+ "disable_mfa_content": "Disable Mult-Factor Authentication for {count} users?",
+ "require_password_change_title": "Force password change",
+ "require_password_change_content": "Force {count} users to change password on next login?",
+ "add": "Add",
+ "remove": "Remove",
+ "delete": "Delete",
+ "activate": "Activate",
+ "deactivate": "Deactivate",
+ "grant": "Grant",
+ "revoke": "Revoke",
+ "approve": "Approve",
+ "confirm": "Confirm",
+ "assign": "Assign",
+ "unassign": "Unassign",
+ "send": "Send"
+ }
},
"highlight_new": {
"disabled": "Don't highlight",
diff --git a/src/modules/adminSettings.js b/src/modules/adminSettings.js
deleted file mode 100644
index 33cc8a595..000000000
--- a/src/modules/adminSettings.js
+++ /dev/null
@@ -1,294 +0,0 @@
-import { cloneDeep, differenceWith, flatten, get, isEqual, set } from 'lodash'
-
-export const defaultState = {
- frontends: [],
- loaded: false,
- needsReboot: null,
- config: null,
- modifiedPaths: null,
- descriptions: null,
- draft: null,
- dbConfigEnabled: null,
-}
-
-export const newUserFlags = {
- ...defaultState.flagStorage,
-}
-
-const adminSettingsStorage = {
- state: {
- ...cloneDeep(defaultState),
- },
- mutations: {
- setInstanceAdminNoDbConfig(state) {
- state.loaded = false
- state.dbConfigEnabled = false
- },
- setAvailableFrontends(state, { frontends }) {
- state.frontends = frontends.map((f) => {
- f.installedRefs = f.installed_refs
- if (f.name === 'pleroma-fe') {
- f.refs = ['master', 'develop']
- } else {
- f.refs = [f.ref]
- }
- return f
- })
- },
- updateAdminSettings(state, { config, modifiedPaths }) {
- state.loaded = true
- state.dbConfigEnabled = true
- state.config = config
- state.modifiedPaths = modifiedPaths
- },
- updateAdminDescriptions(state, { descriptions }) {
- state.descriptions = descriptions
- },
- updateAdminDraft(state, { path, value }) {
- const [group, key, subkey] = path
- const parent = [group, key, subkey]
-
- set(state.draft, path, value)
-
- // force-updating grouped draft to trigger refresh of group settings
- if (path.length > parent.length) {
- set(state.draft, parent, cloneDeep(get(state.draft, parent)))
- }
- },
- resetAdminDraft(state) {
- state.draft = cloneDeep(state.config)
- },
- },
- actions: {
- loadFrontendsStuff({ rootState, commit }) {
- rootState.api.backendInteractor
- .fetchAvailableFrontends()
- .then((frontends) => commit('setAvailableFrontends', { frontends }))
- },
- loadAdminStuff({ state, rootState, dispatch, commit }) {
- rootState.api.backendInteractor
- .fetchInstanceDBConfig()
- .then((backendDbConfig) => {
- if (backendDbConfig.error) {
- if (backendDbConfig.error.status === 400) {
- backendDbConfig.error.json().then((errorJson) => {
- if (/configurable_from_database/.test(errorJson.error)) {
- commit('setInstanceAdminNoDbConfig')
- }
- })
- }
- } else {
- dispatch('setInstanceAdminSettings', { backendDbConfig })
- }
- })
- if (state.descriptions === null) {
- rootState.api.backendInteractor
- .fetchInstanceConfigDescriptions()
- .then((backendDescriptions) =>
- dispatch('setInstanceAdminDescriptions', { backendDescriptions }),
- )
- }
- },
- setInstanceAdminSettings({ state, commit }, { backendDbConfig }) {
- const config = state.config || {}
- const modifiedPaths = new Set()
-
- backendDbConfig.configs.forEach((c) => {
- const path = [c.group, c.key]
- if (c.db) {
- // Path elements can contain dot, therefore we use ' -> ' as a separator instead
- // Using strings for modified paths for easier searching
- c.db.forEach((x) => modifiedPaths.add([...path, x].join(' -> ')))
- }
-
- // we need to preserve tuples on second level only, possibly third
- // but it's not a case right now.
- const convert = (value, preserveTuples, preserveTuplesLv2) => {
- if (Array.isArray(value) && value.length > 0 && value[0].tuple) {
- if (!preserveTuples) {
- return value.reduce((acc, c) => {
- if (c.tuple == null) {
- return {
- ...acc,
- [c]: c,
- }
- }
- return {
- ...acc,
- [c.tuple[0]]: convert(c.tuple[1], preserveTuplesLv2),
- }
- }, {})
- } else {
- return value.map((x) => x.tuple)
- }
- } else {
- if (!preserveTuples) {
- return value
- } else {
- return value.tuple
- }
- }
- }
- // for most stuff we want maps since those are more convenient
- // however this doesn't allow for multiple values per same key
- // so for those cases we want to preserve tuples as-is
- // right now it's made exclusively for :pleroma.:rate_limit
- // so it might not work properly elsewhere
- const preserveTuples = path.find((x) => x === ':rate_limit')
- set(config, path, convert(c.value, false, preserveTuples))
- })
- // patching http adapter config to be easier to handle
- const adapter = config[':pleroma'][':http'][':adapter']
- if (Array.isArray(adapter)) {
- config[':pleroma'][':http'][':adapter'] = {
- [':ssl_options']: {
- [':versions']: [],
- },
- }
- }
- commit('updateAdminSettings', { config, modifiedPaths })
- commit('resetAdminDraft')
- },
- setInstanceAdminDescriptions({ commit }, { backendDescriptions }) {
- const convert = (
- { children, description, label, key = '![https:\/\/soykaf.com\/attachment\/64411<\/a>", - "statusnet_conversation_id": 200729, - "statusnet_in_groups": false, - "external_url": "https:\/\/soykaf.com\/notice\/339506", - "in_reply_to_profileurl": null, - "in_reply_to_ostatus_uri": null, - "attentions": [], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": true, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "@maiyannah @verius I mean I do sympathize on a moral level because Hussein is indeed a monster. We just didn't do the level of nation building we did post-WW2 with Germany and Japan to ensure they don't turn into chaotic hellholes as soon as the old regime was toppled. We half assed our way in and half assed our way out. And now ISIS has become a far bigger threat than Hussein ever was.", - "truncated": false, - "created_at": "Sun Aug 21 16:55:24 +0000 2016", - "in_reply_to_status_id": "247021", - "uri": "tag:community.highlandarrow.com,2016-08-21:noticeId=255499:objectType=comment", - "source": "ostatus", - "id": 247026, - "in_reply_to_user_id": 23258, - "in_reply_to_screen_name": "maiyannah", - "geo": null, - "user": { - "id": 23253, - "name": "Gamera Godzilla", - "screen_name": "gameragodzilla", - "location": null, - "description": "Hopefully I wont be banned by Staffan here.", - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": null, - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Wed Jul 27 20:05:23 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 691, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/community.highlandarrow.com\/gameragodzilla", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": false, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/73", - "favourites_count": 30 - }, - "statusnet_html": "@](\"https:\/\/soykaf.com\/file\/21105283b95c5db2c3ac38d06f0d34093a35dd6a965cec89c7950a786351d6a4.jpg\"){kind=link}
![https:\/\/gs.smuglo.li\/attachment\/111717<\/a>", - "statusnet_conversation_id": 200726, - "statusnet_in_groups": false, - "external_url": "https:\/\/soykaf.com\/notice\/339502", - "in_reply_to_profileurl": "https:\/\/gs.smuglo.li\/jimrusell01", - "in_reply_to_ostatus_uri": "https:\/\/gs.smuglo.li\/user\/1987", - "attentions": [], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": false, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "@gameragodzilla @verius I think I tend to be more charitible to George Bush than most are, because the problems he had were inherited from elsewhere. \u00a0Was he really up to them? \u00a0Not really, but it was Clinton that authorized the CIA missions that messed up that region.", - "truncated": false, - "created_at": "Sun Aug 21 16:53:29 +0000 2016", - "in_reply_to_status_id": "247019", - "uri": "tag:community.highlandarrow.com,2016-08-21:noticeId=255495:objectType=comment", - "source": "ostatus", - "id": 247021, - "in_reply_to_user_id": 23253, - "in_reply_to_screen_name": "gameragodzilla", - "geo": null, - "user": { - "id": 23258, - "name": "Maiyannah Bishop", - "screen_name": "maiyannah", - "location": "Canada", - "description": "Admin of the HA community \u2022 Editor-in-chief of Highland Arrow \u2022 Lead Developer of !postActiv \u2022 FSF Associate Member \u2022 Email: maiyannah@highlandarrow.com", - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23258-48-20160819164757.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23258-48-20160819164757.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23258-original-20160819160607.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23258-original-20160819160607.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": "http:\/\/www.highlandarrow.com", - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Wed Jul 27 21:36:53 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 937, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/community.highlandarrow.com\/maiyannah", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": false, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/1", - "favourites_count": 37 - }, - "statusnet_html": "@](\"https:\/\/gs.smuglo.li\/file\/13688381b409df69aa11f0469fe19fcc932734d70ddbf8f39249364e205a08f2.jpg\"){kind=link}
\n
\nhttp:\/\/togetter.com\/li\/1013965<\/a>", - "statusnet_conversation_id": 200728, - "statusnet_in_groups": false, - "external_url": "https:\/\/status.akionux.net\/notice\/359563", - "in_reply_to_profileurl": null, - "in_reply_to_ostatus_uri": null, - "attentions": [], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": true, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "@maiyannah @verius Bush's issue was more mission creep and failing to think long term. He just thought about toppeling Hussein, which was indeed easily accomplished within the span of a few months. It was the guerilla fighting afterwards that caused major problems. Clinton was just being an idiot and failed to apprehend Bin Laden prior to 9\/11.", - "truncated": false, - "created_at": "Sun Aug 21 16:52:31 +0000 2016", - "in_reply_to_status_id": "247013", - "uri": "tag:community.highlandarrow.com,2016-08-21:noticeId=255493:objectType=comment", - "source": "ostatus", - "id": 247019, - "in_reply_to_user_id": 23258, - "in_reply_to_screen_name": "maiyannah", - "geo": null, - "user": { - "id": 23253, - "name": "Gamera Godzilla", - "screen_name": "gameragodzilla", - "location": null, - "description": "Hopefully I wont be banned by Staffan here.", - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": null, - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Wed Jul 27 20:05:23 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 691, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/community.highlandarrow.com\/gameragodzilla", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": false, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/73", - "favourites_count": 30 - }, - "statusnet_html": "@maiyannah<\/a> @verius<\/a> Bush's issue was more mission creep and failing to think long term. He just thought about toppeling Hussein, which was indeed easily accomplished within the span of a few months. It was the guerilla fighting afterwards that caused major problems.
\n
\nClinton was just being an idiot and failed to apprehend Bin Laden prior to 9\/11.", - "statusnet_conversation_id": 200682, - "statusnet_in_groups": false, - "external_url": "https:\/\/community.highlandarrow.com\/notice\/255493", - "in_reply_to_profileurl": "https:\/\/community.highlandarrow.com\/maiyannah", - "in_reply_to_ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/1", - "attentions": [ - { - "id": 23250, - "screen_name": "verius", - "fullname": "Verius", - "profileurl": "https:\/\/community.highlandarrow.com\/verius", - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/500" - }, - { - "id": 23258, - "screen_name": "maiyannah", - "fullname": "Maiyannah Bishop", - "profileurl": "https:\/\/community.highlandarrow.com\/maiyannah", - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/1" - } - ], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": true, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "How flat is flat enough? https:\/\/gs.smuglo.li\/attachment\/111716", - "truncated": false, - "created_at": "Sun Aug 21 16:52:11 +0000 2016", - "in_reply_to_status_id": null, - "uri": "tag:gs.smuglo.li,2016-08-21:noticeId=589590:objectType=note", - "source": "ostatus", - "id": 247018, - "in_reply_to_user_id": null, - "in_reply_to_screen_name": null, - "geo": null, - "attachments": [ - { - "url": "https:\/\/gs.smuglo.li\/file\/c1835c05ee3a2f7f2dcf9bdbb0100330842b46819dc78f2a390c790ad8a203fc.jpg", - "mimetype": "image\/jpeg", - "size": "3808766", - "oembed": false, - "id": "103982", - "version": "1.2", - "thumb_url": "https:\/\/social.heldscal.la\/file\/thumb-103982-450x321-c1835c05ee3a2f7f2dcf9bdbb0100330842b46819dc78f2a390c790ad8a203fc.jpg", - "large_thumb_url": "https:\/\/social.heldscal.la\/file\/thumb-103982-1000x712-c1835c05ee3a2f7f2dcf9bdbb0100330842b46819dc78f2a390c790ad8a203fc.jpg", - "width": "5031", - "height": "3579" - } - ], - "user": { - "id": 23266, - "name": "\u3059\u307f", - "screen_name": "sumi", - "location": "The Bunker", - "description": null, - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23266-48-20160814155800.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23266-48-20160814155800.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23266-original-20160814155757.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23266-original-20160814155757.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": null, - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Wed Jul 27 23:10:58 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 74, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/gs.smuglo.li\/sumi", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": false, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/gs.smuglo.li\/user\/580", - "favourites_count": 1 - }, - "statusnet_html": "How flat is flat enough? https:\/\/gs.smuglo.li\/attachment\/111716<\/a>", - "statusnet_conversation_id": 200727, - "statusnet_in_groups": false, - "external_url": "https:\/\/gs.smuglo.li\/notice\/589590", - "in_reply_to_profileurl": null, - "in_reply_to_ostatus_uri": null, - "attentions": [], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": true, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "1iceloops123 favorited something by jimrusell01: #nsfw https:\/\/gs.smuglo.li\/attachment\/111717", - "truncated": false, - "created_at": "Sun Aug 21 16:52:15 +0000 2016", - "in_reply_to_status_id": "247016", - "uri": "tag:shitposter.club,2016-08-21:fave:3895:note:773501:2016-08-21T16:52:15+00:00", - "source": "ostatus", - "id": 247017, - "in_reply_to_user_id": 23236, - "in_reply_to_screen_name": "jimrusell01", - "geo": null, - "user": { - "id": 23212, - "name": "iceloops123", - "screen_name": "1iceloops123", - "location": "backup account", - "description": "loves videogames,art,music,comics,cartoons nothing new. sealion.club\/iceloops123 freezepeach.xyz\/iceloops123 gs.smuglo.li\/iceloops123", - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23212-48-20160727103811.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23212-48-20160727103811.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23212-original-20160727103801.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23212-original-20160727103801.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": "http:\/\/iceloops123.tumblr.com\/", - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Wed Jul 27 10:38:01 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 2092, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/shitposter.club\/1iceloops123", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": true, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/shitposter.club\/user\/3895", - "favourites_count": 643 - }, - "statusnet_html": "1iceloops123 favorited something by jimrusell01: #nsfw<\/a><\/span> https:\/\/gs.smuglo.li\/attachment\/111717<\/a>", - "statusnet_conversation_id": 200726, - "statusnet_in_groups": false, - "external_url": "https:\/\/shitposter.club\/notice\/773502", - "in_reply_to_profileurl": "https:\/\/gs.smuglo.li\/jimrusell01", - "in_reply_to_ostatus_uri": "https:\/\/gs.smuglo.li\/user\/1987", - "attentions": [], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": false, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "#nsfw https:\/\/gs.smuglo.li\/attachment\/111717", - "truncated": false, - "created_at": "Sun Aug 21 16:51:44 +0000 2016", - "in_reply_to_status_id": null, - "uri": "tag:gs.smuglo.li,2016-08-21:noticeId=589587:objectType=note", - "source": "ostatus", - "id": 247016, - "in_reply_to_user_id": null, - "in_reply_to_screen_name": null, - "geo": null, - "attachments": [ - { - "url": "https:\/\/gs.smuglo.li\/file\/13688381b409df69aa11f0469fe19fcc932734d70ddbf8f39249364e205a08f2.jpg", - "mimetype": "image\/jpeg", - "size": "155985", - "oembed": false, - "id": "103981", - "version": "1.2", - "thumb_url": "https:\/\/social.heldscal.la\/file\/thumb-103981-428x600-13688381b409df69aa11f0469fe19fcc932734d70ddbf8f39249364e205a08f2.jpg", - "large_thumb_url": "https:\/\/social.heldscal.la\/file\/thumb-103981-712x1000-13688381b409df69aa11f0469fe19fcc932734d70ddbf8f39249364e205a08f2.jpg", - "width": "712", - "height": "1000" - } - ], - "user": { - "id": 23236, - "name": "Jim Rusell", - "screen_name": "jimrusell01", - "location": "The Internet", - "description": "I once was a normal human, but i'm now just a simple bot.", - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23236-48-20160727155842.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23236-48-20160727155842.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23236-original-20160727155834.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23236-original-20160727155834.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": null, - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Wed Jul 27 15:58:34 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 919, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/gs.smuglo.li\/jimrusell01", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": true, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/gs.smuglo.li\/user\/1987", - "favourites_count": 33 - }, - "statusnet_html": "#nsfw<\/a><\/span> https:\/\/gs.smuglo.li\/attachment\/111717<\/a>", - "statusnet_conversation_id": 200726, - "statusnet_in_groups": false, - "external_url": "https:\/\/gs.smuglo.li\/notice\/589587", - "in_reply_to_profileurl": null, - "in_reply_to_ostatus_uri": null, - "attentions": [], - "fave_num": 2, - "repeat_num": 0, - "is_post_verb": true, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "https:\/\/www.youtube.com\/watch?v=cV9BtuPpW9w&feature=share", - "truncated": false, - "created_at": "Sun Aug 21 16:51:49 +0000 2016", - "in_reply_to_status_id": null, - "uri": "tag:shitposter.club,2016-08-21:noticeId=773500:objectType=note", - "source": "ostatus", - "id": 247015, - "in_reply_to_user_id": null, - "in_reply_to_screen_name": null, - "geo": null, - "attachments": [ - { - "url": "https:\/\/www.youtube.com\/watch?v=cV9BtuPpW9w&feature=share", - "mimetype": "text\/html; charset=utf-8", - "size": null, - "oembed": { - "type": "video", - "provider": "YouTube", - "provider_url": "https:\/\/www.youtube.com\/", - "oembedHTML": "", - "title": "PASSPORT.MID played on a Roland Sound Canvas SC-55", - "author_name": "rerolledDK", - "author_url": "https:\/\/www.youtube.com\/user\/rerolledDK" - }, - "id": "103980", - "version": "1.2", - "thumb_url": "https:\/\/social.heldscal.la\/file\/thumb-103980-450x338-95067907509a4f756e4317c47e8dc38738148e9b915f673c34bbef8de47d283e.jpg.jpg", - "large_thumb_url": "https:\/\/social.heldscal.la\/file\/95067907509a4f756e4317c47e8dc38738148e9b915f673c34bbef8de47d283e.jpg", - "width": null, - "height": null - } - ], - "user": { - "id": 23212, - "name": "iceloops123", - "screen_name": "1iceloops123", - "location": "backup account", - "description": "loves videogames,art,music,comics,cartoons nothing new. sealion.club\/iceloops123 freezepeach.xyz\/iceloops123 gs.smuglo.li\/iceloops123", - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23212-48-20160727103811.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23212-48-20160727103811.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23212-original-20160727103801.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23212-original-20160727103801.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": "http:\/\/iceloops123.tumblr.com\/", - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Wed Jul 27 10:38:01 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 2092, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/shitposter.club\/1iceloops123", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": true, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/shitposter.club\/user\/3895", - "favourites_count": 643 - }, - "statusnet_html": "https:\/\/www.youtube.com\/watch?v=cV9BtuPpW9w&feature=share<\/a>", - "statusnet_conversation_id": 200725, - "statusnet_in_groups": false, - "external_url": "https:\/\/shitposter.club\/notice\/773500", - "in_reply_to_profileurl": null, - "in_reply_to_ostatus_uri": null, - "attentions": [], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": true, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "@verius @maiyannah Good thing you don't vote. :P Of course, it's also incredibly naive to think that corruption and shady things in one country won't impact another country. The bullshit surrounding Brussels is why the UK decided to leave the EU after all.", - "truncated": false, - "created_at": "Sun Aug 21 16:51:16 +0000 2016", - "in_reply_to_status_id": null, - "uri": "tag:community.highlandarrow.com,2016-08-21:noticeId=255491:objectType=comment", - "source": "ostatus", - "id": 247014, - "in_reply_to_user_id": null, - "in_reply_to_screen_name": null, - "geo": null, - "user": { - "id": 23253, - "name": "Gamera Godzilla", - "screen_name": "gameragodzilla", - "location": null, - "description": "Hopefully I wont be banned by Staffan here.", - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": null, - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Wed Jul 27 20:05:23 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 691, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/community.highlandarrow.com\/gameragodzilla", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": false, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/73", - "favourites_count": 30 - }, - "statusnet_html": "@verius<\/a> @maiyannah<\/a> Good thing you don't vote. :P
\n
\nOf course, it's also incredibly naive to think that corruption and shady things in one country won't impact another country. The bullshit surrounding Brussels is why the UK decided to leave the EU after all.", - "statusnet_conversation_id": 200682, - "statusnet_in_groups": false, - "external_url": "https:\/\/community.highlandarrow.com\/notice\/255491", - "in_reply_to_profileurl": null, - "in_reply_to_ostatus_uri": null, - "attentions": [ - { - "id": 23250, - "screen_name": "verius", - "fullname": "Verius", - "profileurl": "https:\/\/community.highlandarrow.com\/verius", - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/500" - }, - { - "id": 23258, - "screen_name": "maiyannah", - "fullname": "Maiyannah Bishop", - "profileurl": "https:\/\/community.highlandarrow.com\/maiyannah", - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/1" - } - ], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": true, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "@verius @gameragodzilla Yeah it's not like her husband was the one that fucked up the middle east situation or anything. \u00a0George Bush just wishes he had as much a hand in that as Bill Clinton did.", - "truncated": false, - "created_at": "Sun Aug 21 16:50:53 +0000 2016", - "in_reply_to_status_id": null, - "uri": "tag:community.highlandarrow.com,2016-08-21:noticeId=255490:objectType=comment", - "source": "ostatus", - "id": 247013, - "in_reply_to_user_id": null, - "in_reply_to_screen_name": null, - "geo": null, - "user": { - "id": 23258, - "name": "Maiyannah Bishop", - "screen_name": "maiyannah", - "location": "Canada", - "description": "Admin of the HA community \u2022 Editor-in-chief of Highland Arrow \u2022 Lead Developer of !postActiv \u2022 FSF Associate Member \u2022 Email: maiyannah@highlandarrow.com", - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23258-48-20160819164757.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23258-48-20160819164757.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23258-original-20160819160607.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23258-original-20160819160607.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": "http:\/\/www.highlandarrow.com", - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Wed Jul 27 21:36:53 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 937, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/community.highlandarrow.com\/maiyannah", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": false, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/1", - "favourites_count": 37 - }, - "statusnet_html": "@verius<\/a> @gameragodzilla<\/a> Yeah it's not like her husband was the one that fucked up the middle east situation or anything. \u00a0George Bush just wishes he had as much a hand in that as Bill Clinton did.", - "statusnet_conversation_id": 200682, - "statusnet_in_groups": false, - "external_url": "https:\/\/community.highlandarrow.com\/notice\/255490", - "in_reply_to_profileurl": null, - "in_reply_to_ostatus_uri": null, - "attentions": [ - { - "id": 23250, - "screen_name": "verius", - "fullname": "Verius", - "profileurl": "https:\/\/community.highlandarrow.com\/verius", - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/500" - }, - { - "id": 23253, - "screen_name": "gameragodzilla", - "fullname": "Gamera Godzilla", - "profileurl": "https:\/\/community.highlandarrow.com\/gameragodzilla", - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/73" - } - ], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": true, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "@maiyannah @verius Trump's issue is his tendency to blurt out whatever the fuck he has in mind at any given time. Sure, that may be a quality that people admire about him, and even I have a sneaky sense of humor at the fact that he just doesn't give a shit, but that does mean the media tend to try and focus on the stupid shit he says while desperately burying the myriad of shady things Clinton has done.", - "truncated": false, - "created_at": "Sun Aug 21 16:48:50 +0000 2016", - "in_reply_to_status_id": "247009", - "uri": "tag:community.highlandarrow.com,2016-08-21:noticeId=255488:objectType=comment", - "source": "ostatus", - "id": 247012, - "in_reply_to_user_id": 23258, - "in_reply_to_screen_name": "maiyannah", - "geo": null, - "user": { - "id": 23253, - "name": "Gamera Godzilla", - "screen_name": "gameragodzilla", - "location": null, - "description": "Hopefully I wont be banned by Staffan here.", - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": null, - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Wed Jul 27 20:05:23 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 691, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/community.highlandarrow.com\/gameragodzilla", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": false, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/73", - "favourites_count": 30 - }, - "statusnet_html": "@maiyannah<\/a> @verius<\/a> Trump's issue is his tendency to blurt out whatever the fuck he has in mind at any given time. Sure, that may be a quality that people admire about him, and even I have a sneaky sense of humor at the fact that he just doesn't give a shit, but that does mean the media tend to try and focus on the stupid shit he says while desperately burying the myriad of shady things Clinton has done.", - "statusnet_conversation_id": 200682, - "statusnet_in_groups": false, - "external_url": "https:\/\/community.highlandarrow.com\/notice\/255488", - "in_reply_to_profileurl": "https:\/\/community.highlandarrow.com\/maiyannah", - "in_reply_to_ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/1", - "attentions": [ - { - "id": 23250, - "screen_name": "verius", - "fullname": "Verius", - "profileurl": "https:\/\/community.highlandarrow.com\/verius", - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/500" - }, - { - "id": 23258, - "screen_name": "maiyannah", - "fullname": "Maiyannah Bishop", - "profileurl": "https:\/\/community.highlandarrow.com\/maiyannah", - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/1" - } - ], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": true, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "#furry #nsfw https:\/\/soykaf.com\/attachment\/64406", - "truncated": false, - "created_at": "Sun Aug 21 16:47:50 +0000 2016", - "in_reply_to_status_id": null, - "uri": "tag:soykaf.com,2016-08-21:noticeId=339493:objectType=note", - "source": "ostatus", - "id": 247011, - "in_reply_to_user_id": null, - "in_reply_to_screen_name": null, - "geo": null, - "attachments": [ - { - "url": "https:\/\/soykaf.com\/file\/135f7f53bfcfe1730b68d1608db4e303355fd7c25acd2402197bc33da552d227.jpg", - "mimetype": "image\/jpeg", - "size": "191078", - "oembed": false, - "id": "103979", - "version": "1.2", - "thumb_url": "https:\/\/social.heldscal.la\/attachment\/103979\/thumbnail?w=417&h=600", - "large_thumb_url": "https:\/\/social.heldscal.la\/attachment\/103979\/thumbnail?w=417&h=600", - "width": "710", - "height": "1024" - } - ], - "user": { - "id": 24329, - "name": "Mouse", - "screen_name": "mouse", - "location": "Somewhere in the US", - "description": "Furry. Lover of animals and good food. Coffee keeps me sane.", - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/24329-48-20160821162822.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/24329-48-20160821162822.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/24329-original-20160821162818.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/24329-original-20160821162818.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": null, - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Mon Aug 15 23:12:20 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 124, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/soykaf.com\/mouse", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": true, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/soykaf.com\/user\/2558", - "favourites_count": 11 - }, - "statusnet_html": "#furry<\/a><\/span> #nsfw<\/a><\/span> https:\/\/soykaf.com\/attachment\/64406<\/a>", - "statusnet_conversation_id": 200724, - "statusnet_in_groups": false, - "external_url": "https:\/\/soykaf.com\/notice\/339493", - "in_reply_to_profileurl": null, - "in_reply_to_ostatus_uri": null, - "attentions": [], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": true, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "@verius @maiyannah Considering the almost cult-like devotion certain people have for him, I doubt it. Oh well, my main concern right now is still keeping Hillary out of office. I'll still take a crazy, unreliable narcissist over Hillary's corruption.", - "truncated": false, - "created_at": "Sun Aug 21 16:47:26 +0000 2016", - "in_reply_to_status_id": null, - "uri": "tag:community.highlandarrow.com,2016-08-21:noticeId=255486:objectType=comment", - "source": "ostatus", - "id": 247010, - "in_reply_to_user_id": null, - "in_reply_to_screen_name": null, - "geo": null, - "user": { - "id": 23253, - "name": "Gamera Godzilla", - "screen_name": "gameragodzilla", - "location": null, - "description": "Hopefully I wont be banned by Staffan here.", - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": null, - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Wed Jul 27 20:05:23 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 691, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/community.highlandarrow.com\/gameragodzilla", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": false, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/73", - "favourites_count": 30 - }, - "statusnet_html": "@verius<\/a> @maiyannah<\/a> Considering the almost cult-like devotion certain people have for him, I doubt it.
![https:\/\/soykaf.com\/attachment\/64406<\/a>", - "statusnet_conversation_id": 200724, - "statusnet_in_groups": false, - "external_url": "https:\/\/soykaf.com\/notice\/339493", - "in_reply_to_profileurl": null, - "in_reply_to_ostatus_uri": null, - "attentions": [], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": true, - "is_local": false, - "favorited": false, - "repeated": false - }, - { - "text": "@verius @maiyannah Considering the almost cult-like devotion certain people have for him, I doubt it. Oh well, my main concern right now is still keeping Hillary out of office. I'll still take a crazy, unreliable narcissist over Hillary's corruption.", - "truncated": false, - "created_at": "Sun Aug 21 16:47:26 +0000 2016", - "in_reply_to_status_id": null, - "uri": "tag:community.highlandarrow.com,2016-08-21:noticeId=255486:objectType=comment", - "source": "ostatus", - "id": 247010, - "in_reply_to_user_id": null, - "in_reply_to_screen_name": null, - "geo": null, - "user": { - "id": 23253, - "name": "Gamera Godzilla", - "screen_name": "gameragodzilla", - "location": null, - "description": "Hopefully I wont be banned by Staffan here.", - "profile_image_url": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg", - "profile_image_url_https": "https:\/\/social.heldscal.la\/avatar\/23253-48-20160802061558.jpeg", - "profile_image_url_profile_size": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg", - "profile_image_url_original": "https:\/\/social.heldscal.la\/avatar\/23253-original-20160727200523.jpeg", - "groups_count": 0, - "linkcolor": false, - "backgroundcolor": false, - "url": null, - "protected": false, - "followers_count": 1, - "friends_count": 0, - "created_at": "Wed Jul 27 20:05:23 +0000 2016", - "utc_offset": "0", - "time_zone": "UTC", - "statuses_count": 691, - "following": true, - "statusnet_blocking": false, - "notifications": true, - "statusnet_profile_url": "https:\/\/community.highlandarrow.com\/gameragodzilla", - "cover_photo": false, - "background_image": false, - "profile_link_color": false, - "profile_background_color": false, - "profile_banner_url": false, - "follows_you": false, - "blocks_you": false, - "is_local": false, - "is_silenced": false, - "rights": { - "delete_user": false, - "delete_others_notice": false, - "silence": false, - "sandbox": false - }, - "is_sandboxed": false, - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/73", - "favourites_count": 30 - }, - "statusnet_html": "@](\"https:\/\/soykaf.com\/file\/135f7f53bfcfe1730b68d1608db4e303355fd7c25acd2402197bc33da552d227.jpg\"){kind=link}
\n
\nOh well, my main concern right now is still keeping Hillary out of office. I'll still take a crazy, unreliable narcissist over Hillary's corruption.", - "statusnet_conversation_id": 200682, - "statusnet_in_groups": false, - "external_url": "https:\/\/community.highlandarrow.com\/notice\/255486", - "in_reply_to_profileurl": null, - "in_reply_to_ostatus_uri": null, - "attentions": [ - { - "id": 23250, - "screen_name": "verius", - "fullname": "Verius", - "profileurl": "https:\/\/community.highlandarrow.com\/verius", - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/500" - }, - { - "id": 23258, - "screen_name": "maiyannah", - "fullname": "Maiyannah Bishop", - "profileurl": "https:\/\/community.highlandarrow.com\/maiyannah", - "ostatus_uri": "https:\/\/community.highlandarrow.com\/user\/1" - } - ], - "fave_num": 0, - "repeat_num": 0, - "is_post_verb": true, - "is_local": false, - "favorited": false, - "repeated": false - } -] diff --git a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js index cd877b05e..43ce4da5d 100644 --- a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js +++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js @@ -5,76 +5,6 @@ import { parseUser, } from '../../../../../src/services/entity_normalizer/entity_normalizer.service.js' import mastoapidata from '../../../../fixtures/mastoapi.json' -import qvitterapidata from '../../../../fixtures/statuses.json' - -const makeMockStatusQvitter = (overrides = {}) => { - return Object.assign( - { - activity_type: 'post', - attachments: [], - attentions: [], - created_at: 'Tue Jan 15 13:57:56 +0000 2019', - external_url: 'https://ap.example/whatever', - fave_num: 1, - favorited: false, - id: '10335970', - in_reply_to_ostatus_uri: null, - in_reply_to_profileurl: null, - in_reply_to_screen_name: null, - in_reply_to_status_id: null, - in_reply_to_user_id: null, - is_local: false, - is_post_verb: true, - possibly_sensitive: false, - repeat_num: 0, - repeated: false, - statusnet_conversation_id: '16300488', - summary: null, - tags: [], - text: 'haha benis', - uri: 'https://ap.example/whatever', - user: makeMockUserQvitter(), - visibility: 'public', - }, - overrides, - ) -} - -const makeMockUserQvitter = (overrides = {}) => { - return Object.assign( - { - background_image: null, - cover_photo: '', - created_at: 'Mon Jan 14 13:56:51 +0000 2019', - default_scope: 'public', - description: 'ebin', - description_html: '
ebin
', - favourites_count: 0, - fields: [], - followers_count: 1, - following: true, - follows_you: true, - friends_count: 1, - id: '60717', - is_local: false, - locked: false, - name: 'Spurdo :ebin:', - name_html: 'Spurdo