Merge branch 'feature/configurable-nsfw-censor-image' into 'develop'

make nsfw censor image configurable

See merge request pleroma/pleroma-fe!243

src/components/attachment/attachment.js

@@ -11,7 +11,7 @@ const Attachment = {
   ],
   data () {
     return {
-      nsfwImage,
+      nsfwImage: this.$store.state.config.nsfwCensorImage || nsfwImage,
       hideNsfwLocal: this.$store.state.config.hideNsfw,
       preloadImage: this.$store.state.config.preloadImage,
       loopVideo: this.$store.state.config.loopVideo,

src/main.js

@@ -60,6 +60,9 @@ const registerPushNotifications = store => {
     if (isUserMutation && vapidPublicKey && permission) {
       return store.dispatch('registerPushNotifications')
     }
+    if (data['nsfwCensorImage']) {
+      store.dispatch('setOption', { name: 'nsfwCensorImage', value: data['nsfwCensorImage'] })
+    }
 
     const user = state.users.currentUser
     const isVapidMutation = mutation.type === 'setInstanceOption' && mutation.payload.name === 'vapidPublicKey'