diff options
| author | Hazel K <acomputerdog@gmail.com> | 2024-10-06 12:26:25 -0400 |
|---|---|---|
| committer | Hazel K <acomputerdog@gmail.com> | 2024-10-06 12:26:25 -0400 |
| commit | 047563bdde95c528da5c136bf98935a06840f47e (patch) | |
| tree | 154c9d666a13cfcd3b626a65942d3dc8f84b5aec /packages/backend/src/server | |
| parent | fix modlog and translations for "Mark as NSFW" (diff) | |
| parent | merge: Warn when a domain is implicitly blocked because a base domain is bloc... (diff) | |
| download | sharkey-047563bdde95c528da5c136bf98935a06840f47e.tar.gz sharkey-047563bdde95c528da5c136bf98935a06840f47e.tar.bz2 sharkey-047563bdde95c528da5c136bf98935a06840f47e.zip | |
Merge branch 'develop' into hazelnoot/579-reject-reports
# Conflicts:
# packages/frontend/src/pages/instance-info.vue
Diffstat (limited to 'packages/backend/src/server')
| -rw-r--r-- | packages/backend/src/server/api/endpoints/admin/meta.ts | 2 | ||||
| -rw-r--r-- | packages/backend/src/server/web/ClientServerService.ts | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts index 5a69fbf679..dbfa31024a 100644 --- a/packages/backend/src/server/api/endpoints/admin/meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/meta.ts @@ -128,7 +128,7 @@ export const meta = { }, silencedHosts: { type: 'array', - optional: true, + optional: false, nullable: false, items: { type: 'string', diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts index 0af90a844b..e20707977f 100644 --- a/packages/backend/src/server/web/ClientServerService.ts +++ b/packages/backend/src/server/web/ClientServerService.ts @@ -193,9 +193,9 @@ export class ClientServerService { icon: meta.iconUrl, appleTouchIcon: meta.app512IconUrl, themeColor: meta.themeColor, - serverErrorImageUrl: meta.serverErrorImageUrl ?? 'https://launcher.moe/error.png', - infoImageUrl: meta.infoImageUrl ?? 'https://launcher.moe/nothinghere.png', - notFoundImageUrl: meta.notFoundImageUrl ?? 'https://launcher.moe/missingpage.webp', + serverErrorImageUrl: meta.serverErrorImageUrl ?? '/status/error.png', + infoImageUrl: meta.infoImageUrl ?? '/status/nothinghere.png', + notFoundImageUrl: meta.notFoundImageUrl ?? '/status/missingpage.webp', instanceUrl: this.config.url, randomMOTD: this.config.customMOTD ? this.config.customMOTD[Math.floor(Math.random() * this.config.customMOTD.length)] : undefined, metaJson: htmlSafeJsonStringify(await this.metaEntityService.packDetailed(meta)), |