forked from AkkomaGang/admin-fe
Fix parsing tuples in Pleroma.Upload.Filter.Mogrify and Pleroma.Emails.Mailer settings
This commit is contained in:
parent
5c1edb32a9
commit
ddc7d16a7d
2 changed files with 9 additions and 2 deletions
|
@ -11,6 +11,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
||||||
- Ability to see local statuses in Statuses by instance section
|
- Ability to see local statuses in Statuses by instance section
|
||||||
- Ability to configure Oban.Cron settings and settings for notifications streamer
|
- Ability to configure Oban.Cron settings and settings for notifications streamer
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fix parsing tuples in Pleroma.Upload.Filter.Mogrify and Pleroma.Emails.Mailer settings
|
||||||
|
|
||||||
## [2.0] - 2020-02-27
|
## [2.0] - 2020-02-27
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
|
@ -63,6 +63,9 @@ export const parseNonTuples = (key, value) => {
|
||||||
return updated
|
return updated
|
||||||
}
|
}
|
||||||
if (key === ':args') {
|
if (key === ':args') {
|
||||||
|
if (typeof value === 'string') {
|
||||||
|
return [value]
|
||||||
|
}
|
||||||
const index = value.findIndex(el => typeof el === 'object' && el.tuple.includes('implode'))
|
const index = value.findIndex(el => typeof el === 'object' && el.tuple.includes('implode'))
|
||||||
const updated = value.map((el, i) => i === index ? 'implode' : el)
|
const updated = value.map((el, i) => i === index ? 'implode' : el)
|
||||||
return updated
|
return updated
|
||||||
|
@ -80,8 +83,8 @@ export const parseTuples = (tuples, key) => {
|
||||||
accum[item.tuple[0]] = item.tuple[1].reduce((acc, mascot) => {
|
accum[item.tuple[0]] = item.tuple[1].reduce((acc, mascot) => {
|
||||||
return [...acc, { [mascot.tuple[0]]: { ...mascot.tuple[1], id: `f${(~~(Math.random() * 1e8)).toString(16)}` }}]
|
return [...acc, { [mascot.tuple[0]]: { ...mascot.tuple[1], id: `f${(~~(Math.random() * 1e8)).toString(16)}` }}]
|
||||||
}, [])
|
}, [])
|
||||||
} else if (
|
} else if (Array.isArray(item.tuple[1]) &&
|
||||||
item.tuple[0] === ':groups' || item.tuple[0] === ':replace' || item.tuple[0] === ':retries') {
|
(item.tuple[0] === ':groups' || item.tuple[0] === ':replace' || item.tuple[0] === ':retries')) {
|
||||||
accum[item.tuple[0]] = item.tuple[1].reduce((acc, group) => {
|
accum[item.tuple[0]] = item.tuple[1].reduce((acc, group) => {
|
||||||
return [...acc, { [group.tuple[0]]: { value: group.tuple[1], id: `f${(~~(Math.random() * 1e8)).toString(16)}` }}]
|
return [...acc, { [group.tuple[0]]: { value: group.tuple[1], id: `f${(~~(Math.random() * 1e8)).toString(16)}` }}]
|
||||||
}, [])
|
}, [])
|
||||||
|
|
Loading…
Reference in a new issue