fix: fix review comments

Author: meness

src/handlers/app.handler.ts

@@ -102,6 +102,7 @@ export class AppHandler {
       apiKey = await this.services.configService.getApiKey(context);
       config = await this.services.configService.getConfig(context, apiKey);
 
+      await this.services.appService.init(context);
       await callback(apiKey, config);
     } catch (error) {
       if ('repository' in context.payload) {
@@ -129,7 +130,6 @@ export class AppHandler {
   ): Promise<void> {
     await this.safeEventHandler(context, async (apiKey, config) => {
       await this.handlers.contributorHandler.safeCacheContributors(context, apiKey);
-      await this.services.appService.init(context);
       await this.handlers.chatHandler.handle(context, apiKey, config);
     });
   }

src/services/app.service.ts

@@ -7,6 +7,7 @@ import { GitHubService } from './github.service';
 export class AppService {
   private static instance: AppService;
   private appData?: RestEndpointMethodTypes['apps']['getAuthenticated']['response']['data'];
+  private user?: RestEndpointMethodTypes['users']['getByUsername']['response']['data'];
 
   private constructor() {}
 
@@ -19,11 +20,13 @@ export class AppService {
   }
 
   async init(context: Context): Promise<void> {
-    if (!this.appData) {
+    if (!this.appData || !this.user) {
       try {
         const { data } = await GitHubService.getAuthenticated(context);
 
         this.appData = data;
+
+        this.user = await GitHubService.getByUsername(this.appData!.slug + '[bot]', context);
       } catch (error) {
         throw new SystemError('Failed to get authenticated app data', Severity.ERROR, error);
       }
@@ -42,9 +45,15 @@ export class AppService {
     return this.appData!.slug;
   }
 
-  getId(): number | undefined {
+  getLogin(): string {
+    this.ensureInitialized();
+
+    return this.user!.login;
+  }
+
+  getEmail(): string {
     this.ensureInitialized();
 
-    return this.appData!.id;
+    return `${this.user!.id}+${this.user!.login}@users.noreply.github.com`;
   }
 }

src/services/github.service.ts

@@ -70,6 +70,17 @@ export class GitHubService {
     return context.octokit.apps.getAuthenticated();
   }
 
+  static getByUsername = async (
+    username: string,
+    context: Context
+  ): Promise<RestEndpointMethodTypes['users']['getByUsername']['response']['data']> => {
+    const { data } = await context.octokit.users.getByUsername({
+      username
+    });
+
+    return data;
+  };
+
   static paginateListComments(
     context: Context
   ): Promise<RestEndpointMethodTypes['issues']['listComments']['response']['data']> {

src/utils/review-skip-conditions.util.ts

@@ -37,9 +37,9 @@ export class ReviewSkipConditions {
       const commitSha = this.context.payload.after;
       const commit = await GitHubService.getCommit(commitSha, this.context);
       const { message } = commit.data.commit;
-      const slug = this.appService.getAppSlug();
-      const id = this.appService.getId();
-      const coAuthoredMessage = `${slug}[bot] <${id}+${slug}[bot]@users.noreply.github.com>`;
+      const login = this.appService.getLogin();
+      const email = this.appService.getEmail();
+      const coAuthoredMessage = `${login} <${email}>`;
 
       return message.toLowerCase().includes(coAuthoredMessage.toLowerCase());
     }