Merge branch 'develop' into feature/pleroma-be

2017-08-21 17:02:50 +02:00 · 2017-08-21 17:02:50 +02:00 · 43320cff9d
parent d3d58c25e7 cbe652f2d9
commit 43320cff9d
20 changed files with 413 additions and 95 deletions
--- a/package.json
+++ b/package.json
@ -27,7 +27,8 @@
    "vue-router": "^2.5.3",
    "vue-template-compiler": "^2.3.4",
    "vue-timeago": "^3.1.2",
-    "vuex": "^2.3.1"
+    "vuex": "^2.3.1",
+    "whatwg-fetch": "^2.0.3"
  },
  "devDependencies": {
    "autoprefixer": "^6.4.0",
--- a/src/App.scss
+++ b/src/App.scss
@ -42,6 +42,11 @@ button{
    &:hover {
        box-shadow: 0px 0px 4px rgba(255, 255, 255, 0.3);
    }
+
+    &:disabled {
+      cursor: not-allowed;
+      opacity: 0.5;
+    }
 }

 .container {
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@ -49,6 +49,10 @@
        color: $green;
      }

+      .icon-user-plus.lit {
+        color: $blue;
+      }
+
      .icon-reply.lit {
        color: $blue;
      }
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@ -8,9 +8,11 @@
      </div>
      <div class="panel-body base03-border">
        <div v-for="notification in visibleNotifications" :key="notification" class="notification" :class='{"unseen": !notification.seen}'>
-          <a :href="notification.action.user.statusnet_profile_url">
-            <img class='avatar' :src="notification.action.user.profile_image_url_original">
-          </a>
+          <div>
+            <a :href="notification.action.user.statusnet_profile_url" target="_blank">
+              <img class='avatar' :src="notification.action.user.profile_image_url_original">
+            </a>
+          </div>
          <div class='text' style="width: 100%;">
            <div v-if="notification.type === 'favorite'">
              <h1>
@ -36,6 +38,15 @@
              </h1>
              <status :compact="true" :statusoid="notification.status"></status>
            </div>
+            <div v-if="notification.type === 'follow'">
+              <h1>
+                <span :title="'@'+notification.action.user.screen_name">{{ notification.action.user.name }}</span>
+                <i class="fa icon-user-plus lit"></i>
+              </h1>
+              <div>
+                <router-link :to="{ name: 'user-profile', params: { id: notification.action.user.id } }">@{{ notification.action.user.screen_name }}</router-link> followed you
+              </div>
+            </div>
          </div>
        </div>
      </div>
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@ -39,6 +39,8 @@ const PostStatusForm = {
    return {
      dropFiles: [],
      submitDisabled: false,
+      error: null,
+      posting: false,
      newStatus: {
        status: statusText,
        files: []
@ -85,19 +87,27 @@ const PostStatusForm = {
      this.caret = selectionStart
    },
    postStatus (newStatus) {
+      this.posting = true
      statusPoster.postStatus({
        status: newStatus.status,
        media: newStatus.files,
        store: this.$store,
        inReplyToStatusId: this.replyTo
+      }).then((data) => {
+        if (!data.error) {
+          this.newStatus = {
+            status: '',
+            files: []
+          }
+          this.$emit('posted')
+          let el = this.$el.querySelector('textarea')
+          el.style.height = '16px'
+          this.error = null
+        } else {
+          this.error = data.error
+        }
+        this.posting = false
      })
-      this.newStatus = {
-        status: '',
-        files: []
-      }
-      this.$emit('posted')
-      let el = this.$el.querySelector('textarea')
-      el.style.height = '16px'
    },
    addMediaFile (fileInfo) {
      this.newStatus.files.push(fileInfo)
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@ -17,7 +17,11 @@
      </div>
      <div class='form-bottom'>
        <media-upload @uploading="disableSubmit" @uploaded="addMediaFile" @upload-failed="enableSubmit" :drop-files="dropFiles"></media-upload>
-        <button :disabled="submitDisabled" type="submit" class="btn btn-default base05 base01-background">Submit</button>
+        <button v-if="posting" disabled class="btn btn-default base05 base01-background">Posting</button>
+        <button v-else :disabled="submitDisabled" type="submit" class="btn btn-default base05 base01-background">Submit</button>
+      </div>
+      <div class='error' v-if="error">
+        Error: {{ error }}
      </div>
      <div class="attachments">
        <div class="attachment" v-for="file in newStatus.files">
@ -61,6 +65,13 @@
             width: 10em;
         }
     }
+     .error {
+       border-radius: 5px;
+       text-align: center;
+       background-color: rgba(255, 48, 16, 0.65);
+       padding: 0.25em;
+       margin: 0.35em;
+     }

     .attachments {
         padding: 0 0.5em;
--- a/src/components/settings/settings.js
+++ b/src/components/settings/settings.js
@ -9,8 +9,7 @@ const settings = {
      hideNsfwLocal: this.$store.state.config.hideNsfw,
      muteWordsString: this.$store.state.config.muteWords.join('\n'),
      autoLoadLocal: this.$store.state.config.autoLoad,
-      hoverPreviewLocal: this.$store.state.config.hoverPreview,
-      previewfile: null
+      hoverPreviewLocal: this.$store.state.config.hoverPreview
    }
  },
  components: {
@ -21,44 +20,6 @@ const settings = {
      return this.$store.state.users.currentUser
    }
  },
-  methods: {
-    uploadAvatar ({target}) {
-      const file = target.files[0]
-      // eslint-disable-next-line no-undef
-      const reader = new FileReader()
-      reader.onload = ({target}) => {
-        const img = target.result
-        this.previewfile = img
-      }
-      reader.readAsDataURL(file)
-    },
-    submitAvatar () {
-      if (!this.previewfile) { return }
-
-      const img = this.previewfile
-      // eslint-disable-next-line no-undef
-      let imginfo = new Image()
-      let cropX, cropY, cropW, cropH
-      imginfo.src = this.previewfile
-      if (imginfo.height > imginfo.width) {
-        cropX = 0
-        cropW = imginfo.width
-        cropY = Math.floor((imginfo.height - imginfo.width) / 2)
-        cropH = imginfo.width
-      } else {
-        cropY = 0
-        cropH = imginfo.height
-        cropX = Math.floor((imginfo.width - imginfo.height) / 2)
-        cropW = imginfo.height
-      }
-      this.$store.state.api.backendInteractor.updateAvatar({params: {img, cropX, cropY, cropW, cropH}}).then((user) => {
-        if (!user.error) {
-          this.$store.commit('addNewUsers', [user])
-          this.$store.commit('setCurrentUser', user)
-        }
-      })
-    }
-  },
  watch: {
    hideAttachmentsLocal (value) {
      this.$store.dispatch('setOption', { name: 'hideAttachments', value })
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@ -8,18 +8,6 @@
        <h2>Theme</h2>
        <style-switcher></style-switcher>
      </div>
-      <div class="setting-item" v-if="user">
-        <h2>Avatar</h2>
-        <p>Your current avatar:</p>
-        <img :src="user.profile_image_url_original" class="old-avatar"></img>
-        <p>Set new avatar:</p>
-        <img class="new-avatar" v-bind:src="previewfile" v-if="previewfile">
-        </img>
-        <div>
-          <input name="avatar-upload" id="avatar-upload" type="file" @change="uploadAvatar" ></input>
-        </div>
-        <button class="btn btn-default base05 base01-background" v-if="previewfile" @click="submitAvatar">Submit</button>
-      </div>
      <div class="setting-item">
        <h2>Filtering</h2>
        <p>All notices containing these words will be muted, one per line</p>
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@ -194,12 +194,11 @@
     }

     .media-left {
-         img {
-             margin-top: 0.2em;
-             float: right;
-             margin-right: 0.3em;
-             border-radius: 5px;
-         }
+        margin: 0.2em 0.3em 0 0;
+        img {
+          float: right;
+          border-radius: 5px;
+        }
     }

     .retweet-info {
--- a/src/components/user_card_content/user_card_content.vue
+++ b/src/components/user_card_content/user_card_content.vue
@ -2,11 +2,16 @@
  <div id="heading" class="profile-panel-background" :style="headingStyle">
    <div class="panel-heading text-center">
      <div class='user-info'>
+        <router-link to='/user-settings' style="float: right;">
+          <i class="icon-cog usersettings"></i>
+        </router-link>
        <div class='container'>
-          <img :src="user.profile_image_url">
+          <img :src="user.profile_image_url_original">
          <span class="glyphicon glyphicon-user"></span>
-          <div class='user-name'>{{user.name}}</div>
-          <div class='user-screen-name'>@{{user.screen_name}}</div>
+          <div class="name-and-screen-name">
+            <div class='user-name'>{{user.name}}</div>
+            <div class='user-screen-name'>@{{user.screen_name}}</div>
+          </div>
        </div>
        <div v-if="isOtherUser" class="user-interactions">
          <div v-if="user.follows_you && loggedIn" class="following base06">
@ -130,6 +135,11 @@
  padding: 16px 16px 16px 16px;
  margin-bottom: -4em;

+  .usersettings {
+    color: white;
+    opacity: 0.8;
+  }
+
  .container{
    display: flex;
    flex-wrap: wrap;
@ -137,33 +147,37 @@
    align-content: flex-start;
    justify-content: center;
    max-height: 60px;
+    overflow: hidden;
  }

  img {
-      border: 2px solid;
-      border-radius: 5px;
-      flex: 1 0 100%;
-      max-width: 48px;
-      max-height: 48px;
+    border: 2px solid;
+    border-radius: 5px;
+    flex: 1 0 100%;
+    width: 48px;
+    height: 48px;
+    object-fit: cover;
  }

 	text-shadow: 0px 1px 1.5px rgba(0, 0, 0, 1.0);

-	.user-name{
-		margin-top: 0.0em;
+  .name-and-screen-name {
+    display: block;
+    margin-top: 0.0em;
    margin-left: 0.6em;
-    flex: 0 0 auto;
-    align-self: flex-start;
+    text-align: left;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+	.user-name{
 	}

  .user-screen-name {
-      margin-top: 0.0em;
-      margin-left: 0.6em;
      font-weight: lighter;
      font-size: 15px;
      padding-right: 0.1em;
      flex: 0 0 auto;
-      align-self: flex-start;
  }

  .user-interactions {
--- a/src/components/user_panel/user_panel.vue
+++ b/src/components/user_panel/user_panel.vue
@ -6,6 +6,7 @@

      <div class="panel-footer base00-background">
        <post-status-form v-if='user'></post-status-form>
+
      </div>
    </div>
    <login-form v-if='!user'></login-form>
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@ -22,6 +22,12 @@ const UserProfile = {
      }
    }
  },
+  watch: {
+    userId () {
+      this.$store.commit('clearTimeline', { timeline: 'user' })
+      this.$store.dispatch('startFetching', ['user', this.userId])
+    }
+  },
  components: {
    UserCardContent,
    Timeline
--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@ -0,0 +1,124 @@
+import StyleSwitcher from '../style_switcher/style_switcher.vue'
+
+const UserSettings = {
+  data () {
+    return {
+      newname: this.$store.state.users.currentUser.name,
+      newbio: this.$store.state.users.currentUser.description,
+      uploading: [ false, false, false ],
+      previews: [ null, null, null ]
+    }
+  },
+  components: {
+    StyleSwitcher
+  },
+  computed: {
+    user () {
+      return this.$store.state.users.currentUser
+    }
+  },
+  methods: {
+    updateProfile () {
+      const name = this.newname
+      const description = this.newbio
+      this.$store.state.api.backendInteractor.updateProfile({params: {name, description}}).then((user) => {
+        if (!user.error) {
+          this.$store.commit('addNewUsers', [user])
+          this.$store.commit('setCurrentUser', user)
+        }
+      })
+    },
+    uploadFile (slot, e) {
+      const file = e.target.files[0]
+      if (!file) { return }
+      // eslint-disable-next-line no-undef
+      const reader = new FileReader()
+      reader.onload = ({target}) => {
+        const img = target.result
+        this.previews[slot] = img
+        this.$forceUpdate() // just changing the array with the index doesn't update the view
+      }
+      reader.readAsDataURL(file)
+    },
+    submitAvatar () {
+      if (!this.previews[0]) { return }
+
+      let img = this.previews[0]
+      // eslint-disable-next-line no-undef
+      let imginfo = new Image()
+      let cropX, cropY, cropW, cropH
+      imginfo.src = img
+      if (imginfo.height > imginfo.width) {
+        cropX = 0
+        cropW = imginfo.width
+        cropY = Math.floor((imginfo.height - imginfo.width) / 2)
+        cropH = imginfo.width
+      } else {
+        cropY = 0
+        cropH = imginfo.height
+        cropX = Math.floor((imginfo.width - imginfo.height) / 2)
+        cropW = imginfo.height
+      }
+      this.uploading[0] = true
+      this.$store.state.api.backendInteractor.updateAvatar({params: {img, cropX, cropY, cropW, cropH}}).then((user) => {
+        if (!user.error) {
+          this.$store.commit('addNewUsers', [user])
+          this.$store.commit('setCurrentUser', user)
+          this.previews[0] = null
+        }
+        this.uploading[0] = false
+      })
+    },
+    submitBanner () {
+      if (!this.previews[1]) { return }
+
+      let banner = this.previews[1]
+      // eslint-disable-next-line no-undef
+      let imginfo = new Image()
+      /* eslint-disable camelcase */
+      let offset_top, offset_left, width, height
+      imginfo.src = banner
+      width = imginfo.width
+      height = imginfo.height
+      offset_top = 0
+      offset_left = 0
+      this.uploading[1] = true
+      this.$store.state.api.backendInteractor.updateBanner({params: {banner, offset_top, offset_left, width, height}}).then((data) => {
+        if (!data.error) {
+          let clone = JSON.parse(JSON.stringify(this.$store.state.users.currentUser))
+          clone.cover_photo = data.url
+          this.$store.commit('addNewUsers', [clone])
+          this.$store.commit('setCurrentUser', clone)
+          this.previews[1] = null
+        }
+        this.uploading[1] = false
+      })
+      /* eslint-enable camelcase */
+    },
+    submitBg () {
+      if (!this.previews[2]) { return }
+      let img = this.previews[2]
+      // eslint-disable-next-line no-undef
+      let imginfo = new Image()
+      let cropX, cropY, cropW, cropH
+      imginfo.src = img
+      cropX = 0
+      cropY = 0
+      cropW = imginfo.width
+      cropH = imginfo.width
+      this.uploading[2] = true
+      this.$store.state.api.backendInteractor.updateBg({params: {img, cropX, cropY, cropW, cropH}}).then((data) => {
+        if (!data.error) {
+          let clone = JSON.parse(JSON.stringify(this.$store.state.users.currentUser))
+          clone.background_image = data.url
+          this.$store.commit('addNewUsers', [clone])
+          this.$store.commit('setCurrentUser', clone)
+          this.previews[2] = null
+        }
+        this.uploading[2] = false
+      })
+    }
+  }
+}
+
+export default UserSettings
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@ -0,0 +1,86 @@
+<template>
+  <div class="settings panel panel-default base00-background">
+    <div class="panel-heading base01-background base04">
+      User Settings
+    </div>
+    <div class="panel-body profile-edit">
+      <div class="setting-item">
+        <h3>Name & Bio</h3>
+        <p>Name</p>
+        <input class='name-changer base03-border' id='username' v-model="newname" :value="user.screen_name"></input>
+        <p>Bio</p>
+        <textarea class="bio base03-border" v-model="newbio"></textarea>
+        <button :disabled='newname.length <= 0' class="btn btn-default base05 base01-background" @click="updateProfile">Submit</button>
+      </div>
+      <div class="setting-item">
+        <h3>Avatar</h3>
+        <p>Your current avatar:</p>
+        <img :src="user.profile_image_url_original" class="old-avatar"></img>
+        <p>Set new avatar:</p>
+        <img class="new-avatar" v-bind:src="previews[0]" v-if="previews[0]">
+        </img>
+        <div>
+          <input type="file" @change="uploadFile(0, $event)" ></input>
+        </div>
+        <i class="fa icon-spin4 animate-spin" v-if="uploading[0]"></i>
+        <button class="btn btn-default base05 base01-background" v-else-if="previews[0]" @click="submitAvatar">Submit</button>
+      </div>
+      <div class="setting-item">
+        <h3>Profile Banner</h3>
+        <p>Your current profile banner:</p>
+        <img :src="user.cover_photo" class="banner"></img>
+        <p>Set new profile banner:</p>
+        <img class="banner" v-bind:src="previews[1]" v-if="previews[1]">
+        </img>
+        <div>
+          <input type="file" @change="uploadFile(1, $event)" ></input>
+        </div>
+        <i class="fa icon-spin4 animate-spin uploading" v-if="uploading[1]"></i>
+        <button class="btn btn-default base05 base01-background" v-else-if="previews[1]" @click="submitBanner">Submit</button>
+      </div>
+      <div class="setting-item">
+        <h3>Profile Background</h3>
+        <p>Set new profile background:</p>
+        <img class="bg" v-bind:src="previews[2]" v-if="previews[2]">
+        </img>
+        <div>
+          <input type="file" @change="uploadFile(2, $event)" ></input>
+        </div>
+        <i class="fa icon-spin4 animate-spin uploading" v-if="uploading[2]"></i>
+        <button class="btn btn-default base05 base01-background" v-else-if="previews[2]" @click="submitBg">Submit</button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script src="./user_settings.js">
+</script>
+
+<style lang="scss">
+.profile-edit {
+  .name-changer {
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 5px;
+    padding: 0.2em 0.2em 0.2em 0.2em;
+  }
+  .name-submit {
+    padding: 0.2em 0.5em 0.2em 0.5em;
+  }
+  .bio {
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 5px;
+    margin: 0;
+  }
+  .banner {
+    max-width: 400px;
+    border-radius: 5px;
+  }
+
+  .uploading {
+    font-size: 1.5em;
+    margin: 0.25em;
+  }
+}
+</style>
--- a/src/main.js
+++ b/src/main.js
@ -10,6 +10,7 @@ import Mentions from './components/mentions/mentions.vue'
 import UserProfile from './components/user_profile/user_profile.vue'
 import Settings from './components/settings/settings.vue'
 import Registration from './components/registration/registration.vue'
+import UserSettings from './components/user_settings/user_settings.vue'

 import statusesModule from './modules/statuses.js'
 import usersModule from './modules/users.js'
@ -61,7 +62,8 @@ const routes = [
  { name: 'user-profile', path: '/users/:id', component: UserProfile },
  { name: 'mentions', path: '/:username/mentions', component: Mentions },
  { name: 'settings', path: '/settings', component: Settings },
-  { name: 'registration', path: '/registration', component: Registration }
+  { name: 'registration', path: '/registration', component: Registration },
+  { name: 'user-settings', path: '/user-settings', component: UserSettings }
 ]

 const router = new VueRouter({
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@ -97,7 +97,8 @@ export const statusType = (status) => {
    return 'retweet'
  }

-  if (typeof status.uri === 'string' && status.uri.match(/(fave|objectType=Favourite)/)) {
+  if ((typeof status.uri === 'string' && status.uri.match(/(fave|objectType=Favourite)/)) ||
+      (typeof status.text === 'string' && status.text.match(/favorited/))) {
    return 'favorite'
  }

@ -105,6 +106,10 @@ export const statusType = (status) => {
    return 'deletion'
  }

+  if (status.text.match(/started following/)) {
+    return 'follow'
+  }
+
  return 'unknown'
 }

@ -253,6 +258,9 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
        favoriteStatus(favorite)
      }
    },
+    'follow': (status) => {
+      addNotification({ type: 'follow', status: status, action: status })
+    },
    'deletion': (deletion) => {
      const uri = deletion.uri
      updateMaxId(deletion)
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@ -19,12 +19,16 @@ 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 MRN_URL = '/api/account/most_recent_notification.json'
 // const USER_URL = '/api/users/show.json'

 import { each, map } from 'lodash'
+import 'whatwg-fetch'

 const oldfetch = window.fetch

@ -58,6 +62,68 @@ const updateAvatar = ({credentials, params}) => {
  }).then((data) => data.json())
 }

+const updateBg = ({credentials, params}) => {
+  let url = BG_UPDATE_URL
+
+  const form = new FormData()
+
+  each(params, (value, key) => {
+    if (value) {
+      form.append(key, value)
+    }
+  })
+  return fetch(url, {
+    headers: authHeaders(credentials),
+    method: 'POST',
+    body: form
+  }).then((data) => data.json())
+}
+
+// Params
+// height
+// width
+// offset_left
+// offset_top
+// banner (base 64 encodend data url)
+const updateBanner = ({credentials, params}) => {
+  let url = BANNER_UPDATE_URL
+
+  const form = new FormData()
+
+  each(params, (value, key) => {
+    if (value) {
+      form.append(key, value)
+    }
+  })
+  return fetch(url, {
+    headers: authHeaders(credentials),
+    method: 'POST',
+    body: form
+  }).then((data) => data.json())
+}
+
+// Params
+// name
+// url
+// location
+// description
+const updateProfile = ({credentials, params}) => {
+  let url = PROFILE_UPDATE_URL
+
+  const form = new FormData()
+
+  each(params, (value, key) => {
+    if (value) {
+      form.append(key, value)
+    }
+  })
+  return fetch(url, {
+    headers: authHeaders(credentials),
+    method: 'POST',
+    body: form
+  }).then((data) => data.json())
+}
+
 // Params needed:
 // nickname
 // email
@ -284,7 +350,9 @@ const apiService = {
  externalProfile,
  register,
  updateMRN,
-  updateAvatar
+  updateBg,
+  updateProfile,
+  updateBanner
 }

 export default apiService
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@ -38,6 +38,10 @@ const backendInteractorService = (credentials) => {

  const register = (params) => apiService.register(params)
  const updateAvatar = ({params}) => apiService.updateAvatar({credentials, params})
+  const updateBg = ({params}) => apiService.updateBg({credentials, params})
+  const updateBanner = ({params}) => apiService.updateBanner({credentials, params})
+  const updateProfile = ({params}) => apiService.updateProfile({credentials, params})
+
  const externalProfile = (profileUrl) => apiService.externalProfile(profileUrl)
  const updateMRN = ({id}) => apiService.updateMRN({credentials, id})

@ -55,7 +59,10 @@ const backendInteractorService = (credentials) => {
    externalProfile,
    register,
    updateMRN,
-    updateAvatar
+    updateAvatar,
+    updateBg,
+    updateBanner,
+    updateProfile
  }

  return backendInteractorServiceInstance
--- a/src/services/status_poster/status_poster.service.js
+++ b/src/services/status_poster/status_poster.service.js
@ -7,12 +7,20 @@ const postStatus = ({ store, status, media = [], inReplyToStatusId = undefined }
  return apiService.postStatus({credentials: store.state.users.currentUser.credentials, status, mediaIds, inReplyToStatusId})
    .then((data) => data.json())
    .then((data) => {
-      store.dispatch('addNewStatuses', {
-        statuses: [data],
-        timeline: 'friends',
-        showImmediately: true,
-        noIdUpdate: true // To prevent missing notices on next pull.
-      })
+      if (!data.error) {
+        store.dispatch('addNewStatuses', {
+          statuses: [data],
+          timeline: 'friends',
+          showImmediately: true,
+          noIdUpdate: true // To prevent missing notices on next pull.
+        })
+      }
+      return data
+    })
+    .catch((err) => {
+      return {
+        error: err.message
+      }
    })
 }

--- a/yarn.lock
+++ b/yarn.lock
@ -5816,6 +5816,10 @@ webpack@^1.13.2:
    watchpack "^0.2.1"
    webpack-core "~0.6.9"

+whatwg-fetch@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
+
 whet.extend@~0.9.9:
  version "0.9.9"
  resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"