Merge remote-tracking branch 'tusooa/from/develop/tusooa/tree-threading' into shigusegubu

* tusooa/from/develop/tusooa/tree-threading: (48 commits)
  Fix showingLongSubject not correctly propagated
  Fix timeline jump when scrolling
  Make replying and mediaPlaying controlled
  Clean up debug code for tree threading
  Fix virtual scrolling for tree threading
  Fix controlled status display toggles
  Add English translations for other replies count
  Add other replies count for reply list link
  Add English translation for position of other replies button pref
  Make position of other replies button a pref
  Add English translation for show all conversation button improvement
  Improve "show full conversation" interaction
  Make other replies button stretch along the row
  Optimise thread ancestor borders
  Optimise thread ancestor display style
  Reset thread open state when collapsed
  Clean up
  Highlight ancestor of the current status when diving back to top
  Add English translation for Misskey-style tree view
  Implement Misskey-style tree view
  ...

src/components/settings_modal/tabs/general_tab.js

@@ -20,6 +20,16 @@ const GeneralTab = {
         value: mode,
         label: this.$t(`settings.subject_line_${mode === 'masto' ? 'mastodon' : mode}`)
       })),
+      conversationDisplayOptions: ['tree', 'simple_tree', 'linear'].map(mode => ({
+        key: mode,
+        value: mode,
+        label: this.$t(`settings.conversation_display_${mode}`)
+      })),
+      conversationOtherRepliesButtonOptions: ['below', 'inside'].map(mode => ({
+        key: mode,
+        value: mode,
+        label: this.$t(`settings.conversation_other_replies_button_${mode}`)
+      })),
       mentionLinkDisplayOptions: ['short', 'full_for_remote', 'full'].map(mode => ({
         key: mode,
         value: mode,

src/components/settings_modal/tabs/general_tab.vue

@@ -157,6 +157,42 @@
             {{ $t('settings.show_yous') }}
           </BooleanSetting>
         </li>
+        <li>
+          <ChoiceSetting
+            id="conversationDisplay"
+            path="conversationDisplay"
+            :options="conversationDisplayOptions"
+          >
+            {{ $t('settings.conversation_display') }}
+          </ChoiceSetting>
+        </li>
+        <ul
+          v-if="conversationDisplay !== 'linear'"
+          class="setting-list suboptions"
+        >
+          <li>
+            <label for="maxDepthInThread">
+              {{ $t('settings.max_depth_in_thread') }}
+            </label>
+            <input
+              id="maxDepthInThread"
+              path.number="maxDepthInThread"
+              class="number-input"
+              type="number"
+              min="3"
+              step="1"
+            >
+          </li>
+          <li>
+            <ChoiceSetting
+              id="conversationOtherRepliesButton"
+              path="conversationOtherRepliesButton"
+              :options="conversationOtherRepliesButtonOptions"
+            >
+              {{ $t('settings.conversation_other_replies_button') }}
+            </ChoiceSetting>
+          </li>
+        </ul>
         <li>
           <ChoiceSetting
             id="mentionLinkDisplay"