diff --git a/build/check-versions.mjs b/build/check-versions.mjs index 8c5968a30..c22004b00 100644 --- a/build/check-versions.mjs +++ b/build/check-versions.mjs @@ -36,7 +36,6 @@ export default function () { const warning = warnings[i] console.warn(' ' + warning) } - console.warn() process.exit(1) } } diff --git a/src/App.vue b/src/App.vue index f432d8bc4..c1a7199d7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -28,10 +28,10 @@ > - - - - + + + + diff --git a/src/boot/after_store.js b/src/boot/after_store.js index e18cfa788..a3d8701e5 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -152,8 +152,10 @@ const getStaticConfig = async () => { throw res } } catch (error) { - console.warn('Failed to load static/config.json, continuing without it.') - console.warn(error) + console.warn( + 'Failed to load static/config.json, continuing without it.', + error, + ) return {} } } @@ -442,8 +444,7 @@ const getNodeInfo = async ({ store }) => { throw res } } catch (e) { - console.warn('Could not load nodeinfo') - console.warn(e) + console.warn('Could not load nodeinfo', e) } } diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js index 0146a3de8..6c4568d14 100644 --- a/src/components/emoji_input/emoji_input.js +++ b/src/components/emoji_input/emoji_input.js @@ -333,7 +333,6 @@ const EmojiInput = { if (!this.pickerShown) { this.scrollIntoView() this.$refs.picker.showPicker() - this.$refs.picker.startEmojiLoad() } else { this.$refs.picker.hidePicker() } diff --git a/src/components/instance_specific_panel/instance_specific_panel.vue b/src/components/instance_specific_panel/instance_specific_panel.vue index c8ed0a2de..597155e27 100644 --- a/src/components/instance_specific_panel/instance_specific_panel.vue +++ b/src/components/instance_specific_panel/instance_specific_panel.vue @@ -11,3 +11,9 @@ + + diff --git a/src/components/interactions/interactions.vue b/src/components/interactions/interactions.vue index 1e2efe402..98fba754d 100644 --- a/src/components/interactions/interactions.vue +++ b/src/components/interactions/interactions.vue @@ -42,7 +42,6 @@ @@ -50,7 +49,6 @@ v-model="pollType" class="poll-type-select" unstyled="true" - @change="updatePollToParent" > {{ $t('polls.single_choice') }} diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss index 1e93f9271..313ed71b0 100644 --- a/src/components/settings_modal/settings_modal.scss +++ b/src/components/settings_modal/settings_modal.scss @@ -133,6 +133,7 @@ &.suboptions { margin-left: 2em; border-top: 1px dotted var(--border); + border-bottom: 1px dotted var(--border); } diff --git a/src/components/settings_modal/tabs/clutter_tab.vue b/src/components/settings_modal/tabs/clutter_tab.vue index 533cd85c6..c0e6008f8 100644 --- a/src/components/settings_modal/tabs/clutter_tab.vue +++ b/src/components/settings_modal/tabs/clutter_tab.vue @@ -50,6 +50,16 @@ + + + {{ $t('settings.user_card_hide_personal_marks') }} + + + + + {{ $t('settings.hide_shoutbox') }} + + {{ $t('settings.attachments') }} @@ -77,16 +87,6 @@ {{ $t('settings.hide_attachments_in_convo') }} - - - {{ $t('settings.user_card_hide_personal_marks') }} - - - - - {{ $t('settings.hide_shoutbox') }} - - diff --git a/src/components/settings_modal/tabs/layout_tab.vue b/src/components/settings_modal/tabs/layout_tab.vue index ca514e0cb..0035f3a11 100644 --- a/src/components/settings_modal/tabs/layout_tab.vue +++ b/src/components/settings_modal/tabs/layout_tab.vue @@ -117,7 +117,6 @@ :key="column" :local="true" :path="column + 'ColumnWidth'" - :units="horizontalUnits" expert="1" > {{ $t('settings.column_sizes_' + column) }} diff --git a/src/components/settings_modal/tabs/posts_tab.js b/src/components/settings_modal/tabs/posts_tab.js index ab00e52e7..dbf284d93 100644 --- a/src/components/settings_modal/tabs/posts_tab.js +++ b/src/components/settings_modal/tabs/posts_tab.js @@ -3,6 +3,7 @@ import BooleanSetting from '../helpers/boolean_setting.vue' import ChoiceSetting from '../helpers/choice_setting.vue' import IntegerSetting from '../helpers/integer_setting.vue' import SharedComputedObject from '../helpers/shared_computed_object.js' +import UnitSetting from '../helpers/unit_setting.vue' import { useLocalConfigStore } from 'src/stores/local_config.js' import { useSyncConfigStore } from 'src/stores/sync_config.js' @@ -62,6 +63,7 @@ const PostsTab = { ChoiceSetting, IntegerSetting, FontControl, + UnitSetting, }, computed: { ...SharedComputedObject(), diff --git a/src/components/settings_modal/tabs/style_tab/style_tab.js b/src/components/settings_modal/tabs/style_tab/style_tab.js index 6c2366999..4d3ed1695 100644 --- a/src/components/settings_modal/tabs/style_tab/style_tab.js +++ b/src/components/settings_modal/tabs/style_tab/style_tab.js @@ -492,7 +492,7 @@ export default { try { return deserializeShadow(shadow) } catch (e) { - console.warn(e) + console.warn('Failed to deserialize shadow', e) return shadow } } @@ -652,7 +652,7 @@ export default { return rgb2hex(computedColor) } } catch (e) { - console.warn(e) + console.warn('failed to get computed color', e) } return null } diff --git a/src/components/shadow_control/shadow_control.js b/src/components/shadow_control/shadow_control.js index 066fe9d71..52ca888fe 100644 --- a/src/components/shadow_control/shadow_control.js +++ b/src/components/shadow_control/shadow_control.js @@ -125,7 +125,7 @@ export default { if (computedColor) return rgb2hex(computedColor) return null } catch (e) { - console.warn(e) + console.warn('Failed to get fallback color', e) return null } } else { diff --git a/src/components/status_action_buttons/action_button.js b/src/components/status_action_buttons/action_button.js index 38d2bc3de..0fc494434 100644 --- a/src/components/status_action_buttons/action_button.js +++ b/src/components/status_action_buttons/action_button.js @@ -4,6 +4,7 @@ import StatusBookmarkFolderMenu from 'src/components/status_bookmark_folder_menu import { useInstanceStore } from 'src/stores/instance.js' import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js' +import { useMergedConfigStore } from 'src/stores/merged_config.js' import { library } from '@fortawesome/fontawesome-svg-core' import { @@ -96,6 +97,9 @@ export default { return !useInstanceCapabilitiesStore() .pleromaCustomEmojiReactionsAvailable }, + hidePostStats() { + return useMergedConfigStore().mergedConfig.hidePostStats + }, buttonInnerClass() { return [ this.button.name + '-button', diff --git a/src/components/status_action_buttons/action_button.vue b/src/components/status_action_buttons/action_button.vue index 502ee5b2e..82b481127 100644 --- a/src/components/status_action_buttons/action_button.vue +++ b/src/components/status_action_buttons/action_button.vue @@ -59,7 +59,7 @@ /> {{ button.counter?.(funcArg) }} diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js index 7f3865374..2d6bfb722 100644 --- a/src/components/user_card/user_card.js +++ b/src/components/user_card/user_card.js @@ -403,6 +403,12 @@ export default { allowNonSquareEmoji() { return this.mergedConfig.nonSquareEmoji }, + hideUserStats() { + return this.mergedConfig.hideUserStats + }, + hideRemarks() { + return this.mergedConfig.userCardHidePersonalMarks + }, ...mapState(useMergedConfigStore, ['mergedConfig']), }, methods: { diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue index 875028937..49675779e 100644 --- a/src/components/user_card/user_card.vue +++ b/src/components/user_card/user_card.vue @@ -304,7 +304,7 @@ {{ $t(isMute ? 'user_card.expire_mute_message' : 'user_card.expire_block_message', [user.screen_name]) }} - + {{ $t('user_card.expire_in') }} - - - + - {{ $t('time.unit.seconds_suffix') }} - - - {{ $t('time.unit.minutes_suffix') }} - - - {{ $t('time.unit.hours_suffix') }} - - - {{ $t('time.unit.days_suffix') }} - - + + {{ $t('time.unit.seconds_suffix') }} + + + {{ $t('time.unit.minutes_suffix') }} + + + {{ $t('time.unit.hours_suffix') }} + + + {{ $t('time.unit.days_suffix') }} + + + {{ $t('user_card.mute_or') }} @@ -64,7 +66,7 @@ > {{ $t('user_card.mute_block_never') }} - +
+