ポイント受領通知を追加

Author: Suzlun

locales/index.d.ts

@@ -10018,6 +10018,10 @@ export interface Locale extends ILocale {
          * ログインボーナス
          */
         "loginbonus": string;
+        /**
+         * {sender}から{point}{pointName}をもらいました
+         */
+        "acceptPoints": ParameterizedString<"sender" | "point" | "pointName">;
         /**
          * 通知テスト
          */
@@ -10119,6 +10123,10 @@ export interface Locale extends ILocale {
              * ログインボーナス
              */
             "loginBonus": string;
+            /**
+             * {pointName}獲得
+             */
+            "acceptPoints": ParameterizedString<"pointName">;
             /**
              * エクスポートが完了した
              */

locales/ja-JP.yml

@@ -2641,6 +2641,7 @@ _notification:
   emptyPushNotificationMessage: "プッシュ通知の更新をしました"
   achievementEarned: "実績を獲得"
   loginbonus: "ログインボーナス"
+  acceptPoints: "{sender}から{point}{pointName}をもらいました"
   testNotification: "通知テスト"
   checkNotificationBehavior: "通知の表示を確かめる"
   sendTestNotification: "テスト通知を送信する"
@@ -2668,6 +2669,7 @@ _notification:
     roleAssigned: "ロールが付与された"
     achievementEarned: "実績の獲得"
     loginBonus: "ログインボーナス"
+    acceptPoints: "{pointName}獲得"
     exportCompleted: "エクスポートが完了した"
     login: "ログイン"
     test: "通知のテスト"

packages/backend/src/core/entities/NotificationEntityService.ts

@@ -171,6 +171,9 @@ export class NotificationEntityService implements OnModuleInit {
 			...(notification.type === 'loginBonus' ? {
 				loginBonus: notification.loginBonus,
 			} : {}),
+			...(notification.type === 'acceptPoints' ? {
+				getPoint: notification.getPoint,
+			} : {}),
 			...(notification.type === 'app' ? {
 				body: notification.customBody,
 				header: notification.customHeader,

packages/backend/src/models/Notification.ts

@@ -59,11 +59,11 @@ export type MiNotification = {
 	createdAt: string;
 	loginBonus: number;
 } | {
-	type: 'sendPoint';
+	type: 'acceptPoints';
 	id: string;
 	createdAt: string;
 	getPoint: number;
-	senderId: MiUser['id'];
+	notifierId: MiUser['id'];
 } | {
 	type: 'pollEnded';
 	id: string;

packages/backend/src/models/json-schema/notification.ts

@@ -412,6 +412,30 @@ export const packedNotificationSchema = {
 				},
 			},
 		},
+	}, {
+		type: 'object',
+		properties: {
+			...baseSchema.properties,
+			type: {
+				type: 'string',
+				optional: false, nullable: false,
+				enum: ['acceptPoints'],
+			},
+			getPoint: {
+				type: 'number',
+				optional: false, nullable: false,
+			},
+			user: {
+				type: 'object',
+				ref: 'UserLite',
+				optional: false, nullable: false,
+			},
+			userId: {
+				type: 'string',
+				optional: false, nullable: false,
+				format: 'id',
+			},
+		},
 	}, {
 		type: 'object',
 		properties: {

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

@@ -52,10 +52,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				getPoints: user.getPoints + ps.points,
 			});
 
-			this.notificationService.createNotification(user.id, 'sendPoint', {
+			this.notificationService.createNotification(user.id, 'acceptPoints', {
 				getPoint: ps.points,
-				senderId: sender.id,
-			});
+			}, sender.id);
 
 			return {};
 		});

packages/backend/src/types.ts

@@ -48,6 +48,7 @@ export const notificationTypes = [
 	'app',
 	'test',
 	'loginBonus',
+	'acceptPoints',
 ] as const;
 
 export const groupedNotificationTypes = [

packages/frontend/src/components/MkNotification.vue

@@ -55,8 +55,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 					[$style.t_achievementEarned]:
 						notification.type === 'achievementEarned' || notification.type === 'loginBonus',
 					[$style.t_exportCompleted]: notification.type === 'exportCompleted',
-				[$style.t_login]: notification.type === 'login',
-				[$style.t_roleAssigned]:
+					[$style.t_login]: notification.type === 'login',
+					[$style.t_acceptPoints]: notification.type === 'acceptPoints',
+					[$style.t_roleAssigned]:
 						notification.type === 'roleAssigned' &&
 						notification.role.iconUrl == null,
 				},
@@ -90,6 +91,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 				v-else-if="notification.type === 'loginBonus'"
 				class="ti ti-medal"
 			></i>
+			<i
+				v-else-if="notification.type === 'acceptPoints'"
+				class="ti ti-medal"
+			></i>
 <i v-else-if="notification.type === 'exportCompleted'" class="ti ti-archive"></i>
 			<i v-else-if="notification.type === 'login'" class="ti ti-login-2"></i>
 			<template v-else-if="notification.type === 'roleAssigned'">
@@ -140,7 +145,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 						notification.type === 'quote' ||
 						notification.type === 'reaction' ||
 						notification.type === 'receiveFollowRequest' ||
-						notification.type === 'followRequestAccepted'
+						notification.type === 'followRequestAccepted' ||
+						notification.type === 'acceptPoints'
 				"
 				v-user-preview="notification.user.id"
 				:class="$style.headerName"
@@ -298,6 +304,18 @@ SPDX-License-Identifier: AGPL-3.0-only
 					})
 				}}
 			</div>
+			<div
+				v-else-if="notification.type === 'acceptPoints'"
+				:class="$style.text"
+			>
+				{{
+					i18n.tsx._notification.acceptPoints({
+						point: notification.getPoint,
+						pointName: instance?.pointName ?? i18n.ts.point,
+						sender: notification.user.username,
+					})
+				}}
+			</div>
 			<MkA
 				v-else-if="notification.type === 'achievementEarned'"
 				:class="$style.text"
@@ -488,6 +506,7 @@ function getActualReactedUsersCount(
 	--eventReactionHeart: var(--MI_THEME-love);
 	--eventReaction: #e99a0b;
 	--eventAchievement: #cb9a11;
+	--eventAcceptPoints: #cb9a11;
 	--eventLogin: #007aff;
 	--eventOther: #88a6b7;
 }
@@ -612,6 +631,12 @@ function getActualReactedUsersCount(
 	pointer-events: none;
 }
 
+.t_acceptPoints {
+	padding: 3px;
+	background: var(--eventAcceptPoints);
+	pointer-events: none;
+}
+
 .t_login {
 	padding: 3px;
 	background: var(--eventLogin);

packages/misskey-js/etc/misskey-js.api.md

@@ -1865,7 +1865,7 @@ declare namespace entities {
         UsersAchievementsRequest,
         UsersAchievementsResponse,
         UsersUpdateMemoRequest,
-		PointSendRequest,
+        PointSendRequest,
         FetchRssRequest,
         FetchRssResponse,
         FetchExternalResourcesRequest,
@@ -2998,6 +2998,9 @@ type PingResponse = operations['ping']['responses']['200']['content']['applicati
 // @public (undocumented)
 type PinnedUsersResponse = operations['pinned-users']['responses']['200']['content']['application/json'];
 
+// @public (undocumented)
+type PointSendRequest = operations['point___send']['requestBody']['content']['application/json'];
+
 // @public (undocumented)
 type PromoReadRequest = operations['promo___read']['requestBody']['content']['application/json'];
 
@@ -3526,8 +3529,6 @@ type UsersShowResponse = operations['users___show']['responses']['200']['content
 // @public (undocumented)
 type UsersUpdateMemoRequest = operations['users___update-memo']['requestBody']['content']['application/json'];
 
-// @public (undocumented)
-type PointSendRequest = operations['point___send']['requestBody']['content']['application/json']
 // Warnings were encountered during analysis:
 //
 // src/entities.ts:50:2 - (ae-forgotten-export) The symbol "ModerationLogPayloads" needs to be exported by the entry point index.d.ts

packages/misskey-js/src/autogen/apiClientJSDoc.ts

@@ -4344,6 +4344,18 @@ declare module '../api.js' {
       credential?: string | null,
     ): Promise<SwitchCaseResponseType<E, P>>;
 
+    /**
+     * No description provided.
+     * 
+     * **Internal Endpoint**: This endpoint is an API for the misskey mainframe and is not intended for use by third parties.
+     * **Credential required**: *Yes* / **Permission**: *write:points*
+     */
+    request<E extends 'point/send', P extends Endpoints[E]['req']>(
+      endpoint: E,
+      params: P,
+      credential?: string | null,
+    ): Promise<SwitchCaseResponseType<E, P>>;
+
     /**
      * No description provided.
      *