Add Media Preview Proxy settings

This commit is contained in:
Angelina Filippova 2020-11-18 15:11:33 +03:00
parent a028748fb7
commit 08417331ed
2 changed files with 12 additions and 2 deletions

View file

@ -4,6 +4,10 @@
<setting :setting-group="mediaProxy" :data="mediaProxyData"/> <setting :setting-group="mediaProxy" :data="mediaProxyData"/>
</el-form> </el-form>
<el-divider v-if="mediaProxy" class="divider thick-line"/> <el-divider v-if="mediaProxy" class="divider thick-line"/>
<el-form v-if="!loading" :model="mediaPreviewProxyData" :label-position="labelPosition" :label-width="labelWidth">
<setting :setting-group="mediaPreviewProxy" :data="mediaPreviewProxyData"/>
</el-form>
<el-divider v-if="mediaPreviewProxy" class="divider thick-line"/>
<el-form v-if="!loading" :model="httpInvalidationData" :label-position="labelPosition" :label-width="labelWidth"> <el-form v-if="!loading" :model="httpInvalidationData" :label-position="labelPosition" :label-width="labelWidth">
<setting :setting-group="httpInvalidation" :data="httpInvalidationData"/> <setting :setting-group="httpInvalidation" :data="httpInvalidationData"/>
</el-form> </el-form>
@ -60,6 +64,12 @@ export default {
loading() { loading() {
return this.settings.loading return this.settings.loading
}, },
mediaPreviewProxy() {
return this.settings.description.find(setting => setting.key === ':media_preview_proxy')
},
mediaPreviewProxyData() {
return _.get(this.settings.settings, [':pleroma', ':media_preview_proxy']) || {}
},
mediaProxy() { mediaProxy() {
return this.settings.description.find(setting => setting.key === ':media_proxy') return this.settings.description.find(setting => setting.key === ':media_proxy')
}, },

View file

@ -34,7 +34,7 @@ export const tabs = description => {
}, },
'job-queue': { 'job-queue': {
label: 'settings.jobQueue', label: 'settings.jobQueue',
settings: ['Pleroma.ActivityExpiration', ':connections_pool', ':hackney_pools', 'Oban', ':pools', ':workers'] settings: ['Pleroma.Workers.PurgeExpiredActivity', ':connections_pool', ':hackney_pools', 'Oban', ':pools', ':workers']
}, },
'link-formatter': { 'link-formatter': {
label: 'settings.linkFormatter', label: 'settings.linkFormatter',
@ -50,7 +50,7 @@ export const tabs = description => {
}, },
'media-proxy': { 'media-proxy': {
label: 'settings.mediaProxy', label: 'settings.mediaProxy',
settings: [':media_proxy', 'Pleroma.Web.MediaProxy.Invalidation.Http', 'Pleroma.Web.MediaProxy.Invalidation.Script'] settings: [':media_proxy', ':media_preview_proxy', 'Pleroma.Web.MediaProxy.Invalidation.Http', 'Pleroma.Web.MediaProxy.Invalidation.Script']
}, },
'metadata': { 'metadata': {
label: 'settings.metadata', label: 'settings.metadata',