commit: 03ffa7e84e648f1114605c338e6b40c214199e9d
parent: 8b7faa810693e85247a86d3a9fc1190afc33896b
Author: HJ <spam@hjkos.com>
Date: Thu, 24 Jan 2019 18:13:07 +0000
Merge branch 'fix-custom-nsfw-image' into 'develop'
fix custom nsfwCensorImage not working
See merge request pleroma/pleroma-fe!469
Diffstat:
3 files changed, 41 insertions(+), 46 deletions(-)
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
@@ -24,10 +24,6 @@ const afterStoreSetup = ({ store, i18n }) => {
store.dispatch('setInstanceOption', { name: 'bannerlimit', value: parseInt(uploadlimit.bannerlimit) })
}
- if (data.nsfwCensorImage) {
- store.dispatch('setInstanceOption', { name: 'nsfwCensorImage', value: data.nsfwCensorImage })
- }
-
if (vapidPublicKey) {
store.dispatch('setInstanceOption', { name: 'vapidPublicKey', value: vapidPublicKey })
}
@@ -54,46 +50,44 @@ const afterStoreSetup = ({ store, i18n }) => {
config = Object.assign({}, staticConfig, apiConfig)
}
- var theme = (config.theme)
- var background = (config.background)
- var hidePostStats = (config.hidePostStats)
- var hideUserStats = (config.hideUserStats)
- var logo = (config.logo)
- var logoMask = (typeof config.logoMask === 'undefined' ? true : config.logoMask)
- var logoMargin = (typeof config.logoMargin === 'undefined' ? 0 : config.logoMargin)
- var redirectRootNoLogin = (config.redirectRootNoLogin)
- var redirectRootLogin = (config.redirectRootLogin)
- var chatDisabled = (config.chatDisabled)
- var showInstanceSpecificPanel = (config.showInstanceSpecificPanel)
- var scopeOptionsEnabled = (config.scopeOptionsEnabled)
- var formattingOptionsEnabled = (config.formattingOptionsEnabled)
- var collapseMessageWithSubject = (config.collapseMessageWithSubject)
- var loginMethod = (config.loginMethod)
- var scopeCopy = (config.scopeCopy)
- var subjectLineBehavior = (config.subjectLineBehavior)
- var alwaysShowSubjectInput = (config.alwaysShowSubjectInput)
- var noAttachmentLinks = (config.noAttachmentLinks)
-
- store.dispatch('setInstanceOption', { name: 'theme', value: theme })
- store.dispatch('setInstanceOption', { name: 'background', value: background })
- store.dispatch('setInstanceOption', { name: 'hidePostStats', value: hidePostStats })
- store.dispatch('setInstanceOption', { name: 'hideUserStats', value: hideUserStats })
- store.dispatch('setInstanceOption', { name: 'logo', value: logo })
- store.dispatch('setInstanceOption', { name: 'logoMask', value: logoMask })
- store.dispatch('setInstanceOption', { name: 'logoMargin', value: logoMargin })
- store.dispatch('setInstanceOption', { name: 'redirectRootNoLogin', value: redirectRootNoLogin })
- store.dispatch('setInstanceOption', { name: 'redirectRootLogin', value: redirectRootLogin })
- store.dispatch('setInstanceOption', { name: 'showInstanceSpecificPanel', value: showInstanceSpecificPanel })
- store.dispatch('setInstanceOption', { name: 'scopeOptionsEnabled', value: scopeOptionsEnabled })
- store.dispatch('setInstanceOption', { name: 'formattingOptionsEnabled', value: formattingOptionsEnabled })
- store.dispatch('setInstanceOption', { name: 'collapseMessageWithSubject', value: collapseMessageWithSubject })
- store.dispatch('setInstanceOption', { name: 'loginMethod', value: loginMethod })
- store.dispatch('setInstanceOption', { name: 'scopeCopy', value: scopeCopy })
- store.dispatch('setInstanceOption', { name: 'subjectLineBehavior', value: subjectLineBehavior })
- store.dispatch('setInstanceOption', { name: 'alwaysShowSubjectInput', value: alwaysShowSubjectInput })
- store.dispatch('setInstanceOption', { name: 'noAttachmentLinks', value: noAttachmentLinks })
-
- if (chatDisabled) {
+ const copyInstanceOption = (name) => {
+ store.dispatch('setInstanceOption', {name, value: config[name]})
+ }
+
+ copyInstanceOption('nsfwCensorImage')
+ copyInstanceOption('theme')
+ copyInstanceOption('background')
+ copyInstanceOption('hidePostStats')
+ copyInstanceOption('hideUserStats')
+ copyInstanceOption('logo')
+
+ store.dispatch('setInstanceOption', {
+ name: 'logoMask',
+ value: typeof config.logoMask === 'undefined'
+ ? true
+ : config.logoMask
+ })
+
+ store.dispatch('setInstanceOption', {
+ name: 'logoMargin',
+ value: typeof config.logoMargin === 'undefined'
+ ? 0
+ : config.logoMargin
+ })
+
+ copyInstanceOption('redirectRootNoLogin')
+ copyInstanceOption('redirectRootLogin')
+ copyInstanceOption('showInstanceSpecificPanel')
+ copyInstanceOption('scopeOptionsEnabled')
+ copyInstanceOption('formattingOptionsEnabled')
+ copyInstanceOption('collapseMessageWithSubject')
+ copyInstanceOption('loginMethod')
+ copyInstanceOption('scopeCopy')
+ copyInstanceOption('subjectLineBehavior')
+ copyInstanceOption('alwaysShowSubjectInput')
+ copyInstanceOption('noAttachmentLinks')
+
+ if ((config.chatDisabled)) {
store.dispatch('disableChat')
}
diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
@@ -11,7 +11,7 @@ const Attachment = {
],
data () {
return {
- nsfwImage: this.$store.state.config.nsfwCensorImage || nsfwImage,
+ nsfwImage: this.$store.state.instance.nsfwCensorImage || nsfwImage,
hideNsfwLocal: this.$store.state.config.hideNsfw,
preloadImage: this.$store.state.config.preloadImage,
loopVideo: this.$store.state.config.loopVideo,
diff --git a/static/config.json b/static/config.json
@@ -18,5 +18,6 @@
"hideUserStats": false,
"loginMethod": "password",
"webPushNotifications": false,
- "noAttachmentLinks": false
+ "noAttachmentLinks": false,
+ "nsfwCensorImage": ""
}