Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

about/federation.vueをreversiVersionでソート #436

Merged
merged 2 commits into from
Sep 14, 2024
Merged

about/federation.vueをreversiVersionでソート #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33c1442
about/federation.vueをreversiVersionでソート
kozakura913 Sep 13, 2024
c218eb7
Update CHANGELOG_YOJO.md
kozakura913 Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG_YOJO.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Cherrypick 4.11.1
### Release Date

### General
-
- Enhance: 連合一覧のソートにリバーシのバージョンを追加

### Client
- Fix: リアクションが閲覧できる状態でも見れない問題を修正 [#429](https://github.com/yojo-art/cherrypick/pull/429)
Expand Down
4 changes: 4 additions & 0 deletions packages/backend/src/server/api/endpoints/federation/instances.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ export const paramDef = {
'-firstRetrievedAt',
'+latestRequestReceivedAt',
'-latestRequestReceivedAt',
'+reversiVersion',
'-reversiVersion',
null,
],
},
Expand Down Expand Up @@ -94,6 +96,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
case '-firstRetrievedAt': query.orderBy('instance.firstRetrievedAt', 'ASC'); break;
case '+latestRequestReceivedAt': query.orderBy('instance.latestRequestReceivedAt', 'DESC', 'NULLS LAST'); break;
case '-latestRequestReceivedAt': query.orderBy('instance.latestRequestReceivedAt', 'ASC', 'NULLS FIRST'); break;
case '+reversiVersion': query.orderBy('instance.reversiVersion', 'DESC', 'NULLS LAST'); break;
case '-reversiVersion': query.orderBy('instance.reversiVersion', 'ASC', 'NULLS FIRST'); break;

default: query.orderBy('instance.id', 'DESC'); break;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cherrypick-js/src/autogen/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15315,7 +15315,7 @@ export type operations = {
/** @default 0 */
offset?: number;
/** @enum {string|null} */
sort?: '+pubSub' | '-pubSub' | '+notes' | '-notes' | '+users' | '-users' | '+following' | '-following' | '+followers' | '-followers' | '+firstRetrievedAt' | '-firstRetrievedAt' | '+latestRequestReceivedAt' | '-latestRequestReceivedAt' | null;
sort?: '+pubSub' | '-pubSub' | '+notes' | '-notes' | '+users' | '-users' | '+following' | '-following' | '+followers' | '-followers' | '+firstRetrievedAt' | '-firstRetrievedAt' | '+latestRequestReceivedAt' | '-latestRequestReceivedAt' | '+reversiVersion' | '-reversiVersion' | null;
};
};
};
Expand Down
2 changes: 2 additions & 0 deletions packages/frontend/src/pages/about.federation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ SPDX-License-Identifier: AGPL-3.0-only
<option value="-followers">{{ i18n.ts.followers }} ({{ i18n.ts.ascendingOrder }})</option>
<option value="+firstRetrievedAt">{{ i18n.ts.registeredAt }} ({{ i18n.ts.descendingOrder }})</option>
<option value="-firstRetrievedAt">{{ i18n.ts.registeredAt }} ({{ i18n.ts.ascendingOrder }})</option>
<option value="+reversiVersion">{{ i18n.ts._reversi.reversi }} ({{ i18n.ts.descendingOrder }})</option>
<option value="-reversiVersion">{{ i18n.ts._reversi.reversi }} ({{ i18n.ts.ascendingOrder }})</option>
</MkSelect>
</FormSplit>
</div>
Expand Down
Loading