merge develop in

2019-03-23 22:21:57 +02:00 · 2019-03-23 22:21:57 +02:00 · fd12263cac
commit fd12263cac
parent 85584021fb f86a5dc804
52 changed files with 803 additions and 339 deletions
--- a/src/App.scss
+++ b/src/App.scss
@ -154,7 +154,7 @@ input, textarea, .select {
    background: transparent;
    border: none;
    color: $fallback--text;
-    color: var(--text, $fallback--text);
+    color: var(--inputText, --text, $fallback--text);
    margin: 0;
    padding: 0 2em 0 .2em;
    font-family: sans-serif;
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@ -4,13 +4,11 @@ import routes from './routes'

 import App from '../App.vue'

-const afterStoreSetup = ({ store, i18n }) => {
-  const width = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth
-  store.dispatch('setMobileLayout', width <= 800)
-
-  window.fetch('/api/statusnet/config.json')
-    .then((res) => res.json())
-    .then((data) => {
+const getStatusnetConfig = async ({ store }) => {
+  try {
+    const res = await window.fetch('/api/statusnet/config.json')
+    if (res.ok) {
+      const data = await res.json()
      const { name, closed: registrationClosed, textlimit, uploadlimit, server, vapidPublicKey } = data.site

      store.dispatch('setInstanceOption', { name: 'name', value: name })
@ -31,16 +29,32 @@ const afterStoreSetup = ({ store, i18n }) => {
        store.dispatch('setInstanceOption', { name: 'vapidPublicKey', value: vapidPublicKey })
      }

-      var apiConfig = data.site.pleromafe
+      return data.site.pleromafe
+    } else {
+      throw (res)
+    }
+  } catch (error) {
+    console.error('Could not load statusnet config, potentially fatal')
+    console.error(error)
+  }
+}

-      window.fetch('/static/config.json')
-        .then((res) => res.json())
-        .catch((err) => {
+const getStaticConfig = async () => {
+  try {
+    const res = await window.fetch('/static/config.json')
+    if (res.ok) {
+      return res.json()
+    } else {
+      throw (res)
+    }
+  } catch (error) {
    console.warn('Failed to load static/config.json, continuing without it.')
-          console.warn(err)
+    console.warn(error)
    return {}
-        })
-        .then((staticConfig) => {
+  }
+}
+
+const setSettings = async ({ apiConfig, staticConfig, store }) => {
  const overrides = window.___pleromafe_dev_overrides || {}
  const env = window.___pleromafe_mode.NODE_ENV

@ -54,7 +68,7 @@ const afterStoreSetup = ({ store, i18n }) => {
  }

  const copyInstanceOption = (name) => {
-            store.dispatch('setInstanceOption', {name, value: config[name]})
+    store.dispatch('setInstanceOption', { name, value: config[name] })
  }

  copyInstanceOption('nsfwCensorImage')
@ -92,13 +106,146 @@ const afterStoreSetup = ({ store, i18n }) => {
  copyInstanceOption('noAttachmentLinks')
  copyInstanceOption('showFeaturesPanel')

-          if (config.chatDisabled) {
+  if ((config.chatDisabled)) {
    store.dispatch('disableChat')
+  } else {
+    store.dispatch('initializeSocket')
  }

  return store.dispatch('setTheme', config['theme'])
+}
+
+const getTOS = async ({ store }) => {
+  try {
+    const res = await window.fetch('/static/terms-of-service.html')
+    if (res.ok) {
+      const html = await res.text()
+      store.dispatch('setInstanceOption', { name: 'tos', value: html })
+    } else {
+      throw (res)
+    }
+  } catch (e) {
+    console.warn("Can't load TOS")
+    console.warn(e)
+  }
+}
+
+const getInstancePanel = async ({ store }) => {
+  try {
+    const res = await window.fetch('/instance/panel.html')
+    if (res.ok) {
+      const html = await res.text()
+      store.dispatch('setInstanceOption', { name: 'instanceSpecificPanelContent', value: html })
+    } else {
+      throw (res)
+    }
+  } catch (e) {
+    console.warn("Can't load instance panel")
+    console.warn(e)
+  }
+}
+
+const getStaticEmoji = async ({ store }) => {
+  try {
+    const res = await window.fetch('/static/emoji.json')
+    if (res.ok) {
+      const values = await res.json()
+      const emoji = Object.keys(values).map((key) => {
+        return { shortcode: key, image_url: false, 'utf': values[key] }
      })
-        .then(() => {
+      store.dispatch('setInstanceOption', { name: 'emoji', value: emoji })
+    } else {
+      throw (res)
+    }
+  } catch (e) {
+    console.warn("Can't load static emoji")
+    console.warn(e)
+  }
+}
+
+// This is also used to indicate if we have a 'pleroma backend' or not.
+// Somewhat weird, should probably be somewhere else.
+const getCustomEmoji = async ({ store }) => {
+  try {
+    const res = await window.fetch('/api/pleroma/emoji.json')
+    if (res.ok) {
+      const values = await res.json()
+      const emoji = Object.keys(values).map((key) => {
+        return { shortcode: key, image_url: values[key] }
+      })
+      store.dispatch('setInstanceOption', { name: 'customEmoji', value: emoji })
+      store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: true })
+    } else {
+      throw (res)
+    }
+  } catch (e) {
+    store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: false })
+    console.warn("Can't load custom emojis, maybe not a Pleroma instance?")
+    console.warn(e)
+  }
+}
+
+const getNodeInfo = async ({ store }) => {
+  try {
+    const res = await window.fetch('/nodeinfo/2.0.json')
+    if (res.ok) {
+      const data = await res.json()
+      const metadata = data.metadata
+
+      const features = metadata.features
+      store.dispatch('setInstanceOption', { name: 'mediaProxyAvailable', value: features.includes('media_proxy') })
+      store.dispatch('setInstanceOption', { name: 'chatAvailable', value: features.includes('chat') })
+      store.dispatch('setInstanceOption', { name: 'gopherAvailable', value: features.includes('gopher') })
+
+      store.dispatch('setInstanceOption', { name: 'restrictedNicknames', value: metadata.restrictedNicknames })
+      store.dispatch('setInstanceOption', { name: 'postFormats', value: metadata.postFormats })
+
+      const suggestions = metadata.suggestions
+      store.dispatch('setInstanceOption', { name: 'suggestionsEnabled', value: suggestions.enabled })
+      store.dispatch('setInstanceOption', { name: 'suggestionsWeb', value: suggestions.web })
+
+      const software = data.software
+      store.dispatch('setInstanceOption', { name: 'backendVersion', value: software.version })
+
+      const frontendVersion = window.___pleromafe_commit_hash
+      store.dispatch('setInstanceOption', { name: 'frontendVersion', value: frontendVersion })
+    } else {
+      throw (res)
+    }
+  } catch (e) {
+    console.warn('Could not load nodeinfo')
+    console.warn(e)
+  }
+}
+
+const afterStoreSetup = async ({ store, i18n }) => {
+  if (store.state.config.customTheme) {
+    // This is a hack to deal with async loading of config.json and themes
+    // See: style_setter.js, setPreset()
+    window.themeLoaded = true
+    store.dispatch('setOption', {
+      name: 'customTheme',
+      value: store.state.config.customTheme
+    })
+  }
+
+  const width = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth
+  store.dispatch('setMobileLayout', width <= 800)
+
+  const apiConfig = await getStatusnetConfig({ store })
+  const staticConfig = await getStaticConfig()
+  await setSettings({ store, apiConfig, staticConfig })
+  await getTOS({ store })
+  await getInstancePanel({ store })
+  await getStaticEmoji({ store })
+  await getCustomEmoji({ store })
+  await getNodeInfo({ store })
+
+  // Now we have the server settings and can try logging in
+  if (store.state.oauth.token) {
+    store.dispatch('loginUser', store.state.oauth.token)
+  }
+
  const router = new VueRouter({
    mode: 'history',
    routes: routes(store),
@ -111,73 +258,13 @@ const afterStoreSetup = ({ store, i18n }) => {
  })

  /* eslint-disable no-new */
-          new Vue({
+  return new Vue({
    router,
    store,
    i18n,
    el: '#app',
    render: h => h(App)
  })
-        })
-    })
-
-  window.fetch('/static/terms-of-service.html')
-    .then((res) => res.text())
-    .then((html) => {
-      store.dispatch('setInstanceOption', { name: 'tos', value: html })
-    })
-
-  window.fetch('/api/pleroma/emoji.json')
-    .then(
-      (res) => res.json()
-        .then(
-          (values) => {
-            const emoji = Object.keys(values).map((key) => {
-              return { shortcode: key, image_url: values[key] }
-            })
-            store.dispatch('setInstanceOption', { name: 'customEmoji', value: emoji })
-            store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: true })
-          },
-          (failure) => {
-            store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: false })
-          }
-        ),
-      (error) => console.log(error)
-    )
-
-  window.fetch('/static/emoji.json')
-    .then((res) => res.json())
-    .then((values) => {
-      const emoji = Object.keys(values).map((key) => {
-        return { shortcode: key, image_url: false, 'utf': values[key] }
-      })
-      store.dispatch('setInstanceOption', { name: 'emoji', value: emoji })
-    })
-
-  window.fetch('/instance/panel.html')
-    .then((res) => res.text())
-    .then((html) => {
-      store.dispatch('setInstanceOption', { name: 'instanceSpecificPanelContent', value: html })
-    })
-
-  window.fetch('/nodeinfo/2.0.json')
-    .then((res) => res.json())
-    .then((data) => {
-      const metadata = data.metadata
-
-      const features = metadata.features
-      store.dispatch('setInstanceOption', { name: 'mediaProxyAvailable', value: features.includes('media_proxy') })
-      store.dispatch('setInstanceOption', { name: 'chatAvailable', value: features.includes('chat') })
-      store.dispatch('setInstanceOption', { name: 'gopherAvailable', value: features.includes('gopher') })
-
-      store.dispatch('setInstanceOption', { name: 'postFormats', value: metadata.postFormats })
-
-      store.dispatch('setInstanceOption', { name: 'restrictedNicknames', value: metadata.restrictedNicknames })
-
-      const suggestions = metadata.suggestions
-      store.dispatch('setInstanceOption', { name: 'suggestionsEnabled', value: suggestions.enabled })
-      store.dispatch('setInstanceOption', { name: 'suggestionsWeb', value: suggestions.web })
-    })
 }

 export default afterStoreSetup
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@ -8,8 +8,8 @@
    </div>
    <div class="basic-user-card-collapsed-content" v-else>
      <div :title="user.name" class="basic-user-card-user-name">
-        <span v-if="user.name_html" v-html="user.name_html"></span>
-        <span v-else>{{ user.name }}</span>
+        <span v-if="user.name_html" class="basic-user-card-user-name-value" v-html="user.name_html"></span>
+        <span v-else class="basic-user-card-user-name-value">{{ user.name }}</span>
      </div>
      <div>
        <router-link class="basic-user-card-screen-name" :to="userProfileLink(user)">
@ -52,6 +52,14 @@
      width: 16px;
      vertical-align: middle;
    }
+
+    &-value {
+      display: inline-block;
+      max-width: 100%;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
  }

  &-expanded-content {
--- a/src/components/block_card/block_card.js
+++ b/src/components/block_card/block_card.js
@ -9,7 +9,7 @@ const BlockCard = {
  },
  computed: {
    user () {
-      return this.$store.getters.userById(this.userId)
+      return this.$store.getters.findUser(this.userId)
    },
    blocked () {
      return this.user.statusnet_blocking
--- a/src/components/follow_card/follow_card.js
+++ b/src/components/follow_card/follow_card.js
@ -1,4 +1,5 @@
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
+import RemoteFollow from '../remote_follow/remote_follow.vue'
 import { requestFollow, requestUnfollow } from '../../services/follow_manipulate/follow_manipulate'

 const FollowCard = {
@ -14,13 +15,17 @@ const FollowCard = {
    }
  },
  components: {
-    BasicUserCard
+    BasicUserCard,
+    RemoteFollow
  },
  computed: {
    isMe () { return this.$store.state.users.currentUser.id === this.user.id },
    following () { return this.updated ? this.updated.following : this.user.following },
    showFollow () {
      return !this.following || this.updated && !this.updated.following
+    },
+    loggedIn () {
+      return this.$store.state.users.currentUser
    }
  },
  methods: {
--- a/src/components/follow_card/follow_card.vue
+++ b/src/components/follow_card/follow_card.vue
@ -4,9 +4,12 @@
      <span class="faint" v-if="!noFollowsYou && user.follows_you">
        {{ isMe ? $t('user_card.its_you') : $t('user_card.follows_you') }}
      </span>
+      <div class="follow-card-follow-button" v-if="showFollow && !loggedIn">
+        <RemoteFollow :user="user" />
+      </div>
      <button
-        v-if="showFollow"
-        class="btn btn-default"
+        v-if="showFollow && loggedIn"
+        class="btn btn-default follow-card-follow-button"
        @click="followUser"
        :disabled="inProgress"
        :title="requestSent ? $t('user_card.follow_again') : ''"
@ -21,7 +24,7 @@
          {{ $t('user_card.follow') }}
        </template>
      </button>
-      <button v-if="following" class="btn btn-default pressed" @click="unfollowUser" :disabled="inProgress">
+      <button v-if="following" class="btn btn-default follow-card-follow-button pressed" @click="unfollowUser" :disabled="inProgress">
        <template v-if="inProgress">
          {{ $t('user_card.follow_progress') }}
        </template>
@ -36,15 +39,17 @@
 <script src="./follow_card.js"></script>

 <style lang="scss">
-.follow-card-content-container {
+.follow-card {
+  &-content-container {
    flex-shrink: 0;
    display: flex;
    flex-direction: row;
    justify-content: space-between;
    flex-wrap: wrap;
    line-height: 1.5em;
+  }

-  .btn {
+  &-follow-button {
    margin-top: 0.5em;
    margin-left: auto;
    width: 10em;
--- a/src/components/image_cropper/image_cropper.js
+++ b/src/components/image_cropper/image_cropper.js
@ -31,6 +31,9 @@ const ImageCropper = {
    saveButtonLabel: {
      type: String
    },
+    saveWithoutCroppingButtonlabel: {
+      type: String
+    },
    cancelButtonLabel: {
      type: String
    }
@ -48,6 +51,9 @@ const ImageCropper = {
    saveText () {
      return this.saveButtonLabel || this.$t('image_cropper.save')
    },
+    saveWithoutCroppingText () {
+      return this.saveWithoutCroppingButtonlabel || this.$t('image_cropper.save_without_cropping')
+    },
    cancelText () {
      return this.cancelButtonLabel || this.$t('image_cropper.cancel')
    },
@ -76,6 +82,18 @@ const ImageCropper = {
          this.submitting = false
        })
    },
+    submitWithoutCropping () {
+      this.submitting = true
+      this.avatarUploadError = null
+      this.submitHandler(false, this.dataUrl)
+        .then(() => this.destroy())
+        .catch((err) => {
+          this.submitError = err
+        })
+        .finally(() => {
+          this.submitting = false
+        })
+    },
    pickImage () {
      this.$refs.input.click()
    },
--- a/src/components/image_cropper/image_cropper.vue
+++ b/src/components/image_cropper/image_cropper.vue
@ -7,6 +7,7 @@
      <div class="image-cropper-buttons-wrapper">
        <button class="btn" type="button" :disabled="submitting" @click="submit" v-text="saveText"></button>
        <button class="btn" type="button" :disabled="submitting" @click="destroy" v-text="cancelText"></button>
+        <button class="btn" type="button" :disabled="submitting" @click="submitWithoutCropping" v-text="saveWithoutCroppingText"></button>
        <i class="icon-spin4 animate-spin" v-if="submitting"></i>
      </div>
      <div class="alert error" v-if="submitError">
@ -36,7 +37,11 @@
  }

  &-buttons-wrapper {
-    margin-top: 15px;
+    margin-top: 10px;
+
+    button {
+      margin-top: 5px;
+    }
  }
 }
 </style>
--- a/src/components/mute_card/mute_card.js
+++ b/src/components/mute_card/mute_card.js
@ -9,7 +9,7 @@ const MuteCard = {
  },
  computed: {
    user () {
-      return this.$store.getters.userById(this.userId)
+      return this.$store.getters.findUser(this.userId)
    },
    muted () {
      return this.user.muted
--- a/src/components/remote_follow/remote_follow.js
+++ b/src/components/remote_follow/remote_follow.js
@ -0,0 +1,10 @@
+export default {
+  props: [ 'user' ],
+  computed: {
+    subscribeUrl () {
+      // eslint-disable-next-line no-undef
+      const serverUrl = new URL(this.user.statusnet_profile_url)
+      return `${serverUrl.protocol}//${serverUrl.host}/main/ostatus`
+    }
+  }
+}
--- a/src/components/remote_follow/remote_follow.vue
+++ b/src/components/remote_follow/remote_follow.vue
@ -0,0 +1,24 @@
+<template>
+  <div class="remote-follow">
+    <form method="POST" :action='subscribeUrl'>
+      <input type="hidden" name="nickname" :value="user.screen_name">
+      <input type="hidden" name="profile" value="">
+      <button click="submit" class="remote-button">
+        {{ $t('user_card.remote_follow') }}
+      </button>
+    </form>
+  </div>
+</template>
+
+<script src="./remote_follow.js"></script>
+
+<style lang="scss">
+.remote-follow {
+  max-width: 220px;
+
+  .remote-button {
+    width: 100%;
+    min-height: 28px;
+  }
+}
+</style>
--- a/src/components/settings/settings.js
+++ b/src/components/settings/settings.js
@ -1,8 +1,13 @@
 /* eslint-env browser */
+import { filter, trim } from 'lodash'
+
 import TabSwitcher from '../tab_switcher/tab_switcher.js'
 import StyleSwitcher from '../style_switcher/style_switcher.vue'
 import InterfaceLanguageSwitcher from '../interface_language_switcher/interface_language_switcher.vue'
-import { filter, trim } from 'lodash'
+import { extractCommit } from '../../services/version/version.service'
+
+const pleromaFeCommitUrl = 'https://git.pleroma.social/pleroma/pleroma-fe/commit/'
+const pleromaBeCommitUrl = 'https://git.pleroma.social/pleroma/pleroma/commit/'

 const settings = {
  data () {
@ -78,7 +83,10 @@ const settings = {
        // Future spec, still not supported in Nightly 63 as of 08/2018
        Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'audioTracks'),
      playVideosInModal: user.playVideosInModal,
-      useContainFit: user.useContainFit
+      useContainFit: user.useContainFit,
+
+      backendVersion: instance.backendVersion,
+      frontendVersion: instance.frontendVersion
    }
  },
  components: {
@ -96,7 +104,13 @@ const settings = {
    postFormats () {
      return this.$store.state.instance.postFormats || []
    },
-    instanceSpecificPanelPresent () { return this.$store.state.instance.showInstanceSpecificPanel }
+    instanceSpecificPanelPresent () { return this.$store.state.instance.showInstanceSpecificPanel },
+    frontendVersionLink () {
+      return pleromaFeCommitUrl + this.frontendVersion
+    },
+    backendVersionLink () {
+      return pleromaBeCommitUrl + extractCommit(this.backendVersion)
+    }
  },
  watch: {
    hideAttachmentsLocal (value) {
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@ -261,6 +261,28 @@
          </div>
        </div>
      </div>
+      <div :label="$t('settings.version.title')" >
+        <div class="setting-item">
+          <ul class="setting-list">
+            <li>
+              <p>{{$t('settings.version.backend_version')}}</p>
+              <ul class="option-list">
+                <li>
+                  <a :href="backendVersionLink" target="_blank">{{backendVersion}}</a>
+                </li>
+              </ul>
+            </li>
+            <li>
+              <p>{{$t('settings.version.frontend_version')}}</p>
+              <ul class="option-list">
+                <li>
+                  <a :href="frontendVersionLink" target="_blank">{{frontendVersion}}</a>
+                </li>
+              </ul>
+            </li>
+          </ul>
+        </div>
+      </div>
    </tab-switcher>
 </keep-alive>
  </div>
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@ -145,11 +145,11 @@ const Status = {
      return !!(this.status.in_reply_to_status_id && this.status.in_reply_to_user_id)
    },
    replyToName () {
-      const user = this.$store.state.users.usersObject[this.status.in_reply_to_user_id]
-      if (user) {
-        return user.screen_name
-      } else {
+      if (this.status.in_reply_to_screen_name) {
        return this.status.in_reply_to_screen_name
+      } else {
+        const user = this.$store.getters.findUser(this.status.in_reply_to_user_id)
+        return user && user.screen_name
      }
    },
    hideReply () {
--- a/src/components/user_avatar/user_avatar.js
+++ b/src/components/user_avatar/user_avatar.js
@ -23,6 +23,11 @@ const UserAvatar = {
    imageLoadError () {
      this.showPlaceholder = true
    }
+  },
+  watch: {
+    src () {
+      this.showPlaceholder = false
+    }
  }
 }

--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@ -1,4 +1,5 @@
 import UserAvatar from '../user_avatar/user_avatar.vue'
+import RemoteFollow from '../remote_follow/remote_follow.vue'
 import { hex2rgb } from '../../services/color_convert/color_convert.js'
 import { requestFollow, requestUnfollow } from '../../services/follow_manipulate/follow_manipulate'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
@ -15,6 +16,9 @@ export default {
      betterShadow: this.$store.state.interface.browserSupport.cssFilter
    }
  },
+  created () {
+    this.$store.dispatch('fetchUserRelationship', this.user.id)
+  },
  computed: {
    classes () {
      return [{
@ -96,7 +100,8 @@ export default {
    }
  },
  components: {
-    UserAvatar
+    UserAvatar,
+    RemoteFollow
  },
  methods: {
    followUser () {
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@ -84,14 +84,8 @@
            </button>
          </span>
        </div>
-        <div class="remote-follow" v-if='!loggedIn && user.is_local'>
-          <form method="POST" :action='subscribeUrl'>
-            <input type="hidden" name="nickname" :value="user.screen_name">
-            <input type="hidden" name="profile" value="">
-            <button click="submit" class="remote-button">
-              {{ $t('user_card.remote_follow') }}
-            </button>
-          </form>
+        <div v-if='!loggedIn && user.is_local'>
+          <RemoteFollow :user="user" />
        </div>
        <div class='block' v-if='isOtherUser && loggedIn'>
          <span v-if='user.statusnet_blocking'>
@ -375,11 +369,6 @@
      min-height: 28px;
    }

-    .remote-follow {
-      max-width: 220px;
-      min-height: 28px;
-    }
-
    .follow {
      max-width: 220px;
      min-height: 28px;
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@ -9,7 +9,7 @@ import withList from '../../hocs/with_list/with_list'
 const FollowerList = compose(
  withLoadMore({
    fetch: (props, $store) => $store.dispatch('addFollowers', props.userId),
-    select: (props, $store) => get($store.getters.userById(props.userId), 'followers', []),
+    select: (props, $store) => get($store.getters.findUser(props.userId), 'followers', []),
    destory: (props, $store) => $store.dispatch('clearFollowers', props.userId),
    childPropName: 'entries',
    additionalPropNames: ['userId']
@ -20,7 +20,7 @@ const FollowerList = compose(
 const FriendList = compose(
  withLoadMore({
    fetch: (props, $store) => $store.dispatch('addFriends', props.userId),
-    select: (props, $store) => get($store.getters.userById(props.userId), 'friends', []),
+    select: (props, $store) => get($store.getters.findUser(props.userId), 'friends', []),
    destory: (props, $store) => $store.dispatch('clearFriends', props.userId),
    childPropName: 'entries',
    additionalPropNames: ['userId']
@ -31,28 +31,16 @@ const FriendList = compose(
 const UserProfile = {
  data () {
    return {
-      error: false
+      error: false,
+      fetchedUserId: null
    }
  },
  created () {
-    this.$store.commit('clearTimeline', { timeline: 'user' })
-    this.$store.commit('clearTimeline', { timeline: 'favorites' })
-    this.$store.commit('clearTimeline', { timeline: 'media' })
-    this.$store.dispatch('startFetching', { timeline: 'user', userId: this.fetchBy })
-    this.$store.dispatch('startFetching', { timeline: 'media', userId: this.fetchBy })
-    this.startFetchFavorites()
    if (!this.user.id) {
-      this.$store.dispatch('fetchUser', this.fetchBy)
-        .catch((reason) => {
-          const errorMessage = get(reason, 'error.error')
-          if (errorMessage === 'No user with such user_id') { // Known error
-            this.error = this.$t('user_profile.profile_does_not_exist')
-          } else if (errorMessage) {
-            this.error = errorMessage
+      this.fetchUserId()
+        .then(() => this.startUp())
    } else {
-            this.error = this.$t('user_profile.profile_loading_error')
-          }
-        })
+      this.startUp()
    }
  },
  destroyed () {
@ -69,7 +57,7 @@ const UserProfile = {
      return this.$store.state.statuses.timelines.media
    },
    userId () {
-      return this.$route.params.id || this.user.id
+      return this.$route.params.id || this.user.id || this.fetchedUserId
    },
    userName () {
      return this.$route.params.name || this.user.screen_name
@ -79,10 +67,9 @@ const UserProfile = {
        this.userId === this.$store.state.users.currentUser.id
    },
    userInStore () {
-      if (this.isExternal) {
-        return this.$store.getters.userById(this.userId)
-      }
-      return this.$store.getters.userByName(this.userName)
+      const routeParams = this.$route.params
+      // This needs fetchedUserId so that computed will be refreshed when user is fetched
+      return this.$store.getters.findUser(this.fetchedUserId || routeParams.name || routeParams.id)
    },
    user () {
      if (this.timeline.statuses[0]) {
@ -93,9 +80,6 @@ const UserProfile = {
      }
      return {}
    },
-    fetchBy () {
-      return this.isExternal ? this.userId : this.userName
-    },
    isExternal () {
      return this.$route.name === 'external-user-profile'
    },
@ -109,14 +93,38 @@ const UserProfile = {
  methods: {
    startFetchFavorites () {
      if (this.isUs) {
-        this.$store.dispatch('startFetching', { timeline: 'favorites', userId: this.fetchBy })
+        this.$store.dispatch('startFetching', { timeline: 'favorites', userId: this.userId })
      }
    },
+    fetchUserId () {
+      let fetchPromise
+      if (this.userId && !this.$route.params.name) {
+        fetchPromise = this.$store.dispatch('fetchUser', this.userId)
+      } else {
+        fetchPromise = this.$store.dispatch('fetchUser', this.userName)
+          .then(({ id }) => {
+            this.fetchedUserId = id
+          })
+      }
+      return fetchPromise
+        .catch((reason) => {
+          const errorMessage = get(reason, 'error.error')
+          if (errorMessage === 'No user with such user_id') { // Known error
+            this.error = this.$t('user_profile.profile_does_not_exist')
+          } else if (errorMessage) {
+            this.error = errorMessage
+          } else {
+            this.error = this.$t('user_profile.profile_loading_error')
+          }
+        })
+        .then(() => this.startUp())
+    },
    startUp () {
-      this.$store.dispatch('startFetching', { timeline: 'user', userId: this.fetchBy })
-      this.$store.dispatch('startFetching', { timeline: 'media', userId: this.fetchBy })
-
+      if (this.userId) {
+        this.$store.dispatch('startFetching', { timeline: 'user', userId: this.userId })
+        this.$store.dispatch('startFetching', { timeline: 'media', userId: this.userId })
        this.startFetchFavorites()
+      }
    },
    cleanUp () {
      this.$store.dispatch('stopFetching', 'user')
@ -128,19 +136,19 @@ const UserProfile = {
    }
  },
  watch: {
-    userName () {
-      if (this.isExternal) {
-        return
-      }
+    // userId can be undefined if we don't know it yet
+    userId (newVal) {
+      if (newVal) {
        this.cleanUp()
        this.startUp()
+      }
    },
-    userId () {
-      if (!this.isExternal) {
-        return
-      }
+    userName () {
+      if (this.$route.params.name) {
+        this.fetchUserId()
        this.cleanUp()
        this.startUp()
+      }
    },
    $route () {
      this.$refs.tabSwitcher.activateTab(0)()
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@ -11,7 +11,7 @@
        :title="$t('user_profile.timeline_title')"
        :timeline="timeline"
        :timeline-name="'user'"
-        :user-id="fetchBy"
+        :user-id="userId"
      />
      <div :label="$t('user_card.followees')" v-if="followsTabVisible" :disabled="!user.friends_count">
        <FriendList :userId="userId" />
@ -25,7 +25,7 @@
        :embedded="true" :title="$t('user_card.media')"
        timeline-name="media"
        :timeline="media"
-        :user-id="fetchBy"
+        :user-id="userId"
      />
      <Timeline
        v-if="isUs"
--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@ -158,7 +158,13 @@ const UserSettings = {
      reader.readAsDataURL(file)
    },
    submitAvatar (cropper, file) {
-      const img = cropper.getCroppedCanvas().toDataURL(file.type)
+      let img
+      if (cropper) {
+        img = cropper.getCroppedCanvas().toDataURL(file.type)
+      } else {
+        img = file
+      }
+
      return this.$store.state.api.backendInteractor.updateAvatar({ params: { img } }).then((user) => {
        if (!user.error) {
          this.$store.commit('addNewUsers', [user])
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@ -49,7 +49,7 @@
        "account_not_locked_warning_link": "مقفل",
        "attachments_sensitive": "اعتبر المرفقات كلها كمحتوى حساس",
        "content_type": {
-            "plain_text": "نص صافٍ"
+            "text/plain": "نص صافٍ"
        },
        "content_warning": "الموضوع (اختياري)",
        "default": "وصلت للتوّ إلى لوس أنجلس.",
--- a/src/i18n/ca.json
+++ b/src/i18n/ca.json
@ -49,7 +49,7 @@
    "account_not_locked_warning_link": "bloquejat",
    "attachments_sensitive": "Marca l'adjunt com a delicat",
    "content_type": {
-      "plain_text": "Text pla"
+      "text/plain": "Text pla"
    },
    "content_warning": "Assumpte (opcional)",
    "default": "Em sento…",
--- a/src/i18n/cs.json
+++ b/src/i18n/cs.json
@ -71,7 +71,7 @@
    "account_not_locked_warning_link": "uzamčen",
    "attachments_sensitive": "Označovat přílohy jako citlivé",
    "content_type": {
-      "plain_text": "Prostý text",
+      "text/plain": "Prostý text",
      "text/html": "HTML",
      "text/markdown": "Markdown"
    },
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@ -55,7 +55,7 @@
    "account_not_locked_warning_link": "gesperrt",
    "attachments_sensitive": "Anhänge als heikel markieren",
    "content_type": {
-      "plain_text": "Nur Text"
+      "text/plain": "Nur Text"
    },
    "content_warning": "Betreff (optional)",
    "default": "Sitze gerade im Hofbräuhaus.",
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@ -25,6 +25,7 @@
  "image_cropper": {
    "crop_picture": "Crop picture",
    "save": "Save",
+    "save_without_cropping": "Save without cropping",
    "cancel": "Cancel"
  },
  "login": {
@ -347,6 +348,11 @@
        "checkbox": "I have skimmed over terms and conditions",
        "link": "a nice lil' link"
      }
+    },
+    "version": {
+      "title": "Version",
+      "backend_version": "Backend Version",
+      "frontend_version": "Frontend Version"
    }
  },
  "timeline": {
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@ -71,7 +71,7 @@
    "account_not_locked_warning_link": "ŝlosita",
    "attachments_sensitive": "Marki kunsendaĵojn kiel konsternajn",
    "content_type": {
-      "plain_text": "Plata teksto"
+      "text/plain": "Plata teksto"
    },
    "content_warning": "Temo (malnepra)",
    "default": "Ĵus alvenis al la Universala Kongreso!",
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@ -61,7 +61,7 @@
    "account_not_locked_warning_link": "bloqueada",
    "attachments_sensitive": "Contenido sensible",
    "content_type": {
-      "plain_text": "Texto Plano"
+      "text/plain": "Texto Plano"
    },
    "content_warning": "Tema (opcional)",
    "default": "Acabo de aterrizar en L.A.",
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@ -60,7 +60,7 @@
    "account_not_locked_warning_link": "lukittu",
    "attachments_sensitive": "Merkkaa liitteet arkaluonteisiksi",
    "content_type": {
-      "plain_text": "Tavallinen teksti"
+      "text/plain": "Tavallinen teksti"
    },
    "content_warning": "Aihe (valinnainen)",
    "default": "Tulin juuri saunasta.",
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@ -51,7 +51,7 @@
    "account_not_locked_warning_link": "verrouillé",
    "attachments_sensitive": "Marquer le média comme sensible",
    "content_type": {
-      "plain_text": "Texte brut"
+      "text/plain": "Texte brut"
    },
    "content_warning": "Sujet (optionnel)",
    "default": "Écrivez ici votre prochain statut.",
--- a/src/i18n/ga.json
+++ b/src/i18n/ga.json
@ -49,7 +49,7 @@
    "account_not_locked_warning_link": "faoi glas",
    "attachments_sensitive": "Marcáil ceangaltán mar íogair",
    "content_type": {
-      "plain_text": "Gnáth-théacs"
+      "text/plain": "Gnáth-théacs"
    },
    "content_warning": "Teideal (roghnach)",
    "default": "Lá iontach anseo i nGaillimh",
--- a/src/i18n/he.json
+++ b/src/i18n/he.json
@ -49,7 +49,7 @@
    "account_not_locked_warning_link": "נעול",
    "attachments_sensitive": "סמן מסמכים מצורפים כלא בטוחים לצפייה",
    "content_type": {
-      "plain_text": "טקסט פשוט"
+      "text/plain": "טקסט פשוט"
    },
    "content_warning": "נושא (נתון לבחירה)",
    "default": "הרגע נחת ב-ל.א.",
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@ -175,7 +175,7 @@
    "account_not_locked_warning_link": "bloccato",
    "attachments_sensitive": "Segna allegati come sensibili",
    "content_type": {
-      "plain_text": "Testo normale"
+      "text/plain": "Testo normale"
    },
    "content_warning": "Oggetto (facoltativo)",
    "default": "Appena atterrato in L.A.",
--- a/src/i18n/ja.json
+++ b/src/i18n/ja.json
@ -61,7 +61,7 @@
    "account_not_locked_warning_link": "ロックされたアカウント",
    "attachments_sensitive": "ファイルをNSFWにする",
    "content_type": {
-      "plain_text": "プレーンテキスト"
+      "text/plain": "プレーンテキスト"
    },
    "content_warning": "せつめい (かかなくてもよい)",
    "default": "はねだくうこうに、つきました。",
--- a/src/i18n/ko.json
+++ b/src/i18n/ko.json
@ -56,7 +56,7 @@
    "account_not_locked_warning_link": "잠김",
    "attachments_sensitive": "첨부물을 민감함으로 설정",
    "content_type": {
-      "plain_text": "평문"
+      "text/plain": "평문"
    },
    "content_warning": "주제 (필수 아님)",
    "default": "LA에 도착!",
--- a/src/i18n/nb.json
+++ b/src/i18n/nb.json
@ -49,7 +49,7 @@
    "account_not_locked_warning_link": "låst",
    "attachments_sensitive": "Merk vedlegg som sensitive",
    "content_type": {
-      "plain_text": "Klar tekst"
+      "text/plain": "Klar tekst"
    },
    "content_warning": "Tema (valgfritt)",
    "default": "Landet akkurat i L.A.",
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@ -57,7 +57,7 @@
    "account_not_locked_warning_link": "gesloten",
    "attachments_sensitive": "Markeer bijlage als gevoelig",
    "content_type": {
-      "plain_text": "Gewone tekst"
+      "text/plain": "Gewone tekst"
    },
    "content_warning": "Onderwerp (optioneel)",
    "default": "Tijd voor een pauze!",
--- a/src/i18n/oc.json
+++ b/src/i18n/oc.json
@ -59,19 +59,21 @@
    "broken_favorite": "Estatut desconegut, sèm a lo cercar...",
    "favorited_you": "a aimat vòstre estatut",
    "followed_you": "vos a seguit",
-    "load_older": "Cargar las notificaciones mai ancianas",
+    "load_older": "Cargar las notificacions mai ancianas",
    "notifications": "Notficacions",
-    "read": "Legit !",
+    "read": "Legit !",
    "repeated_you": "a repetit vòstre estatut",
    "no_more_notifications": "Pas mai de notificacions"
  },
  "post_status": {
    "new_status": "Publicar d’estatuts novèls",
-    "account_not_locked_warning": "Vòstre compte es pas {0}. Qual que siá pòt vos seguir per veire vòstras publicacions destinadas pas qu'a vòstres seguidors.",
+    "account_not_locked_warning": "Vòstre compte es pas {0}. Qual que siá pòt vos seguir per veire vòstras publicacions destinadas pas qu’a vòstres seguidors.",
    "account_not_locked_warning_link": "clavat",
    "attachments_sensitive": "Marcar las pèças juntas coma sensiblas",
    "content_type": {
-      "plain_text": "Tèxte brut"
+      "text/plain": "Tèxte brut",
+      "text/html": "HTML",
+      "text/markdown": "Markdown"
    },
    "content_warning": "Avís de contengut (opcional)",
    "default": "Escrivètz aquí vòstre estatut.",
@ -118,12 +120,12 @@
    "blocks_tab": "Blocatges",
    "btnRadius": "Botons",
    "cBlue": "Blau (Respondre, seguir)",
-    "cGreen": "Verd (Repartajar)",
+    "cGreen": "Verd (Repertir)",
    "cOrange": "Irange (Aimar)",
    "cRed": "Roge (Anullar)",
    "change_password": "Cambiar lo senhal",
    "change_password_error": "Una error s’es producha en cambiant lo senhal.",
-    "changed_password": "Senhal corrèctament cambiat !",
+    "changed_password": "Senhal corrèctament cambiat !",
    "collapse_subject": "Replegar las publicacions amb de subjèctes",
    "composing": "Escritura",
    "confirm_new_password": "Confirmatz lo nòu senhal",
@ -134,7 +136,7 @@
    "default_vis": "Nivèl de visibilitat per defaut",
    "delete_account": "Suprimir lo compte",
    "delete_account_description": "Suprimir vòstre compte e los messatges per sempre.",
-    "delete_account_error": "Una error s’es producha en suprimir lo compte. S’aquò ten d’arribar mercés de contactar vòstre administrador d’instància.",
+    "delete_account_error": "Una error s’es producha en suprimir lo compte. S’aquò ten d’arribar mercés de contactar vòstre administrator d’instància.",
    "delete_account_instructions": "Picatz vòstre senhal dins lo camp tèxte çai-jos per confirmar la supression del compte.",
    "avatar_size_instruction": "La talha minimum recomandada pels imatges d’avatar es 150x150 pixèls.",
    "export_theme": "Enregistrar la preconfiguracion",
@ -154,14 +156,14 @@
    "hide_isp": "Amagar lo panèl especial instància",
    "preload_images": "Precargar los imatges",
    "use_one_click_nsfw": "Dobrir las pèças juntas NSFW amb un clic",
-    "hide_post_stats": "Amagar los estatistics de publicacion (ex. lo ombre de favorits)",
+    "hide_post_stats": "Amagar las estatisticas de publicacion (ex. lo nombre de favorits)",
    "hide_user_stats": "Amagar las estatisticas de l’utilizaire (ex. lo nombre de seguidors)",
    "hide_filtered_statuses": "Amagar los estatuts filtrats",
    "import_followers_from_a_csv_file": "Importar los seguidors d’un fichièr csv",
    "import_theme": "Cargar un tèma",
    "inputRadius": "Camps tèxte",
    "checkboxRadius": "Casas de marcar",
-    "instance_default": "(defaut : {value})",
+    "instance_default": "(defaut : {value})",
    "instance_default_simple": "(defaut)",
    "interface": "Interfàcia",
    "interfaceLanguage": "Lenga de l’interfàcia",
@ -172,7 +174,7 @@
    "loop_video": "Bocla vidèo",
    "loop_video_silent_only": "Legir en bocla solament las vidèos sens son (coma los « Gifs » de Mastodon)",
    "mutes_tab": "Agamats",
-    "play_videos_in_modal": "Legir las vidèoas dirèctament dins la visualizaira mèdia",
+    "play_videos_in_modal": "Legir las vidèos dirèctament dins la visualizaira mèdia",
    "use_contain_fit": "Talhar pas las pèças juntas per las vinhetas",
    "name": "Nom",
    "name_bio": "Nom & Bio",
@ -223,7 +225,7 @@
 "post_status_content_type": "Publicar lo tipe de contengut dels estatuts",
    "stop_gifs": "Lançar los GIFs al subrevòl",
    "streaming": "Activar lo cargament automatic dels novèls estatus en anar amont",
-    "text": "Tèxt",
+    "text": "Tèxte",
    "theme": "Tèma",
    "theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
    "theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
@ -234,6 +236,117 @@
    "values": {
      "false": "non",
      "true": "òc"
+    },
+ "notifications": "Notificacions",
+    "enable_web_push_notifications": "Activar las notificacions web push",
+    "style": {
+      "switcher": {
+        "keep_color": "Gardar las colors",
+        "keep_shadows": "Gardar las ombras",
+        "keep_opacity": "Gardar l’opacitat",
+        "keep_roundness": "Gardar la redondetat",
+        "keep_fonts": "Gardar las polissas",
+        "save_load_hint": "Las opcions « Gardar » permeton de servar las opcions configuradas actualament quand seleccionatz o cargatz un tèma, permeton tanben d’enregistrar aquelas opcions quand exportatz un tèma. Quand totas las casas son pas marcadas, l’exportacion de tèma o enregistrarà tot.",
+        "reset": "Restablir",
+        "clear_all": "O escafar tot",
+        "clear_opacity": "Escafar l’opacitat"
+      },
+      "common": {
+        "color": "Color",
+        "opacity": "Opacitat",
+        "contrast": {
+          "hint": "Lo coeficient de contraste es de {ratio}. Dòna {level} {context}",
+          "level": {
+            "aa": "un nivèl AA minimum recomandat",
+            "aaa": "un nivèl AAA recomandat",
+            "bad": "pas un nivèl d’accessibilitat recomandat"
+          },
+          "context": {
+            "18pt": "pel tèxte grand (18pt+)",
+            "text": "pel tèxte"
+          }
+        }
+      },
+      "common_colors": {
+        "_tab_label": "Comun",
+        "main": "Colors comunas",
+        "foreground_hint": "Vejatz « Avançat » per mai de paramètres detalhats",
+        "rgbo": "Icònas, accents, badges"
+      },
+      "advanced_colors": {
+        "_tab_label": "Avançat",
+        "alert": "Rèire plan d’alèrtas",
+        "alert_error": "Error",
+        "badge": "Rèire plan dels badges",
+        "badge_notification": "Notificacion",
+        "panel_header": "Bandièra del tablèu de bòrd",
+        "top_bar": "Barra amont",
+        "borders": "Caires",
+        "buttons": "Botons",
+        "inputs": "Camps tèxte",
+        "faint_text": "Tèxte descolorit"
+      },
+      "radii": {
+        "_tab_label": "Redondetat"
+      },
+      "shadows": {
+        "_tab_label": "Ombra e luminositat",
+        "component": "Compausant",
+        "override": "Subrecargar",
+        "shadow_id": "Ombra #{value}",
+        "blur": "Fosc",
+        "spread": "Espandiment",
+        "inset": "Incrustacion",
+        "hint": "Per las ombras podètz tanben utilizar --variable coma valor de color per emplegar una variable CSS3. Notatz que lo paramètre d’opacitat foncionarà pas dins aquel cas.",
+        "filter_hint": {
+          "always_drop_shadow": "Avertiment, aquel ombra utiliza totjorn {0} quand lo navigator es compatible.",
+          "drop_shadow_syntax": "{0} es pas compatible amb lo paramètre {1} e lo mot clau {2}.",
+          "avatar_inset": "Notatz que combinar d’ombras incrustadas e pas incrustadas pòt donar de resultats inesperats amb los avatars transparents.",
+          "spread_zero": "L’ombra amb un espandiment de > 0 apareisserà coma reglat a zèro",
+          "inset_classic": "L’ombra d’incrustacion utilizarà {0}"
+        },
+        "components": {
+          "panel": "Tablèu",
+          "panelHeader": "Bandièra del tablèu",
+          "topBar": "Barra amont",
+          "avatar": "Utilizar l’avatar (vista perfil)",
+          "avatarStatus": "Avatar de l’utilizaire (afichatge publicacion)",
+          "popup": "Fenèstras sorgissentas e astúcias",
+          "button": "Boton",
+          "buttonHover": "Boton (en passar la mirga)",
+          "buttonPressed": "Boton (en quichar)",
+          "buttonPressedHover": "Boton (en quichar e passar)",
+          "input": "Camp tèxte"
+        }
+      },
+      "fonts": {
+        "_tab_label": "Polissas",
+        "help": "Selecionatz la polissa d’utilizar pels elements de l’UI. Per « Personalizada » vos cal picar lo nom exacte tal coma apareis sul sistèma.",
+        "components": {
+          "interface": "Interfàcia",
+          "input": "Camps tèxte",
+          "post": "Tèxte de publicacion",
+          "postCode": "Tèxte Monospaced dins las publicacion (tèxte formatat)"
+        },
+        "family": "Nom de la polissa",
+        "size": "Talha (en px)",
+        "weight": "Largor (gras)",
+        "custom": "Personalizada"
+      },
+      "preview": {
+        "header": "Apercebut",
+        "content": "Contengut",
+        "error": "Error d’exemple",
+        "button": "Boton",
+        "text": "A tròç de mai de {0} e {1}",
+        "mono": "contengut",
+        "input": "arribada al país.",
+        "faint_link": "manual d’ajuda",
+        "fine_print": "Legissètz nòstre {0} per legir pas res d’util !",
+        "header_faint": "Va plan",
+        "checkbox": "Ai legit los tèrmes e condicions d’utilizacion",
+        "link": "un pichon ligam simpatic"
+      }
    }
  },
  "timeline": {
@ -241,19 +354,21 @@
    "conversation": "Conversacion",
    "error_fetching": "Error en cercant de mesas a jorn",
    "load_older": "Ne veire mai",
+	"no_retweet_hint": "Las publicacions marcadas pels seguidors solament o dirèctas se pòdon pas repetir",
    "repeated": "repetit",
    "show_new": "Ne veire mai",
    "up_to_date": "A jorn",
-    "no_retweet_hint": "La publicacion marcada coma pels seguidors solament o dirècte pòt pas èsser repetida"
+    "no_more_statuses": "Pas mai d’estatuts",
+    "no_statuses": "Cap d’estatuts"
  },
  "status": {
-    "reply_to": "Respondre à",
+    "reply_to": "Respond a",
    "replies_list": "Responsas :"
  },
  "user_card": {
    "approve": "Validar",
    "block": "Blocar",
-    "blocked": "Blocat !",
+    "blocked": "Blocat !",
    "deny": "Refusar",
    "favorites": "Favorits",
    "follow": "Seguir",
@ -263,8 +378,8 @@
    "follow_unfollow": "Quitar de seguir",
    "followees": "Abonaments",
    "followers": "Seguidors",
-    "following": "Seguit !",
-    "follows_you": "Vos sèc !",
+    "following": "Seguit !",
+    "follows_you": "Vos sèc !",
    "its_you": "Sètz vos !",
    "media": "Mèdia",
    "mute": "Amagar",
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@ -51,7 +51,7 @@
    "public_tl": "Linha do tempo pública",
    "timeline": "Linha do tempo",
    "twkn": "Toda a rede conhecida",
-    "user_search": "Busca de usuário",
+    "user_search": "Buscar usuários",
    "who_to_follow": "Quem seguir",
    "preferences": "Preferências"
  },
@ -67,11 +67,11 @@
  },
  "post_status": {
    "new_status": "Postar novo status",
-    "account_not_locked_warning": "Sua conta não está {0}. Qualquer pessoa pode te seguir para ver seus posts restritos.",
-    "account_not_locked_warning_link": "fechada",
+    "account_not_locked_warning": "Sua conta não é {0}. Qualquer pessoa pode te seguir e ver seus posts privados (só para seguidores).",
+    "account_not_locked_warning_link": "restrita",
    "attachments_sensitive": "Marcar anexos como sensíveis",
    "content_type": {
-      "plain_text": "Texto puro"
+      "text/plain": "Texto puro"
    },
    "content_warning": "Assunto (opcional)",
    "default": "Acabei de chegar no Rio!",
@ -115,7 +115,7 @@
    "avatarRadius": "Avatares",
    "background": "Pano de Fundo",
    "bio": "Biografia",
-    "blocks_tab": "Blocos",
+    "blocks_tab": "Bloqueios",
    "btnRadius": "Botões",
    "cBlue": "Azul (Responder, seguir)",
    "cGreen": "Verde (Repetir)",
@ -125,7 +125,7 @@
    "change_password_error": "Houve um erro ao modificar sua senha.",
    "changed_password": "Senha modificada com sucesso!",
    "collapse_subject": "Esconder posts com assunto",
-    "composing": "Escrevendo",
+    "composing": "Escrita",
    "confirm_new_password": "Confirmar nova senha",
    "current_avatar": "Seu avatar atual",
    "current_password": "Sua senha atual",
@ -139,7 +139,7 @@
    "avatar_size_instruction": "O tamanho mínimo recomendado para imagens de avatar é 150x150 pixels.",
    "export_theme": "Salvar predefinições",
    "filtering": "Filtragem",
-    "filtering_explanation": "Todas as postagens contendo estas palavras serão silenciadas, uma por linha.",
+    "filtering_explanation": "Todas as postagens contendo estas palavras serão silenciadas; uma palavra por linha.",
    "follow_export": "Exportar quem você segue",
    "follow_export_button": "Exportar quem você segue para um arquivo CSV",
    "follow_export_processing": "Processando. Em breve você receberá a solicitação de download do arquivo",
@ -178,7 +178,7 @@
    "name_bio": "Nome & Biografia",
    "new_password": "Nova senha",
    "notification_visibility": "Tipos de notificação para mostrar",
-    "notification_visibility_follows": "Seguidos",
+    "notification_visibility_follows": "Seguidas",
    "notification_visibility_likes": "Favoritos",
    "notification_visibility_mentions": "Menções",
    "notification_visibility_repeats": "Repetições",
@ -187,7 +187,7 @@
    "no_mutes": "Sem silenciados",
    "hide_follows_description": "Não mostrar quem estou seguindo",
    "hide_followers_description": "Não mostrar quem me segue",
-    "show_admin_badge": "Mostrar distintivo de Administrador em meu perfil",
+    "show_admin_badge": "Mostrar título de Administrador em meu perfil",
    "show_moderator_badge": "Mostrar título de Moderador em meu perfil",
    "nsfw_clickthrough": "Habilitar clique para ocultar anexos sensíveis",
    "oauth_tokens": "Token OAuth",
@ -201,9 +201,9 @@
    "profile_background": "Pano de fundo de perfil",
    "profile_banner": "Capa de perfil",
    "profile_tab": "Perfil",
-    "radii_help": "Arredondar arestas da interface (em píxeis)",
+    "radii_help": "Arredondar arestas da interface (em pixel)",
    "replies_in_timeline": "Respostas na linha do tempo",
-    "reply_link_preview": "Habilitar a pré-visualização de link de respostas ao passar o mouse.",
+    "reply_link_preview": "Habilitar a pré-visualização de de respostas ao passar o mouse.",
    "reply_visibility_all": "Mostrar todas as respostas",
    "reply_visibility_following": "Só mostrar respostas direcionadas a mim ou a usuários que sigo",
    "reply_visibility_self": "Só mostrar respostas direcionadas a mim",
@ -212,7 +212,7 @@
    "security_tab": "Segurança",
    "scope_copy": "Copiar opções de privacidade ao responder (Mensagens diretas sempre copiam)",
    "set_new_avatar": "Alterar avatar",
-    "set_new_profile_background": "Alterar o plano de fundo de perfil",
+    "set_new_profile_background": "Alterar o pano de fundo de perfil",
    "set_new_profile_banner": "Alterar capa de perfil",
    "settings": "Configurações",
    "subject_input_always_show": "Sempre mostrar campo de assunto",
@ -220,9 +220,9 @@
    "subject_line_email": "Como em email: \"re: assunto\"",
    "subject_line_mastodon": "Como o Mastodon: copiar como está",
    "subject_line_noop": "Não copiar",
-    "post_status_content_type": "Postar tipo de conteúdo do status",
-    "stop_gifs": "Reproduzir GIFs ao passar o cursor em cima",
-    "streaming": "Habilitar o fluxo automático de postagens quando ao topo da página",
+    "post_status_content_type": "Tipo de conteúdo do status",
+    "stop_gifs": "Reproduzir GIFs ao passar o cursor",
+    "streaming": "Habilitar o fluxo automático de postagens no topo da página",
    "text": "Texto",
    "theme": "Tema",
    "theme_help": "Use cores em código hexadecimal (#rrggbb) para personalizar seu esquema de cores.",
@ -235,7 +235,7 @@
      "false": "não",
      "true": "sim"
    },
-    "notifications": "Notifications",
+    "notifications": "Notificações",
    "enable_web_push_notifications": "Habilitar notificações web push",
    "style": {
      "switcher": {
@ -245,7 +245,7 @@
        "keep_roundness": "Manter arredondado",
        "keep_fonts": "Manter fontes",
        "save_load_hint": "Manter as opções preserva as opções atuais ao selecionar ou carregar temas; também salva as opções ao exportar um tempo. Quanto todos os campos estiverem desmarcados, tudo será salvo ao exportar o tema.",
-        "reset": "Voltar ao padrão",
+        "reset": "Restaurar o padrão",
        "clear_all": "Limpar tudo",
        "clear_opacity": "Limpar opacidade"
      },
@ -319,7 +319,7 @@
      },
      "fonts": {
        "_tab_label": "Fontes",
-        "help": "Selecionar fonte dos elementos da interface. Para fonte \"personalizada\" você deve entrar exatamente o nome da fonte no sistema.",
+        "help": "Selecione as fontes dos elementos da interface. Para fonte \"personalizada\" você deve inserir o mesmo nome da fonte no sistema.",
        "components": {
          "interface": "Interface",
          "input": "Campo de entrada",
@ -383,7 +383,7 @@
    "mute": "Silenciar",
    "muted": "Silenciado",
    "per_day": "por dia",
-    "remote_follow": "Seguidor Remoto",
+    "remote_follow": "Seguir remotamente",
    "statuses": "Postagens",
    "unblock": "Desbloquear",
    "unblock_progress": "Desbloqueando...",
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@ -49,7 +49,7 @@
    "account_not_locked_warning_link": "上锁",
    "attachments_sensitive": "标记附件为敏感内容",
    "content_type": {
-      "plain_text": "纯文本"
+      "text/plain": "纯文本"
    },
    "content_warning": "主题（可选）",
    "default": "刚刚抵达上海",
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@ -60,18 +60,6 @@ export default function createPersistedState ({
            merge({}, store.state, savedState)
          )
        }
-        if (store.state.config.customTheme) {
-          // This is a hack to deal with async loading of config.json and themes
-          // See: style_setter.js, setPreset()
-          window.themeLoaded = true
-          store.dispatch('setOption', {
-            name: 'customTheme',
-            value: store.state.config.customTheme
-          })
-        }
-        if (store.state.oauth.token) {
-          store.dispatch('loginUser', store.state.oauth.token)
-        }
        loaded = true
      } catch (e) {
        console.log("Couldn't load state")
--- a/src/main.js
+++ b/src/main.js
@ -53,9 +53,10 @@ const persistedStateOptions = {
    'users.lastLoginName',
    'oauth'
  ]
-}
+};

-createPersistedState(persistedStateOptions).then((persistedState) => {
+(async () => {
+  const persistedState = await createPersistedState(persistedStateOptions)
  const store = new Vuex.Store({
    modules: {
      interface: interfaceModule,
@ -75,7 +76,7 @@ createPersistedState(persistedStateOptions).then((persistedState) => {
  })

  afterStoreSetup({ store, i18n })
-})
+})()

 // These are inlined by webpack's DefinePlugin
 /* eslint-disable */
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@ -48,7 +48,11 @@ const defaultState = {

  // Html stuff
  instanceSpecificPanelContent: '',
-  tos: ''
+  tos: '',
+
+  // Version Information
+  backendVersion: '',
+  frontendVersion: ''
 }

 const instance = {
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@ -1,4 +1,4 @@
-import { remove, slice, each, find, maxBy, minBy, merge, first, last, isArray } from 'lodash'
+import { remove, slice, each, find, maxBy, minBy, merge, first, last, isArray, omitBy } from 'lodash'
 import apiService from '../services/api/api.service.js'
 // import parse from '../services/status_parser/status_parser.js'

@ -72,7 +72,9 @@ const mergeOrAdd = (arr, obj, item) => {

  if (oldItem) {
    // We already have this, so only merge the new info.
-    merge(oldItem, item)
+    // We ignore null values to avoid overwriting existing properties with missing data
+    // we also skip 'user' because that is handled by users module
+    merge(oldItem, omitBy(item, (v, k) => v === null || k === 'user'))
    // Reactivity fix.
    oldItem.attachments.splice(oldItem.attachments.length)
    return {item: oldItem, new: false}
--- a/src/modules/users.js
+++ b/src/modules/users.js
@ -18,7 +18,7 @@ export const mergeOrAdd = (arr, obj, item) => {
    arr.push(item)
    obj[item.id] = item
    if (item.screen_name && !item.screen_name.includes('@')) {
-      obj[item.screen_name] = item
+      obj[item.screen_name.toLowerCase()] = item
    }
    return { item, new: true }
  }
@ -91,6 +91,17 @@ export const mutations = {
  addNewUsers (state, users) {
    each(users, (user) => mergeOrAdd(state.users, state.usersObject, user))
  },
+  updateUserRelationship (state, relationships) {
+    relationships.forEach((relationship) => {
+      const user = state.usersObject[relationship.id]
+      if (user) {
+        user.follows_you = relationship.followed_by
+        user.following = relationship.following
+        user.muted = relationship.muting
+        user.statusnet_blocking = relationship.blocking
+      }
+    })
+  },
  saveBlocks (state, blockIds) {
    state.currentUser.blockIds = blockIds
  },
@ -122,12 +133,14 @@ export const mutations = {
 }

 export const getters = {
-  userById: state => id =>
-    state.users.find(user => user.id === id),
-  userByName: state => name =>
-    state.users.find(user => user.screen_name &&
-      (user.screen_name.toLowerCase() === name.toLowerCase())
-    )
+  findUser: state => query => {
+    const result = state.usersObject[query]
+    // In case it's a screen_name, we can try searching case-insensitive
+    if (!result && typeof query === 'string') {
+      return state.usersObject[query.toLowerCase()]
+    }
+    return result
+  }
 }

 export const defaultState = {
@ -147,7 +160,14 @@ const users = {
  actions: {
    fetchUser (store, id) {
      return store.rootState.api.backendInteractor.fetchUser({ id })
-        .then((user) => store.commit('addNewUsers', [user]))
+        .then((user) => {
+          store.commit('addNewUsers', [user])
+          return user
+        })
+    },
+    fetchUserRelationship (store, id) {
+      return store.rootState.api.backendInteractor.fetchUserRelationship({ id })
+        .then((relationships) => store.commit('updateUserRelationship', relationships))
    },
    fetchBlocks (store) {
      return store.rootState.api.backendInteractor.fetchBlocks()
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@ -28,12 +28,10 @@ const BG_UPDATE_URL = '/api/qvitter/update_background_image.json'
 const BANNER_UPDATE_URL = '/api/account/update_profile_banner.json'
 const PROFILE_UPDATE_URL = '/api/account/update_profile.json'
 const EXTERNAL_PROFILE_URL = '/api/externalprofile/show.json'
-const QVITTER_USER_TIMELINE_URL = '/api/qvitter/statuses/user_timeline.json'
 const QVITTER_USER_NOTIFICATIONS_URL = '/api/qvitter/statuses/notifications.json'
 const QVITTER_USER_NOTIFICATIONS_READ_URL = '/api/qvitter/statuses/notifications/read.json'
 const BLOCKING_URL = '/api/blocks/create.json'
 const UNBLOCKING_URL = '/api/blocks/destroy.json'
-const USER_URL = '/api/users/show.json'
 const FOLLOW_IMPORT_URL = '/api/pleroma/follow_import'
 const DELETE_ACCOUNT_URL = '/api/pleroma/delete_account'
 const CHANGE_PASSWORD_URL = '/api/pleroma/change_password'
@ -43,6 +41,9 @@ const DENY_USER_URL = '/api/pleroma/friendships/deny'
 const SUGGESTIONS_URL = '/api/v1/suggestions'

 const MASTODON_USER_FAVORITES_TIMELINE_URL = '/api/v1/favourites'
+const MASTODON_USER_URL = '/api/v1/accounts'
+const MASTODON_USER_RELATIONSHIPS_URL = '/api/v1/accounts/relationships'
+const MASTODON_USER_TIMELINE_URL = id => `/api/v1/accounts/${id}/statuses`

 import { each, map } from 'lodash'
 import { parseStatus, parseUser, parseNotification } from '../entity_normalizer/entity_normalizer.service.js'
@ -243,7 +244,7 @@ const denyUser = ({id, credentials}) => {
 }

 const fetchUser = ({id, credentials}) => {
-  let url = `${USER_URL}?user_id=${id}`
+  let url = `${MASTODON_USER_URL}/${id}`
  return fetch(url, { headers: authHeaders(credentials) })
    .then((response) => {
      return new Promise((resolve, reject) => response.json()
@ -257,6 +258,20 @@ const fetchUser = ({id, credentials}) => {
    .then((data) => parseUser(data))
 }

+const fetchUserRelationship = ({id, credentials}) => {
+  let url = `${MASTODON_USER_RELATIONSHIPS_URL}/?id=${id}`
+  return fetch(url, { headers: authHeaders(credentials) })
+    .then((response) => {
+      return new Promise((resolve, reject) => response.json()
+        .then((json) => {
+          if (!response.ok) {
+            return reject(new StatusCodeError(response.status, json, { url }, response))
+          }
+          return resolve(json)
+        }))
+    })
+}
+
 const fetchFriends = ({id, page, credentials}) => {
  let url = `${FRIENDS_URL}?user_id=${id}`
  if (page) {
@ -347,8 +362,8 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
    dms: DM_TIMELINE_URL,
    notifications: QVITTER_USER_NOTIFICATIONS_URL,
    'publicAndExternal': PUBLIC_AND_EXTERNAL_TIMELINE_URL,
-    user: QVITTER_USER_TIMELINE_URL,
-    media: QVITTER_USER_TIMELINE_URL,
+    user: MASTODON_USER_TIMELINE_URL,
+    media: MASTODON_USER_TIMELINE_URL,
    favorites: MASTODON_USER_FAVORITES_TIMELINE_URL,
    tag: TAG_TIMELINE_URL
  }
@ -357,15 +372,16 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use

  let url = timelineUrls[timeline]

+  if (timeline === 'user' || timeline === 'media') {
+    url = url(userId)
+  }
+
  if (since) {
    params.push(['since_id', since])
  }
  if (until) {
    params.push(['max_id', until])
  }
-  if (userId) {
-    params.push(['user_id', userId])
-  }
  if (tag) {
    url += `/${tag}.json`
  }
@ -545,7 +561,12 @@ const fetchOAuthTokens = ({credentials}) => {

  return fetch(url, {
    headers: authHeaders(credentials)
-  }).then((data) => data.json())
+  }).then((data) => {
+    if (data.ok) {
+      return data.json()
+    }
+    throw new Error('Error fetching auth tokens', data)
+  })
 }

 const revokeOAuthToken = ({id, credentials}) => {
@ -588,6 +609,7 @@ const apiService = {
  blockUser,
  unblockUser,
  fetchUser,
+  fetchUserRelationship,
  favorite,
  unfavorite,
  retweet,
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@ -30,6 +30,10 @@ const backendInteractorService = (credentials) => {
    return apiService.fetchUser({id, credentials})
  }

+  const fetchUserRelationship = ({id}) => {
+    return apiService.fetchUserRelationship({id, credentials})
+  }
+
  const followUser = (id) => {
    return apiService.followUser({credentials, id})
  }
@ -92,6 +96,7 @@ const backendInteractorService = (credentials) => {
    blockUser,
    unblockUser,
    fetchUser,
+    fetchUserRelationship,
    fetchAllFollowing,
    verifyCredentials: apiService.verifyCredentials,
    startFetching,
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@ -39,11 +39,11 @@ export const parseUser = (data) => {
      return output
    }

-    output.name = null // missing
-    output.name_html = data.display_name
+    // output.name = ??? missing
+    output.name_html = addEmojis(data.display_name, data.emojis)

-    output.description = null // missing
-    output.description_html = data.note
+    // output.description = ??? missing
+    output.description_html = addEmojis(data.note, data.emojis)

    // Utilize avatar_static for gif avatars?
    output.profile_image_url = data.avatar
@ -59,10 +59,14 @@ export const parseUser = (data) => {
    output.statusnet_profile_url = data.url

    if (data.pleroma) {
-      const pleroma = data.pleroma
-      output.follows_you = pleroma.follows_you
-      output.statusnet_blocking = pleroma.statusnet_blocking
-      output.muted = pleroma.muted
+      const relationship = data.pleroma.relationship
+
+      if (relationship) {
+        output.follows_you = relationship.followed_by
+        output.following = relationship.following
+        output.statusnet_blocking = relationship.blocking
+        output.muted = relationship.muting
+      }
    }

    // Missing, trying to recover
@ -83,7 +87,7 @@ export const parseUser = (data) => {

    output.friends_count = data.friends_count

-    output.bot = null // missing
+    // output.bot = ??? missing

    output.statusnet_profile_url = data.statusnet_profile_url

@ -134,7 +138,7 @@ const parseAttachment = (data) => {
    output.meta = data.meta // not present in BE yet
  } else {
    output.mimetype = data.mimetype
-    output.meta = null // missing
+    // output.meta = ??? missing
  }

  output.url = data.url
@ -142,6 +146,14 @@ const parseAttachment = (data) => {

  return output
 }
+export const addEmojis = (string, emojis) => {
+  return emojis.reduce((acc, emoji) => {
+    return acc.replace(
+      new RegExp(`:${emoji.shortcode}:`, 'g'),
+      `<img src='${emoji.url}' alt='${emoji.shortcode}' class='emoji' />`
+    )
+  }, string)
+}

 export const parseStatus = (data) => {
  const output = {}
@ -157,7 +169,7 @@ export const parseStatus = (data) => {
    output.type = data.reblog ? 'retweet' : 'status'
    output.nsfw = data.sensitive

-    output.statusnet_html = data.content
+    output.statusnet_html = addEmojis(data.content, data.emojis)

    // Not exactly the same but works?
    output.text = data.content
@ -166,7 +178,7 @@ export const parseStatus = (data) => {
    output.in_reply_to_user_id = data.in_reply_to_account_id

    // Missing!! fix in UI?
-    output.in_reply_to_screen_name = null
+    // output.in_reply_to_screen_name = ???

    // Not exactly the same but works
    output.statusnet_conversation_id = data.id
@ -176,11 +188,10 @@ export const parseStatus = (data) => {
    }

    output.summary = data.spoiler_text
-    output.summary_html = data.spoiler_text
+    output.summary_html = addEmojis(data.spoiler_text, data.emojis)
    output.external_url = data.url

-    // FIXME missing!!
-    output.is_local = false
+    // output.is_local = ??? missing
  } else {
    output.favorited = data.favorited
    output.fave_num = data.fave_num
@ -259,7 +270,7 @@ export const parseNotification = (data) => {

  if (masto) {
    output.type = mastoDict[data.type] || data.type
-    output.seen = null // missing
+    // output.seen = ??? missing
    output.status = parseStatus(data.status)
    output.action = output.status // not sure
    output.from_profile = parseUser(data.account)
@ -282,5 +293,5 @@ export const parseNotification = (data) => {

 const isNsfw = (status) => {
  const nsfwRegex = /#nsfw/i
-  return (status.tags || []).includes('nsfw') || !!status.text.match(nsfwRegex)
+  return (status.tags || []).includes('nsfw') || !!(status.text || '').match(nsfwRegex)
 }
--- a/src/services/new_api/user_search.js
+++ b/src/services/new_api/user_search.js
@ -1,13 +1,16 @@
 import utils from './utils.js'
+import { parseUser } from '../entity_normalizer/entity_normalizer.service.js'

 const search = ({query, store}) => {
  return utils.request({
    store,
-    url: '/api/pleroma/search_user',
+    url: '/api/v1/accounts/search',
    params: {
-      query
+      q: query
    }
-  }).then((data) => data.json())
+  })
+  .then((data) => data.json())
+  .then((data) => data.map(parseUser))
 }
 const UserSearch = {
  search
--- a/src/services/version/version.service.js
+++ b/src/services/version/version.service.js
@ -0,0 +1,6 @@
+
+export const extractCommit = versionString => {
+  const regex = /-g(\w+)$/i
+  const matches = versionString.match(regex)
+  return matches ? matches[1] : ''
+}
--- a/test/unit/specs/components/user_profile.spec.js
+++ b/test/unit/specs/components/user_profile.spec.js
@ -12,9 +12,13 @@ const mutations = {
  setError: () => {}
 }

+const actions = {
+  fetchUser: () => {},
+  fetchUserByScreenName: () => {}
+}
+
 const testGetters = {
-  userByName: state => getters.userByName(state.users),
-  userById: state => getters.userById(state.users)
+  findUser: state => getters.findUser(state.users)
 }

 const localUser = {
@ -31,6 +35,7 @@ const extUser = {

 const externalProfileStore = new Vuex.Store({
  mutations,
+  actions,
  getters: testGetters,
  state: {
    api: {
@ -89,7 +94,7 @@ const externalProfileStore = new Vuex.Store({
      currentUser: {
        credentials: ''
      },
-      usersObject: [extUser],
+      usersObject: { 100: extUser },
      users: [extUser]
    }
  }
@ -97,6 +102,7 @@ const externalProfileStore = new Vuex.Store({

 const localProfileStore = new Vuex.Store({
  mutations,
+  actions,
  getters: testGetters,
  state: {
    api: {
@ -155,7 +161,7 @@ const localProfileStore = new Vuex.Store({
      currentUser: {
        credentials: ''
      },
-      usersObject: [localUser],
+      usersObject: { 100: localUser, 'testuser': localUser },
      users: [localUser]
    }
  }
--- a/test/unit/specs/modules/users.spec.js
+++ b/test/unit/specs/modules/users.spec.js
@ -34,40 +34,31 @@ describe('The users module', () => {
    })
  })

-  describe('getUserByName', () => {
+  describe('findUser', () => {
    it('returns user with matching screen_name', () => {
+      const user = { screen_name: 'Guy', id: '1' }
      const state = {
-        users: [
-          { screen_name: 'Guy', id: '1' }
-        ]
+        usersObject: {
+          1: user,
+          guy: user
+        }
      }
      const name = 'Guy'
      const expected = { screen_name: 'Guy', id: '1' }
-      expect(getters.userByName(state)(name)).to.eql(expected)
+      expect(getters.findUser(state)(name)).to.eql(expected)
    })

-    it('returns user with matching screen_name with different case', () => {
-      const state = {
-        users: [
-          { screen_name: 'guy', id: '1' }
-        ]
-      }
-      const name = 'Guy'
-      const expected = { screen_name: 'guy', id: '1' }
-      expect(getters.userByName(state)(name)).to.eql(expected)
-    })
-  })
-
-  describe('getUserById', () => {
    it('returns user with matching id', () => {
+      const user = { screen_name: 'Guy', id: '1' }
      const state = {
-        users: [
-          { screen_name: 'Guy', id: '1' }
-        ]
+        usersObject: {
+          1: user,
+          guy: user
+        }
      }
      const id = '1'
      const expected = { screen_name: 'Guy', id: '1' }
-      expect(getters.userById(state)(id)).to.eql(expected)
+      expect(getters.findUser(state)(id)).to.eql(expected)
    })
  })
 })
--- a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
+++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
@ -1,4 +1,4 @@
-import { parseStatus, parseUser, parseNotification } from '../../../../../src/services/entity_normalizer/entity_normalizer.service.js'
+import { parseStatus, parseUser, parseNotification, addEmojis } from '../../../../../src/services/entity_normalizer/entity_normalizer.service.js'
 import mastoapidata from '../../../../fixtures/mastoapi.json'
 import qvitterapidata from '../../../../fixtures/statuses.json'

@ -143,6 +143,23 @@ const makeMockNotificationQvitter = (overrides = {}) => {
  }, overrides)
 }

+const makeMockEmojiMasto = (overrides = [{}]) => {
+  return [
+    Object.assign({
+      shortcode: 'image',
+      static_url: 'https://example.com/image.png',
+      url: 'https://example.com/image.png',
+      visible_in_picker: false
+    }, overrides[0]),
+    Object.assign({
+      shortcode: 'thinking',
+      static_url: 'https://example.com/think.png',
+      url: 'https://example.com/think.png',
+      visible_in_picker: false
+    }, overrides[1])
+  ]
+}
+
 parseNotification
 parseUser
 parseStatus
@ -218,6 +235,22 @@ describe('API Entities normalizer', () => {
        expect(parsedRepeat).to.have.property('retweeted_status')
        expect(parsedRepeat).to.have.deep.property('retweeted_status.id', 'deadbeef')
      })
+
+      it('adds emojis to post content', () => {
+        const post = makeMockStatusMasto({ emojis: makeMockEmojiMasto(), content: 'Makes you think :thinking:' })
+
+        const parsedPost = parseStatus(post)
+
+        expect(parsedPost).to.have.property('statusnet_html').that.contains('<img')
+      })
+
+      it('adds emojis to subject line', () => {
+        const post = makeMockStatusMasto({ emojis: makeMockEmojiMasto(), spoiler_text: 'CW: 300 IQ :thinking:' })
+
+        const parsedPost = parseStatus(post)
+
+        expect(parsedPost).to.have.property('summary_html').that.contains('<img')
+      })
    })
  })

@ -230,6 +263,22 @@ describe('API Entities normalizer', () => {
      expect(parseUser(local)).to.have.property('is_local', true)
      expect(parseUser(remote)).to.have.property('is_local', false)
    })
+
+    it('adds emojis to user name', () => {
+      const user = makeMockUserMasto({ emojis: makeMockEmojiMasto(), display_name: 'The :thinking: thinker' })
+
+      const parsedUser = parseUser(user)
+
+      expect(parsedUser).to.have.property('name_html').that.contains('<img')
+    })
+
+    it('adds emojis to user bio', () => {
+      const user = makeMockUserMasto({ emojis: makeMockEmojiMasto(), note: 'Hello i like to :thinking: a lot' })
+
+      const parsedUser = parseUser(user)
+
+      expect(parsedUser).to.have.property('description_html').that.contains('<img')
+    })
  })

  // We currently use QvitterAPI notifications only, and especially due to MastoAPI lacking is_seen, support for MastoAPI
@ -267,4 +316,28 @@ describe('API Entities normalizer', () => {
      expect(parseNotification(notif)).to.have.deep.property('from_profile.id', 'spurdo')
    })
  })
+
+  describe('MastoAPI emoji adder', () => {
+    const emojis = makeMockEmojiMasto()
+    const imageHtml = '<img src="https://example.com/image.png" alt="image" class="emoji" />'
+          .replace(/"/g, '\'')
+    const thinkHtml = '<img src="https://example.com/think.png" alt="thinking" class="emoji" />'
+          .replace(/"/g, '\'')
+
+    it('correctly replaces shortcodes in supplied string', () => {
+      const result = addEmojis('This post has :image: emoji and :thinking: emoji', emojis)
+      expect(result).to.include(thinkHtml)
+      expect(result).to.include(imageHtml)
+    })
+
+    it('handles consecutive emojis correctly', () => {
+      const result = addEmojis('Lelel emoji spam :thinking::thinking::thinking::thinking:', emojis)
+      expect(result).to.include(thinkHtml + thinkHtml + thinkHtml + thinkHtml)
+    })
+
+    it('Doesn\'t replace nonexistent emojis', () => {
+      const result = addEmojis('Admin add the :tenshi: emoji', emojis)
+      expect(result).to.equal('Admin add the :tenshi: emoji')
+    })
+  })
 })