OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

More robust about page 

Don't throw if we can't find a category or a language
Can happen if the instance configuration contains a category/language
that has been deleted by a plugin for example
pull/5949/head
Chocobozzz 2023-08-21 15:32:33 +02:00
parent ab5f1356b9
commit 4d3ea87486
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
client/src/app/shared/shared-instance/instance.service.ts
View File

@ -6,6 +6,7 @@ import { MarkdownService, RestExtractor, ServerService } from '@app/core'
import { objectKeysTyped, peertubeTranslate } from '@peertube/peertube-core-utils'
import { About } from '@peertube/peertube-models'
import { environment } from '../../../environments/environment'
import { logger } from '@root-helpers/logger'
export type AboutHTML = Pick<About['instance'],
'terms' | 'codeOfConduct' | 'moderationInformation' | 'administrator' | 'creationReason' |
@ -69,11 +70,15 @@ export class InstanceService {
]).pipe(
map(([ languagesArray, translations ]) => {
return about.instance.languages
.map(l => {
const languageObj = languagesArray.find(la => la.id === l)
.map(l => {
const languageObj = languagesArray.find(la => la.id === l)
if (!languageObj) {
logger.error(`Cannot find language ${l} in available languages`)
return ''
}
return peertubeTranslate(languageObj.label, translations)
})
return peertubeTranslate(languageObj.label, translations)
})
})
)
}
@ -85,11 +90,15 @@ export class InstanceService {
]).pipe(
map(([ categoriesArray, translations ]) => {
return about.instance.categories
.map(c => {
const categoryObj = categoriesArray.find(ca => ca.id === c)
.map(c => {
const categoryObj = categoriesArray.find(ca => ca.id === c)
if (!categoryObj) {
logger.error(`Cannot find instance category ${c} in available categories`)
return ''
}
return peertubeTranslate(categoryObj.label, translations)
})
return peertubeTranslate(categoryObj.label, translations)
})
})
)
}