4 files changed, 8 insertions, 3 deletions
diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index 16114c30..97c4f283 100644
--- a/src/components/attachment/attachment.js
+++ b/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,
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index a651f619..f28b85bd 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -2,6 +2,7 @@ import Status from '../status/status.vue'
 import timelineFetcher from '../../services/timeline_fetcher/timeline_fetcher.service.js'
 import StatusOrConversation from '../status_or_conversation/status_or_conversation.vue'
 import UserCard from '../user_card/user_card.vue'
+import { throttle } from 'lodash'
 
 const Timeline = {
   props: [
@@ -88,7 +89,7 @@ const Timeline = {
         this.paused = false
       }
     },
-    fetchOlderStatuses () {
+    fetchOlderStatuses: throttle(function () {
       const store = this.$store
       const credentials = store.state.users.currentUser.credentials
       store.commit('setLoading', { timeline: this.timelineName, value: true })
@@ -101,7 +102,7 @@ const Timeline = {
         userId: this.userId,
         tag: this.tag
       }).then(() => store.commit('setLoading', { timeline: this.timelineName, value: false }))
-    },
+    }, 1000, this),
     fetchFollowers () {
       const id = this.userId
       this.$store.state.api.backendInteractor.fetchFollowers({ id })
diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js
index 8e57894c..422a057e 100644
--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@@ -213,6 +213,7 @@ const UserSettings = {
         .fetchFriends({id: this.$store.state.users.currentUser.id})
         .then((friendList) => {
           this.exportPeople(friendList, 'friends.csv')
+          setTimeout(() => { this.enableFollowsExport = true }, 2000)
         })
     },
     followListChange () {
diff --git a/src/main.js b/src/main.js
index bf92e78e..6ce2df13 100644
--- a/src/main.js
+++ b/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'