about/federation.vueをreversiVersionでソート (yojo-art#436)

kozakura913 · Sep 14, 2024 · 4ae086f · 4ae086f
1 parent 4838494
commit 4ae086f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG_YOJO.md b/CHANGELOG_YOJO.md
@@ -4,7 +4,7 @@ Cherrypick 4.11.1
 ### Release Date
 
 ### General
--
+- Enhance: 連合一覧のソートにリバーシのバージョンを追加
 
 ### Client
 - Fix: リアクションが閲覧できる状態でも見れない問題を修正 [#429](https://github.com/yojo-art/cherrypick/pull/429)

diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts
@@ -60,6 +60,8 @@ export const paramDef = {
 				'-firstRetrievedAt',
 				'+latestRequestReceivedAt',
 				'-latestRequestReceivedAt',
+				'+reversiVersion',
+				'-reversiVersion',
 				null,
 			],
 		},
@@ -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;
 			}

diff --git a/packages/cherrypick-js/src/autogen/types.ts b/packages/cherrypick-js/src/autogen/types.ts
@@ -15324,7 +15324,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;
         };
       };
     };

diff --git a/packages/frontend/src/pages/about.federation.vue b/packages/frontend/src/pages/about.federation.vue
@@ -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>