WNomunomu 2 лет назад
Родитель
Сommit
ddd5cc4670

+ 2 - 2
apps/app/src/server/routes/comment.js

@@ -269,13 +269,13 @@ module.exports = function(crowi, app) {
       action: SupportedAction.ACTION_COMMENT_CREATE,
     };
 
-    const getAditionalTargetUsers = async(activity) => {
+    const getAdditionalTargetUsers = async(activity) => {
       const mentionedUsers = await crowi.commentService.getMentionedUsers(activity.event);
 
       return mentionedUsers;
     };
 
-    activityEvent.emit('update', res.locals.activity._id, parameters, page, preNotifyService.generatePreNotify, getAditionalTargetUsers);
+    activityEvent.emit('update', res.locals.activity._id, parameters, page, preNotifyService.generatePreNotify, getAdditionalTargetUsers);
 
     res.json(ApiResponse.success({ comment: createdComment }));
 

+ 3 - 3
apps/app/src/server/service/activity.ts

@@ -11,7 +11,7 @@ import loggerFactory from '../../utils/logger';
 import Crowi from '../crowi';
 
 
-import type { GeneratePreNotify, GetAditionalTargetUsers } from './preNotify';
+import type { GeneratePreNotify, GetAdditionalTargetUsers } from './preNotify';
 
 const logger = loggerFactory('growi:service:ActivityService');
 
@@ -42,7 +42,7 @@ class ActivityService {
 
   initActivityEventListeners(): void {
     this.activityEvent.on('update', async(
-        activityId: string, parameters, target: IPage, generatePreNotify: GeneratePreNotify, getAditionalTargetUsers?: GetAditionalTargetUsers,
+        activityId: string, parameters, target: IPage, generatePreNotify: GeneratePreNotify, getAdditionalTargetUsers?: GetAdditionalTargetUsers,
     ) => {
       let activity: ActivityDocument;
       const shoudUpdate = this.shoudUpdateActivity(parameters.action);
@@ -56,7 +56,7 @@ class ActivityService {
           return;
         }
 
-        const preNotify = generatePreNotify(activity, getAditionalTargetUsers);
+        const preNotify = generatePreNotify(activity, getAdditionalTargetUsers);
 
         this.activityEvent.emit('updated', activity, target, preNotify);
       }

+ 6 - 6
apps/app/src/server/service/preNotify.ts

@@ -11,9 +11,9 @@ export type PreNotifyProps = {
 }
 
 export type PreNotify = (props: PreNotifyProps) => Promise<void>;
-export type GeneratePreNotify = (activity: ActivityDocument, getAditionalTargetUsers?: (activity?: ActivityDocument) => Ref<IUser>[]) => PreNotify;
+export type GeneratePreNotify = (activity: ActivityDocument, getAdditionalTargetUsers?: (activity?: ActivityDocument) => Ref<IUser>[]) => PreNotify;
 
-export type GetAditionalTargetUsers = (activity: ActivityDocument) => Ref<IUser>[];
+export type GetAdditionalTargetUsers = (activity: ActivityDocument) => Ref<IUser>[];
 
 class PreNotifyService {
 
@@ -24,7 +24,7 @@ class PreNotifyService {
     return { notificationTargetUsers: initialPreNotifyProps };
   };
 
-  generatePreNotify = (activity: ActivityDocument, getAditionalTargetUsers?: GetAditionalTargetUsers): PreNotify => {
+  generatePreNotify = (activity: ActivityDocument, getAdditionalTargetUsers?: GetAdditionalTargetUsers): PreNotify => {
 
     const preNotify = async(props: PreNotifyProps) => {
       const { notificationTargetUsers } = props;
@@ -39,15 +39,15 @@ class PreNotifyService {
         status: User.STATUS_ACTIVE,
       }).distinct('_id');
 
-      if (getAditionalTargetUsers == null) {
+      if (getAdditionalTargetUsers == null) {
         notificationTargetUsers?.push(...activeNotificationUsers);
       }
       else {
-        const aditionalTargetUsers = getAditionalTargetUsers(activity);
+        const AdditionalTargetUsers = getAdditionalTargetUsers(activity);
 
         notificationTargetUsers?.push(
           ...activeNotificationUsers,
-          ...aditionalTargetUsers,
+          ...AdditionalTargetUsers,
         );
       }