Merge branch 'develop' into 'master'

`master` refresh with `develop`

See merge request pleroma/pleroma-fe!1028

2 files changed, 11 insertions, 4 deletions

diff --git a/src/components/user_avatar/user_avatar.js b/src/components/user_avatar/user_avatar.js
index e513b993..4adf8211 100644
--- a/src/components/user_avatar/user_avatar.js
+++ b/src/components/user_avatar/user_avatar.js
@@ -2,7 +2,7 @@ import StillImage from '../still-image/still-image.vue'
 
 const UserAvatar = {
   props: [
-    'src',
+    'user',
     'betterShadow',
     'compact'
   ],
@@ -16,13 +16,18 @@ const UserAvatar = {
   },
   computed: {
     imgSrc () {
-      return this.showPlaceholder ? '/images/avi.png' : this.src
+      return this.showPlaceholder ? '/images/avi.png' : this.user.profile_image_url_original
     }
   },
   methods: {
     imageLoadError () {
       this.showPlaceholder = true
     }
+  },
+  watch: {
+    src () {
+      this.showPlaceholder = false
+    }
   }
 }
 
diff --git a/src/components/user_avatar/user_avatar.vue b/src/components/user_avatar/user_avatar.vue
index 6bf7123d..9ffb28d8 100644
--- a/src/components/user_avatar/user_avatar.vue
+++ b/src/components/user_avatar/user_avatar.vue
@@ -1,9 +1,11 @@
 <template>
   <StillImage
     class="avatar"
-    :class="{ 'avatar-compact': compact, 'better-shadow': betterShadow }"
+    :alt="user.screen_name"
+    :title="user.screen_name"
     :src="imgSrc"
-    :imageLoadError="imageLoadError"
+    :class="{ 'avatar-compact': compact, 'better-shadow': betterShadow }"
+    :image-load-error="imageLoadError"
   />
 </template>