Merge branch 'small-fixes-and-improvements' into shigusegubu-themes3

build/check-versions.mjs

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

src/App.vue

@@ -28,10 +28,10 @@
       >
         <user-panel />
         <template v-if="layoutType !== 'mobile'">
-          <nav-panel />
+          <NavPanel />
-          <instance-specific-panel v-if="showInstanceSpecificPanel" />
+          <InstanceSpecificPanel v-if="showInstanceSpecificPanel" />
-          <features-panel v-if="!currentUser && showFeaturesPanel" />
+          <FeaturesPanel v-if="!currentUser && showFeaturesPanel" />
-          <who-to-follow-panel v-if="currentUser && suggestionsEnabled" />
+          <WhoToFollowPanel v-if="currentUser && suggestionsEnabled" />
           <div id="notifs-sidebar" />
         </template>
       </div>

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(
-    console.warn(error)
+      '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('Could not load nodeinfo', e)
-    console.warn(e)
   }
 }
 

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()
       }

src/components/instance_specific_panel/instance_specific_panel.vue

@@ -11,3 +11,9 @@
 </template>
 
 <script src="./instance_specific_panel.js"></script>
+
+<style lang="scss">
+  .instance-specific-panel .panel-body {
+    border-radius: var(--roundness);
+  }
+</style>

src/components/interactions/interactions.vue

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

src/components/link-preview/link-preview.vue

@@ -48,6 +48,7 @@
     img {
       width: 100%;
       height: 100%;
+      max-height: 10em;
       object-fit: cover;
       border-radius: var(--roundness);
     }

src/components/poll/poll_form.vue

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

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);
     }
 
 

src/components/settings_modal/tabs/clutter_tab.vue

@@ -50,6 +50,16 @@
             </li>
           </ul>
         </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>
       <h3>{{ $t('settings.attachments') }}</h3>
       <ul class="setting-list">
@@ -77,16 +87,6 @@
             {{ $t('settings.hide_attachments_in_convo') }}
           </BooleanSetting>
         </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>
     </div>
   </div>

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) }}

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(),

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
     }

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 {

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',

src/components/status_action_buttons/action_button.vue

@@ -59,7 +59,7 @@
       />
     </component>
     <span
-      v-if="button.counter?.(funcArg) > 0"
+      v-if="!hidePostStats && button.counter?.(funcArg) > 0"
       class="action-counter"
     >
       {{ button.counter?.(funcArg) }}

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: {

src/components/user_card/user_card.vue

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

src/components/user_timed_filter_modal/user_timed_filter_modal.scss

@@ -10,4 +10,15 @@
   .footer-left-checkbox {
     width: max-content;
   }
+
+  .expirationTime {
+    display: inline-flex;
+    white-space: nowrap;
+    padding: 0.5em;
+  }
+
+  .dialog-modal-content .checkbox {
+    vertical-align: middle;
+    padding: 0.5em;
+  }
 }

src/components/user_timed_filter_modal/user_timed_filter_modal.vue

@@ -11,48 +11,50 @@
     <p>
       {{ $t(isMute ? 'user_card.expire_mute_message' : 'user_card.expire_block_message', [user.screen_name]) }}
     </p>
-    <p>
+    <div>
       {{ $t('user_card.expire_in') }}
-      <input
+      <span class="expirationTime">
-        id="userFilterExpires"
+        <input
-        v-model="expiration"
+          id="userFilterExpires"
-        class="input input-expire-in"
+          v-model="expiration"
-        :class="{ disabled: forever }"
+          class="input input-expire-in"
-        :disabled="forever"
+          :class="{ disabled: forever }"
-        min="1"
+          :disabled="forever"
-        type="number"
+          min="1"
-      >
+          type="number"
-      <Select
-        id="userFilterExpiresUnit"
-        v-model="expirationUnit"
-        class="input unit-input unstyled"
-        :disabled="forever"
-      >
-        <option
-          key="s"
-          value="s"
         >
-          {{ $t('time.unit.seconds_suffix') }}
+        <Select
-        </option>
+          id="userFilterExpiresUnit"
-        <option
+          v-model="expirationUnit"
-          key="m"
+          class="input unit-input unstyled"
-          value="m"
+          :disabled="forever"
         >
-          {{ $t('time.unit.minutes_suffix') }}
+          <option
-        </option>
+            key="s"
-        <option
+            value="s"
-          key="h"
+          >
-          value="h"
+            {{ $t('time.unit.seconds_suffix') }}
-        >
+          </option>
-          {{ $t('time.unit.hours_suffix') }}
+          <option
-        </option>
+            key="m"
-        <option
+            value="m"
-          key="d"
+          >
-          value="d"
+            {{ $t('time.unit.minutes_suffix') }}
-        >
+          </option>
-          {{ $t('time.unit.days_suffix') }}
+          <option
-        </option>
+            key="h"
-      </Select>
+            value="h"
+          >
+            {{ $t('time.unit.hours_suffix') }}
+          </option>
+          <option
+            key="d"
+            value="d"
+          >
+            {{ $t('time.unit.days_suffix') }}
+          </option>
+        </Select>
+      </span>
 
       {{ $t('user_card.mute_or') }}
 
@@ -64,7 +66,7 @@
       >
         {{ $t('user_card.mute_block_never') }}
       </Checkbox>
-    </p>
+    </div>
 
     <template #footerLeft>
       <div class="footer-left-checkbox">

src/modules/statuses.js

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

src/services/theme_data/theme_data_3.service.js

@@ -99,12 +99,16 @@ export const findColor = (color, { dynamicVars, staticVars }) => {
         const staticVar = staticVars[variableSlot]
         const dynamicVar = dynamicVars[variableSlot]
         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:
 ${JSON.stringify(staticVars, null, 2)}
 Dynamic:
-${JSON.stringify(dynamicVars, null, 2)}`)
+${JSON.stringify(dynamicVars, null, 2)}`,
+            dynamicVars,
+            variableSlot,
+            dynamicVars[variableSlot],
+          )
         }
         targetColor = convert(staticVar ?? dynamicVar ?? '#FF00FF').rgb
       }

test/unit/specs/components/gallery.spec.js

@@ -146,11 +146,7 @@ describe('Gallery', () => {
       { items: [{ type: 'image' }] },
       { audio: true, items: [{ type: 'audio' }] },
       {
-        items: [
+        items: [{ type: 'image' }, { type: 'image' }, { type: 'image' }],
-          { type: 'image' },
-          { type: 'image' },
-          { type: 'image' },
-        ],
       },
     ])
   })
@@ -251,31 +247,19 @@ describe('Gallery', () => {
 
     expect(Gallery.computed.rows.call(local)).to.eql([
       {
-        items: [
+        items: [{ type: 'image' }, { type: 'image' }],
-          { type: 'image' },
-          { type: 'image' },
-        ],
       },
       {
-        items: [
+        items: [{ type: 'image' }, { type: 'image' }],
-          { type: 'image' },
-          { type: 'image' },
-        ],
       },
       { audio: true, items: [{ type: 'audio' }] },
       { items: [{ type: 'image' }] },
       { audio: true, items: [{ type: 'audio' }] },
       {
-        items: [
+        items: [{ type: 'image' }, { type: 'image' }],
-          { type: 'image' },
-          { type: 'image' },
-        ],
       },
       {
-        items: [
+        items: [{ type: 'image' }, { type: 'image' }],
-          { type: 'image' },
-          { type: 'image' },
-        ],
       },
     ])
   })