Remove :fed_sockets settings

This commit is contained in:
Angelina Filippova 2020-12-09 00:50:04 +03:00
parent aa2b9102c3
commit 05cd0cc712
3 changed files with 3 additions and 12 deletions

View file

@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Move `:restrict_unauthenticated` settings from Authentication tab to Instance tab - Move `:restrict_unauthenticated` settings from Authentication tab to Instance tab
- Replace regular inputs with textareas for setting welcome messages in the Settings section - Replace regular inputs with textareas for setting welcome messages in the Settings section
- Update rendering Moderation Log Messages so that all usernames are links to the pages of the corresponding users in Admin-FE - Update rendering Moderation Log Messages so that all usernames are links to the pages of the corresponding users in Admin-FE
- Remove Websocket based federation settings
### Fixed ### Fixed

View file

@ -11,14 +11,10 @@
<el-form :model="httpSecurityData" :label-position="labelPosition" :label-width="labelWidth"> <el-form :model="httpSecurityData" :label-position="labelPosition" :label-width="labelWidth">
<setting :setting-group="httpSecurity" :data="httpSecurityData"/> <setting :setting-group="httpSecurity" :data="httpSecurityData"/>
</el-form> </el-form>
<el-divider v-if="httpSecurity" class="divider thick-line"/> <el-divider v-if="webCacheTtl" class="divider thick-line"/>
<el-form :model="webCacheTtlData" :label-position="labelPosition" :label-width="labelWidth"> <el-form :model="webCacheTtlData" :label-position="labelPosition" :label-width="labelWidth">
<setting :setting-group="webCacheTtl" :data="webCacheTtlData"/> <setting :setting-group="webCacheTtl" :data="webCacheTtlData"/>
</el-form> </el-form>
<el-divider v-if="fedSockets" class="divider thick-line"/>
<el-form :model="fedSocketsData" :label-position="labelPosition" :label-width="labelWidth">
<setting :setting-group="fedSockets" :data="fedSocketsData"/>
</el-form>
<div class="submit-button-container"> <div class="submit-button-container">
<el-button class="submit-button" type="primary" @click="onSubmit">Submit</el-button> <el-button class="submit-button" type="primary" @click="onSubmit">Submit</el-button>
</div> </div>
@ -44,12 +40,6 @@ export default {
corsPlugData() { corsPlugData() {
return _.get(this.settings.settings, [':cors_plug']) || {} return _.get(this.settings.settings, [':cors_plug']) || {}
}, },
fedSockets() {
return this.settings.description.find(setting => setting.key === ':fed_sockets')
},
fedSocketsData() {
return _.get(this.settings.settings, [':pleroma', ':fed_sockets']) || {}
},
http() { http() {
return this.settings.description.find(setting => setting.key === ':http') return this.settings.description.find(setting => setting.key === ':http')
}, },

View file

@ -26,7 +26,7 @@ export const tabs = description => {
}, },
'http': { 'http': {
label: 'settings.http', label: 'settings.http',
settings: [':cors_plug', ':http', ':fed_sockets', ':http_security', ':web_cache_ttl'] settings: [':cors_plug', ':http', ':http_security', ':web_cache_ttl']
}, },
'instance': { 'instance': {
label: 'settings.instance', label: 'settings.instance',