clarified and combined warnings

This commit is contained in:
Henry Jameson 2026-05-18 18:21:59 +03:00
commit 44ea6d3469
16 changed files with 34 additions and 30 deletions

View file

@ -36,7 +36,6 @@ export default function () {
const warning = warnings[i] const warning = warnings[i]
console.warn(' ' + warning) console.warn(' ' + warning)
} }
console.warn()
process.exit(1) process.exit(1)
} }
} }

View file

@ -152,8 +152,10 @@ const getStaticConfig = async () => {
throw res throw res
} }
} catch (error) { } catch (error) {
console.warn('Failed to load static/config.json, continuing without it.') console.warn(
console.warn(error) 'Failed to load static/config.json, continuing without it.',
error,
)
return {} return {}
} }
} }
@ -442,8 +444,7 @@ const getNodeInfo = async ({ store }) => {
throw res throw res
} }
} catch (e) { } catch (e) {
console.warn('Could not load nodeinfo') console.warn('Could not load nodeinfo', e)
console.warn(e)
} }
} }

View file

@ -333,7 +333,6 @@ const EmojiInput = {
if (!this.pickerShown) { if (!this.pickerShown) {
this.scrollIntoView() this.scrollIntoView()
this.$refs.picker.showPicker() this.$refs.picker.showPicker()
this.$refs.picker.startEmojiLoad()
} else { } else {
this.$refs.picker.hidePicker() this.$refs.picker.hidePicker()
} }

View file

@ -42,7 +42,6 @@
</tab-switcher> </tab-switcher>
<Notifications <Notifications
ref="notifications" ref="notifications"
:no-heading="true"
:no-extra="true" :no-extra="true"
:minimal-mode="true" :minimal-mode="true"
:filter-mode="filterMode" :filter-mode="filterMode"

View file

@ -17,7 +17,6 @@
type="text" type="text"
:placeholder="$t('polls.option')" :placeholder="$t('polls.option')"
:maxlength="maxLength" :maxlength="maxLength"
@change="updatePollToParent"
@keydown.enter.stop.prevent="nextOption(index)" @keydown.enter.stop.prevent="nextOption(index)"
> >
</div> </div>
@ -50,7 +49,6 @@
v-model="pollType" v-model="pollType"
class="poll-type-select" class="poll-type-select"
unstyled="true" unstyled="true"
@change="updatePollToParent"
> >
<option value="single"> <option value="single">
{{ $t('polls.single_choice') }} {{ $t('polls.single_choice') }}

View file

@ -133,6 +133,7 @@
&.suboptions { &.suboptions {
margin-left: 2em; margin-left: 2em;
border-top: 1px dotted var(--border); border-top: 1px dotted var(--border);
border-bottom: 1px dotted var(--border);
} }

View file

@ -50,6 +50,16 @@
</li> </li>
</ul> </ul>
</li> </li>
<li>
<BooleanSetting path="userCardHidePersonalMarks">
{{ $t('settings.user_card_hide_personal_marks') }}
</BooleanSetting>
</li>
<li v-if="shoutAvailable">
<BooleanSetting path="hideShoutbox">
{{ $t('settings.hide_shoutbox') }}
</BooleanSetting>
</li>
</ul> </ul>
<h3>{{ $t('settings.attachments') }}</h3> <h3>{{ $t('settings.attachments') }}</h3>
<ul class="setting-list"> <ul class="setting-list">
@ -77,16 +87,6 @@
{{ $t('settings.hide_attachments_in_convo') }} {{ $t('settings.hide_attachments_in_convo') }}
</BooleanSetting> </BooleanSetting>
</li> </li>
<li>
<BooleanSetting path="userCardHidePersonalMarks">
{{ $t('settings.user_card_hide_personal_marks') }}
</BooleanSetting>
</li>
<li v-if="shoutAvailable">
<BooleanSetting path="hideShoutbox">
{{ $t('settings.hide_shoutbox') }}
</BooleanSetting>
</li>
</ul> </ul>
</div> </div>
</div> </div>

View file

@ -117,7 +117,6 @@
:key="column" :key="column"
:local="true" :local="true"
:path="column + 'ColumnWidth'" :path="column + 'ColumnWidth'"
:units="horizontalUnits"
expert="1" expert="1"
> >
{{ $t('settings.column_sizes_' + column) }} {{ $t('settings.column_sizes_' + column) }}

View file

@ -3,6 +3,7 @@ import BooleanSetting from '../helpers/boolean_setting.vue'
import ChoiceSetting from '../helpers/choice_setting.vue' import ChoiceSetting from '../helpers/choice_setting.vue'
import IntegerSetting from '../helpers/integer_setting.vue' import IntegerSetting from '../helpers/integer_setting.vue'
import SharedComputedObject from '../helpers/shared_computed_object.js' import SharedComputedObject from '../helpers/shared_computed_object.js'
import UnitSetting from '../helpers/unit_setting.vue'
import { useLocalConfigStore } from 'src/stores/local_config.js' import { useLocalConfigStore } from 'src/stores/local_config.js'
import { useSyncConfigStore } from 'src/stores/sync_config.js' import { useSyncConfigStore } from 'src/stores/sync_config.js'
@ -62,6 +63,7 @@ const PostsTab = {
ChoiceSetting, ChoiceSetting,
IntegerSetting, IntegerSetting,
FontControl, FontControl,
UnitSetting,
}, },
computed: { computed: {
...SharedComputedObject(), ...SharedComputedObject(),

View file

@ -492,7 +492,7 @@ export default {
try { try {
return deserializeShadow(shadow) return deserializeShadow(shadow)
} catch (e) { } catch (e) {
console.warn(e) console.warn('Failed to deserialize shadow', e)
return shadow return shadow
} }
} }
@ -652,7 +652,7 @@ export default {
return rgb2hex(computedColor) return rgb2hex(computedColor)
} }
} catch (e) { } catch (e) {
console.warn(e) console.warn('failed to get computed color', e)
} }
return null return null
} }

View file

@ -125,7 +125,7 @@ export default {
if (computedColor) return rgb2hex(computedColor) if (computedColor) return rgb2hex(computedColor)
return null return null
} catch (e) { } catch (e) {
console.warn(e) console.warn('Failed to get fallback color', e)
return null return null
} }
} else { } else {

View file

@ -2,9 +2,9 @@ import EmojiPicker from 'src/components/emoji_picker/emoji_picker.vue'
import Popover from 'src/components/popover/popover.vue' import Popover from 'src/components/popover/popover.vue'
import StatusBookmarkFolderMenu from 'src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.vue' import StatusBookmarkFolderMenu from 'src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.vue'
import { useMergedConfigStore } from 'src/stores/merged_config.js'
import { useInstanceStore } from 'src/stores/instance.js' import { useInstanceStore } from 'src/stores/instance.js'
import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.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 { library } from '@fortawesome/fontawesome-svg-core'
import { import {

View file

@ -406,6 +406,9 @@ export default {
hideUserStats() { hideUserStats() {
return this.mergedConfig.hideUserStats return this.mergedConfig.hideUserStats
}, },
hideRemarks() {
return this.mergedConfig.userCardHidePersonalMarks
},
...mapState(useMergedConfigStore, ['mergedConfig']), ...mapState(useMergedConfigStore, ['mergedConfig']),
}, },
methods: { methods: {

View file

@ -304,7 +304,7 @@
</div> </div>
</div> </div>
<div <div
v-if="!editable && loggedIn && isOtherUser && (hasNote || !hideBio) && !userCardHidePersonalMarks" v-if="!editable && loggedIn && isOtherUser && (hasNote || !hideBio) && !hideRemarks"
class="personal-marks" class="personal-marks"
> >
<UserNote <UserNote

View file

@ -348,8 +348,7 @@ const addNewStatuses = (
// NOOP, it is known status but we don't do anything about it for now // NOOP, it is known status but we don't do anything about it for now
}, },
default: (unknown) => { default: (unknown) => {
console.warn('unknown status type') console.warn('unknown status type', unknown)
console.warn(unknown)
}, },
} }

View file

@ -99,12 +99,16 @@ export const findColor = (color, { dynamicVars, staticVars }) => {
const staticVar = staticVars[variableSlot] const staticVar = staticVars[variableSlot]
const dynamicVar = dynamicVars[variableSlot] const dynamicVar = dynamicVars[variableSlot]
if (!staticVar && !dynamicVar) { if (!staticVar && !dynamicVar) {
console.warn(dynamicVars, variableSlot, dynamicVars[variableSlot]) console.warn(
console.warn(`Couldn't find variable "${variableSlot}", falling back to magenta. Variables are: `Couldn't find variable "${variableSlot}", falling back to magenta. Variables are:
Static: Static:
${JSON.stringify(staticVars, null, 2)} ${JSON.stringify(staticVars, null, 2)}
Dynamic: Dynamic:
${JSON.stringify(dynamicVars, null, 2)}`) ${JSON.stringify(dynamicVars, null, 2)}`,
dynamicVars,
variableSlot,
dynamicVars[variableSlot],
)
} }
targetColor = convert(staticVar ?? dynamicVar ?? '#FF00FF').rgb targetColor = convert(staticVar ?? dynamicVar ?? '#FF00FF').rgb
} }