adjust

packages/app/src/interfaces/activity.ts

@@ -6,7 +6,6 @@ const MODEL_PAGE = 'Page';
 
 // Action
 const ACTION_UNSETTLED = 'UNSETTLED';
-
 const ACTION_PAGE_LIKE = 'PAGE_LIKE';
 const ACTION_PAGE_BOOKMARK = 'PAGE_BOOKMARK';
 const ACTION_PAGE_CREATE = 'PAGE_CREATE';
@@ -57,6 +56,7 @@ export const AllSupportedTargetModelType = Object.values(SUPPORTED_TARGET_MODEL_
 export const AllSupportedActionType = Object.values(SUPPORTED_ACTION_TYPE);
 export const AllSupportedActionToNotifiedType = Object.values(SUPPORTED_ACTION_TO_NOTIFIED_TYPE);
 
+
 /*
  * For AuditLogManagement.tsx
  */
@@ -79,7 +79,6 @@ export const CommentActions = Object.values({
 
 
 export type SupportedTargetModelType = typeof SUPPORTED_TARGET_MODEL_TYPE[keyof typeof SUPPORTED_TARGET_MODEL_TYPE];
-// type supportedEventModelType = typeof SUPPORTED_EVENT_MODEL_TYPE[keyof typeof SUPPORTED_EVENT_MODEL_TYPE];
 export type SupportedActionType = typeof SUPPORTED_ACTION_TYPE[keyof typeof SUPPORTED_ACTION_TYPE];
 
 

packages/app/src/server/middlewares/add-activity.ts

@@ -7,13 +7,12 @@ import loggerFactory from '~/utils/logger';
 
 const logger = loggerFactory('growi:middlewares:add-activity');
 
-
 interface AuthorizedRequest extends Request {
   user?: IUserHasId
 }
 
 export const generateAddActivityMiddleware = crowi => async(req: AuthorizedRequest, res: Response, next: NextFunction): Promise<void> => {
-  const ip = (req.headers['x-forwarded-for'] || req.connection.remoteAddress);
+  const ip = req.headers['x-forwarded-for'];
   const path = req.originalUrl;
   const user = req.user;
 
@@ -35,5 +34,5 @@ export const generateAddActivityMiddleware = crowi => async(req: AuthorizedReque
     logger.error('Create activity failed', err);
   }
 
-  next();
+  return next();
 };

packages/app/src/server/service/activity.ts

@@ -8,7 +8,7 @@ import Activity from '~/server/models/activity';
 import Crowi from '../crowi';
 
 
-type ParameterType = Omit<IActivity, 'ip' | 'path' | 'createdAt'>
+type ParameterType = Omit<IActivity, 'createdAt'>
 
 class ActivityService {