37 changed files with 200 additions and 390 deletions
--- a/package.json
+++ b/package.json
@ -32,7 +32,6 @@
    "cropperjs": "^1.6.2",
    "diff": "^5.2.0",
    "escape-html": "^1.0.3",
-    "fzy.js": "^0.4.1",
    "iso-639-1": "^2.1.15",
    "js-cookie": "^3.0.1",
    "localforage": "^1.10.0",
--- a/src/App.js
+++ b/src/App.js
@ -61,17 +61,9 @@ export default {
          '-no-sticky-headers': this.noSticky,
          '-has-new-post-button': this.newPostButtonShown
        },
-        '-' + this.layoutType,
+        '-' + this.layoutType
      ]
    },
-    columnWidth() {
-      let type = this.$store.getters.mergedConfig.widenTimeline
-      console.log(type);
-      if (type && type !== 'off') {
-        return `minmax(var(--miniColumn), ${type})`
-      }
-      return 'minmax(var(--miniColumn), 45rem)'
-    },
    pageBackground () {
      return this.mergedConfig.displayPageBackgrounds
        ? this.$store.state.users.displayBackground
--- a/src/App.scss
+++ b/src/App.scss
@ -172,10 +172,6 @@ nav {
  background-color: rgba(0, 0, 0, 0.15);
  background-color: var(--underlay, rgba(0, 0, 0, 0.15));
  z-index: -1000;
-
-  .-wide-timeline & {
-    margin:0 calc(var(--columnGap) / -2);
-  }
 }

 .app-layout {
@ -191,7 +187,6 @@ nav {
  grid-template-rows: 1fr;
  box-sizing: border-box;
  margin: 0 auto;
-  padding: 0 calc(var(--columnGap) / 2);
  align-content: flex-start;
  flex-wrap: wrap;
  justify-content: center;
--- a/src/App.vue
+++ b/src/App.vue
@ -14,7 +14,6 @@
      id="content"
      class="app-layout container"
      :class="classes"
-      :style="{'--maxiColumn': this.columnWidth}"
    >
      <div class="underlay" />
      <div
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@ -345,7 +345,7 @@ const setConfig = async ({ store }) => {
  const apiConfig = configInfos[0]
  const staticConfig = configInfos[1]

-  await setSettings({ store, apiConfig, staticConfig })
+  await setSettings({ store, apiConfig, staticConfig }).then(getAppSecret({ store }))
 }

 const checkOAuthToken = async ({ store }) => {
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@ -414,11 +414,6 @@ const conversation = {
    },
    toggleExpanded () {
      this.expanded = !this.expanded
-      this.$nextTick(() => {
-        if (!this.expanded) {
-          this.$el.scrollIntoView({ block: 'nearest' })
-        }
-      })
    },
    getConversationId (statusId) {
      const status = this.$store.state.statuses.allStatusesObject[statusId]
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@ -278,8 +278,5 @@
  &.-expanded.status-fadein {
    margin: calc(var(--status-margin, $status-margin) / 2);
  }
-
-  /* HACK: this value was picked arbitrarily and this is likely not even the right place */
-  scroll-margin-block-start: calc(var(--navbar-height) * 2);
 }
 </style>
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@ -183,7 +183,7 @@ const EmojiInput = {
      // Async: cancel if textAtCaret has changed during wait
      if (this.textAtCaret !== newWord) return
      if (matchedSuggestions.length <= 0) return
-      this.suggestions = take(matchedSuggestions, 25)
+      this.suggestions = take(matchedSuggestions, 5)
        .map(({ imageUrl, ...rest }) => ({
          ...rest,
          img: imageUrl || ''
@ -300,9 +300,6 @@ const EmojiInput = {
        if (this.highlighted < 0) {
          this.highlighted = this.suggestions.length - 1
        }
-        const panelBody = this.$refs['panel-body']
-        const highlighted = panelBody.children[this.highlighted]
-        highlighted.scrollIntoView({ block: 'nearest' })
        e.preventDefault()
      } else {
        this.highlighted = 0
@ -315,9 +312,6 @@ const EmojiInput = {
        if (this.highlighted >= len) {
          this.highlighted = 0
        }
-        const panelBody = this.$refs['panel-body']
-        const highlighted = panelBody.children[this.highlighted]
-        highlighted.scrollIntoView({ block: 'nearest' })
        e.preventDefault()
      } else {
        this.highlighted = 0
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@ -128,12 +128,6 @@
        --postLink: var(--popoverPostLink, $fallback--link);
        --postFaintLink: var(--popoverPostFaintLink, $fallback--link);
        --icon: var(--popoverIcon, $fallback--icon);
-
-        overflow-y: scroll;
-        scrollbar-gutter: stable;
-        scrollbar-width: thin;
-        max-height: calc((0.2em * 2 + 1px + 32px) * 5);
-        scroll-padding-block: calc((0.2em * 2 + 1px + 32px) * 2);
      }
    }

--- a/src/components/emoji_input/suggestor.js
+++ b/src/components/emoji_input/suggestor.js
@ -1,6 +1,3 @@
-import * as fzy from 'fzy.js'
-import { sortBy } from 'lodash'
-
 const MFM_TAGS = ['blur', 'bounce', 'flip', 'font', 'jelly', 'jump', 'rainbow', 'rotate', 'shake', 'sparkle', 'spin', 'tada', 'twitch', 'x2', 'x3', 'x4']
  .map(tag => ({ displayText: tag, detailText: '$[' + tag + ' ]', replacement: '$[' + tag + ' ]', mfm: true }))

@ -37,20 +34,6 @@ export default data => {

 export const suggestEmoji = emojis => input => {
  const noPrefix = input.toLowerCase().substr(1)
-
-  if (true) { // TODO check option setting
-    const matches = emojis.filter(({ displayText }) => fzy.hasMatch(noPrefix, displayText))
-    return sortBy(matches, m => {
-      let score = fzy.score(noPrefix, m.displayText)
-
-      // Prioritize custom emoji a lot
-      score += m.imageUrl ? 100 : 0
-
-      // Sort in descending order
-      return -score
-    })
-  }
-
  return emojis
    .filter(({ displayText }) => displayText.toLowerCase().match(noPrefix))
    .sort((a, b) => {
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@ -31,7 +31,7 @@ const EmojiPicker = {
  data () {
    return {
      keyword: '',
-      activeGroup: 'recent',
+      activeGroup: 'standard',
      showingStickers: false,
      keepOpen: false
    }
--- a/src/components/gallery/gallery.js
+++ b/src/components/gallery/gallery.js
@ -88,8 +88,10 @@ const Gallery = {
      set(this.sizes, id, { width, height })
    },
    rowStyle (row) {
-      if (!row.audio && !row.minimal && !row.grid) {
-        return { 'aspect-ratio': `1/${(1 / (row.items.length + 0.6))}` }
+      if (row.audio) {
+        return { 'padding-bottom': '25%' } // fixed reduced height for audio
+      } else if (!row.minimal && !row.grid) {
+        return { 'padding-bottom': `${(100 / (row.items.length + 0.6))}%` }
      }
    },
    itemStyle (id, row) {
--- a/src/components/gallery/gallery.vue
+++ b/src/components/gallery/gallery.vue
@ -96,15 +96,9 @@

  .gallery-row {
    position: relative;
+    height: 0;
    width: 100%;
    flex-grow: 1;
-    .Status & {
-      max-height: 30em;
-    }
-
-    &.-audio {
-      aspect-ratio: 4/1; // this is terrible, but it's how it was before so I'm not changing it >:(
-    }

    &:not(:first-child) {
      margin-top: 0.5em;
--- a/src/components/login_form/login_form.js
+++ b/src/components/login_form/login_form.js
@ -43,7 +43,7 @@ const LoginForm = {
      }

      oauthApi.getOrCreateApp(data)
-        .then((app) => { oauthApi.login({ ...data, ...app }) })
+        .then((app) => { oauthApi.login({ ...app, ...data }) })
    },
    submitPassword () {
      const { clientId } = this.oauth
--- a/src/components/poll/poll_form.vue
+++ b/src/components/poll/poll_form.vue
@ -24,7 +24,6 @@
      <button
        v-if="options.length > 2"
        class="delete-option button-unstyled -hover-highlight"
-        type="button"
        @click="deleteOption(index)"
      >
        <FAIcon icon="times" />
@ -33,7 +32,6 @@
    <button
      v-if="options.length < maxOptions"
      class="add-option faint button-unstyled -hover-highlight"
-      type="button"
      @click="addOption"
    >
      <FAIcon
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@ -85,7 +85,6 @@ const PostStatusForm = {
    'quoteId',
    'repliedUser',
    'attentions',
-    'copyMessageLanguage',
    'copyMessageScope',
    'subject',
    'disableSubject',
@ -154,7 +153,8 @@ const PostStatusForm = {
      statusText = buildMentionsString({ user: this.repliedUser, attentions: this.attentions }, currentUser)
    }

-    const { postContentType: contentType, sensitiveByDefault, sensitiveIfSubject, alwaysShowSubjectInput } = this.$store.getters.mergedConfig
+    const { postContentType: contentType, postLanguage: defaultPostLanguage, sensitiveByDefault, sensitiveIfSubject, interfaceLanguage, alwaysShowSubjectInput } = this.$store.getters.mergedConfig
+    const postLanguage = defaultPostLanguage || interfaceToISOLanguage(interfaceLanguage)

    let statusParams = {
      spoilerText: this.subject || '',
@ -165,7 +165,7 @@ const PostStatusForm = {
      poll: {},
      mediaDescriptions: {},
      visibility: this.suggestedVisibility(),
-      language: this.suggestedLanguage(),
+      language: postLanguage,
      contentType
    }

@ -180,7 +180,7 @@ const PostStatusForm = {
        poll: this.statusPoll || {},
        mediaDescriptions: this.statusMediaDescriptions || {},
        visibility: this.statusScope || this.suggestedVisibility(),
-        language: this.statusLanguage || this.suggestedLanguage(),
+        language: this.statusLanguage || postLanguage,
        contentType: statusContentType
      }
    }
@ -329,7 +329,6 @@ const PostStatusForm = {
  watch: {
    'newStatus': {
      deep: true,
-      flush: 'sync',
      handler () {
        this.statusChanged()
      }
@ -342,22 +341,17 @@ const PostStatusForm = {
      this.saveDraft()
    },
    clearStatus () {
-      const config = this.$store.getters.mergedConfig
+      const newStatus = this.newStatus
      this.newStatus = {
        status: '',
        spoilerText: '',
        files: [],
-        nsfw: !!config.sensitiveByDefault,
-        visibility: this.suggestedVisibility(),
-        contentType: config.postContentType,
-        language: this.suggestedLanguage(),
+        visibility: newStatus.visibility,
+        contentType: newStatus.contentType,
+        language: newStatus.language,
        poll: {},
        mediaDescriptions: {}
      }
-      const scopeselector = this.$refs.scopeselector
-      if (scopeselector) {
-        scopeselector.currentScope = this.newStatus.visibility
-      }
      this.pollFormVisible = false
      this.$refs.mediaUpload && this.$refs.mediaUpload.clearFile()
      this.clearPollForm()
@ -766,15 +760,6 @@ const PostStatusForm = {
    openProfileTab () {
      this.$store.dispatch('openSettingsModalTab', 'profile')
    },
-    suggestedLanguage () {
-      // Make sure the inherited language is actually valid
-      if (this.postLanguageOptions.find(o => o.value === this.copyMessageLanguage)) {
-        return this.copyMessageLanguage
-      }
-      const { postLanguage: defaultPostLanguage, interfaceLanguage } = this.$store.getters.mergedConfig
-      const postLanguage = defaultPostLanguage || interfaceToISOLanguage(interfaceLanguage)
-      return postLanguage
-    },
    suggestedVisibility () {
      if (this.copyMessageScope) {
        if (this.copyMessageScope === 'direct') {
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@ -18,7 +18,6 @@
        >
          <button
            class="button-unstyled -link"
-            type="button"
            @click="openProfileTab"
          >
            {{ $t('post_status.account_not_locked_warning_link') }}
@ -137,7 +136,6 @@
            class="form-post-subject"
            @input="onSubjectInput"
            @focus="focusSubjectInput()"
-            @keydown.exact.enter.prevent
          >
        </EmojiInput>
        <i18n-t
@ -195,7 +193,6 @@
          :class="{ 'visibility-tray-edit': isEdit }"
        >
          <scope-selector
-            ref="scopeselector"
            v-if="!disableVisibilitySelector"
            :user-default="userDefaultScope"
            :original-scope="copyMessageScope"
@ -275,7 +272,6 @@
          <button
            class="emoji-icon button-unstyled"
            :title="$t('emoji.add_emoji')"
-            type="button"
            @click="showEmojiPicker"
          >
            <FAIcon icon="smile-beam" />
@ -285,7 +281,6 @@
            class="poll-icon button-unstyled"
            :class="{ selected: pollFormVisible }"
            :title="$t('polls.add_poll')"
-            type="button"
            @click="togglePollForm"
          >
            <FAIcon icon="poll-h" />
@ -295,7 +290,6 @@
            class="spoiler-icon button-unstyled"
            :class="{ selected: subjectVisible }"
            :title="$t('post_status.toggle_content_warning')"
-            type="button"
            @click="toggleSubjectVisible"
          >
            <FAIcon icon="eye-slash" />
@ -612,16 +606,6 @@
      border-top-right-radius: 0;
    }

-    &.-has-subject {
-      border-top-left-radius: 0;
-      border-top-right-radius: 0;
-    }
-
-    &.-has-subject {
-      border-top-left-radius: 0;
-      border-top-right-radius: 0;
-    }
-
    &.scrollable-form {
      overflow-y: auto;
    }
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@ -55,11 +55,6 @@ const GeneralTab = {
        value: tab,
        label: this.$t(`user_card.${tab}`)
      })),
-      widenTimelineOptions : ['1fr', '75%', '50%', 'off'].map(width => ({
-        key: width,
-        value: width,
-        label: this.$t(`settings.widen_timeline_option.${width}`)
-      })),
      profilesExpanded: false,
      newProfileName: '',
      loopSilentAvailable:
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@ -159,16 +159,6 @@
            {{ $t('settings.show_page_backgrounds') }}
          </BooleanSetting>
        </li>
-        <li>
-          <BooleanSetting path="centerAlignBio">
-            {{ $t('settings.center_align_bio') }}
-          </BooleanSetting>
-        </li>
-        <li>
-          <BooleanSetting path="compactUserInfo">
-            {{ $t('settings.compact_user_info') }}
-          </BooleanSetting>
-        </li>
        <li>
          <BooleanSetting path="stopGifs">
            {{ $t('settings.stop_gifs') }}
@ -279,14 +269,6 @@
            {{ $t('settings.right_sidebar') }}
          </BooleanSetting>
        </li>
-        <li>
-          <ChoiceSetting
-            path="widenTimeline"
-            :options="widenTimelineOptions"
-          >
-            {{ $t('settings.widen_timeline') }}
-          </ChoiceSetting>
-        </li>
        <li>
          <ChoiceSetting
            v-if="user"
--- a/src/components/settings_modal/tabs/version_tab.js
+++ b/src/components/settings_modal/tabs/version_tab.js
@ -1,7 +1,7 @@
 import { extractCommit } from 'src/services/version/version.service'

-const pleromaFeCommitUrl = 'https://git.jeder.pl/jeder/akkoma-fe/commit/'
-const pleromaBeCommitUrl = 'https://iceshrimp.dev/iceshrimp/Iceshrimp.NET'
+const pleromaFeCommitUrl = 'https://akkoma.dev/AkkomaGang/pleroma-fe/commit/'
+const pleromaBeCommitUrl = 'https://akkoma.dev/AkkomaGang/akkoma/commit/'

 const VersionTab = {
  data () {
@ -16,7 +16,7 @@ const VersionTab = {
      return pleromaFeCommitUrl + this.frontendVersion
    },
    backendVersionLink () {
-      return pleromaBeCommitUrl
+      return pleromaBeCommitUrl + extractCommit(this.backendVersion)
    }
  }
 }
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@ -322,7 +322,6 @@

    > * {
      min-width: fit-content;
-      max-width: 3em;
      flex: 1;
    }
  }
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@ -460,6 +460,12 @@
              :status="status"
              @toggle="toggleReplying"
            />
+            <quote-button
+              :visibility="status.visibility"
+              :quoting="quoting"
+              :status="status"
+              @toggle="toggleQuoting"
+            />
            <retweet-button
              :visibility="status.visibility"
              :logged-in="loggedIn"
@ -473,12 +479,6 @@
              v-if="loggedIn"
              :status="status"
            />
-            <quote-button
-              :visibility="status.visibility"
-              :quoting="quoting"
-              :status="status"
-              @toggle="toggleQuoting"
-            />
            <extra-buttons
              :status="status"
              @on-error="showError"
@ -519,7 +519,6 @@
          :reply-to="status.id"
          :attentions="status.attentions"
          :replied-user="status.user"
-          :copy-message-language="status.language"
          :copy-message-scope="status.visibility"
          :subject="replySubject"
          @posted="toggleReplying"
@ -534,7 +533,6 @@
          :quote-id="status.id"
          :attentions="[status.user]"
          :replied-user="status.user"
-          :copy-message-language="status.language"
          :copy-message-scope="status.visibility"
          :subject="replySubject"
          @posted="toggleQuoting"
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@ -117,11 +117,6 @@ export default {
    shouldConfirmMute () {
      return this.mergedConfig.modalOnMute
    },
-    compactUserInfo () {
-      return this.$store.getters.mergedConfig.compactUserInfo
-        && (this.$store.state.interface.layoutType !== 'mobile')
-        && this.switcher
-    },
    ...mapGetters(['mergedConfig'])
  },
  components: {
--- a/src/components/user_card/user_card.scss
+++ b/src/components/user_card/user_card.scss
@ -21,13 +21,6 @@
    position: relative;
  }

-  .user-buttons {
-    grid-area: edit;
-    display: flex;
-    padding: .5em 0 .5em 0;
-    justify-self: end;
-  }
-
  .panel-body {
    word-wrap: break-word;
    border-bottom-right-radius: inherit;
@ -60,6 +53,7 @@
  }

  &-bio {
+    text-align: center;
    display: block;
    line-height: 1.3;
    padding: 1em;
@ -106,14 +100,15 @@
  padding: 0 26px;

  .container {
+    min-width: 0;
    padding: 16px 0 6px;
-    display: grid;
-    grid-template-areas:
-      "pfp name edit"
-      "pfp summary summary"
-      "stats stats stats";
-    grid-template-columns: auto 1fr auto;
-    align-items: start;
+    display: flex;
+    align-items: flex-start;
+    max-height: 56px;
+
+    > * {
+      min-width: 0;
+    }

    .Avatar {
      --_avatarShadowBox: var(--avatarShadow);
@ -128,7 +123,6 @@
  }

  &-avatar-link {
-    grid-area: pfp;
    position: relative;
    cursor: pointer;

@ -159,8 +153,8 @@

  .external-link-button, .edit-profile-button {
    cursor: pointer;
-    width: 2.3em;
-    text-align: right;
+    width: 2.5em;
+    text-align: center;
    margin: -0.5em 0;
    padding: 0.5em 0;

@ -171,16 +165,12 @@
  }

  .user-summary {
-    grid-area: summary;
-    display: grid;
-    grid-template-areas:
-      "name name name name name"
-      "hand role lock avg _";
-    grid-template-columns:
-       auto auto auto auto 1fr;
-    justify-items: start;
+    display: block;
    margin-left: 0.6em;
+    text-align: left;
    text-overflow: ellipsis;
+    white-space: nowrap;
+    flex: 1 1 0;
    // This is so that text doesn't get overlapped by avatar's shadow if it has
    // big one
    z-index: 1;
@ -188,81 +178,55 @@

    --emoji-size: 1.7em;

-    .user-locked {
+    .top-line,
+    .bottom-line {
+      display: flex;
+    }
+  }
+
+  .user-name {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    flex: 1 1 auto;
+    margin-right: 1em;
+    font-size: 1.1em;
+  }
+
+  .bottom-line {
+    font-weight: light;
+    font-size: 1.1em;
+    align-items: baseline;
+
+    .lock-icon {
      margin-left: 0.5em;
-      grid-area: lock;
    }

    .user-screen-name {
      min-width: 1px;
-      max-width: 100%;
+      flex: 0 1 auto;
      text-overflow: ellipsis;
      overflow: hidden;
      color: $fallback--lightText;
      color: var(--lightText, $fallback--lightText);
-      grid-area: hand;
    }

    .dailyAvg {
      min-width: 1px;
+      flex: 0 0 auto;
      margin-left: 1em;
      font-size: 0.7em;
      color: $fallback--text;
      color: var(--text, $fallback--text);
-      grid-area: avg;
    }

-    .user-roles {
-      display: flex;
-      grid-area: role;
-
    .user-role {
+      flex: none;
      color: $fallback--text;
      color: var(--alertNeutralText, $fallback--text);
      background-color: $fallback--fg;
      background-color: var(--alertNeutral, $fallback--fg);
    }
  }
-  }
-
-  .user-counts {
-    grid-area: stats;
-    display: flex;
-    line-height:16px;
-    padding-top: 0.5em;
-    text-align: center;
-    justify-content: space-around;
-    color: $fallback--lightText;
-    color: var(--lightText, $fallback--lightText);
-    align-self: center;
-
-    .user-count {
-      padding: .5em 0 .5em 0;
-      margin: 0 .5em;
-
-      h5 {
-        font-size:1em;
-        font-weight: bolder;
-        margin: 0 0 0.25em;
-      }
-      a {
-        text-decoration: none;
-      }
-    }
-  }
-
-  .user-name {
-    text-align: start;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    margin-left: 0.6em;
-    font-size: 1.1em;
-    grid-area: name;
-    align-self: center;
-    white-space: nowrap;
-    max-width: 100%;
-    z-index: 1; // so shadow from user avatar doesn't overlap it
-  }

  .user-meta {
    margin-bottom: .15em;
@ -326,21 +290,34 @@
      margin: 0;
    }
  }
-
-  &.-compact {
-    .container {
-      grid-template-areas:
-        "pfp name stats edit"
-        "pfp summary stats edit";
-      grid-template-columns: auto auto 1fr auto;
-    }
-    .user-counts {
-      padding-top: 0;
-      justify-content: space-evenly;
-    }
-  }
 }

 .sidebar .edit-profile-button {
  display: none;
 }
+
+.user-counts {
+  display: flex;
+  line-height:16px;
+  padding: .5em 1.5em 0em 1.5em;
+  text-align: center;
+  justify-content: space-between;
+  color: $fallback--lightText;
+  color: var(--lightText, $fallback--lightText);
+  flex-wrap: wrap;
+}
+
+.user-count {
+  flex: 1 0 auto;
+  padding: .5em 0 .5em 0;
+  margin: 0 .5em;
+
+  h5 {
+    font-size:1em;
+    font-weight: bolder;
+    margin: 0 0 0.25em;
+  }
+  a {
+    text-decoration: none;
+  }
+}
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@ -9,10 +9,7 @@
      class="background-image"
    />
    <div class="panel-heading -flexible-height">
-      <div
-        class="user-info"
-        :class="{ '-compact': this.compactUserInfo }"
-      >
+      <div class="user-info">
        <div class="container">
          <a
            v-if="allowZoomingAvatar"
@ -32,7 +29,6 @@
          </a>
          <router-link
            v-else
-            class="user-info-avatar-link"
            :to="userProfileLink(user)"
          >
            <UserAvatar
@ -40,79 +36,14 @@
              :user="user"
            />
          </router-link>
+          <div class="user-summary">
+            <div class="top-line">
              <RichContent
                :title="user.name"
                class="user-name"
                :html="user.name"
                :emoji="user.emoji"
              />
-          <div class="user-summary">
-            <router-link
-              class="user-screen-name"
-              :title="user.screen_name_ui"
-              :to="userProfileLink(user)"
-            >
-              @{{ user.screen_name_ui }}
-            </router-link>
-            <span class="user-roles" v-if="!hideBio && (user.deactivated || !!visibleRole || user.bot)">
-              <span
-                v-if="user.deactivated"
-                class="alert user-role"
-              >
-                {{ $t('user_card.deactivated') }}
-              </span>
-              <span
-                v-if="!!visibleRole"
-                class="alert user-role"
-              >
-                {{ $t(`general.role.${visibleRole}`) }}
-              </span>
-              <span
-                v-if="user.bot"
-                class="alert user-role"
-              >
-                {{ $t('user_card.bot') }}
-              </span>
-            </span>
-            <span class="user-locked" v-if="user.locked">
-              <FAIcon
-                class="lock-icon"
-                icon="lock"
-                size="sm"
-              />
-            </span>
-            <span
-              v-if="!mergedConfig.hideUserStats && !hideBio"
-              class="dailyAvg"
-            >{{ dailyAvg }} {{ $t('user_card.per_day') }}</span>
-          </div>
-          <div
-            v-if="!mergedConfig.hideUserStats && switcher"
-            class="user-counts"
-          >
-            <div
-              class="user-count"
-              @click.prevent="setProfileView('statuses')"
-            >
-              <h5>{{ $t('user_card.statuses') }}</h5>
-              <span>{{ user.statuses_count }} <br></span>
-            </div>
-            <div
-              class="user-count"
-              @click.prevent="setProfileView('friends')"
-            >
-              <h5>{{ $t('user_card.followees') }}</h5>
-              <span>{{ hideFollowsCount ? $t('user_card.hidden') : user.friends_count }}</span>
-            </div>
-            <div
-              class="user-count"
-              @click.prevent="setProfileView('followers')"
-            >
-              <h5>{{ $t('user_card.followers') }}</h5>
-              <span>{{ hideFollowersCount ? $t('user_card.hidden') : user.followers_count }}</span>
-            </div>
-          </div>
-          <div class="user-buttons">
              <button
                v-if="!isOtherUser && user.is_local"
                class="button-unstyled edit-profile-button"
@ -153,6 +84,47 @@
                :relationship="relationship"
              />
            </div>
+            <div class="bottom-line">
+              <router-link
+                class="user-screen-name"
+                :title="user.screen_name_ui"
+                :to="userProfileLink(user)"
+              >
+                @{{ user.screen_name_ui }}
+              </router-link>
+              <template v-if="!hideBio">
+                <span
+                  v-if="user.deactivated"
+                  class="alert user-role"
+                >
+                  {{ $t('user_card.deactivated') }}
+                </span>
+                <span
+                  v-if="!!visibleRole"
+                  class="alert user-role"
+                >
+                  {{ $t(`general.role.${visibleRole}`) }}
+                </span>
+                <span
+                  v-if="user.bot"
+                  class="alert user-role"
+                >
+                  {{ $t('user_card.bot') }}
+                </span>
+              </template>
+              <span v-if="user.locked">
+                <FAIcon
+                  class="lock-icon"
+                  icon="lock"
+                  size="sm"
+                />
+              </span>
+              <span
+                v-if="!mergedConfig.hideUserStats && !hideBio"
+                class="dailyAvg"
+              >{{ dailyAvg }} {{ $t('user_card.per_day') }}</span>
+            </div>
+          </div>
        </div>
        <div class="user-meta">
          <div
@ -297,13 +269,38 @@
      v-if="!hideBio"
      class="panel-body"
    >
+      <div
+        v-if="!mergedConfig.hideUserStats && switcher"
+        class="user-counts"
+      >
+        <div
+          class="user-count"
+          @click.prevent="setProfileView('statuses')"
+        >
+          <h5>{{ $t('user_card.statuses') }}</h5>
+          <span>{{ user.statuses_count }} <br></span>
+        </div>
+        <div
+          class="user-count"
+          @click.prevent="setProfileView('friends')"
+        >
+          <h5>{{ $t('user_card.followees') }}</h5>
+          <span>{{ hideFollowsCount ? $t('user_card.hidden') : user.friends_count }}</span>
+        </div>
+        <div
+          class="user-count"
+          @click.prevent="setProfileView('followers')"
+        >
+          <h5>{{ $t('user_card.followers') }}</h5>
+          <span>{{ hideFollowersCount ? $t('user_card.hidden') : user.followers_count }}</span>
+        </div>
+      </div>
      <RichContent
        v-if="!hideBio"
        class="user-card-bio"
        :html="user.description_html"
        :emoji="user.emoji"
        :handle-links="true"
-        :style='{"text-align": this.$store.getters.mergedConfig.centerAlignBio ? "center" : "start"}'
      />
    </div>
    <teleport to="#modal">
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@ -482,7 +482,6 @@
        "blocks_tab": "Blocks",
        "bot": "Dies ist ein Bot Account",
        "btnRadius": "Knöpfe",
-        "center_align_bio": "Zentrale Textausrichtung in der Bio",
        "cBlue": "Blau (Antworten, folgt dir)",
        "cGreen": "Grün (Retweet)",
        "cOrange": "Orange (Favorisieren)",
@ -497,7 +496,6 @@
        "checkboxRadius": "Auswahlfelder",
        "collapse_subject": "Beiträge mit Inhaltswarnungen einklappen",
        "columns": "Spalten",
-        "compact_user_info": "Kompakte Benutzerinfos wenn genug Platz",
        "composing": "Verfassen",
        "confirm_dialogs": "Bestätigung erforderlich für:",
        "confirm_dialogs_approve_follow": "Annehmen einer Followanfrage",
@ -936,7 +934,6 @@
            "title": "Version"
        },
        "virtual_scrolling": "Anzeige der Zeitleiste optimieren",
-        "widen_timeline": "Zeitleiste verbreitern, um horizontalen Platz zu füllen",
        "word_filter": "Wortfilter",
        "wordfilter": "Wortfilter"
    },
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@ -488,7 +488,6 @@
        "blocks_tab": "Blocks",
        "bot": "This is a bot account",
        "btnRadius": "Buttons",
-        "center_align_bio": "Center text in user bio",
        "cBlue": "Blue (Reply, follow)",
        "cGreen": "Green (Retweet)",
        "cOrange": "Orange (Favorite)",
@ -503,7 +502,6 @@
        "checkboxRadius": "Checkboxes",
        "collapse_subject": "Collapse posts with content warnings",
        "columns": "Columns",
-        "compact_user_info": "Compact user info when enough space",
        "composing": "Composing",
        "confirm_dialogs": "Require confirmation for:",
        "confirm_dialogs_approve_follow": "Accepting a follow request",
@ -950,13 +948,6 @@
        },
        "virtual_scrolling": "Optimize timeline rendering",
        "use_blurhash": "Use blurhashes for NSFW thumbnails",
-        "widen_timeline": "Widen the Timeline to fill horizontal space",
-        "widen_timeline_option": {
-            "1fr": "Full",
-            "75%": "75%",
-            "50%": "50%",
-            "off": "Off"
-        },
        "word_filter": "Word filter",
        "wordfilter": "Wordfilter"
    },
--- a/src/modules/config.js
+++ b/src/modules/config.js
@ -56,8 +56,6 @@ export const defaultState = {
  autohideFloatingPostButton: false,
  pauseOnUnfocused: true,
  displayPageBackgrounds: true,
-  centerAlignBio: false,
-  compactUserInfo: true,
  stopGifs: undefined,
  replyVisibility: 'all',
  thirdColumnMode: 'notifications',
@ -79,7 +77,6 @@ export const defaultState = {
  hideScopeNotice: false,
  useStreamingApi: false,
  sidebarRight: undefined, // instance default
-  widenTimeline: undefined, // instance default
  subjectLineBehavior: undefined, // instance default
  alwaysShowSubjectInput: undefined, // instance default
  postContentType: undefined, // instance default
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@ -61,7 +61,6 @@ const defaultState = {
  showNavShortcuts: true,
  showWiderShortcuts: true,
  sidebarRight: false,
-  widenTimeline: true,
  subjectLineBehavior: 'email',
  theme: 'pleroma-dark',
  virtualScrolling: true,
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@ -901,7 +901,7 @@ const postStatus = ({
      form.append('poll[options][]', option)
    })
  }
-  if (inReplyToStatusId && typeof inReplyToStatusId === 'string') {
+  if (inReplyToStatusId) {
    form.append('in_reply_to_id', inReplyToStatusId)
  }
  if (quoteId) {
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@ -326,7 +326,6 @@ export const parseStatus = (data) => {
    }
    output.pinned = data.pinned
    output.muted = data.muted
-    output.language = data.language
  } else {
    output.favorited = data.favorited
    output.fave_num = data.fave_num
--- a/static/aurora_borealis.jpg
+++ b/static/aurora_borealis.jpg
--- a/static/background.jpg
+++ b/static/background.jpg
--- a/static/config.json
+++ b/static/config.json
@ -1,7 +1,7 @@
 {
  "alwaysShowSubjectInput": true,
-  "background": "/static/background.jpg",
-  "collapseMessageWithSubject": true,
+  "background": "/static/aurora_borealis.jpg",
+  "collapseMessageWithSubject": false,
  "greentext": false,
  "hideFilteredStatuses": false,
  "hideMutedPosts": false,
@ -22,5 +22,5 @@
  "sidebarRight": false,
  "subjectLineBehavior": "email",
  "theme": "ihatebeingalive",
-  "webPushNotifications": true
+  "webPushNotifications": false
 }
--- a/static/favicon.png
+++ b/static/favicon.png
--- a/static/terms-of-service.html
+++ b/static/terms-of-service.html
@ -1,3 +1,5 @@
-<h3>Hello.</h3>
+<h4>Terms of Service</h4>

-<p>This is an <a href="https://iceshrimp.dev/iceshrimp/akkoma-fe">akkoma-fe</a> instance running for users of miau.jeder.pl which itself is running on <a href="https://iceshrimp.dev/iceshrimp/Iceshrimp.NET">Iceshrimp.NET</a>, and should be showing contents of the instance.</p>
+<p>This is a placeholder, overwrite this by putting a file at <pre>$STATIC_DIR/static/terms-of-service.html</pre><p>
+
+<p>See the <a href="https://docs.akkoma.dev/main/backend/configuration/static_dir/">Static Directory</a> docs for more info.</p>
--- a/yarn.lock
+++ b/yarn.lock
@ -4283,11 +4283,6 @@ functions-have-names@^1.2.3:
  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==

-fzy.js@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/fzy.js/-/fzy.js-0.4.1.tgz#695bf87cc0bbdda9cbcf22bc318a74c4aca6b758"
-  integrity sha512-4sPVXf+9oGhzg2tYzgWe4hgAY0wEbkqeuKVEgdnqX8S8VcLosQsDjb0jV+f5uoQlf8INWId1w0IGoufAoik1TA==
-
 gensync@^1.0.0-beta.2:
  version "1.0.0-beta.2"
  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@ -7395,16 +7390,7 @@ streamroller@^3.1.5:
    debug "^4.3.4"
    fs-extra "^8.1.0"

-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
  version "4.2.3"
  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@ -7491,14 +7477,7 @@ stringify-object@^3.3.0:
    is-obj "^1.0.1"
    is-regexp "^1.0.0"

-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
  version "6.0.1"
  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@ -8598,7 +8577,8 @@ workerpool@6.2.1:
  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
  integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==

-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+  name wrap-ansi-cjs
  version "7.0.0"
  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@ -8616,15 +8596,6 @@ wrap-ansi@^6.2.0:
    string-width "^4.1.0"
    strip-ansi "^6.0.0"

-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.1.0:
  version "8.1.0"
  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"