Merge branch 'develop' into 'mastoapi/public-tl'

# Conflicts: # src/services/api/api.service.js
2019-03-25 19:09:22 +00:00 · 2019-03-25 19:09:22 +00:00 · 3025532ecf
commit 3025532ecf
parent 8522063b2c 854d0e8051
86 changed files with 1499 additions and 751 deletions
--- a/src/App.js
+++ b/src/App.js
@ -8,6 +8,7 @@ import WhoToFollowPanel from './components/who_to_follow_panel/who_to_follow_pan
 import ChatPanel from './components/chat_panel/chat_panel.vue'
 import MediaModal from './components/media_modal/media_modal.vue'
 import SideDrawer from './components/side_drawer/side_drawer.vue'
+import MobilePostStatusModal from './components/mobile_post_status_modal/mobile_post_status_modal.vue'
 import { unseenNotificationsFromStore } from './services/notification_utils/notification_utils'

 export default {
@ -22,7 +23,8 @@ export default {
    WhoToFollowPanel,
    ChatPanel,
    MediaModal,
-    SideDrawer
+    SideDrawer,
+    MobilePostStatusModal
  },
  data: () => ({
    mobileActivePanel: 'timeline',
--- 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;
@ -671,6 +671,31 @@ nav {
  border-radius: var(--inputRadius, $fallback--inputRadius);
 }

+@keyframes modal-background-fadein {
+  from {
+    background-color: rgba(0, 0, 0, 0);
+  }
+  to {
+    background-color: rgba(0, 0, 0, 0.5);
+  }
+}
+
+.modal-view {
+  z-index: 1000;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  overflow: auto;
+  animation-duration: 0.2s;
+  background-color: rgba(0, 0, 0, 0.5);
+  animation-name: modal-background-fadein;
+}
+
 .button-icon {
  font-size: 1.2em;
 }
--- a/src/App.vue
+++ b/src/App.vue
@ -50,6 +50,7 @@
      <media-modal></media-modal>
    </div>
    <chat-panel :floating="true" v-if="currentUser && chat" class="floating-chat mobile-hidden"></chat-panel>
+    <MobilePostStatusModal />
  </div>
 </template>

--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@ -4,10 +4,11 @@ import routes from './routes'

 import App from '../App.vue'

-const afterStoreSetup = ({ store, i18n }) => {
-  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 })
@ -28,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

@ -80,6 +97,7 @@ const afterStoreSetup = ({ store, i18n }) => {
  copyInstanceOption('showInstanceSpecificPanel')
  copyInstanceOption('scopeOptionsEnabled')
  copyInstanceOption('formattingOptionsEnabled')
+  copyInstanceOption('hideMutedPosts')
  copyInstanceOption('collapseMessageWithSubject')
  copyInstanceOption('loginMethod')
  copyInstanceOption('scopeCopy')
@ -96,8 +114,136 @@ const afterStoreSetup = ({ store, i18n }) => {
  }

  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 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),
@ -110,73 +256,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/boot/routes.js
+++ b/src/boot/routes.js
@ -13,7 +13,6 @@ import FollowRequests from 'components/follow_requests/follow_requests.vue'
 import OAuthCallback from 'components/oauth_callback/oauth_callback.vue'
 import UserSearch from 'components/user_search/user_search.vue'
 import Notifications from 'components/notifications/notifications.vue'
-import UserPanel from 'components/user_panel/user_panel.vue'
 import LoginForm from 'components/login_form/login_form.vue'
 import ChatPanel from 'components/chat_panel/chat_panel.vue'
 import WhoToFollow from 'components/who_to_follow/who_to_follow.vue'
@ -43,7 +42,6 @@ export default (store) => {
    { name: 'friend-requests', path: '/friend-requests', component: FollowRequests },
    { name: 'user-settings', path: '/user-settings', component: UserSettings },
    { name: 'notifications', path: '/:username/notifications', component: Notifications },
-    { name: 'new-status', path: '/:username/new-status', component: UserPanel },
    { name: 'login', path: '/login', component: LoginForm },
    { name: 'chat', path: '/chat', component: ChatPanel, props: () => ({ floating: false }) },
    { name: 'oauth-callback', path: '/oauth-callback', component: OAuthCallback, props: (route) => ({ code: route.query.code }) },
--- 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/conversation-page/conversation-page.js
+++ b/src/components/conversation-page/conversation-page.js
@ -1,5 +1,4 @@
 import Conversation from '../conversation/conversation.vue'
-import { find } from 'lodash'

 const conversationPage = {
  components: {
@ -8,8 +7,8 @@ const conversationPage = {
  computed: {
    statusoid () {
      const id = this.$route.params.id
-      const statuses = this.$store.state.statuses.allStatuses
-      const status = find(statuses, {id})
+      const statuses = this.$store.state.statuses.allStatusesObject
+      const status = statuses[id]

      return status
    }
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@ -1,4 +1,5 @@
 import { reduce, filter } from 'lodash'
+import { set } from 'vue'
 import Status from '../status/status.vue'

 const sortById = (a, b) => {
@ -25,7 +26,8 @@ const sortAndFilterConversation = (conversation) => {
 const conversation = {
  data () {
    return {
-      highlight: null
+      highlight: null,
+      converationStatusIds: []
    }
  },
  props: [
@ -36,6 +38,15 @@ const conversation = {
    status () {
      return this.statusoid
    },
+    idsToShow () {
+      if (this.converationStatusIds.length > 0) {
+        return this.converationStatusIds
+      } else if (this.statusId) {
+        return [this.statusId]
+      } else {
+        return []
+      }
+    },
    statusId () {
      if (this.statusoid.retweeted_status) {
        return this.statusoid.retweeted_status.id
@ -48,9 +59,11 @@ const conversation = {
        return []
      }

-      const conversationId = this.status.statusnet_conversation_id
-      const statuses = this.$store.state.statuses.allStatuses
-      const conversation = filter(statuses, { statusnet_conversation_id: conversationId })
+      const statusesObject = this.$store.state.statuses.allStatusesObject
+      const conversation = this.idsToShow.reduce((acc, id) => {
+        acc.push(statusesObject[id])
+        return acc
+      }, [])
      return sortAndFilterConversation(conversation)
    },
    replies () {
@ -83,9 +96,15 @@ const conversation = {
  methods: {
    fetchConversation () {
      if (this.status) {
-        const conversationId = this.status.statusnet_conversation_id
-        this.$store.state.api.backendInteractor.fetchConversation({id: conversationId})
-          .then((statuses) => this.$store.dispatch('addNewStatuses', { statuses }))
+        this.$store.state.api.backendInteractor.fetchConversation({id: this.status.id})
+          .then(({ancestors, descendants}) => {
+            this.$store.dispatch('addNewStatuses', { statuses: ancestors })
+            this.$store.dispatch('addNewStatuses', { statuses: descendants })
+            set(this, 'converationStatusIds', [].concat(
+              ancestors.map(_ => _.id),
+              this.statusId,
+              descendants.map(_ => _.id)))
+          })
          .then(() => this.setHighlight(this.statusId))
      } else {
        const id = this.$route.params.id
--- 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/media_modal/media_modal.vue
+++ b/src/components/media_modal/media_modal.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="modal-view" v-if="showing" @click.prevent="hide">
+  <div class="modal-view media-modal-view" v-if="showing" @click.prevent="hide">
    <img class="modal-image" v-if="type === 'image'" :src="currentMedia.url"></img>
    <VideoAttachment
      class="modal-image"
@ -32,18 +32,7 @@
 <style lang="scss">
@import '../../_variables.scss';

-.modal-view {
-  z-index: 1000;
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background-color: rgba(0, 0, 0, 0.5);
-
+.media-modal-view {
  &:hover {
    .modal-view-button-arrow {
      opacity: 0.75;
--- a/src/components/media_upload/media_upload.js
+++ b/src/components/media_upload/media_upload.js
@ -20,7 +20,7 @@ const mediaUpload = {
        return
      }
      const formData = new FormData()
-      formData.append('media', file)
+      formData.append('file', file)

      self.$emit('uploading')
      self.uploading = true
--- a/src/components/mobile_post_status_modal/mobile_post_status_modal.js
+++ b/src/components/mobile_post_status_modal/mobile_post_status_modal.js
@ -0,0 +1,91 @@
+import PostStatusForm from '../post_status_form/post_status_form.vue'
+import { throttle } from 'lodash'
+
+const MobilePostStatusModal = {
+  components: {
+    PostStatusForm
+  },
+  data () {
+    return {
+      hidden: false,
+      postFormOpen: false,
+      scrollingDown: false,
+      inputActive: false,
+      oldScrollPos: 0,
+      amountScrolled: 0
+    }
+  },
+  created () {
+    window.addEventListener('scroll', this.handleScroll)
+    window.addEventListener('resize', this.handleOSK)
+  },
+  destroyed () {
+    window.removeEventListener('scroll', this.handleScroll)
+    window.removeEventListener('resize', this.handleOSK)
+  },
+  computed: {
+    currentUser () {
+      return this.$store.state.users.currentUser
+    },
+    isHidden () {
+      return this.hidden || this.inputActive
+    }
+  },
+  methods: {
+    openPostForm () {
+      this.postFormOpen = true
+      this.hidden = true
+
+      const el = this.$el.querySelector('textarea')
+      this.$nextTick(function () {
+        el.focus()
+      })
+    },
+    closePostForm () {
+      this.postFormOpen = false
+      this.hidden = false
+    },
+    handleOSK () {
+      // This is a big hack: we're guessing from changed window sizes if the
+      // on-screen keyboard is active or not. This is only really important
+      // for phones in portrait mode and it's more important to show the button
+      // in normal scenarios on all phones, than it is to hide it when the
+      // keyboard is active.
+      // Guesswork based on https://www.mydevice.io/#compare-devices
+
+      // for example, iphone 4 and android phones from the same time period
+      const smallPhone = window.innerWidth < 350
+      const smallPhoneKbOpen = smallPhone && window.innerHeight < 345
+
+      const biggerPhone = !smallPhone && window.innerWidth < 450
+      const biggerPhoneKbOpen = biggerPhone && window.innerHeight < 560
+      if (smallPhoneKbOpen || biggerPhoneKbOpen) {
+        this.inputActive = true
+      } else {
+        this.inputActive = false
+      }
+    },
+    handleScroll: throttle(function () {
+      const scrollAmount = window.scrollY - this.oldScrollPos
+      const scrollingDown = scrollAmount > 0
+
+      if (scrollingDown !== this.scrollingDown) {
+        this.amountScrolled = 0
+        this.scrollingDown = scrollingDown
+        if (!scrollingDown) {
+          this.hidden = false
+        }
+      } else if (scrollingDown) {
+        this.amountScrolled += scrollAmount
+        if (this.amountScrolled > 100 && !this.hidden) {
+          this.hidden = true
+        }
+      }
+
+      this.oldScrollPos = window.scrollY
+      this.scrollingDown = scrollingDown
+    }, 100)
+  }
+}
+
+export default MobilePostStatusModal
--- a/src/components/mobile_post_status_modal/mobile_post_status_modal.vue
+++ b/src/components/mobile_post_status_modal/mobile_post_status_modal.vue
@ -0,0 +1,76 @@
+<template>
+<div v-if="currentUser">
+  <div
+    class="post-form-modal-view modal-view"
+    v-show="postFormOpen"
+    @click="closePostForm"
+  >
+    <div class="post-form-modal-panel panel" @click.stop="">
+      <div class="panel-heading">{{$t('post_status.new_status')}}</div>
+      <PostStatusForm class="panel-body" @posted="closePostForm"/>
+    </div>
+  </div>
+  <button
+    class="new-status-button"
+    :class="{ 'hidden': isHidden }"
+    @click="openPostForm"
+  >
+    <i class="icon-edit" />
+  </button>
+</div>
+</template>
+
+<script src="./mobile_post_status_modal.js"></script>
+
+<style lang="scss">
+@import '../../_variables.scss';
+
+.post-form-modal-view {
+  max-height: 100%;
+  display: block;
+}
+
+.post-form-modal-panel {
+  flex-shrink: 0;
+  margin: 25% 0 4em 0;
+  width: 100%;
+}
+
+.new-status-button {
+  width: 5em;
+  height: 5em;
+  border-radius: 100%;
+  position: fixed;
+  bottom: 1.5em;
+  right: 1.5em;
+  // TODO: this needs its own color, it has to stand out enough and link color
+  // is not very optimal for this particular use.
+  background-color: $fallback--fg;
+  background-color: var(--btn, $fallback--fg);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3), 0px 4px 6px rgba(0, 0, 0, 0.3);
+  z-index: 10;
+
+  transition: 0.35s transform;
+  transition-timing-function: cubic-bezier(0, 1, 0.5, 1);
+
+  &.hidden {
+    transform: translateY(150%);
+  }
+
+  i {
+    font-size: 1.5em;
+    color: $fallback--text;
+    color: var(--text, $fallback--text);
+  }
+}
+
+@media all and (min-width: 801px) {
+  .new-status-button {
+    display: none;
+  }
+}
+
+</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/mute_card/mute_card.vue
+++ b/src/components/mute_card/mute_card.vue
@ -1,6 +1,6 @@
 <template>
  <basic-user-card :user="user">
-    <template slot="secondary-area">
+    <div class="mute-card-content-container">
      <button class="btn btn-default" @click="unmuteUser" :disabled="progress" v-if="muted">
        <template v-if="progress">
          {{ $t('user_card.unmute_progress') }}
@ -17,8 +17,18 @@
          {{ $t('user_card.mute') }}
        </template>
      </button>
-    </template>
+    </div>
  </basic-user-card>
 </template>

 <script src="./mute_card.js"></script>
+
+<style lang="scss">
+.mute-card-content-container {
+  margin-top: 0.5em;
+  text-align: right;
+  button {
+    width: 10em;
+  }
+}
+</style>
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@ -222,6 +222,9 @@ const PostStatusForm = {
        this.highlighted = 0
      }
    },
+    onKeydown (e) {
+      e.stopPropagation()
+    },
    setCaret ({target: {selectionStart}}) {
      this.caret = selectionStart
    },
@ -293,6 +296,8 @@ const PostStatusForm = {
    },
    paste (e) {
      if (e.clipboardData.files.length > 0) {
+        // prevent pasting of file as text
+        e.preventDefault()
        // Strangely, files property gets emptied after event propagation
        // Trying to wrap it in array doesn't work. Plus I doubt it's possible
        // to hold more than one file in clipboard.
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@ -20,6 +20,7 @@
        ref="textarea"
        @click="setCaret"
        @keyup="setCaret" v-model="newStatus.status" :placeholder="$t('post_status.default')" rows="1" class="form-control"
+        @keydown="onKeydown"
        @keydown.down="cycleForward"
        @keydown.up="cycleBackward"
        @keydown.shift.tab="cycleBackward"
@ -83,10 +84,10 @@
        <div class="media-upload-wrapper" v-for="file in newStatus.files">
          <i class="fa button-icon icon-cancel" @click="removeMediaFile(file)"></i>
          <div class="media-upload-container attachment">
-            <img class="thumbnail media-upload" :src="file.image" v-if="type(file) === 'image'"></img>
-            <video v-if="type(file) === 'video'" :src="file.image" controls></video>
-            <audio v-if="type(file) === 'audio'" :src="file.image" controls></audio>
-            <a v-if="type(file) === 'unknown'" :href="file.image">{{file.url}}</a>
+            <img class="thumbnail media-upload" :src="file.url" v-if="type(file) === 'image'"></img>
+            <video v-if="type(file) === 'video'" :src="file.url" controls></video>
+            <audio v-if="type(file) === 'audio'" :src="file.url" controls></audio>
+            <a v-if="type(file) === 'unknown'" :href="file.url">{{file.url}}</a>
          </div>
        </div>
      </div>
@ -286,8 +287,6 @@
    img {
      width: 24px;
      height: 24px;
-      border-radius: $fallback--avatarRadius;
-      border-radius: var(--avatarRadius, $fallback--avatarRadius);
      object-fit: contain;
    }

--- 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 () {
@ -42,6 +47,11 @@ const settings = {
      pauseOnUnfocusedLocal: user.pauseOnUnfocused,
      hoverPreviewLocal: user.hoverPreview,

+      hideMutedPostsLocal: typeof user.hideMutedPosts === 'undefined'
+        ? instance.hideMutedPosts
+        : user.hideMutedPosts,
+      hideMutedPostsDefault: this.$t('settings.values.' + instance.hideMutedPosts),
+
      collapseMessageWithSubjectLocal: typeof user.collapseMessageWithSubject === 'undefined'
        ? instance.collapseMessageWithSubject
        : user.collapseMessageWithSubject,
@ -78,7 +88,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 +109,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) {
@ -163,6 +182,9 @@ const settings = {
      value = filter(value.split('\n'), (word) => trim(word).length > 0)
      this.$store.dispatch('setOption', { name: 'muteWords', value })
    },
+    hideMutedPostsLocal (value) {
+      this.$store.dispatch('setOption', { name: 'hideMutedPosts', value })
+    },
    collapseMessageWithSubjectLocal (value) {
      this.$store.dispatch('setOption', { name: 'collapseMessageWithSubject', value })
    },
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@ -36,6 +36,10 @@
        <div class="setting-item">
          <h2>{{$t('nav.timeline')}}</h2>
          <ul class="setting-list">
+            <li>
+              <input type="checkbox" id="hideMutedPosts" v-model="hideMutedPostsLocal">
+              <label for="hideMutedPosts">{{$t('settings.hide_muted_posts')}} {{$t('settings.instance_default', { value: hideMutedPostsDefault })}}</label>
+            </li>
            <li>
              <input type="checkbox" id="collapseMessageWithSubject" v-model="collapseMessageWithSubjectLocal">
              <label for="collapseMessageWithSubject">
@ -261,6 +265,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/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@ -15,12 +15,7 @@
        </div>
      </div>
      <ul>
-        <li v-if="currentUser" @click="toggleDrawer">
-          <router-link :to="{ name: 'new-status', params: { username: currentUser.screen_name } }">
-            {{ $t("post_status.new_status") }}
-          </router-link>
-        </li>
-        <li v-else @click="toggleDrawer">
+        <li v-if="!currentUser" @click="toggleDrawer">
          <router-link :to="{ name: 'login' }">
            {{ $t("login.login") }}
          </router-link>
@ -119,14 +114,14 @@
 }

 .side-drawer-container-open {
-  transition-delay: 0.0s;
-  transition-property: left;
+  transition: 0.35s;
+  transition-property: background-color;
+  background-color: rgba(0, 0, 0, 0.5);
 }

 .side-drawer-container-closed {
  left: -100%;
-  transition-delay: 0.5s;
-  transition-property: left;
+  background-color: rgba(0, 0, 0, 0);
 }

 .side-drawer-click-outside {
--- 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 () {
@ -116,24 +121,16 @@ export default {
      })
    },
    blockUser () {
-      const store = this.$store
-      store.state.api.backendInteractor.blockUser(this.user.id)
-        .then((blockedUser) => {
-          store.commit('addNewUsers', [blockedUser])
-          store.commit('removeStatus', { timeline: 'friends', userId: this.user.id })
-          store.commit('removeStatus', { timeline: 'public', userId: this.user.id })
-          store.commit('removeStatus', { timeline: 'publicAndExternal', userId: this.user.id })
-        })
+      this.$store.dispatch('blockUser', this.user.id)
    },
    unblockUser () {
-      const store = this.$store
-      store.state.api.backendInteractor.unblockUser(this.user.id)
-        .then((unblockedUser) => store.commit('addNewUsers', [unblockedUser]))
+      this.$store.dispatch('unblockUser', this.user.id)
    },
-    toggleMute () {
-      const store = this.$store
-      store.commit('setMuted', {user: this.user, muted: !this.user.muted})
-      store.state.api.backendInteractor.setUserMute(this.user)
+    muteUser () {
+      this.$store.dispatch('muteUser', this.user.id)
+    },
+    unmuteUser () {
+      this.$store.dispatch('unmuteUser', this.user.id)
    },
    setProfileView (v) {
      if (this.switcher) {
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@ -11,7 +11,7 @@
            <div :title="user.name" class='user-name' v-if="user.name_html" v-html="user.name_html"></div>
            <div :title="user.name" class='user-name' v-else>{{user.name}}</div>
            <router-link :to="{ name: 'user-settings' }" v-if="!isOtherUser">
-              <i class="button-icon icon-cog usersettings" :title="$t('tool_tip.user_settings')"></i>
+              <i class="button-icon icon-pencil usersettings" :title="$t('tool_tip.user_settings')"></i>
            </router-link>
            <a :href="user.statusnet_profile_url" target="_blank" v-if="isOtherUser && !user.is_local">
              <i class="icon-link-ext usersettings"></i>
@ -74,24 +74,18 @@
        </div>
        <div class='mute' v-if='isOtherUser && loggedIn'>
          <span v-if='user.muted'>
-            <button @click="toggleMute" class="pressed">
+            <button @click="unmuteUser" class="pressed">
              {{ $t('user_card.muted') }}
            </button>
          </span>
          <span v-if='!user.muted'>
-            <button @click="toggleMute">
+            <button @click="muteUser">
              {{ $t('user_card.mute') }}
            </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'>
@ -159,6 +153,18 @@

  &-bio {
    text-align: center;
+
+    img {
+      object-fit: contain;
+      vertical-align: middle;
+      max-width: 100%;
+      max-height: 400px;
+
+      .emoji {
+        width: 32px;
+        height: 32px;
+      }
+    }
  }

  // Modifiers
@ -363,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/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@ -192,6 +192,12 @@
            <template slot="empty">{{$t('settings.no_blocks')}}</template>
          </block-list>
        </div>
+
+        <div :label="$t('settings.mutes_tab')">
+          <mute-list :refresh="true">
+            <template slot="empty">{{$t('settings.no_mutes')}}</template>
+          </mute-list>
+        </div>
      </tab-switcher>
    </div>
  </div>
--- 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,9 @@
    "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"
    },
    "content_warning": "Předmět (volitelný)",
    "default": "Právě jsem přistál v L.A.",
@ -95,7 +97,7 @@
    "new_captcha": "Kliknutím na obrázek získáte novou CAPTCHA",
    "username_placeholder": "např. lain",
    "fullname_placeholder": "např. Lain Iwakura",
-    "bio_placeholder": "např.\nNazdar, jsem Lain\nJsem anime dívka a žiji v příměstském Japonsku. Možná mě znáte z Wired.",
+    "bio_placeholder": "např.\nNazdar, jsem Lain\nJsem anime dívka žijící v příměstském Japonsku. Možná mě znáte z Wired.",
    "validations": {
      "username_required": "nemůže být prázdné",
      "fullname_required": "nemůže být prázdné",
@ -204,7 +206,7 @@
    "radii_help": "Nastavit zakulacení rohů rozhraní (v pixelech)",
    "replies_in_timeline": "Odpovědi v časové ose",
    "reply_link_preview": "Povolit náhledy odkazu pro odpověď při přejetí myši",
-    "reply_visibility_all": "Zobrazit všechny odpovědiShow all replies",
+    "reply_visibility_all": "Zobrazit všechny odpovědi",
    "reply_visibility_following": "Zobrazit pouze odpovědi směřované na mě nebo uživatele, které sleduji",
    "reply_visibility_self": "Zobrazit pouze odpovědi směřované na mě",
    "saving_err": "Chyba při ukládání nastavení",
@ -221,7 +223,6 @@
    "subject_line_mastodon": "Jako u Mastodonu: zkopírovat tak, jak je",
    "subject_line_noop": "Nekopírovat",
    "post_status_content_type": "Publikovat typ obsahu příspěvku",
-    "status_content_type_plain": "Prostý text",
    "stop_gifs": "Přehrávat GIFy při přejetí myši",
    "streaming": "Povolit automatické streamování nových příspěvků při rolování nahoru",
    "text": "Text",
@ -339,7 +340,7 @@
        "button": "Tlačítko",
        "text": "Spousta dalšího {0} a {1}",
        "mono": "obsahu",
-        "input": "Just landed in L.A.",
+        "input": "Právě jsem přistál v L.A.",
        "faint_link": "pomocný manuál",
        "fine_print": "Přečtěte si náš {0} a nenaučte se nic užitečného!",
        "header_faint": "Tohle je v pohodě",
@ -361,7 +362,7 @@
    "no_statuses": "Žádné příspěvky"
  },
  "status": {
-    "reply_to": "Odpovědět uživateli",
+    "reply_to": "Odpověď uživateli",
    "replies_list": "Odpovědi:"
  },

@ -413,7 +414,7 @@
  "upload":{
    "error": {
      "base": "Nahrávání selhalo.",
-      "file_too_big": "Soubor je úříliš velký [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+      "file_too_big": "Soubor je příliš velký [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
      "default": "Zkuste to znovu později"
    },
    "file_size_units": {
--- 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": {
@ -152,6 +153,7 @@
    "general": "General",
    "hide_attachments_in_convo": "Hide attachments in conversations",
    "hide_attachments_in_tl": "Hide attachments in timeline",
+    "hide_muted_posts": "Hide posts of muted users",
    "max_thumbnails": "Maximum amount of thumbnails per post",
    "hide_isp": "Hide instance-specific panel",
    "preload_images": "Preload images",
@ -347,6 +349,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,15 +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)
        }
--- 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/chat.js
+++ b/src/modules/chat.js
@ -1,12 +1,16 @@
 const chat = {
  state: {
    messages: [],
-    channel: {state: ''}
+    channel: {state: ''},
+    socket: null
  },
  mutations: {
    setChannel (state, channel) {
      state.channel = channel
    },
+    setSocket (state, socket) {
+      state.socket = socket
+    },
    addMessage (state, message) {
      state.messages.push(message)
      state.messages = state.messages.slice(-19, 20)
@ -16,8 +20,12 @@ const chat = {
    }
  },
  actions: {
+    disconnectFromChat (store) {
+      store.state.socket.disconnect()
+    },
    initializeChat (store, socket) {
      const channel = socket.channel('chat:public')
+      store.commit('setSocket', socket)
      channel.on('new_msg', (msg) => {
        store.commit('addMessage', msg)
      })
--- a/src/modules/config.js
+++ b/src/modules/config.js
@ -5,6 +5,7 @@ const browserLocale = (window.navigator.language || 'en').split('-')[0]

 const defaultState = {
  colors: {},
+  hideMutedPosts: undefined, // instance default
  collapseMessageWithSubject: undefined, // instance default
  hideAttachments: false,
  hideAttachmentsInConv: false,
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@ -18,6 +18,7 @@ const defaultState = {
  scopeOptionsEnabled: true,
  formattingOptionsEnabled: false,
  alwaysShowSubjectInput: true,
+  hideMutedPosts: false,
  collapseMessageWithSubject: false,
  hidePostStats: false,
  hideUserStats: false,
@ -48,7 +49,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,5 @@
-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 { set } from 'vue'
 import apiService from '../services/api/api.service.js'
 // import parse from '../services/status_parser/status_parser.js'

@ -72,7 +73,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}
@ -80,7 +83,7 @@ const mergeOrAdd = (arr, obj, item) => {
    // This is a new item, prepare it
    prepareStatus(item)
    arr.push(item)
-    obj[item.id] = item
+    set(obj, item.id, item)
    return {item, new: true}
  }
 }
@ -333,6 +336,7 @@ export const mutations = {
    oldTimeline.newStatusCount = 0
    oldTimeline.visibleStatuses = slice(oldTimeline.statuses, 0, 50)
    oldTimeline.minVisibleId = last(oldTimeline.visibleStatuses).id
+    oldTimeline.minId = oldTimeline.minVisibleId
    oldTimeline.visibleStatusesObject = {}
    each(oldTimeline.visibleStatuses, (status) => { oldTimeline.visibleStatusesObject[status.id] = status })
  },
--- a/src/modules/users.js
+++ b/src/modules/users.js
@ -16,9 +16,9 @@ export const mergeOrAdd = (arr, obj, item) => {
  } else {
    // This is a new item, prepare it
    arr.push(item)
-    obj[item.id] = item
+    set(obj, item.id, item)
    if (item.screen_name && !item.screen_name.includes('@')) {
-      obj[item.screen_name] = item
+      set(obj, item.screen_name.toLowerCase(), item)
    }
    return { item, new: true }
  }
@ -91,10 +91,31 @@ export const mutations = {
  addNewUsers (state, users) {
    each(users, (user) => mergeOrAdd(state.users, state.usersObject, user))
  },
-  saveBlocks (state, blockIds) {
+  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
+      }
+    })
+  },
+  updateBlocks (state, blockedUsers) {
+    // Reset statusnet_blocking of all fetched users
+    each(state.users, (user) => { user.statusnet_blocking = false })
+    each(blockedUsers, (user) => mergeOrAdd(state.users, state.usersObject, user))
+  },
+  saveBlockIds (state, blockIds) {
    state.currentUser.blockIds = blockIds
  },
-  saveMutes (state, muteIds) {
+  updateMutes (state, mutedUsers) {
+    // Reset muted of all fetched users
+    each(state.users, (user) => { user.muted = false })
+    each(mutedUsers, (user) => mergeOrAdd(state.users, state.usersObject, user))
+  },
+  saveMuteIds (state, muteIds) {
    state.currentUser.muteIds = muteIds
  },
  setUserForStatus (state, status) {
@ -122,12 +143,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,39 +170,51 @@ 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()
        .then((blocks) => {
-          store.commit('saveBlocks', map(blocks, 'id'))
-          store.commit('addNewUsers', blocks)
+          store.commit('saveBlockIds', map(blocks, 'id'))
+          store.commit('updateBlocks', blocks)
          return blocks
        })
    },
-    blockUser (store, id) {
-      return store.rootState.api.backendInteractor.blockUser(id)
-        .then((user) => store.commit('addNewUsers', [user]))
+    blockUser (store, userId) {
+      return store.rootState.api.backendInteractor.blockUser(userId)
+        .then((relationship) => {
+          store.commit('updateUserRelationship', [relationship])
+          store.commit('removeStatus', { timeline: 'friends', userId })
+          store.commit('removeStatus', { timeline: 'public', userId })
+          store.commit('removeStatus', { timeline: 'publicAndExternal', userId })
+        })
    },
    unblockUser (store, id) {
      return store.rootState.api.backendInteractor.unblockUser(id)
-        .then((user) => store.commit('addNewUsers', [user]))
+        .then((relationship) => store.commit('updateUserRelationship', [relationship]))
    },
    fetchMutes (store) {
      return store.rootState.api.backendInteractor.fetchMutes()
-        .then((mutedUsers) => {
-          each(mutedUsers, (user) => { user.muted = true })
-          store.commit('addNewUsers', mutedUsers)
-          store.commit('saveMutes', map(mutedUsers, 'id'))
+        .then((mutes) => {
+          store.commit('updateMutes', mutes)
+          store.commit('saveMuteIds', map(mutes, 'id'))
+          return mutes
        })
    },
    muteUser (store, id) {
-      return store.state.api.backendInteractor.setUserMute({ id, muted: true })
-        .then((user) => store.commit('addNewUsers', [user]))
+      return store.rootState.api.backendInteractor.muteUser(id)
+        .then((relationship) => store.commit('updateUserRelationship', [relationship]))
    },
    unmuteUser (store, id) {
-      return store.state.api.backendInteractor.setUserMute({ id, muted: false })
-        .then((user) => store.commit('addNewUsers', [user]))
+      return store.rootState.api.backendInteractor.unmuteUser(id)
+        .then((relationship) => store.commit('updateUserRelationship', [relationship]))
    },
    addFriends ({ rootState, commit }, fetchBy) {
      return new Promise((resolve, reject) => {
@ -292,6 +327,7 @@ const users = {

    logout (store) {
      store.commit('clearCurrentUser')
+      store.dispatch('disconnectFromChat')
      store.commit('setToken', false)
      store.dispatch('stopFetching', 'friends')
      store.commit('setBackendInteractor', backendInteractorService())
@ -321,6 +357,9 @@ const users = {

              if (user.token) {
                store.dispatch('setWsToken', user.token)
+
+                // Initialize the chat socket.
+                store.dispatch('initializeSocket')
              }

              // Start getting fresh posts.
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@ -7,31 +7,21 @@ const FAVORITE_URL = '/api/favorites/create'
 const UNFAVORITE_URL = '/api/favorites/destroy'
 const RETWEET_URL = '/api/statuses/retweet'
 const UNRETWEET_URL = '/api/statuses/unretweet'
-const STATUS_UPDATE_URL = '/api/statuses/update.json'
 const STATUS_DELETE_URL = '/api/statuses/destroy'
-const STATUS_URL = '/api/statuses/show'
-const MEDIA_UPLOAD_URL = '/api/statusnet/media/upload'
-const CONVERSATION_URL = '/api/statusnet/conversation'
 const MENTIONS_URL = '/api/statuses/mentions.json'
 const DM_TIMELINE_URL = '/api/statuses/dm_timeline.json'
 const FOLLOWERS_URL = '/api/statuses/followers.json'
 const FRIENDS_URL = '/api/statuses/friends.json'
-const BLOCKS_URL = '/api/statuses/blocks.json'
 const FOLLOWING_URL = '/api/friendships/create.json'
 const UNFOLLOWING_URL = '/api/friendships/destroy.json'
-const QVITTER_USER_PREF_URL = '/api/qvitter/set_profile_pref.json'
 const REGISTRATION_URL = '/api/account/register.json'
 const AVATAR_UPDATE_URL = '/api/qvitter/update_avatar.json'
 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'
@ -42,9 +32,22 @@ const SUGGESTIONS_URL = '/api/v1/suggestions'

 const MASTODON_USER_FAVORITES_TIMELINE_URL = '/api/v1/favourites'
 const MASTODON_PUBLIC_TIMELINE = '/api/v1/timelines/public'
+const MASTODON_STATUS_URL = id => `/api/v1/statuses/${id}`
+const MASTODON_STATUS_CONTEXT_URL = id => `/api/v1/statuses/${id}/context`
+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`
+const MASTODON_USER_BLOCKS_URL = '/api/v1/blocks/'
+const MASTODON_USER_MUTES_URL = '/api/v1/mutes/'
+const MASTODON_BLOCK_USER_URL = id => `/api/v1/accounts/${id}/block`
+const MASTODON_UNBLOCK_USER_URL = id => `/api/v1/accounts/${id}/unblock`
+const MASTODON_MUTE_USER_URL = id => `/api/v1/accounts/${id}/mute`
+const MASTODON_UNMUTE_USER_URL = id => `/api/v1/accounts/${id}/unmute`
+const MASTODON_POST_STATUS_URL = '/api/v1/statuses'
+const MASTODON_MEDIA_UPLOAD_URL = '/api/v1/media'

 import { each, map } from 'lodash'
-import { parseStatus, parseUser, parseNotification } from '../entity_normalizer/entity_normalizer.service.js'
+import { parseStatus, parseUser, parseNotification, parseAttachment } from '../entity_normalizer/entity_normalizer.service.js'
 import 'whatwg-fetch'
 import { StatusCodeError } from '../errors/errors'

@ -58,6 +61,19 @@ let fetch = (url, options) => {
  return oldfetch(fullUrl, options)
 }

+const promisedRequest = (url, options) => {
+  return fetch(url, options)
+    .then((response) => {
+      return new Promise((resolve, reject) => response.json()
+        .then((json) => {
+          if (!response.ok) {
+            return reject(new StatusCodeError(response.status, json, { url, options }, response))
+          }
+          return resolve(json)
+        }))
+    })
+}
+
 // Params
 // cropH
 // cropW
@ -210,16 +226,14 @@ const unfollowUser = ({id, credentials}) => {
 }

 const blockUser = ({id, credentials}) => {
-  let url = `${BLOCKING_URL}?user_id=${id}`
-  return fetch(url, {
+  return fetch(MASTODON_BLOCK_USER_URL(id), {
    headers: authHeaders(credentials),
    method: 'POST'
  }).then((data) => data.json())
 }

 const unblockUser = ({id, credentials}) => {
-  let url = `${UNBLOCKING_URL}?user_id=${id}`
-  return fetch(url, {
+  return fetch(MASTODON_UNBLOCK_USER_URL(id), {
    headers: authHeaders(credentials),
    method: 'POST'
  }).then((data) => data.json())
@ -242,7 +256,13 @@ const denyUser = ({id, credentials}) => {
 }

 const fetchUser = ({id, credentials}) => {
-  let url = `${USER_URL}?user_id=${id}`
+  let url = `${MASTODON_USER_URL}/${id}`
+  return promisedRequest(url, { headers: authHeaders(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()
@ -253,7 +273,6 @@ const fetchUser = ({id, credentials}) => {
          return resolve(json)
        }))
    })
-    .then((data) => parseUser(data))
 }

 const fetchFriends = ({id, page, credentials}) => {
@ -297,8 +316,8 @@ const fetchFollowRequests = ({credentials}) => {
 }

 const fetchConversation = ({id, credentials}) => {
-  let url = `${CONVERSATION_URL}/${id}.json?count=100`
-  return fetch(url, { headers: authHeaders(credentials) })
+  let urlContext = MASTODON_STATUS_CONTEXT_URL(id)
+  return fetch(urlContext, { headers: authHeaders(credentials) })
    .then((data) => {
      if (data.ok) {
        return data
@ -306,11 +325,14 @@ const fetchConversation = ({id, credentials}) => {
      throw new Error('Error fetching timeline', data)
    })
    .then((data) => data.json())
-    .then((data) => data.map(parseStatus))
+    .then(({ancestors, descendants}) => ({
+      ancestors: ancestors.map(parseStatus),
+      descendants: descendants.map(parseStatus)
+    }))
 }

 const fetchStatus = ({id, credentials}) => {
-  let url = `${STATUS_URL}/${id}.json`
+  let url = MASTODON_STATUS_URL(id)
  return fetch(url, { headers: authHeaders(credentials) })
    .then((data) => {
      if (data.ok) {
@ -322,23 +344,7 @@ const fetchStatus = ({id, credentials}) => {
    .then((data) => parseStatus(data))
 }

-const setUserMute = ({id, credentials, muted = true}) => {
-  const form = new FormData()
-
-  const muteInteger = muted ? 1 : 0
-
-  form.append('namespace', 'qvitter')
-  form.append('data', muteInteger)
-  form.append('topic', `mute:${id}`)
-
-  return fetch(QVITTER_USER_PREF_URL, {
-    method: 'POST',
-    headers: authHeaders(credentials),
-    body: form
-  })
-}
-
-const fetchTimeline = ({timeline, credentials, since = false, until = false, userId = false, tag = false}) => {
+const fetchTimeline = ({timeline, credentials, since = false, until = false, userId = false, tag = false, withMuted = false}) => {
  const timelineUrls = {
    public: MASTODON_PUBLIC_TIMELINE,
    friends: FRIENDS_TIMELINE_URL,
@ -346,8 +352,8 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
    dms: DM_TIMELINE_URL,
    notifications: QVITTER_USER_NOTIFICATIONS_URL,
    'publicAndExternal': MASTODON_PUBLIC_TIMELINE,
-    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
  }
@ -356,15 +362,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`
  }
@ -379,6 +386,7 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
  }

  params.push(['count', 20])
+  params.push(['with_muted', withMuted])

  const queryString = map(params, (param) => `${param[0]}=${param[1]}`).join('&')
  url += `?${queryString}`
@ -439,23 +447,23 @@ const unretweet = ({ id, credentials }) => {
  })
 }

-const postStatus = ({credentials, status, spoilerText, visibility, sensitive, mediaIds, inReplyToStatusId, contentType, noAttachmentLinks}) => {
-  const idsText = mediaIds.join(',')
+const postStatus = ({credentials, status, spoilerText, visibility, sensitive, mediaIds = [], inReplyToStatusId, contentType}) => {
  const form = new FormData()

  form.append('status', status)
  form.append('source', 'Pleroma FE')
-  if (noAttachmentLinks) form.append('no_attachment_links', noAttachmentLinks)
  if (spoilerText) form.append('spoiler_text', spoilerText)
  if (visibility) form.append('visibility', visibility)
  if (sensitive) form.append('sensitive', sensitive)
  if (contentType) form.append('content_type', contentType)
-  form.append('media_ids', idsText)
+  mediaIds.forEach(val => {
+    form.append('media_ids[]', val)
+  })
  if (inReplyToStatusId) {
-    form.append('in_reply_to_status_id', inReplyToStatusId)
+    form.append('in_reply_to_id', inReplyToStatusId)
  }

-  return fetch(STATUS_UPDATE_URL, {
+  return fetch(MASTODON_POST_STATUS_URL, {
    body: form,
    method: 'POST',
    headers: authHeaders(credentials)
@ -480,13 +488,13 @@ const deleteStatus = ({ id, credentials }) => {
 }

 const uploadMedia = ({formData, credentials}) => {
-  return fetch(MEDIA_UPLOAD_URL, {
+  return fetch(MASTODON_MEDIA_UPLOAD_URL, {
    body: formData,
    method: 'POST',
    headers: authHeaders(credentials)
  })
-    .then((response) => response.text())
-    .then((text) => (new DOMParser()).parseFromString(text, 'application/xml'))
+    .then((data) => data.json())
+    .then((data) => parseAttachment(data))
 }

 const followImport = ({params, credentials}) => {
@ -527,30 +535,40 @@ const changePassword = ({credentials, password, newPassword, newPasswordConfirma
 }

 const fetchMutes = ({credentials}) => {
-  const url = '/api/qvitter/mutes.json'
-
-  return fetch(url, {
-    headers: authHeaders(credentials)
-  }).then((data) => data.json())
+  return promisedRequest(MASTODON_USER_MUTES_URL, { headers: authHeaders(credentials) })
+    .then((users) => users.map(parseUser))
 }

-const fetchBlocks = ({page, credentials}) => {
-  return fetch(BLOCKS_URL, {
-    headers: authHeaders(credentials)
-  }).then((data) => {
-    if (data.ok) {
-      return data.json()
-    }
-    throw new Error('Error fetching blocks', data)
+const muteUser = ({id, credentials}) => {
+  return promisedRequest(MASTODON_MUTE_USER_URL(id), {
+    headers: authHeaders(credentials),
+    method: 'POST'
  })
 }

+const unmuteUser = ({id, credentials}) => {
+  return promisedRequest(MASTODON_UNMUTE_USER_URL(id), {
+    headers: authHeaders(credentials),
+    method: 'POST'
+  })
+}
+
+const fetchBlocks = ({credentials}) => {
+  return promisedRequest(MASTODON_USER_BLOCKS_URL, { headers: authHeaders(credentials) })
+    .then((users) => users.map(parseUser))
+}
+
 const fetchOAuthTokens = ({credentials}) => {
  const url = '/api/oauth_tokens.json'

  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}) => {
@ -593,6 +611,7 @@ const apiService = {
  blockUser,
  unblockUser,
  fetchUser,
+  fetchUserRelationship,
  favorite,
  unfavorite,
  retweet,
@ -601,8 +620,9 @@ const apiService = {
  deleteStatus,
  uploadMedia,
  fetchAllFollowing,
-  setUserMute,
  fetchMutes,
+  muteUser,
+  unmuteUser,
  fetchBlocks,
  fetchOAuthTokens,
  revokeOAuthToken,
--- 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})
  }
@ -58,12 +62,10 @@ const backendInteractorService = (credentials) => {
    return timelineFetcherService.startFetching({timeline, store, credentials, userId, tag})
  }

-  const setUserMute = ({id, muted = true}) => {
-    return apiService.setUserMute({id, muted, credentials})
-  }
-
  const fetchMutes = () => apiService.fetchMutes({credentials})
-  const fetchBlocks = (params) => apiService.fetchBlocks({credentials, ...params})
+  const muteUser = (id) => apiService.muteUser({credentials, id})
+  const unmuteUser = (id) => apiService.unmuteUser({credentials, id})
+  const fetchBlocks = () => apiService.fetchBlocks({credentials})
  const fetchFollowRequests = () => apiService.fetchFollowRequests({credentials})
  const fetchOAuthTokens = () => apiService.fetchOAuthTokens({credentials})
  const revokeOAuthToken = (id) => apiService.revokeOAuthToken({id, credentials})
@ -92,11 +94,13 @@ const backendInteractorService = (credentials) => {
    blockUser,
    unblockUser,
    fetchUser,
+    fetchUserRelationship,
    fetchAllFollowing,
    verifyCredentials: apiService.verifyCredentials,
    startFetching,
-    setUserMute,
    fetchMutes,
+    muteUser,
+    unmuteUser,
    fetchBlocks,
    fetchOAuthTokens,
    revokeOAuthToken,
--- 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

@ -124,17 +128,18 @@ export const parseUser = (data) => {
  return output
 }

-const parseAttachment = (data) => {
+export const parseAttachment = (data) => {
  const output = {}
  const masto = !data.hasOwnProperty('oembed')

  if (masto) {
    // Not exactly same...
-    output.mimetype = data.type
+    output.mimetype = data.pleroma ? data.pleroma.mime_type : data.type
    output.meta = data.meta // not present in BE yet
+    output.id = data.id
  } else {
    output.mimetype = data.mimetype
-    output.meta = null // missing
+    // output.meta = ??? missing
  }

  output.url = data.url
@ -142,6 +147,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 +170,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 +179,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 +189,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 +271,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 +294,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/status_poster/status_poster.service.js
+++ b/src/services/status_poster/status_poster.service.js
@ -4,7 +4,7 @@ import apiService from '../api/api.service.js'
 const postStatus = ({ store, status, spoilerText, visibility, sensitive, media = [], inReplyToStatusId = undefined, contentType = 'text/plain' }) => {
  const mediaIds = map(media, 'id')

-  return apiService.postStatus({credentials: store.state.users.currentUser.credentials, status, spoilerText, visibility, sensitive, mediaIds, inReplyToStatusId, contentType, noAttachmentLinks: store.state.instance.noAttachmentLinks})
+  return apiService.postStatus({credentials: store.state.users.currentUser.credentials, status, spoilerText, visibility, sensitive, mediaIds, inReplyToStatusId, contentType})
    .then((data) => {
      if (!data.error) {
        store.dispatch('addNewStatuses', {
@ -26,25 +26,7 @@ const postStatus = ({ store, status, spoilerText, visibility, sensitive, media =
 const uploadMedia = ({ store, formData }) => {
  const credentials = store.state.users.currentUser.credentials

-  return apiService.uploadMedia({ credentials, formData }).then((xml) => {
-    // Firefox and Chrome treat method differently...
-    let link = xml.getElementsByTagName('link')
-
-    if (link.length === 0) {
-      link = xml.getElementsByTagName('atom:link')
-    }
-
-    link = link[0]
-
-    const mediaData = {
-      id: xml.getElementsByTagName('media_id')[0].textContent,
-      url: xml.getElementsByTagName('media_url')[0].textContent,
-      image: link.getAttribute('href'),
-      mimetype: link.getAttribute('type')
-    }
-
-    return mediaData
-  })
+  return apiService.uploadMedia({ credentials, formData })
 }

 const statusPosterService = {
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@ -19,6 +19,9 @@ const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false
  const args = { timeline, credentials }
  const rootState = store.rootState || store.state
  const timelineData = rootState.statuses.timelines[camelCase(timeline)]
+  const hideMutedPosts = typeof rootState.config.hideMutedPosts === 'undefined'
+    ? rootState.instance.hideMutedPosts
+    : rootState.config.hideMutedPosts

  if (older) {
    args['until'] = until || timelineData.minId
@ -28,6 +31,7 @@ const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false

  args['userId'] = userId
  args['tag'] = tag
+  args['withMuted'] = !hideMutedPosts

  const numStatusesBeforeFetch = timelineData.statuses.length

--- 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/static/font/LICENSE.txt
+++ b/static/font/LICENSE.txt
--- a/static/font/README.txt
+++ b/static/font/README.txt
--- a/static/font/config.json
+++ b/static/font/config.json
@ -233,6 +233,12 @@
      "css": "play-circled",
      "code": 61764,
      "src": "fontawesome"
+    },
+    {
+      "uid": "d35a1d35efeb784d1dc9ac18b9b6c2b6",
+      "css": "pencil",
+      "code": 59416,
+      "src": "fontawesome"
    }
  ]
 }
--- a/static/font/css/animation.css
+++ b/static/font/css/animation.css
--- a/static/font/css/fontello-codes.css
+++ b/static/font/css/fontello-codes.css
@ -23,6 +23,7 @@
 .icon-plus:before { content: '\e815'; } /* '' */
 .icon-adjust:before { content: '\e816'; } /* '' */
 .icon-edit:before { content: '\e817'; } /* '' */
+.icon-pencil:before { content: '\e818'; } /* '' */
 .icon-spin3:before { content: '\e832'; } /* '' */
 .icon-spin4:before { content: '\e834'; } /* '' */
 .icon-link-ext:before { content: '\f08e'; } /* '' */
--- a/static/font/css/fontello-embedded.css
+++ b/static/font/css/fontello-embedded.css
--- a/static/font/css/fontello-ie7-codes.css
+++ b/static/font/css/fontello-ie7-codes.css
@ -23,6 +23,7 @@
 .icon-plus { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe815;&nbsp;'); }
 .icon-adjust { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe816;&nbsp;'); }
 .icon-edit { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe817;&nbsp;'); }
+.icon-pencil { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe818;&nbsp;'); }
 .icon-spin3 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe832;&nbsp;'); }
 .icon-spin4 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe834;&nbsp;'); }
 .icon-link-ext { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf08e;&nbsp;'); }
--- a/static/font/css/fontello-ie7.css
+++ b/static/font/css/fontello-ie7.css
@ -34,6 +34,7 @@
 .icon-plus { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe815;&nbsp;'); }
 .icon-adjust { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe816;&nbsp;'); }
 .icon-edit { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe817;&nbsp;'); }
+.icon-pencil { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe818;&nbsp;'); }
 .icon-spin3 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe832;&nbsp;'); }
 .icon-spin4 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe834;&nbsp;'); }
 .icon-link-ext { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf08e;&nbsp;'); }
--- a/static/font/css/fontello.css
+++ b/static/font/css/fontello.css
@ -1,11 +1,11 @@
@font-face {
  font-family: 'fontello';
-  src: url('../font/fontello.eot?94672585');
-  src: url('../font/fontello.eot?94672585#iefix') format('embedded-opentype'),
-       url('../font/fontello.woff2?94672585') format('woff2'),
-       url('../font/fontello.woff?94672585') format('woff'),
-       url('../font/fontello.ttf?94672585') format('truetype'),
-       url('../font/fontello.svg?94672585#fontello') format('svg');
+  src: url('../font/fontello.eot?40679575');
+  src: url('../font/fontello.eot?40679575#iefix') format('embedded-opentype'),
+       url('../font/fontello.woff2?40679575') format('woff2'),
+       url('../font/fontello.woff?40679575') format('woff'),
+       url('../font/fontello.ttf?40679575') format('truetype'),
+       url('../font/fontello.svg?40679575#fontello') format('svg');
  font-weight: normal;
  font-style: normal;
 }
@ -15,7 +15,7 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
  @font-face {
    font-family: 'fontello';
-    src: url('../font/fontello.svg?94672585#fontello') format('svg');
+    src: url('../font/fontello.svg?40679575#fontello') format('svg');
  }
 }
 */
@ -79,6 +79,7 @@
 .icon-plus:before { content: '\e815'; } /* '' */
 .icon-adjust:before { content: '\e816'; } /* '' */
 .icon-edit:before { content: '\e817'; } /* '' */
+.icon-pencil:before { content: '\e818'; } /* '' */
 .icon-spin3:before { content: '\e832'; } /* '' */
 .icon-spin4:before { content: '\e834'; } /* '' */
 .icon-link-ext:before { content: '\f08e'; } /* '' */
--- a/static/font/demo.html
+++ b/static/font/demo.html
@ -229,11 +229,11 @@ body {
 }
@font-face {
      font-family: 'fontello';
-      src: url('./font/fontello.eot?28736547');
-      src: url('./font/fontello.eot?28736547#iefix') format('embedded-opentype'),
-           url('./font/fontello.woff?28736547') format('woff'),
-           url('./font/fontello.ttf?28736547') format('truetype'),
-           url('./font/fontello.svg?28736547#fontello') format('svg');
+      src: url('./font/fontello.eot?50378338');
+      src: url('./font/fontello.eot?50378338#iefix') format('embedded-opentype'),
+           url('./font/fontello.woff?50378338') format('woff'),
+           url('./font/fontello.ttf?50378338') format('truetype'),
+           url('./font/fontello.svg?50378338#fontello') format('svg');
      font-weight: normal;
      font-style: normal;
    }
@ -334,24 +334,25 @@ body {
        <div class="the-icons span3" title="Code: 0xe817"><i class="demo-icon icon-edit">&#xe817;</i> <span class="i-name">icon-edit</span><span class="i-code">0xe817</span></div>
      </div>
      <div class="row">
+        <div class="the-icons span3" title="Code: 0xe818"><i class="demo-icon icon-pencil">&#xe818;</i> <span class="i-name">icon-pencil</span><span class="i-code">0xe818</span></div>
        <div class="the-icons span3" title="Code: 0xe832"><i class="demo-icon icon-spin3 animate-spin">&#xe832;</i> <span class="i-name">icon-spin3</span><span class="i-code">0xe832</span></div>
        <div class="the-icons span3" title="Code: 0xe834"><i class="demo-icon icon-spin4 animate-spin">&#xe834;</i> <span class="i-name">icon-spin4</span><span class="i-code">0xe834</span></div>
        <div class="the-icons span3" title="Code: 0xf08e"><i class="demo-icon icon-link-ext">&#xf08e;</i> <span class="i-name">icon-link-ext</span><span class="i-code">0xf08e</span></div>
-        <div class="the-icons span3" title="Code: 0xf08f"><i class="demo-icon icon-link-ext-alt">&#xf08f;</i> <span class="i-name">icon-link-ext-alt</span><span class="i-code">0xf08f</span></div>
      </div>
      <div class="row">
+        <div class="the-icons span3" title="Code: 0xf08f"><i class="demo-icon icon-link-ext-alt">&#xf08f;</i> <span class="i-name">icon-link-ext-alt</span><span class="i-code">0xf08f</span></div>
        <div class="the-icons span3" title="Code: 0xf0c9"><i class="demo-icon icon-menu">&#xf0c9;</i> <span class="i-name">icon-menu</span><span class="i-code">0xf0c9</span></div>
        <div class="the-icons span3" title="Code: 0xf0e0"><i class="demo-icon icon-mail-alt">&#xf0e0;</i> <span class="i-name">icon-mail-alt</span><span class="i-code">0xf0e0</span></div>
        <div class="the-icons span3" title="Code: 0xf0e5"><i class="demo-icon icon-comment-empty">&#xf0e5;</i> <span class="i-name">icon-comment-empty</span><span class="i-code">0xf0e5</span></div>
-        <div class="the-icons span3" title="Code: 0xf0fe"><i class="demo-icon icon-plus-squared">&#xf0fe;</i> <span class="i-name">icon-plus-squared</span><span class="i-code">0xf0fe</span></div>
      </div>
      <div class="row">
+        <div class="the-icons span3" title="Code: 0xf0fe"><i class="demo-icon icon-plus-squared">&#xf0fe;</i> <span class="i-name">icon-plus-squared</span><span class="i-code">0xf0fe</span></div>
        <div class="the-icons span3" title="Code: 0xf112"><i class="demo-icon icon-reply">&#xf112;</i> <span class="i-name">icon-reply</span><span class="i-code">0xf112</span></div>
        <div class="the-icons span3" title="Code: 0xf13e"><i class="demo-icon icon-lock-open-alt">&#xf13e;</i> <span class="i-name">icon-lock-open-alt</span><span class="i-code">0xf13e</span></div>
        <div class="the-icons span3" title="Code: 0xf144"><i class="demo-icon icon-play-circled">&#xf144;</i> <span class="i-name">icon-play-circled</span><span class="i-code">0xf144</span></div>
-        <div class="the-icons span3" title="Code: 0xf164"><i class="demo-icon icon-thumbs-up-alt">&#xf164;</i> <span class="i-name">icon-thumbs-up-alt</span><span class="i-code">0xf164</span></div>
      </div>
      <div class="row">
+        <div class="the-icons span3" title="Code: 0xf164"><i class="demo-icon icon-thumbs-up-alt">&#xf164;</i> <span class="i-name">icon-thumbs-up-alt</span><span class="i-code">0xf164</span></div>
        <div class="the-icons span3" title="Code: 0xf1e5"><i class="demo-icon icon-binoculars">&#xf1e5;</i> <span class="i-name">icon-binoculars</span><span class="i-code">0xf1e5</span></div>
        <div class="the-icons span3" title="Code: 0xf234"><i class="demo-icon icon-user-plus">&#xf234;</i> <span class="i-name">icon-user-plus</span><span class="i-code">0xf234</span></div>
      </div>
--- a/static/font/font/fontello.eot
+++ b/static/font/font/fontello.eot
--- a/static/font/font/fontello.svg
+++ b/static/font/font/fontello.svg
@ -54,6 +54,8 @@

 <glyph glyph-name="edit" unicode="&#xe817;" d="M496 196l64 65-85 85-64-65v-31h53v-54h32z m245 402q-9 9-18 0l-196-196q-9-9 0-18t18 0l196 196q9 9 0 18z m45-331v-106q0-67-47-114t-114-47h-464q-67 0-114 47t-47 114v464q0 66 47 113t114 48h464q35 0 65-14 9-4 10-13 2-10-5-16l-27-28q-8-8-18-4-13 3-25 3h-464q-37 0-63-26t-27-63v-464q0-37 27-63t63-27h464q37 0 63 27t26 63v70q0 7 5 12l36 36q8 8 20 4t11-16z m-54 411l161-160-375-375h-161v160z m248-73l-51-52-161 161 51 52q16 15 38 15t38-15l85-85q16-16 16-38t-16-38z" horiz-adv-x="1000" />

+<glyph glyph-name="pencil" unicode="&#xe818;" d="M203 0l50 51-131 131-51-51v-60h72v-71h60z m291 518q0 12-12 12-5 0-9-4l-303-302q-4-4-4-10 0-12 13-12 5 0 9 4l303 302q3 4 3 10z m-30 107l232-232-464-465h-232v233z m381-54q0-29-20-50l-93-93-232 233 93 92q20 21 50 21 29 0 51-21l131-131q20-22 20-51z" horiz-adv-x="857.1" />
+
 <glyph glyph-name="spin3" unicode="&#xe832;" d="M494 857c-266 0-483-210-494-472-1-19 13-20 13-20l84 0c16 0 19 10 19 18 10 199 176 358 378 358 107 0 205-45 273-118l-58-57c-11-12-11-27 5-31l247-50c21-5 46 11 37 44l-58 227c-2 9-16 22-29 13l-65-60c-89 91-214 148-352 148z m409-508c-16 0-19-10-19-18-10-199-176-358-377-358-108 0-205 45-274 118l59 57c10 12 10 27-5 31l-248 50c-21 5-46-11-37-44l58-227c2-9 16-22 30-13l64 60c89-91 214-148 353-148 265 0 482 210 493 473 1 18-13 19-13 19l-84 0z" horiz-adv-x="1000" />

 <glyph glyph-name="spin4" unicode="&#xe834;" d="M498 857c-114 0-228-39-320-116l0 0c173 140 428 130 588-31 134-134 164-332 89-495-10-29-5-50 12-68 21-20 61-23 84 0 3 3 12 15 15 24 71 180 33 393-112 539-99 98-228 147-356 147z m-409-274c-14 0-29-5-39-16-3-3-13-15-15-24-71-180-34-393 112-539 185-185 479-195 676-31l0 0c-173-140-428-130-589 31-134 134-163 333-89 495 11 29 6 50-12 68-11 11-27 17-44 16z" horiz-adv-x="1001" />
--- a/static/font/font/fontello.ttf
+++ b/static/font/font/fontello.ttf
--- a/static/font/font/fontello.woff
+++ b/static/font/font/fontello.woff
--- a/static/font/font/fontello.woff2
+++ b/static/font/font/fontello.woff2
--- 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/statuses.spec.js
+++ b/test/unit/specs/modules/statuses.spec.js
@ -14,14 +14,15 @@ const makeMockStatus = ({id, text, type = 'status'}) => {
  }
 }

-describe('Statuses.prepareStatus', () => {
+describe('Statuses module', () => {
+  describe('prepareStatus', () => {
    it('sets deleted flag to false', () => {
      const aStatus = makeMockStatus({id: '1', text: 'Hello oniichan'})
      expect(prepareStatus(aStatus).deleted).to.eq(false)
    })
  })

-describe('The Statuses module', () => {
+  describe('addNewStatuses', () => {
    it('adds the status to allStatuses and to the given timeline', () => {
      const state = defaultState()
      const status = makeMockStatus({id: '1'})
@ -238,7 +239,25 @@ describe('The Statuses module', () => {
      expect(state.timelines.public.visibleStatuses[0].fave_num).to.eql(1)
      expect(state.timelines.public.visibleStatuses[0].favorited).to.eql(true)
    })
+  })

+  describe('showNewStatuses', () => {
+    it('resets the minId to the min of the visible statuses when adding new to visible statuses', () => {
+      const state = defaultState()
+      const status = makeMockStatus({ id: '10' })
+      mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
+      const newStatus = makeMockStatus({ id: '20' })
+      mutations.addNewStatuses(state, { statuses: [newStatus], showImmediately: false, timeline: 'public' })
+      state.timelines.public.minId = '5'
+      mutations.showNewStatuses(state, { timeline: 'public' })
+
+      expect(state.timelines.public.visibleStatuses.length).to.eql(2)
+      expect(state.timelines.public.minVisibleId).to.eql('10')
+      expect(state.timelines.public.minId).to.eql('10')
+    })
+  })
+
+  describe('clearTimeline', () => {
    it('keeps userId when clearing user timeline', () => {
      const state = defaultState()
      state.timelines.user.userId = 123
@ -247,6 +266,7 @@ describe('The Statuses module', () => {

      expect(state.timelines.user.userId).to.eql(123)
    })
+  })

  describe('notifications', () => {
    it('removes a notification when the notice gets removed', () => {
--- 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')
+    })
+  })
 })