refactor 0491042d, 42cc15d7, 02957a1b

CHANGELOG_CHERRYPICK.md

@@ -38,6 +38,7 @@
 - 「이미 본 리노트를 간략화하기」 옵션의 기본값을 켜짐으로 변경 (revert 94bd0fa9)
 - 서브 노트에 액션 버튼을 표시하는 기능
 - 「발견하기」의 인기 태그 기본값을 펼침으로 설정
+- 초대 코드 해지 기능을 새 버전에 맞게 개선
 
 ### Client
 - 리노트 전 확인 팝업을 띄움

locales/ko-KR.yml

@@ -5,8 +5,8 @@ showSubNoteFooterButtonDescription: "이 설정을 활성화하면 답글이 달
 alreadyFollowed: "팔로우 했어요!"
 enableMarkByDate: "노트 시간을 일자로 표시"
 renoteConfirm: "리노트 할까요?"
-inviteRevoke: "모든 초대 코드 무효화"
-inviteRevokeConfirm: "정말로 모든 초대 코드를 무효화 할까요?"
+inviteRevoke: "모든 초대 코드 제거"
+inviteRevokeConfirm: "정말로 모든 초대 코드를 제거할까요?"
 enableAbsoluteTime: "절대 시간 표기 사용"
 posted: "노트를 게시했어요!"
 translateNote: "노트 번역하기"

packages/backend/src/server/api/EndpointsModule.ts

@@ -40,6 +40,7 @@ import * as ep___admin_getTableStats from './endpoints/admin/get-table-stats.js'
 import * as ep___admin_getUserIps from './endpoints/admin/get-user-ips.js';
 import * as ep___admin_invite_create from './endpoints/admin/invite/create.js';
 import * as ep___admin_invite_list from './endpoints/admin/invite/list.js';
+import * as ep___admin_invite_revoke from './endpoints/admin/invite/revoke.js';
 import * as ep___admin_promo_create from './endpoints/admin/promo/create.js';
 import * as ep___admin_queue_clear from './endpoints/admin/queue/clear.js';
 import * as ep___admin_queue_deliverDelayed from './endpoints/admin/queue/deliver-delayed.js';
@@ -409,6 +410,7 @@ const $admin_getTableStats: Provider = { provide: 'ep:admin/get-table-stats', us
 const $admin_getUserIps: Provider = { provide: 'ep:admin/get-user-ips', useClass: ep___admin_getUserIps.default };
 const $admin_invite_create: Provider = { provide: 'ep:admin/invite/create', useClass: ep___admin_invite_create.default };
 const $admin_invite_list: Provider = { provide: 'ep:admin/invite/list', useClass: ep___admin_invite_list.default };
+const $admin_invite_revoke: Provider = { provide: 'ep:admin/invite/revoke', useClass: ep___admin_invite_revoke.default };
 const $admin_promo_create: Provider = { provide: 'ep:admin/promo/create', useClass: ep___admin_promo_create.default };
 const $admin_queue_clear: Provider = { provide: 'ep:admin/queue/clear', useClass: ep___admin_queue_clear.default };
 const $admin_queue_deliverDelayed: Provider = { provide: 'ep:admin/queue/deliver-delayed', useClass: ep___admin_queue_deliverDelayed.default };
@@ -782,6 +784,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
 		$admin_getUserIps,
 		$admin_invite_create,
 		$admin_invite_list,
+		$admin_invite_revoke,
 		$admin_promo_create,
 		$admin_queue_clear,
 		$admin_queue_deliverDelayed,
@@ -1149,6 +1152,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
 		$admin_getUserIps,
 		$admin_invite_create,
 		$admin_invite_list,
+		$admin_invite_revoke,
 		$admin_promo_create,
 		$admin_queue_clear,
 		$admin_queue_deliverDelayed,

packages/backend/src/server/api/endpoints.ts

@@ -40,6 +40,7 @@ import * as ep___admin_getTableStats from './endpoints/admin/get-table-stats.js'
 import * as ep___admin_getUserIps from './endpoints/admin/get-user-ips.js';
 import * as ep___admin_invite_create from './endpoints/admin/invite/create.js';
 import * as ep___admin_invite_list from './endpoints/admin/invite/list.js';
+import * as ep___admin_invite_revoke from './endpoints/admin/invite/revoke.js';
 import * as ep___admin_promo_create from './endpoints/admin/promo/create.js';
 import * as ep___admin_queue_clear from './endpoints/admin/queue/clear.js';
 import * as ep___admin_queue_deliverDelayed from './endpoints/admin/queue/deliver-delayed.js';
@@ -407,6 +408,7 @@ const eps = [
 	['admin/get-user-ips', ep___admin_getUserIps],
 	['admin/invite/create', ep___admin_invite_create],
 	['admin/invite/list', ep___admin_invite_list],
+	['admin/invite/revoke', ep___admin_invite_revoke],
 	['admin/promo/create', ep___admin_promo_create],
 	['admin/queue/clear', ep___admin_queue_clear],
 	['admin/queue/deliver-delayed', ep___admin_queue_deliverDelayed],

packages/backend/src/server/api/endpoints/admin/invite/revoke.ts

@@ -7,7 +7,6 @@ export const meta = {
 	tags: ['admin'],
 
 	requireCredential: true,
-	requireRolePolicy: 'canInvite',
 	requireModerator: true,
 } as const;
 

packages/cherrypick-js/src/api.types.ts

@@ -60,6 +60,8 @@ export type Endpoints = {
 	'admin/federation/update-instance': { req: TODO; res: TODO; };
 	'admin/invite/create': { req: TODO; res: TODO; };
 	'admin/invite/list': { req: TODO; res: TODO; };
+	'admin/invite/revoke': { req: TODO; res: TODO; };
+	'admin/invite/revoke-unused': { req: TODO; res: TODO; };
 	'admin/moderators/add': { req: TODO; res: TODO; };
 	'admin/moderators/remove': { req: TODO; res: TODO; };
 	'admin/promo/create': { req: TODO; res: TODO; };

packages/frontend/src/pages/admin/index.vue

@@ -82,11 +82,6 @@ const menuDef = $computed(() => [{
 		icon: 'ti ti-user-plus',
 		text: i18n.ts.createInviteCode,
 		action: invite,
-	}, {
-		type: 'button',
-		icon: 'ti ti-user-cancel',
-		text: i18n.ts.inviteRevoke,
-		action: inviteRevoke,
 	}] : [])],
 }, {
 	title: i18n.ts.administration,
@@ -263,16 +258,6 @@ const invite = () => {
 	});
 };
 
-const inviteRevoke = () => {
-	os.confirm({
-		type: 'warning',
-		text: i18n.ts.inviteRevokeConfirm,
-	}).then(({ canceled }) => {
-		if (canceled) return;
-		os.apiWithDialog('invite-revoke');
-	});
-};
-
 const lookup = (ev) => {
 	os.popupMenu([{
 		text: i18n.ts.user,

packages/frontend/src/pages/admin/invites.vue

@@ -104,7 +104,21 @@ function deleted(id: string) {
 	}
 }
 
-const headerActions = $computed(() => []);
+function inviteRevoke() {
+	os.confirm({
+		type: 'warning',
+		text: i18n.ts.inviteRevokeConfirm,
+	}).then(({ canceled }) => {
+		if (canceled) return;
+		os.apiWithDialog('admin/invite/revoke');
+	});
+}
+
+const headerActions = $computed(() => [{
+	text: i18n.ts.inviteRevoke,
+	icon: 'ti ti-trash',
+	handler: inviteRevoke,
+}]);
 const headerTabs = $computed(() => []);
 
 definePageMetadata({