diff options
| author | Marie <marie@kaifa.ch> | 2024-02-19 19:09:11 +0000 |
|---|---|---|
| committer | Marie <marie@kaifa.ch> | 2024-02-19 19:09:11 +0000 |
| commit | 3912436f4f2df97a9efd826faaa59e7112c8b24d (patch) | |
| tree | 1940037d8d1afb1fada6a91957dfc82aa63a3ee9 | |
| parent | merge: point default repo/feedback URLs to our repos #414 (!419) (diff) | |
| parent | hide blocked&c instances when not logged in - fixes 422 (diff) | |
| download | sharkey-3912436f4f2df97a9efd826faaa59e7112c8b24d.tar.gz sharkey-3912436f4f2df97a9efd826faaa59e7112c8b24d.tar.bz2 sharkey-3912436f4f2df97a9efd826faaa59e7112c8b24d.zip | |
merge: hide blocked&c instances when not logged in - fixes #422 (!430)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/430
Closes #422
Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
| -rw-r--r-- | packages/backend/src/server/api/endpoints/federation/instances.ts | 6 | ||||
| -rw-r--r-- | packages/frontend/src/pages/about.federation.vue | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts index 6c7b893843..4064a415a4 100644 --- a/packages/backend/src/server/api/endpoints/federation/instances.ts +++ b/packages/backend/src/server/api/endpoints/federation/instances.ts @@ -100,6 +100,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- default: query.orderBy('instance.id', 'DESC'); break; } + if (me == null) { + ps.blocked = false; + ps.suspended = false; + ps.silenced = false; + } + if (typeof ps.blocked === 'boolean') { const meta = await this.metaService.fetch(true); if (ps.blocked) { diff --git a/packages/frontend/src/pages/about.federation.vue b/packages/frontend/src/pages/about.federation.vue index 3eb6e21a56..c7f2315faa 100644 --- a/packages/frontend/src/pages/about.federation.vue +++ b/packages/frontend/src/pages/about.federation.vue @@ -19,9 +19,9 @@ SPDX-License-Identifier: AGPL-3.0-only <option value="publishing">{{ i18n.ts.publishing }}</option> <option value="bubble">Bubble</option> <option value="nsfw">NSFW</option> - <option value="suspended">{{ i18n.ts.suspended }}</option> - <option value="silenced">{{ i18n.ts.silence }}</option> - <option value="blocked">{{ i18n.ts.blocked }}</option> + <option v-if="$i" value="suspended">{{ i18n.ts.suspended }}</option> + <option v-if="$i" value="silenced">{{ i18n.ts.silence }}</option> + <option v-if="$i" value="blocked">{{ i18n.ts.blocked }}</option> <option value="notResponding">{{ i18n.ts.notResponding }}</option> </MkSelect> <MkSelect v-model="sort"> @@ -60,6 +60,7 @@ import MkPagination, { Paging } from '@/components/MkPagination.vue'; import MkInstanceCardMini from '@/components/MkInstanceCardMini.vue'; import FormSplit from '@/components/form/split.vue'; import { i18n } from '@/i18n.js'; +import { $i } from '@/account.js'; const host = ref(''); const state = ref('federating'); |