Merge branch 'main' into feat/1046/link-message

givepraise · Jun 29, 2023 · 7c46151 · 7c46151
2 parents 345a286 + 3411178
commit 7c46151
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 23 deletions.
diff --git a/packages/api/src/praise/schemas/praise.schema.ts b/packages/api/src/praise/schemas/praise.schema.ts
@@ -53,20 +53,20 @@ export class Praise {
     example: 'for making edits in the welcome text',
     type: 'string',
   })
-  @Prop({ required: true, minlength: 5, maxlength: 280 })
+  @Prop({ required: true, minlength: 5, maxlength: 500 })
   @IsString()
   @MinLength(5)
-  @MaxLength(280)
+  @MaxLength(500)
   reasonRaw: string;
 
   @ApiResponseProperty({
     example: 'for making edits in the welcome text',
     type: 'string',
   })
-  @Prop({ required: true, minlength: 5, maxlength: 280 })
+  @Prop({ required: true, minlength: 5, maxlength: 500 })
   @IsString()
   @MinLength(5)
-  @MaxLength(280)
+  @MaxLength(500)
   reason: string;
 
   @ApiResponseProperty({

diff --git a/packages/api/test/praise.e2e-spec.ts b/packages/api/test/praise.e2e-spec.ts
@@ -446,8 +446,8 @@ describe('Praise (E2E)', () => {
       expect(rb[0]).toBeProperlySerialized();
     });
 
-    // test, API should return 400 when praise reason contains more than 280 characters
-    test('400 when reason is more than 280 characters', async () => {
+    // test, API should return 400 when praise reason contains more than 500 characters
+    test('400 when reason is more than 500 characters', async () => {
       const giver = await userAccountsSeeder.seedUserAccount();
       const receiver = await userAccountsSeeder.seedUserAccount();
 
@@ -475,10 +475,10 @@ describe('Praise (E2E)', () => {
 
       expect(response.status).toBe(400);
       expect(response.body.message).toContain(
-        'reason must be shorter than or equal to 280 characters',
+        'reason must be shorter than or equal to 500 characters',
       );
       expect(response.body.message).toContain(
-        'reasonRaw must be shorter than or equal to 280 characters',
+        'reasonRaw must be shorter than or equal to 500 characters',
       );
     });
 

diff --git a/packages/discord-bot/src/handlers/announce.ts b/packages/discord-bot/src/handlers/announce.ts
@@ -91,7 +91,7 @@ export const announcementHandler: CommandHandler = async (
             const response = await apiGet<PeriodPaginatedResponseDto>(
               'periods',
               {
-                headers: { host: host },
+                headers: { host },
               }
             );
             periods = [...response.data.docs];

diff --git a/packages/discord-bot/src/handlers/forward.ts b/packages/discord-bot/src/handlers/forward.ts
@@ -67,7 +67,7 @@ export const forwardHandler: CommandHandler = async (
 
     const reason = interaction.options.getString('reason', true);
 
-    if (reason.length < 5 || reason.length > 280) {
+    if (reason.length < 5 || reason.length > 500) {
       await ephemeralWarning(interaction, 'INVALID_REASON_LENGTH', host);
       return;
     }

diff --git a/packages/discord-bot/src/handlers/leaderboard.ts b/packages/discord-bot/src/handlers/leaderboard.ts
@@ -31,7 +31,7 @@ export const leaderboardHandler: CommandHandler = async (
     const response = await apiClient.get<PeriodPaginatedResponseDto>(
       'periods',
       {
-        headers: { host: host },
+        headers: { host },
       }
     );
     periods = [...response.data.docs];
@@ -62,7 +62,7 @@ export const leaderboardHandler: CommandHandler = async (
     const response = await apiClient.get<PeriodDetailsDto>(
       `periods/${latestClosedPeriod?._id}`,
       {
-        headers: { host: host },
+        headers: { host },
       }
     );
     await interaction.editReply({

diff --git a/packages/discord-bot/src/handlers/praise.ts b/packages/discord-bot/src/handlers/praise.ts
@@ -58,7 +58,7 @@ export const praiseHandler: CommandHandler = async (
 
     const reason = interaction.options.getString('reason', true);
 
-    if (reason.length < 5 || reason.length > 280) {
+    if (reason.length < 5 || reason.length > 500) {
       await ephemeralWarning(interaction, 'INVALID_REASON_LENGTH', host);
       return;
     }

diff --git a/packages/discord-bot/src/handlers/whatsup.ts b/packages/discord-bot/src/handlers/whatsup.ts
@@ -61,7 +61,7 @@ export const whatsupHandler: CommandHandler = async (
   const praiseResponse = await apiGet<PraisePaginatedResponseDto>(
     '/praise?limit=100&page=1&sortColumn=createdAt&sortType=desc',
     {
-      headers: { host: host },
+      headers: { host },
     }
   );
 

diff --git a/packages/discord-bot/src/handlers/whoami.ts b/packages/discord-bot/src/handlers/whoami.ts
@@ -50,7 +50,7 @@ export const whoamiHandler: CommandHandler = async (
 
       const activatedAccounts = await apiClient
         .get<UserAccount[]>(`useraccounts?user=${ua.user._id}`, {
-          headers: { host: host },
+          headers: { host },
         })
         .then((res) => res.data);
       for (const account of activatedAccounts) {

diff --git a/packages/discord-bot/src/handlers/whois.ts b/packages/discord-bot/src/handlers/whois.ts
@@ -58,7 +58,7 @@ export const whoisHandler: CommandHandler = async (
     const response = await apiClient.get<PraisePaginatedResponseDto>(
       `/praise?limit=100&page=1&receiver=${userAccount._id}&sortType=desc&sortColumn=score`,
       {
-        headers: { host: host },
+        headers: { host },
       }
     );
 
@@ -79,7 +79,7 @@ export const whoisHandler: CommandHandler = async (
       userAccount.user
         ? apiClient
             .get<UserWithStatsDto>(`/users/${userAccount.user._id}`, {
-              headers: { host: host },
+              headers: { host },
             })
             .then((res) => res.data)
         : Promise.resolve(null),

diff --git a/packages/discord-bot/src/utils/dmTargets.ts b/packages/discord-bot/src/utils/dmTargets.ts
@@ -183,7 +183,8 @@ export const selectTargets = async (
 
       try {
         const selectedPeriod = await apiGet<PeriodDetailsDto>(
-          `/periods/${period}`
+          `/periods/${period}`,
+          { headers: { host } }
         ).then((res) => res.data);
 
         logger.debug(

diff --git a/packages/discord-bot/src/utils/getActivateToken.ts b/packages/discord-bot/src/utils/getActivateToken.ts
@@ -18,7 +18,7 @@ export const getActivateToken = async (
     `/useraccounts/${userAccount._id}`,
     ua,
     {
-      headers: { host: host },
+      headers: { host },
     }
   )
     .then((res) => res.data)

diff --git a/packages/discord-bot/src/utils/getUserAccount.ts b/packages/discord-bot/src/utils/getUserAccount.ts
@@ -22,7 +22,7 @@ const createUserAccount = async (
     CreateUserAccountResponseDto,
     CreateUserAccountInputDto
   >('/useraccounts', newUserAccount, {
-    headers: { host: host },
+    headers: { host },
   });
   return response.data;
 };
@@ -41,7 +41,7 @@ const updateUserAccount = async (
       UpdateUserAccountResponseDto,
       UpdateUserAccountInputDto
     >(`/useraccounts/${ua._id}`, updatedUserAccount, {
-      headers: { host: host },
+      headers: { host },
     });
     return response.data;
   }
@@ -61,7 +61,7 @@ export const getUserAccount = async (
   const data = await apiGet<UserAccount[]>(
     `/useraccounts/?accountId=${user.id}`,
     {
-      headers: { host: host },
+      headers: { host },
     }
   )
     .then((res) => res.data.filter((acc) => acc.platform === 'DISCORD'))

diff --git a/packages/discord-bot/src/utils/settingsUtil.ts b/packages/discord-bot/src/utils/settingsUtil.ts
@@ -44,7 +44,7 @@ export const getDefaultSetting = (
     case 'FORWARDER_ROLE_WARNING':
       return "**❌ You don't have the permission to use this command.**";
     case 'INVALID_REASON_LENGTH':
-      return 'Reason should be between 5 to 280 characters';
+      return 'Reason should be between 5 to 500 characters';
     case 'FORWARD_FORWARD_FAILED':
       return 'Forward Failed :(';
     case 'PRAISE_FAILED':

diff --git a/praise-giveth-io-20230614071552.archive b/praise-giveth-io-20230614071552.archive