Skip to content

Commit

Permalink
feat: 非ログイン時に見れる項目を少なく (#80)
Browse files Browse the repository at this point in the history
* feat: 非ログイン時にブロック/配送停止/サイレンスしたサーバーを非表示に

* feat: 「タイムラインを見てみる」を廃止

* Revert "feat: 「タイムラインを見てみる」を廃止"

This reverts commit c5fd4ca.

* Update CHANGELOG
  • Loading branch information
1673beta authored Jul 8, 2024
1 parent 8cd5390 commit cd898e0
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG_engawa.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
-->

## x.x.x (unreleased)
## 0.4.1 (unreleased)

### Release Date

Expand All @@ -26,6 +26,7 @@
### Client
- ダイスウィジェットを追加
- 通知を全て削除できるボタンを追加
- 非ログイン時にブロック/配送停止/サイレンスしているサーバーが見れないように

### Server
- 管理者アカウントを別サーバーに移行できるように
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,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) {
Expand Down
7 changes: 4 additions & 3 deletions packages/frontend/src/pages/about.federation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ SPDX-License-Identifier: AGPL-3.0-only
<option value="federating">{{ i18n.ts.federating }}</option>
<option value="subscribing">{{ i18n.ts.subscribing }}</option>
<option value="publishing">{{ i18n.ts.publishing }}</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">
Expand Down Expand Up @@ -58,6 +58,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');
Expand Down

0 comments on commit cd898e0

Please sign in to comment.