From 7e0603776f88a7e77aa8496a21661a0b852bc5de Mon Sep 17 00:00:00 2001
From: ArafatHossain403 <arafatnubt@gmail.com>
Date: Sat, 21 Dec 2024 23:53:52 +0600
Subject: [PATCH 01/31] user registration company name and password max length
 set for unhandled error in backend

---
 .../src/dtos/auth/create.org.user.dto.ts      | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/libraries/nestjs-libraries/src/dtos/auth/create.org.user.dto.ts b/libraries/nestjs-libraries/src/dtos/auth/create.org.user.dto.ts
index 0505e2b00..25f633a94 100644
--- a/libraries/nestjs-libraries/src/dtos/auth/create.org.user.dto.ts
+++ b/libraries/nestjs-libraries/src/dtos/auth/create.org.user.dto.ts
@@ -1,29 +1,31 @@
-import {IsDefined, IsEmail, IsString, MinLength, ValidateIf} from "class-validator";
+import {IsDefined, IsEmail, IsString, MaxLength, MinLength, ValidateIf} from "class-validator";
 import {Provider} from '@prisma/client';
 
 export class CreateOrgUserDto {
-    @IsString()
-    @MinLength(3)
-    @IsDefined()
-    @ValidateIf(o => !o.providerToken)
-    password: string;
+  @IsString()
+  @MinLength(3)
+  @MaxLength(64)
+  @IsDefined()
+  @ValidateIf((o) => !o.providerToken)
+  password: string;
 
-    @IsString()
-    @IsDefined()
-    provider: Provider;
+  @IsString()
+  @IsDefined()
+  provider: Provider;
 
-    @IsString()
-    @IsDefined()
-    @ValidateIf(o => !o.password)
-    providerToken: string;
+  @IsString()
+  @IsDefined()
+  @ValidateIf((o) => !o.password)
+  providerToken: string;
 
-    @IsEmail()
-    @IsDefined()
-    @ValidateIf(o => !o.providerToken)
-    email: string;
+  @IsEmail()
+  @IsDefined()
+  @ValidateIf((o) => !o.providerToken)
+  email: string;
 
-    @IsString()
-    @IsDefined()
-    @MinLength(3)
-    company: string;
+  @IsString()
+  @IsDefined()
+  @MinLength(3)
+  @MaxLength(128)
+  company: string;
 }

From 9c10d0f1a65c1a9288e32a28eb39b4be9030daa7 Mon Sep 17 00:00:00 2001
From: Aniket Kumar Ghosh <ghoshaniketkumar7@gmail.com>
Date: Sun, 19 Jan 2025 14:57:13 +0530
Subject: [PATCH 02/31] short.io integration is in progress.

---
 .../src/short-linking/providers/short.io.ts   | 85 +++++++++++++++++++
 .../src/short-linking/short.link.service.ts   |  5 ++
 2 files changed, 90 insertions(+)
 create mode 100644 libraries/nestjs-libraries/src/short-linking/providers/short.io.ts

diff --git a/libraries/nestjs-libraries/src/short-linking/providers/short.io.ts b/libraries/nestjs-libraries/src/short-linking/providers/short.io.ts
new file mode 100644
index 000000000..f94e90491
--- /dev/null
+++ b/libraries/nestjs-libraries/src/short-linking/providers/short.io.ts
@@ -0,0 +1,85 @@
+import { ShortLinking } from '@gitroom/nestjs-libraries/short-linking/short-linking.interface';
+
+
+const options = {
+  headers: {
+    Authorization: `Bearer ${process.env.SHORT_IO_SECRET_KEY}`,
+    'Content-Type': 'application/json',
+  },
+};
+
+export class ShortIo implements ShortLinking {
+  shortLinkDomain = 'aniket.short.gy';
+
+  async linksStatistics ( links: string[] ) {
+    return Promise.all(
+      links.map(async (link) => {
+        const url = `https://api.short.io/links/expand?domain=${this.shortLinkDomain}&path=${link.split('/').pop()}`;
+        const response = await ( fetch( url, options )
+          .then( res => res.json() ) );
+
+        const linkStatisticsUrl = `https://statistics.short.io/statistics/link/${response.id}?period=last30&tz=UTC`;
+
+        const statResponse = await ( fetch( linkStatisticsUrl, options ).then( ( res ) => res.json() ) );
+
+        return {
+          short: response.shortURL,
+          original: response.originalURL,
+          clicks: statResponse.totalClicks,
+        };
+      })
+    );
+  }
+
+  async convertLinkToShortLink(id: string, link: string) {
+    return (
+      await (
+        await fetch(`https://api.dub.co/links`, {
+          ...options,
+          method: 'POST',
+          body: JSON.stringify({
+            url: link,
+            tenantId: id,
+            domain: this.shortLinkDomain,
+          }),
+        })
+      ).json()
+    ).shortLink;
+  }
+
+  async convertShortLinkToLink(shortLink: string) {
+    return await (
+      await (
+        await fetch(
+          `https://api.dub.co/links/info?domain=${shortLink}`,
+          options
+        )
+      ).json()
+    ).url;
+  }
+
+  // recursive functions that gets maximum 100 links per request if there are less than 100 links stop the recursion
+  async getAllLinksStatistics(
+    id: string,
+    page = 1
+  ): Promise<{ short: string; original: string; clicks: string }[]> {
+    const response = await (
+      await fetch(
+        `https://api.dub.co/links?tenantId=${id}&page=${page}&pageSize=100`,
+        options
+      )
+    ).json();
+
+    const mapLinks = response.links.map((link: any) => ({
+      short: link,
+      original: response.url,
+      clicks: response.clicks,
+    }));
+
+    if (mapLinks.length < 100) {
+      return mapLinks;
+    }
+
+    return [...mapLinks, ...(await this.getAllLinksStatistics(id, page + 1))];
+  }
+}
diff --git a/libraries/nestjs-libraries/src/short-linking/short.link.service.ts b/libraries/nestjs-libraries/src/short-linking/short.link.service.ts
index cdff93ce0..4815e7f27 100644
--- a/libraries/nestjs-libraries/src/short-linking/short.link.service.ts
+++ b/libraries/nestjs-libraries/src/short-linking/short.link.service.ts
@@ -2,12 +2,17 @@ import { Dub } from '@gitroom/nestjs-libraries/short-linking/providers/dub';
 import { Empty } from '@gitroom/nestjs-libraries/short-linking/providers/empty';
 import { ShortLinking } from '@gitroom/nestjs-libraries/short-linking/short-linking.interface';
 import { Injectable } from '@nestjs/common';
+import { ShortIo } from './providers/short.io';
 
 const getProvider = (): ShortLinking => {
   if (process.env.DUB_TOKEN) {
     return new Dub();
   }
 
+  if ( process.env.SHORT_IO_SECRET_KEY ) {
+    return new ShortIo();
+  }
+
   return new Empty();
 };
 

From 4d9ef69476968a30413dfab0d4f575122e978f5e Mon Sep 17 00:00:00 2001
From: Aniket Kumar Ghosh <ghoshaniketkumar7@gmail.com>
Date: Sun, 19 Jan 2025 16:54:10 +0530
Subject: [PATCH 03/31] code implementation complete.

---
 .../src/short-linking/providers/short.io.ts   | 56 ++++++++++---------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/libraries/nestjs-libraries/src/short-linking/providers/short.io.ts b/libraries/nestjs-libraries/src/short-linking/providers/short.io.ts
index f94e90491..585d73dc4 100644
--- a/libraries/nestjs-libraries/src/short-linking/providers/short.io.ts
+++ b/libraries/nestjs-libraries/src/short-linking/providers/short.io.ts
@@ -9,7 +9,7 @@ const options = {
 };
 
 export class ShortIo implements ShortLinking {
-  shortLinkDomain = 'aniket.short.gy';
+  shortLinkDomain = 'short.io';
 
   async linksStatistics ( links: string[] ) {
     return Promise.all(
@@ -31,31 +31,31 @@ export class ShortIo implements ShortLinking {
     );
   }
 
-  async convertLinkToShortLink(id: string, link: string) {
-    return (
-      await (
-        await fetch(`https://api.dub.co/links`, {
-          ...options,
-          method: 'POST',
-          body: JSON.stringify({
-            url: link,
-            tenantId: id,
-            domain: this.shortLinkDomain,
-          }),
-        })
-      ).json()
-    ).shortLink;
+  async convertLinkToShortLink ( id: string, link: string ) {
+    const response = await fetch( `https://api.short.io/links`, {
+      ...options,
+      method: 'POST',
+      body: JSON.stringify( {
+        url: link,
+        tenantId: id,
+        domain: this.shortLinkDomain,
+        originalURL: link
+
+      } ),
+    } ).then( ( res ) => res.json() );
+
+    return response.shortURL;
   }
 
   async convertShortLinkToLink(shortLink: string) {
-    return await (
-      await (
+    return await(
+      await(
         await fetch(
-          `https://api.dub.co/links/info?domain=${shortLink}`,
+          `https://api.short.io/links/expand?domain=${this.shortLinkDomain}&path=${shortLink.split('/').pop()}`,
           options
         )
       ).json()
-    ).url;
+    ).originalURL;
   }
 
   // recursive functions that gets maximum 100 links per request if there are less than 100 links stop the recursion
@@ -65,16 +65,22 @@ export class ShortIo implements ShortLinking {
   ): Promise<{ short: string; original: string; clicks: string }[]> {
     const response = await (
       await fetch(
-        `https://api.dub.co/links?tenantId=${id}&page=${page}&pageSize=100`,
+        `https://api.short.io/api/links?domain_id=${id}&limit=150`,
         options
       )
     ).json();
 
-    const mapLinks = response.links.map((link: any) => ({
-      short: link,
-      original: response.url,
-      clicks: response.clicks,
-    }));
+    const mapLinks = response.links.map(async ( link: any ) => {
+      const linkStatisticsUrl = `https://statistics.short.io/statistics/link/${response.id}?period=last30&tz=UTC`;
+
+      const statResponse = await(fetch(linkStatisticsUrl, options).then((res) => res.json()));
+
+      return {
+        short: link,
+        original: response.url,
+        clicks: statResponse.totalClicks,
+      };
+    } );
 
     if (mapLinks.length < 100) {
       return mapLinks;

From 13b26030b4099b9a99f5c248943973804d807059 Mon Sep 17 00:00:00 2001
From: Keiwan Mosaddegh <keiwan.mosaddegh@gmail.com>
Date: Thu, 23 Jan 2025 09:49:08 +0100
Subject: [PATCH 04/31] feat(tiktok): add content posting method to tiktok dto

---
 .../src/dtos/posts/providers-settings/tiktok.dto.ts           | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libraries/nestjs-libraries/src/dtos/posts/providers-settings/tiktok.dto.ts b/libraries/nestjs-libraries/src/dtos/posts/providers-settings/tiktok.dto.ts
index 28c49024f..91eece6cc 100644
--- a/libraries/nestjs-libraries/src/dtos/posts/providers-settings/tiktok.dto.ts
+++ b/libraries/nestjs-libraries/src/dtos/posts/providers-settings/tiktok.dto.ts
@@ -32,4 +32,8 @@ export class TikTokDto {
   @IsIn(['true'])
   @IsDefined()
   isValidVideo: boolean;
+
+  @IsIn(['DIRECT_POST', 'UPLOAD'])
+  @IsString()
+  content_posting_method: 'DIRECT_POST' | 'UPLOAD';
 }

From 912895b6c7a9f9756aed441df73fe9cd8731c7cf Mon Sep 17 00:00:00 2001
From: Keiwan Mosaddegh <keiwan.mosaddegh@gmail.com>
Date: Thu, 23 Jan 2025 09:52:12 +0100
Subject: [PATCH 05/31] feat(tiktok): add content posting method alternative to
 settings

---
 .../providers/tiktok/tiktok.provider.tsx      | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/apps/frontend/src/components/launches/providers/tiktok/tiktok.provider.tsx b/apps/frontend/src/components/launches/providers/tiktok/tiktok.provider.tsx
index 6f2ca47cc..6b704027e 100644
--- a/apps/frontend/src/components/launches/providers/tiktok/tiktok.provider.tsx
+++ b/apps/frontend/src/components/launches/providers/tiktok/tiktok.provider.tsx
@@ -33,6 +33,17 @@ const privacyLevel = [
   },
 ];
 
+const contentPostingMethod = [
+  {
+    value: 'DIRECT_POST',
+    label: 'Post content directly to TikTok',
+  },
+  {
+    value: 'UPLOAD',
+    label: 'Upload content to TikTok without posting it',
+  },
+];
+
 const yesNo = [
   {
     value: 'true',
@@ -126,6 +137,19 @@ const TikTokSettings: FC<{ values?: any }> = (props) => {
           </option>
         ))}
       </Select>
+      <Select
+        label="Content posting method"
+        {...register('content_posting_method', {
+          value: 'DIRECT_POST',
+        })}
+      >
+        <option value="">Select</option>
+        {contentPostingMethod.map((item) => (
+          <option key={item.value} value={item.value}>
+            {item.label}
+          </option>
+        ))}
+      </Select>
       <hr className="mb-[15px] border-tableBorder" />
       <div className="text-[14px] mb-[10px]">Allow User To:</div>
       <div className="flex gap-[40px]">

From 81eacbe6d5bb14da56b3efc75d17e73416a017de Mon Sep 17 00:00:00 2001
From: Keiwan Mosaddegh <keiwan.mosaddegh@gmail.com>
Date: Thu, 23 Jan 2025 10:09:35 +0100
Subject: [PATCH 06/31] feat(tiktok): update conetnt posting method based on
 setting

---
 .../integrations/social/tiktok.provider.ts    | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/libraries/nestjs-libraries/src/integrations/social/tiktok.provider.ts b/libraries/nestjs-libraries/src/integrations/social/tiktok.provider.ts
index aa299b419..1cbb39cbe 100644
--- a/libraries/nestjs-libraries/src/integrations/social/tiktok.provider.ts
+++ b/libraries/nestjs-libraries/src/integrations/social/tiktok.provider.ts
@@ -226,11 +226,21 @@ export class TiktokProvider extends SocialAbstract implements SocialProvider {
   ): Promise<PostResponse[]> {
     const [firstPost, ...comments] = postDetails;
 
+    const endpoint: string = (() => {
+      switch (firstPost.settings.content_posting_method) {
+        case 'UPLOAD':
+          return '/inbox/video/init/';
+        case 'DIRECT_POST':
+        default:
+          return '/video/init/';
+      }
+    })();
+
     const {
       data: { publish_id },
     } = await (
       await this.fetch(
-        'https://open.tiktokapis.com/v2/post/publish/video/init/',
+        `https://open.tiktokapis.com/v2/post/publish${endpoint}`,
         {
           method: 'POST',
           headers: {
@@ -238,15 +248,17 @@ export class TiktokProvider extends SocialAbstract implements SocialProvider {
             Authorization: `Bearer ${accessToken}`,
           },
           body: JSON.stringify({
-            post_info: {
-              title: firstPost.message,
-              privacy_level: firstPost.settings.privacy_level,
-              disable_duet: !firstPost.settings.duet,
-              disable_comment: !firstPost.settings.comment,
-              disable_stitch: !firstPost.settings.stitch,
-              brand_content_toggle: firstPost.settings.brand_content_toggle,
-              brand_organic_toggle: firstPost.settings.brand_organic_toggle,
-            },
+            ...(firstPost.settings.content_posting_method === 'DIRECT_POST' ? {
+              post_info: {
+                title: firstPost.message,
+                privacy_level: firstPost.settings.privacy_level,
+                disable_duet: !firstPost.settings.duet,
+                disable_comment: !firstPost.settings.comment,
+                disable_stitch: !firstPost.settings.stitch,
+                brand_content_toggle: firstPost.settings.brand_content_toggle,
+                brand_organic_toggle: firstPost.settings.brand_organic_toggle,
+              }
+            } : {}),
             source_info: {
               source: 'PULL_FROM_URL',
               video_url: firstPost?.media?.[0]?.url!,

From aa3ffac193d4d1adcd294b64dead441a3e7986ff Mon Sep 17 00:00:00 2001
From: Keiwan Mosaddegh <keiwan.mosaddegh@gmail.com>
Date: Thu, 23 Jan 2025 10:29:50 +0100
Subject: [PATCH 07/31] fix(tiktok): extract endopoint method outside of post()

---
 .../integrations/social/tiktok.provider.ts    | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/libraries/nestjs-libraries/src/integrations/social/tiktok.provider.ts b/libraries/nestjs-libraries/src/integrations/social/tiktok.provider.ts
index 1cbb39cbe..14b4b0c5a 100644
--- a/libraries/nestjs-libraries/src/integrations/social/tiktok.provider.ts
+++ b/libraries/nestjs-libraries/src/integrations/social/tiktok.provider.ts
@@ -218,6 +218,16 @@ export class TiktokProvider extends SocialAbstract implements SocialProvider {
     }
   }
 
+  private postingMethod(method: TikTokDto["content_posting_method"]): string {
+      switch (method) {
+        case 'UPLOAD':
+          return '/inbox/video/init/';
+        case 'DIRECT_POST':
+        default:
+        return '/video/init/';
+    }
+  }
+
   async post(
     id: string,
     accessToken: string,
@@ -225,22 +235,11 @@ export class TiktokProvider extends SocialAbstract implements SocialProvider {
     integration: Integration
   ): Promise<PostResponse[]> {
     const [firstPost, ...comments] = postDetails;
-
-    const endpoint: string = (() => {
-      switch (firstPost.settings.content_posting_method) {
-        case 'UPLOAD':
-          return '/inbox/video/init/';
-        case 'DIRECT_POST':
-        default:
-          return '/video/init/';
-      }
-    })();
-
     const {
       data: { publish_id },
     } = await (
       await this.fetch(
-        `https://open.tiktokapis.com/v2/post/publish${endpoint}`,
+        `https://open.tiktokapis.com/v2/post/publish${this.postingMethod(firstPost.settings.content_posting_method)}`,
         {
           method: 'POST',
           headers: {

From 1df0b98de7eae8c977ccd62e07c483455b0bdb09 Mon Sep 17 00:00:00 2001
From: Keiwan Mosaddegh <keiwan.mosaddegh@gmail.com>
Date: Thu, 23 Jan 2025 10:46:23 +0100
Subject: [PATCH 08/31] fix(tiktok): add explanation about example use case for
 upload method

---
 .../components/launches/providers/tiktok/tiktok.provider.tsx  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/frontend/src/components/launches/providers/tiktok/tiktok.provider.tsx b/apps/frontend/src/components/launches/providers/tiktok/tiktok.provider.tsx
index 6b704027e..88af11a87 100644
--- a/apps/frontend/src/components/launches/providers/tiktok/tiktok.provider.tsx
+++ b/apps/frontend/src/components/launches/providers/tiktok/tiktok.provider.tsx
@@ -137,6 +137,10 @@ const TikTokSettings: FC<{ values?: any }> = (props) => {
           </option>
         ))}
       </Select>
+      <div className="text-[14px] mb-[10px] text-balance">
+        Choose upload without posting if you want to review and edit your content within TikTok's app before publishing.
+        This gives you access to TikTok's built-in editing tools and lets you make final adjustments before posting.
+      </div>
       <Select
         label="Content posting method"
         {...register('content_posting_method', {

From a122488b470368fbf09399f6efe773fd49cd7e7f Mon Sep 17 00:00:00 2001
From: Keiwan Mosaddegh <keiwan.mosaddegh@gmail.com>
Date: Thu, 23 Jan 2025 11:10:32 +0100
Subject: [PATCH 09/31] fix(tiktok): disable settings based on posting method

---
 .../launches/providers/tiktok/tiktok.provider.tsx     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/apps/frontend/src/components/launches/providers/tiktok/tiktok.provider.tsx b/apps/frontend/src/components/launches/providers/tiktok/tiktok.provider.tsx
index 88af11a87..784570a81 100644
--- a/apps/frontend/src/components/launches/providers/tiktok/tiktok.provider.tsx
+++ b/apps/frontend/src/components/launches/providers/tiktok/tiktok.provider.tsx
@@ -120,12 +120,16 @@ const TikTokSettings: FC<{ values?: any }> = (props) => {
   const disclose = watch('disclose');
   const brand_organic_toggle = watch('brand_organic_toggle');
   const brand_content_toggle = watch('brand_content_toggle');
+const content_posting_method = watch('content_posting_method');
+
+  const isUploadMode = content_posting_method === 'UPLOAD';
 
   return (
     <div className="flex flex-col">
       <CheckTikTokValidity picture={props?.values?.[0]?.image?.[0]?.path} />
       <Select
         label="Who can see this video?"
+disabled={isUploadMode}
         {...register('privacy_level', {
           value: 'PUBLIC_TO_EVERYONE',
         })}
@@ -143,6 +147,7 @@ const TikTokSettings: FC<{ values?: any }> = (props) => {
       </div>
       <Select
         label="Content posting method"
+disabled={isUploadMode}
         {...register('content_posting_method', {
           value: 'DIRECT_POST',
         })}
@@ -160,6 +165,7 @@ const TikTokSettings: FC<{ values?: any }> = (props) => {
         <Checkbox
           variant="hollow"
           label="Duet"
+disabled={isUploadMode}
           {...register('duet', {
             value: false,
           })}
@@ -167,6 +173,7 @@ const TikTokSettings: FC<{ values?: any }> = (props) => {
         <Checkbox
           label="Stitch"
           variant="hollow"
+disabled={isUploadMode}
           {...register('stitch', {
             value: false,
           })}
@@ -174,6 +181,7 @@ const TikTokSettings: FC<{ values?: any }> = (props) => {
         <Checkbox
           label="Comments"
           variant="hollow"
+disabled={isUploadMode}
           {...register('comment', {
             value: false,
           })}
@@ -184,6 +192,7 @@ const TikTokSettings: FC<{ values?: any }> = (props) => {
         <Checkbox
           variant="hollow"
           label="Disclose Video Content"
+disabled={isUploadMode}
           {...register('disclose', {
             value: false,
           })}
@@ -221,6 +230,7 @@ const TikTokSettings: FC<{ values?: any }> = (props) => {
         <Checkbox
           variant="hollow"
           label="Your brand"
+disabled={isUploadMode}
           {...register('brand_organic_toggle', {
             value: false,
           })}
@@ -233,6 +243,7 @@ const TikTokSettings: FC<{ values?: any }> = (props) => {
         <Checkbox
           variant="hollow"
           label="Branded content"
+disabled={isUploadMode}
           {...register('brand_content_toggle', {
             value: false,
           })}

From 29dfd55409cc0c886fdf836bf27acd992204e5c3 Mon Sep 17 00:00:00 2001
From: Keiwan Mosaddegh <keiwan.mosaddegh@gmail.com>
Date: Thu, 23 Jan 2025 11:11:15 +0100
Subject: [PATCH 10/31] fix(tiktok): fix typo

---
 .../components/launches/providers/tiktok/tiktok.provider.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/frontend/src/components/launches/providers/tiktok/tiktok.provider.tsx b/apps/frontend/src/components/launches/providers/tiktok/tiktok.provider.tsx
index 784570a81..1a7322891 100644
--- a/apps/frontend/src/components/launches/providers/tiktok/tiktok.provider.tsx
+++ b/apps/frontend/src/components/launches/providers/tiktok/tiktok.provider.tsx
@@ -220,7 +220,7 @@ disabled={isUploadMode}
           </div>
         )}
         <div className="text-[14px] my-[10px] text-balance">
-          Turn on to disclose that this video promotes good or services in
+          Turn on to disclose that this video promotes goods or services in
           exchange for something of value. You video could promote yourself, a
           third party, or both.
         </div>

From 00691685d9eb0f2faf60489d64ed219e03c43578 Mon Sep 17 00:00:00 2001
From: egelhaus <156946629+egelhaus@users.noreply.github.com>
Date: Fri, 24 Jan 2025 15:00:02 +0100
Subject: [PATCH 11/31] Add new ENV to .env.example

---
 .env.example | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.env.example b/.env.example
index 7ca10d13b..c36c95fcb 100644
--- a/.env.example
+++ b/.env.example
@@ -77,6 +77,7 @@ MASTODON_CLIENT_SECRET=""
 OPENAI_API_KEY=""
 NEXT_PUBLIC_DISCORD_SUPPORT=""
 NEXT_PUBLIC_POLOTNO=""
+NOT_SECURED=false
 
 # Payment settings
 FEE_AMOUNT=0.05

From 77bb2b2c717f00f239c5800a9ca165283e8642cd Mon Sep 17 00:00:00 2001
From: Nevo David <me@nevos.io>
Date: Wed, 29 Jan 2025 00:49:54 +0700
Subject: [PATCH 12/31] feat: bluesky refresh + allow for any username

---
 .../src/api/routes/integrations.controller.ts | 59 ++++++++++---------
 .../src/components/launches/menu/menu.tsx     | 59 +++++++++++++++++--
 .../integrations/social/bluesky.provider.ts   |  2 +-
 3 files changed, 88 insertions(+), 32 deletions(-)

diff --git a/apps/backend/src/api/routes/integrations.controller.ts b/apps/backend/src/api/routes/integrations.controller.ts
index e2999098b..f623162ab 100644
--- a/apps/backend/src/api/routes/integrations.controller.ts
+++ b/apps/backend/src/api/routes/integrations.controller.ts
@@ -86,30 +86,37 @@ export class IntegrationsController {
   @Get('/list')
   async getIntegrationList(@GetOrgFromRequest() org: Organization) {
     return {
-      integrations: (
-        await this._integrationService.getIntegrationsList(org.id)
-      ).map((p) => {
-        const findIntegration = this._integrationManager.getSocialIntegration(
-          p.providerIdentifier
-        );
-        return {
-          name: p.name,
-          id: p.id,
-          internalId: p.internalId,
-          disabled: p.disabled,
-          picture: p.picture || '/no-picture.jpg',
-          identifier: p.providerIdentifier,
-          inBetweenSteps: p.inBetweenSteps,
-          refreshNeeded: p.refreshNeeded,
-          display: p.profile,
-          type: p.type,
-          time: JSON.parse(p.postingTimes),
-          changeProfilePicture: !!findIntegration?.changeProfilePicture,
-          changeNickName: !!findIntegration?.changeNickname,
-          customer: p.customer,
-          additionalSettings: p.additionalSettings || '[]',
-        };
-      }),
+      integrations: await Promise.all(
+        (await this._integrationService.getIntegrationsList(org.id)).map(
+          async (p) => {
+            const findIntegration =
+              this._integrationManager.getSocialIntegration(
+                p.providerIdentifier
+              );
+            return {
+              name: p.name,
+              id: p.id,
+              internalId: p.internalId,
+              disabled: p.disabled,
+              picture: p.picture || '/no-picture.jpg',
+              identifier: p.providerIdentifier,
+              inBetweenSteps: p.inBetweenSteps,
+              refreshNeeded: p.refreshNeeded,
+              isCustomFields: !!findIntegration.customFields,
+              ...(findIntegration.customFields
+                ? { customFields: await findIntegration.customFields() }
+                : {}),
+              display: p.profile,
+              type: p.type,
+              time: JSON.parse(p.postingTimes),
+              changeProfilePicture: !!findIntegration?.changeProfilePicture,
+              changeNickName: !!findIntegration?.changeNickname,
+              customer: p.customer,
+              additionalSettings: p.additionalSettings || '[]',
+            };
+          }
+        )
+      ),
     };
   }
 
@@ -612,9 +619,7 @@ export class IntegrationsController {
   }
 
   @Get('/telegram/updates')
-  async getUpdates(
-    @Query() query: { word: string; id?: number },
-  ) {
+  async getUpdates(@Query() query: { word: string; id?: number }) {
     return new TelegramProvider().getBotId(query);
   }
 }
diff --git a/apps/frontend/src/components/launches/menu/menu.tsx b/apps/frontend/src/components/launches/menu/menu.tsx
index 0b8d8036c..ab8de037f 100644
--- a/apps/frontend/src/components/launches/menu/menu.tsx
+++ b/apps/frontend/src/components/launches/menu/menu.tsx
@@ -1,4 +1,10 @@
-import { FC, MouseEventHandler, useCallback, useMemo, useState } from 'react';
+import React, {
+  FC,
+  MouseEventHandler,
+  useCallback,
+  useMemo,
+  useState,
+} from 'react';
 import { useClickOutside } from '@mantine/hooks';
 import { useFetch } from '@gitroom/helpers/utils/custom.fetch';
 import { deleteDialog } from '@gitroom/react/helpers/delete.dialog';
@@ -11,6 +17,9 @@ import { BotPicture } from '@gitroom/frontend/components/launches/bot.picture';
 import { CustomerModal } from '@gitroom/frontend/components/launches/customer.modal';
 import { Integration } from '@prisma/client';
 import { SettingsModal } from '@gitroom/frontend/components/launches/settings.modal';
+import { string } from 'yup';
+import { CustomVariables } from '@gitroom/frontend/components/launches/add.provider.component';
+import { useRouter } from 'next/navigation';
 
 export const Menu: FC<{
   canEnable: boolean;
@@ -35,6 +44,7 @@ export const Menu: FC<{
     refreshChannel,
   } = props;
   const fetch = useFetch();
+  const router = useRouter();
   const { integrations } = useCalendar();
   const toast = useToaster();
   const modal = useModals();
@@ -209,6 +219,23 @@ export const Menu: FC<{
     setShow(false);
   }, [integrations]);
 
+  const updateCredentials = useCallback(() => {
+    modal.openModal({
+      title: '',
+      withCloseButton: false,
+      classNames: {
+        modal: 'bg-transparent text-textColor',
+      },
+      children: (
+        <CustomVariables
+          identifier={findIntegration.identifier}
+          gotoUrl={(url: string) => router.push(url + '&refresh=true')}
+          variables={findIntegration.customFields}
+        />
+      ),
+    });
+  }, []);
+
   return (
     <div
       className="cursor-pointer relative select-none"
@@ -232,10 +259,34 @@ export const Menu: FC<{
           onClick={(e) => e.stopPropagation()}
           className={`absolute top-[100%] left-0 p-[8px] px-[20px] bg-fifth flex flex-col gap-[16px] z-[100] rounded-[8px] border border-tableBorder ${interClass} text-nowrap`}
         >
-          {canDisable && findIntegration?.refreshNeeded && (
+          {canDisable &&
+            findIntegration?.refreshNeeded &&
+            !findIntegration.customFields && (
+              <div
+                className="flex gap-[12px] items-center"
+                onClick={refreshChannel(findIntegration!)}
+              >
+                <div>
+                  <svg
+                    width={18}
+                    height={18}
+                    viewBox="0 0 32 32"
+                    fill="yellow"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M3.00079 15.9999C3.00343 13.6138 3.95249 11.3262 5.63975 9.63891C7.327 7.95165 9.61465 7.00259 12.0008 6.99995H25.587L24.2933 5.70745C24.1056 5.5198 24.0002 5.26531 24.0002 4.99995C24.0002 4.73458 24.1056 4.48009 24.2933 4.29245C24.4809 4.1048 24.7354 3.99939 25.0008 3.99939C25.2661 3.99939 25.5206 4.10481 25.7083 4.29245L28.7083 7.29245C28.8013 7.38532 28.875 7.49561 28.9253 7.61701C28.9757 7.7384 29.0016 7.86853 29.0016 7.99995C29.0016 8.13136 28.9757 8.26149 28.9253 8.38289C28.875 8.50428 28.8013 8.61457 28.7083 8.70745L25.7083 11.7074C25.5206 11.8951 25.2661 12.0005 25.0008 12.0005C24.7354 12.0005 24.4809 11.8951 24.2933 11.7074C24.1056 11.5198 24.0002 11.2653 24.0002 10.9999C24.0002 10.7346 24.1056 10.4801 24.2933 10.2924L25.587 8.99995H12.0008C10.1449 9.00193 8.36556 9.74007 7.05323 11.0524C5.74091 12.3647 5.00277 14.144 5.00079 15.9999C5.00079 16.2652 4.89543 16.5195 4.70789 16.7071C4.52036 16.8946 4.266 16.9999 4.00079 16.9999C3.73557 16.9999 3.48122 16.8946 3.29368 16.7071C3.10614 16.5195 3.00079 16.2652 3.00079 15.9999ZM28.0008 14.9999C27.7356 14.9999 27.4812 15.1053 27.2937 15.2928C27.1061 15.4804 27.0008 15.7347 27.0008 15.9999C26.9988 17.8559 26.2607 19.6352 24.9483 20.9475C23.636 22.2598 21.8567 22.998 20.0008 22.9999H6.41454L7.70829 21.7074C7.8012 21.6145 7.8749 21.5042 7.92518 21.3828C7.97546 21.2614 8.00134 21.1313 8.00134 20.9999C8.00134 20.8686 7.97546 20.7384 7.92518 20.6171C7.8749 20.4957 7.8012 20.3854 7.70829 20.2924C7.61538 20.1995 7.50508 20.1258 7.38368 20.0756C7.26229 20.0253 7.13218 19.9994 7.00079 19.9994C6.86939 19.9994 6.73928 20.0253 6.61789 20.0756C6.4965 20.1258 6.3862 20.1995 6.29329 20.2924L3.29329 23.2924C3.20031 23.3853 3.12655 23.4956 3.07623 23.617C3.0259 23.7384 3 23.8685 3 23.9999C3 24.1314 3.0259 24.2615 3.07623 24.3829C3.12655 24.5043 3.20031 24.6146 3.29329 24.7074L6.29329 27.7074C6.3862 27.8004 6.4965 27.8741 6.61789 27.9243C6.73928 27.9746 6.86939 28.0005 7.00079 28.0005C7.13218 28.0005 7.26229 27.9746 7.38368 27.9243C7.50508 27.8741 7.61538 27.8004 7.70829 27.7074C7.8012 27.6145 7.8749 27.5042 7.92518 27.3828C7.97546 27.2614 8.00134 27.1313 8.00134 26.9999C8.00134 26.8686 7.97546 26.7384 7.92518 26.6171C7.8749 26.4957 7.8012 26.3854 7.70829 26.2924L6.41454 24.9999H20.0008C22.3869 24.9973 24.6746 24.0482 26.3618 22.361C28.0491 20.6737 28.9981 18.3861 29.0008 15.9999C29.0008 15.7347 28.8954 15.4804 28.7079 15.2928C28.5204 15.1053 28.266 14.9999 28.0008 14.9999Z"
+                      fill="yellow"
+                    />
+                  </svg>
+                </div>
+                <div className="text-[12px]">Reconnect channel</div>
+              </div>
+            )}
+          {!!findIntegration?.isCustomFields && (
             <div
               className="flex gap-[12px] items-center"
-              onClick={refreshChannel(findIntegration!)}
+              onClick={updateCredentials}
             >
               <div>
                 <svg
@@ -251,7 +302,7 @@ export const Menu: FC<{
                   />
                 </svg>
               </div>
-              <div className="text-[12px]">Reconnect channel</div>
+              <div className="text-[12px]">Update Credentials</div>
             </div>
           )}
           {findIntegration?.additionalSettings !== '[]' && (
diff --git a/libraries/nestjs-libraries/src/integrations/social/bluesky.provider.ts b/libraries/nestjs-libraries/src/integrations/social/bluesky.provider.ts
index 361949101..61a5fe6b0 100644
--- a/libraries/nestjs-libraries/src/integrations/social/bluesky.provider.ts
+++ b/libraries/nestjs-libraries/src/integrations/social/bluesky.provider.ts
@@ -69,7 +69,7 @@ export class BlueskyProvider extends SocialAbstract implements SocialProvider {
       {
         key: 'identifier',
         label: 'Identifier',
-        validation: `/^.{3,}$/`,
+        validation: `/^.+$/`,
         type: 'text' as const,
       },
       {

From 1c14497855093fcb0ea4ceb97c35ec8b50829149 Mon Sep 17 00:00:00 2001
From: Nevo David <me@nevos.io>
Date: Wed, 29 Jan 2025 00:55:20 +0700
Subject: [PATCH 13/31] feat: require bluesky refresh

---
 .../src/integrations/social/bluesky.provider.ts   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/libraries/nestjs-libraries/src/integrations/social/bluesky.provider.ts b/libraries/nestjs-libraries/src/integrations/social/bluesky.provider.ts
index 61a5fe6b0..e81a79c87 100644
--- a/libraries/nestjs-libraries/src/integrations/social/bluesky.provider.ts
+++ b/libraries/nestjs-libraries/src/integrations/social/bluesky.provider.ts
@@ -6,8 +6,7 @@ import {
 } from '@gitroom/nestjs-libraries/integrations/social/social.integrations.interface';
 import { makeId } from '@gitroom/nestjs-libraries/services/make.is';
 import {
-  NotEnoughScopes,
-  SocialAbstract,
+  NotEnoughScopes, RefreshToken, SocialAbstract
 } from '@gitroom/nestjs-libraries/integrations/social.abstract';
 import { BskyAgent, RichText } from '@atproto/api';
 import dayjs from 'dayjs';
@@ -152,10 +151,14 @@ export class BlueskyProvider extends SocialAbstract implements SocialProvider {
       service: body.service,
     });
 
-    await agent.login({
-      identifier: body.identifier,
-      password: body.password,
-    });
+    try {
+      await agent.login({
+        identifier: body.identifier,
+        password: body.password,
+      });
+    } catch (err) {
+      throw new RefreshToken('bluesky', JSON.stringify(err), {} as BodyInit);
+    }
 
     let loadCid = '';
     let loadUri = '';

From 3b1047b765ab6edac81609791dc12c0502297095 Mon Sep 17 00:00:00 2001
From: Nevo David <me@nevos.io>
Date: Wed, 29 Jan 2025 17:14:26 +0700
Subject: [PATCH 14/31] feat: fix reconnect channels

---
 apps/frontend/src/components/launches/menu/menu.tsx             | 2 +-
 .../src/database/prisma/integrations/integration.repository.ts  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/frontend/src/components/launches/menu/menu.tsx b/apps/frontend/src/components/launches/menu/menu.tsx
index ab8de037f..2b287e5cd 100644
--- a/apps/frontend/src/components/launches/menu/menu.tsx
+++ b/apps/frontend/src/components/launches/menu/menu.tsx
@@ -229,7 +229,7 @@ export const Menu: FC<{
       children: (
         <CustomVariables
           identifier={findIntegration.identifier}
-          gotoUrl={(url: string) => router.push(url + '&refresh=true')}
+          gotoUrl={(url: string) => router.push(url)}
           variables={findIntegration.customFields}
         />
       ),
diff --git a/libraries/nestjs-libraries/src/database/prisma/integrations/integration.repository.ts b/libraries/nestjs-libraries/src/database/prisma/integrations/integration.repository.ts
index d8e92687e..1b1f5b66c 100644
--- a/libraries/nestjs-libraries/src/database/prisma/integrations/integration.repository.ts
+++ b/libraries/nestjs-libraries/src/database/prisma/integrations/integration.repository.ts
@@ -170,6 +170,7 @@ export class IntegrationRepository {
           : '[]',
       },
       update: {
+        ...additionalSettings ? { additionalSettings: JSON.stringify(additionalSettings) } : {},
         type: type as any,
         ...(!refresh
           ? {

From 92d09b5660b76c12505a46cb2eef8be48c6b75d2 Mon Sep 17 00:00:00 2001
From: Nevo David <me@nevos.io>
Date: Wed, 29 Jan 2025 18:01:44 +0700
Subject: [PATCH 15/31] feat: update custom instance

---
 .../database/prisma/integrations/integration.repository.ts   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libraries/nestjs-libraries/src/database/prisma/integrations/integration.repository.ts b/libraries/nestjs-libraries/src/database/prisma/integrations/integration.repository.ts
index 1b1f5b66c..b16a74d8a 100644
--- a/libraries/nestjs-libraries/src/database/prisma/integrations/integration.repository.ts
+++ b/libraries/nestjs-libraries/src/database/prisma/integrations/integration.repository.ts
@@ -170,7 +170,10 @@ export class IntegrationRepository {
           : '[]',
       },
       update: {
-        ...additionalSettings ? { additionalSettings: JSON.stringify(additionalSettings) } : {},
+        ...(additionalSettings
+          ? { additionalSettings: JSON.stringify(additionalSettings) }
+          : {}),
+        ...(customInstanceDetails ? { customInstanceDetails } : {}),
         type: type as any,
         ...(!refresh
           ? {

From 278e7f818189e3992f6e57846ad7f1b22d09b9b0 Mon Sep 17 00:00:00 2001
From: egelhaus <156946629+egelhaus@users.noreply.github.com>
Date: Thu, 30 Jan 2025 20:35:45 +0100
Subject: [PATCH 16/31] Update SECURITY.md

Remove jread from SECURITY.md (lost Maintainer Aceess), add egelhaus to SECURITY.md (got Maintainer Aceess)
---
 SECURITY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SECURITY.md b/SECURITY.md
index e37fd76a3..a8b687925 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -9,7 +9,7 @@ The Postiz app is committed to ensuring the security and integrity of our users'
 If you discover a security vulnerability in the Postiz app, please report it to us privately via email to one of the maintainers:
 
 * @nevo-david
-* @jamesread ([email](mailto:contact@jread.com))
+* @egelhaus ([email](mailto:gelhausenno@outlook.de))
 * @jonathan-irvin ([email](mailto:offendingcommit@gmail.com))
 
 When reporting a security vulnerability, please provide as much detail as possible, including:

From bf935652df29c9044bff629c430305df16fb4115 Mon Sep 17 00:00:00 2001
From: egelhaus <156946629+egelhaus@users.noreply.github.com>
Date: Thu, 30 Jan 2025 20:41:24 +0100
Subject: [PATCH 17/31] Update SECURITY.md

Remove jonathan-irvin (Former Maintainer)
---
 SECURITY.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/SECURITY.md b/SECURITY.md
index a8b687925..79ff527f2 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -10,7 +10,6 @@ If you discover a security vulnerability in the Postiz app, please report it to
 
 * @nevo-david
 * @egelhaus ([email](mailto:gelhausenno@outlook.de))
-* @jonathan-irvin ([email](mailto:offendingcommit@gmail.com))
 
 When reporting a security vulnerability, please provide as much detail as possible, including:
 

From 3efdaf6243e4a03248e6163bf395f217d9eaf811 Mon Sep 17 00:00:00 2001
From: Enno Gelhaus <gelhausenno@outlook.de>
Date: Thu, 30 Jan 2025 21:28:57 +0100
Subject: [PATCH 18/31] Change .env.example to an simpler Version.

---
 .env.example | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index c36c95fcb..d1144f664 100644
--- a/.env.example
+++ b/.env.example
@@ -1,9 +1,11 @@
 # Configuration reference: http://docs.postiz.com/configuration/reference
 
-# === Required Settings
+# === Required Settings 
 DATABASE_URL="postgresql://postiz-user:postiz-password@localhost:5432/postiz-db-local"
 REDIS_URL="redis://localhost:6379"
 JWT_SECRET="random string for your JWT secret, make it long"
+
+# === This needs to be exactly the URL you're accessing Postiz on.
 FRONTEND_URL="http://localhost:4200"
 NEXT_PUBLIC_BACKEND_URL="http://localhost:3000"
 BACKEND_INTERNAL_URL="http://localhost:3000"

From d4d467276fe308cedd0559cee46f1d8e23b49d6d Mon Sep 17 00:00:00 2001
From: William Hallin <william@hallin.media>
Date: Thu, 30 Jan 2025 22:15:35 +0100
Subject: [PATCH 19/31] feat: allow GUILD_ANNOUNCEMENT for Discord

Allow the Discord provider to post in "GUILD_ANNOUNCEMENT" text channels, also known as announcement channels
---
 .../src/integrations/social/discord.provider.ts                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/nestjs-libraries/src/integrations/social/discord.provider.ts b/libraries/nestjs-libraries/src/integrations/social/discord.provider.ts
index 21833c1d5..6c97e547a 100644
--- a/libraries/nestjs-libraries/src/integrations/social/discord.provider.ts
+++ b/libraries/nestjs-libraries/src/integrations/social/discord.provider.ts
@@ -117,7 +117,7 @@ export class DiscordProvider extends SocialAbstract implements SocialProvider {
     ).json();
 
     return list
-      .filter((p: any) => p.type === 0 || p.type === 15)
+      .filter((p: any) => p.type === 0 || p.type === 5 || p.type === 15)
       .map((p: any) => ({
         id: String(p.id),
         name: p.name,

From 2e752123b81f2e14b23ee2c62f6e42187f66e61f Mon Sep 17 00:00:00 2001
From: Keiwan Mosaddegh <keiwan.mosaddegh@gmail.com>
Date: Sun, 2 Feb 2025 18:49:50 +0100
Subject: [PATCH 20/31] chore: add enclosing backticks

---
 .../components/launches/providers/tiktok/tiktok.provider.tsx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/frontend/src/components/launches/providers/tiktok/tiktok.provider.tsx b/apps/frontend/src/components/launches/providers/tiktok/tiktok.provider.tsx
index 1a7322891..58d0db423 100644
--- a/apps/frontend/src/components/launches/providers/tiktok/tiktok.provider.tsx
+++ b/apps/frontend/src/components/launches/providers/tiktok/tiktok.provider.tsx
@@ -142,8 +142,8 @@ disabled={isUploadMode}
         ))}
       </Select>
       <div className="text-[14px] mb-[10px] text-balance">
-        Choose upload without posting if you want to review and edit your content within TikTok's app before publishing.
-        This gives you access to TikTok's built-in editing tools and lets you make final adjustments before posting.
+        {`Choose upload without posting if you want to review and edit your content within TikTok's app before publishing.
+        This gives you access to TikTok's built-in editing tools and lets you make final adjustments before posting.`}
       </div>
       <Select
         label="Content posting method"

From 07e7b4b530305b3e157f851fc63f8688ef491f49 Mon Sep 17 00:00:00 2001
From: Nevo David <me@nevos.io>
Date: Mon, 3 Feb 2025 13:32:57 +0700
Subject: [PATCH 21/31] feat: prevent lifetime account, disabled

---
 .../prisma/subscriptions/subscription.service.ts         | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.service.ts b/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.service.ts
index e7bb98fa4..ddbeed0ac 100644
--- a/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.service.ts
+++ b/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.service.ts
@@ -75,6 +75,10 @@ export class SubscriptionService {
     totalChannels: number,
     billing: 'FREE' | 'STANDARD' | 'PRO'
   ) {
+    if (!customerId) {
+      return ;
+    }
+
     const getOrgByCustomerId =
       await this._subscriptionRepository.getOrganizationByCustomerId(
         customerId
@@ -84,6 +88,11 @@ export class SubscriptionService {
       (await this._subscriptionRepository.getSubscriptionByCustomerId(
         customerId
       ))!;
+
+    if (getCurrentSubscription.isLifetime) {
+      return ;
+    }
+
     const from = pricing[getCurrentSubscription?.subscriptionTier || 'FREE'];
     const to = pricing[billing];
 

From 1ffcb5c54529345ac002b2a17bc2f1f83abaafc3 Mon Sep 17 00:00:00 2001
From: Nevo David <me@nevos.io>
Date: Tue, 4 Feb 2025 23:16:22 +0700
Subject: [PATCH 22/31] feat: fix billing

---
 .../subscriptions/subscription.service.ts     | 19 ++++++++++++++++---
 .../src/services/stripe.service.ts            | 12 +++++++++---
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.service.ts b/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.service.ts
index ddbeed0ac..1c93ff6f1 100644
--- a/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.service.ts
+++ b/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.service.ts
@@ -76,7 +76,7 @@ export class SubscriptionService {
     billing: 'FREE' | 'STANDARD' | 'PRO'
   ) {
     if (!customerId) {
-      return ;
+      return false;
     }
 
     const getOrgByCustomerId =
@@ -90,7 +90,7 @@ export class SubscriptionService {
       ))!;
 
     if (getCurrentSubscription.isLifetime) {
-      return ;
+      return false;
     }
 
     const from = pricing[getCurrentSubscription?.subscriptionTier || 'FREE'];
@@ -123,6 +123,8 @@ export class SubscriptionService {
       );
     }
 
+    return true;
+
     // if (to.faq < from.faq) {
     //   await this._faqRepository.deleteFAQs(getCurrentSubscription?.organizationId, from.faq - to.faq);
     // }
@@ -152,7 +154,18 @@ export class SubscriptionService {
     org?: string
   ) {
     if (!code) {
-      await this.modifySubscription(customerId, totalChannels, billing);
+      try {
+        const load = await this.modifySubscription(
+          customerId,
+          totalChannels,
+          billing
+        );
+        if (!load) {
+          return {};
+        }
+      } catch (e) {
+        return {};
+      }
     }
     return this._subscriptionRepository.createOrUpdateSubscription(
       identifier,
diff --git a/libraries/nestjs-libraries/src/services/stripe.service.ts b/libraries/nestjs-libraries/src/services/stripe.service.ts
index b17257f84..ece85b8dc 100644
--- a/libraries/nestjs-libraries/src/services/stripe.service.ts
+++ b/libraries/nestjs-libraries/src/services/stripe.service.ts
@@ -104,7 +104,9 @@ export class StripeService {
       try {
         await stripe.paymentMethods.detach(paymentMethods.data[0].id);
         await stripe.subscriptions.cancel(event.data.object.id as string);
-      } catch (err) {/*dont do anything*/}
+      } catch (err) {
+        /*dont do anything*/
+      }
       return false;
     }
   }
@@ -122,8 +124,12 @@ export class StripeService {
       uniqueId: string;
     } = event.data.object.metadata;
 
-    const check = await this.checkValidCard(event);
-    if (!check) {
+    try {
+      const check = await this.checkValidCard(event);
+      if (!check) {
+        return { ok: false };
+      }
+    } catch (err) {
       return { ok: false };
     }
 

From 2a542657a0f35e25fc3d1e007e918135791492b1 Mon Sep 17 00:00:00 2001
From: Nevo David <me@nevos.io>
Date: Tue, 4 Feb 2025 23:47:40 +0700
Subject: [PATCH 23/31] feat: remove lifetime check

---
 .../src/database/prisma/subscriptions/subscription.service.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.service.ts b/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.service.ts
index 1c93ff6f1..f9e12b80b 100644
--- a/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.service.ts
+++ b/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.service.ts
@@ -89,7 +89,7 @@ export class SubscriptionService {
         customerId
       ))!;
 
-    if (getCurrentSubscription.isLifetime) {
+    if (!getCurrentSubscription || getCurrentSubscription?.isLifetime) {
       return false;
     }
 

From 8e0efe17242e6795b36e6779224a8741080076f4 Mon Sep 17 00:00:00 2001
From: Nevo David <me@nevos.io>
Date: Tue, 4 Feb 2025 23:56:43 +0700
Subject: [PATCH 24/31] feat: lifetime check fix

---
 .../src/database/prisma/subscriptions/subscription.service.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.service.ts b/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.service.ts
index f9e12b80b..9078f17dc 100644
--- a/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.service.ts
+++ b/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.service.ts
@@ -89,7 +89,7 @@ export class SubscriptionService {
         customerId
       ))!;
 
-    if (!getCurrentSubscription || getCurrentSubscription?.isLifetime) {
+    if (getCurrentSubscription || getCurrentSubscription?.isLifetime) {
       return false;
     }
 

From 13585a1472f838398827b8cf1cb90fa36381da11 Mon Sep 17 00:00:00 2001
From: egelhaus <156946629+egelhaus@users.noreply.github.com>
Date: Tue, 4 Feb 2025 19:34:51 +0100
Subject: [PATCH 25/31] .gitignore aktualisieren

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 3d97dd0e5..304585422 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ node_modules
 *.launch
 .settings/
 *.sublime-workspace
+.vscode/*
 
 # IDE - VSCode
 .vscode/*

From 57e3d4ddb793849172c677b009c5db8c879b4f00 Mon Sep 17 00:00:00 2001
From: Zerocool <35503951+TonyAntoun@users.noreply.github.com>
Date: Wed, 5 Feb 2025 03:06:25 +0200
Subject: [PATCH 26/31] Update telegram.provider.ts

- Updated the logic in 'authenticate' to handle both public and private Telegram groups/channels.
- Updated the logic in 'getBotId' to handle both public and private Telegram groups/channels.
- Updated the logic in 'post' to apply sending local files, include contentType, media handling (captions/groups), link generation (to fix undefined links)
---
 .../integrations/social/telegram.provider.ts  | 166 +++++++++++++-----
 1 file changed, 121 insertions(+), 45 deletions(-)

diff --git a/libraries/nestjs-libraries/src/integrations/social/telegram.provider.ts b/libraries/nestjs-libraries/src/integrations/social/telegram.provider.ts
index e43da8091..665ffcfb7 100644
--- a/libraries/nestjs-libraries/src/integrations/social/telegram.provider.ts
+++ b/libraries/nestjs-libraries/src/integrations/social/telegram.provider.ts
@@ -7,10 +7,15 @@ import {
 import { makeId } from '@gitroom/nestjs-libraries/services/make.is';
 import dayjs from 'dayjs';
 import { SocialAbstract } from '@gitroom/nestjs-libraries/integrations/social.abstract';
+//@ts-ignore
+import mime from 'mime';
 import TelegramBot from 'node-telegram-bot-api';
 import { Integration } from '@prisma/client';
 
 const telegramBot = new TelegramBot(process.env.TELEGRAM_TOKEN!);
+// Added to support local storage posting
+const frontendURL = process.env.FRONTEND_URL || 'http://localhost:5000';
+const mediaStorage = process.env.STORAGE_PROVIDER || 'local';
 
 export class TelegramProvider extends SocialAbstract implements SocialProvider {
   identifier = 'telegram';
@@ -47,7 +52,7 @@ export class TelegramProvider extends SocialAbstract implements SocialProvider {
   }) {
     const chat = await telegramBot.getChat(params.code);
 
-    console.log(JSON.stringify(chat))
+    console.log(JSON.stringify(chat));
     if (!chat?.id) {
       return 'No chat found';
     }
@@ -55,8 +60,10 @@ export class TelegramProvider extends SocialAbstract implements SocialProvider {
     const photo = !chat?.photo?.big_file_id
       ? ''
       : await telegramBot.getFileLink(chat.photo.big_file_id);
+
+    // Modified id to work with chat.username (public groups/channels) or chat.id (private groups/channels) when chat.username is not available
     return {
-      id: String(chat.username),
+      id: String(chat.username ? chat.username : chat.id),
       name: chat.title!,
       accessToken: String(chat.id),
       refreshToken: '',
@@ -67,21 +74,29 @@ export class TelegramProvider extends SocialAbstract implements SocialProvider {
   }
 
   async getBotId(query: { id?: number; word: string }) {
+    // Added allowed_updates Ensure only necessary updates are fetched
     const res = await telegramBot.getUpdates({
       ...(query.id ? { offset: query.id } : {}),
+      allowed_updates: ['message', 'channel_post'],
     });
-
-    const chatId = res?.find(
-      (p) => p?.message?.text === `/connect ${query.word}`
-    )?.message?.chat?.id;
-
+    //message.text is for groups, channel_post.text is for channels
+    const match = res.find(
+      (p) =>
+        (p?.message?.text === `/connect ${query.word}` &&
+          p?.message?.chat?.id) ||
+        (p?.channel_post?.text === `/connect ${query.word}` &&
+          p?.channel_post?.chat?.id)
+    );
+    // get correct chatId based on the channel type
+    const chatId = match?.message?.chat?.id || match?.channel_post?.chat?.id;
+    // modified lastChatId to work with any type of channel (private/public groups/channels)
     return chatId
-      ? {
-          chatId,
-        }
+      ? { chatId }
       : res.length > 0
       ? {
-          lastChatId: res?.[res.length - 1]?.message?.chat?.id,
+          lastChatId:
+            res?.[res.length - 1]?.message?.chat?.id ||
+            res?.[res.length - 1]?.channel_post?.chat?.id,
         }
       : {};
   }
@@ -92,50 +107,111 @@ export class TelegramProvider extends SocialAbstract implements SocialProvider {
     postDetails: PostDetails[]
   ): Promise<PostResponse[]> {
     const ids: PostResponse[] = [];
+
     for (const message of postDetails) {
-      if (
-        (message?.media?.length || 0) === 1
-      ) {
-        const [{ message_id }] = await telegramBot.sendMediaGroup(
-          accessToken,
-          message?.media?.map((m) => ({
-            type: m.url.indexOf('mp4') > -1 ? 'video' : 'photo',
-            caption: message.message,
-            media: m.url,
-          })) || []
-        );
+      let messageId: number | null = null;
+      const mediaFiles = message.media || [];
+      const text = message.message || '';
+      // check if media is local to modify url
+      const processedMedia = mediaFiles.map((media) => {
+        let mediaUrl = media.url;
+        if (mediaStorage === 'local' && mediaUrl.startsWith(frontendURL)) {
+          mediaUrl = mediaUrl.replace(frontendURL, '');
+        }
+        //get mime type to pass contentType to telegram api.
+        //some photos and videos might not pass telegram api restrictions, so they are sent as documents instead of returning errors
+        const mimeType = mime.getType(mediaUrl); // Detect MIME type
+        let mediaType: 'photo' | 'video' | 'document';
 
-        ids.push({
-          id: message.id,
-          postId: String(message_id),
-          releaseURL: `https://t.me/${id}/${message_id}`,
-          status: 'completed',
-        });
-      } else {
-        const { message_id } = await telegramBot.sendMessage(
-          accessToken,
-          message.message
-        );
+        if (mimeType?.startsWith('image/')) {
+          mediaType = 'photo';
+        } else if (mimeType?.startsWith('video/')) {
+          mediaType = 'video';
+        } else {
+          mediaType = 'document';
+        }
 
-        ids.push({
-          id: message.id,
-          postId: String(message_id),
-          releaseURL: `https://t.me/${id}/${message_id}`,
-          status: 'completed',
-        });
+        return {
+          type: mediaType,
+          media: mediaUrl,
+          fileOptions: {
+            filename: media.url.split('/').pop(),
+            contentType: mimeType || 'application/octet-stream',
+          },
+        };
+      });
+      // if there's no media, bot sends a text message only
+      if (processedMedia.length === 0) {
+        const response = await telegramBot.sendMessage(accessToken, text);
+        messageId = response.message_id;
+      }
+      // if there's only one media, bot sends the media with the text message as caption
+      else if (processedMedia.length === 1) {
+        const media = processedMedia[0];
+        const response =
+          media.type === 'video'
+            ? await telegramBot.sendVideo(
+                accessToken,
+                media.media,
+                { caption: text },
+                media.fileOptions
+              )
+            : media.type === 'photo'
+            ? await telegramBot.sendPhoto(
+                accessToken,
+                media.media,
+                { caption: text },
+                media.fileOptions
+              )
+            : await telegramBot.sendDocument(
+                accessToken,
+                media.media,
+                { caption: text },
+                media.fileOptions
+              );
+        messageId = response.message_id;
+      }
+      // if there are multiple media, bot sends them as a media group - max 10 media per group - with the text as a caption (if there are more than 1 group, the caption will only be sent with the first group)
+      else {
+        const mediaGroups = this.chunkMedia(processedMedia, 10);
+        for (let i = 0; i < mediaGroups.length; i++) {
+          const mediaGroup = mediaGroups[i].map((m, index) => ({
+            type: m.type === 'document' ? 'document' : m.type, // Documents are not allowed in media groups
+            media: m.media,
+            caption: i === 0 && index === 0 ? text : undefined,
+          }));
 
-        if ((message?.media?.length || 0) > 0) {
-          await telegramBot.sendMediaGroup(
+          const response = await telegramBot.sendMediaGroup(
             accessToken,
-            message?.media?.map((m) => ({
-              type: m.url.indexOf('mp4') > -1 ? 'video' : 'photo',
-              media: m.url,
-            })) || []
+            mediaGroup
           );
+          if (i === 0) {
+            messageId = response[0].message_id;
+          }
         }
       }
+      // for private groups/channels message.id is undefined so the link generated by Postiz will be unusable "https://t.me/c/undefined/16"
+      // to avoid that, we use accessToken instead of message.id and we generate the link manually removing the -100 from the start.
+      if (messageId) {
+        ids.push({
+          id: message.id,
+          postId: String(messageId),
+          releaseURL: `https://t.me/${
+            id !== 'undefined' ? id : `c/${accessToken.replace('-100', '')}`
+          }/${messageId}`,
+          status: 'completed',
+        });
+      }
     }
 
     return ids;
   }
+  // chunkMedia is used to split media into groups of "size". 10 is used here because telegram api allows a maximum of 10 media per group
+  private chunkMedia(media: { type: string; media: string }[], size: number) {
+    const result = [];
+    for (let i = 0; i < media.length; i += size) {
+      result.push(media.slice(i, i + size));
+    }
+    return result;
+  }
 }

From fa0c422a554b7703851ab4d7585ebc4e46f489cc Mon Sep 17 00:00:00 2001
From: Nevo David <me@nevos.io>
Date: Wed, 5 Feb 2025 23:34:34 +0700
Subject: [PATCH 27/31] feat: subscription

---
 .../src/database/prisma/subscriptions/subscription.service.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.service.ts b/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.service.ts
index 9078f17dc..a8645cc2e 100644
--- a/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.service.ts
+++ b/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.service.ts
@@ -89,7 +89,7 @@ export class SubscriptionService {
         customerId
       ))!;
 
-    if (getCurrentSubscription || getCurrentSubscription?.isLifetime) {
+    if (getCurrentSubscription && getCurrentSubscription?.isLifetime) {
       return false;
     }
 

From a1417a385855fa1cbc38e0f0f9543ef1ec4adb41 Mon Sep 17 00:00:00 2001
From: Zerocool <35503951+TonyAntoun@users.noreply.github.com>
Date: Thu, 6 Feb 2025 00:40:43 +0200
Subject: [PATCH 28/31] Update telegram.provider.ts

Added the code to delete the user /connect message - IF THE BOT IS ADMIN
Added code to check the member status of the bot
---
 .../integrations/social/telegram.provider.ts  | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/libraries/nestjs-libraries/src/integrations/social/telegram.provider.ts b/libraries/nestjs-libraries/src/integrations/social/telegram.provider.ts
index 665ffcfb7..79c310763 100644
--- a/libraries/nestjs-libraries/src/integrations/social/telegram.provider.ts
+++ b/libraries/nestjs-libraries/src/integrations/social/telegram.provider.ts
@@ -89,6 +89,39 @@ export class TelegramProvider extends SocialAbstract implements SocialProvider {
     );
     // get correct chatId based on the channel type
     const chatId = match?.message?.chat?.id || match?.channel_post?.chat?.id;
+
+    // prevents the code from running while chatId is still undefined to avoid the error 'ETELEGRAM: 400 Bad Request: chat_id is empty'. the code would still work eventually but console spam is not pretty
+    if (chatId) {
+      //get the numberic ID of the bot
+      const botId = (await telegramBot.getMe()).id;
+      // check if the bot is an admin in the chat
+      const isAdmin = await this.botIsAdmin(chatId, botId);
+      // get the messageId of the message that triggered the connection
+      const connectMessageId =
+        match?.message?.message_id || match?.channel_post?.message_id;
+
+      if (!isAdmin) {
+        // alternatively you can replace this with a console.log if you do not want to inform the user of the bot's admin status
+        telegramBot.sendMessage(
+          chatId,
+          "Connection Successful. I don't have admin privileges to delete these messages, please go ahead and remove them yourself."
+        );
+      } else {
+        // Delete the message that triggered the connection
+        await telegramBot.deleteMessage(chatId, connectMessageId);
+        // Send success message to the chat
+        const successMessage = await telegramBot.sendMessage(
+          chatId,
+          'Connection Successful. Message will be deleted in 10 seconds.'
+        );
+        // Delete the success message after 10 seconds
+        setTimeout(async () => {
+          await telegramBot.deleteMessage(chatId, successMessage.message_id);
+          console.log('Success message deleted.');
+        }, 10000);
+      }
+    }
+
     // modified lastChatId to work with any type of channel (private/public groups/channels)
     return chatId
       ? { chatId }
@@ -214,4 +247,23 @@ export class TelegramProvider extends SocialAbstract implements SocialProvider {
     }
     return result;
   }
+
+  async botIsAdmin(chatId: number, botId: number): Promise<boolean> {
+    try {
+      const chatMember = await telegramBot.getChatMember(chatId, botId);
+
+      if (
+        chatMember.status === 'administrator' ||
+        chatMember.status === 'creator'
+      ) {
+        const permissions = chatMember.can_delete_messages;
+        return !!permissions; // Return true if bot can delete messages
+      }
+
+      return false;
+    } catch (error) {
+      console.error('Error checking bot privileges:', error);
+      return false;
+    }
+  }
 }

From 807f7078f35d6108978e14d86d211e9236c83416 Mon Sep 17 00:00:00 2001
From: Nevo David <me@nevos.io>
Date: Thu, 6 Feb 2025 12:22:18 +0700
Subject: [PATCH 29/31] feat: cant enable channels on self-hosted mode

---
 .../src/api/routes/users.controller.ts        |  2 +-
 .../onboarding/connect.channels.tsx           | 37 +++++++++++++++++++
 .../integrations/integration.service.ts       |  2 +-
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/apps/backend/src/api/routes/users.controller.ts b/apps/backend/src/api/routes/users.controller.ts
index e2b9bf16f..358232ae0 100644
--- a/apps/backend/src/api/routes/users.controller.ts
+++ b/apps/backend/src/api/routes/users.controller.ts
@@ -60,7 +60,7 @@ export class UsersController {
       ...user,
       orgId: organization.id,
       // @ts-ignore
-      totalChannels: organization?.subscription?.totalChannels || pricing.FREE.channel,
+      totalChannels: !process.env.STRIPE_PUBLISHABLE_KEY ? 10000 : organization?.subscription?.totalChannels || pricing.FREE.channel,
       // @ts-ignore
       tier: organization?.subscription?.subscriptionTier ||
         (!process.env.STRIPE_PUBLISHABLE_KEY ? 'ULTIMATE' : 'FREE'),
diff --git a/apps/frontend/src/components/onboarding/connect.channels.tsx b/apps/frontend/src/components/onboarding/connect.channels.tsx
index 73b0d20e3..8a6b18f65 100644
--- a/apps/frontend/src/components/onboarding/connect.channels.tsx
+++ b/apps/frontend/src/components/onboarding/connect.channels.tsx
@@ -16,6 +16,9 @@ import { useRouter } from 'next/navigation';
 import { useVariables } from '@gitroom/react/helpers/variable.context';
 import { useToaster } from '@gitroom/react/toaster/toaster';
 import { Integration } from '@prisma/client';
+import { web3List } from '@gitroom/frontend/components/launches/web3/web3.list';
+import { timer } from '@gitroom/helpers/utils/timer';
+import { deleteDialog } from '@gitroom/react/helpers/delete.dialog';
 
 export const ConnectChannels: FC = () => {
   const fetch = useFetch();
@@ -43,6 +46,33 @@ export const ConnectChannels: FC = () => {
   //   []
   // );
 
+  const openWeb3 = async (id: string) => {
+    const { component: Web3Providers } = web3List.find(
+      (item) => item.identifier === id
+    )!;
+
+    const { url } = await (await fetch(`/integrations/social/${id}`)).json();
+
+    setShowCustom(
+      <Web3Providers
+        onComplete={async (code, newState) => {
+          if (await deleteDialog('Connection found, should we continue?', 'Continue')) {
+            window.open(
+              `/integrations/social/${id}?code=${code}&state=${newState}`,
+              'Social Connect',
+              'width=700,height=700'
+            );
+            return ;
+          }
+
+          setShowCustom(undefined);
+        }}
+        nonce={url}
+      />
+    );
+    return;
+  };
+
   const refreshChannel = useCallback(
     (integration: Integration & { identifier: string }) => async () => {
       const { url } = await (
@@ -82,6 +112,7 @@ export const ConnectChannels: FC = () => {
     (
         identifier: string,
         isExternal: boolean,
+        isWeb3: boolean,
         customFields?: Array<{
           key: string;
           label: string;
@@ -124,6 +155,11 @@ export const ConnectChannels: FC = () => {
         //   return;
         // }
 
+        if (isWeb3) {
+          openWeb3(identifier);
+          return;
+        }
+
         if (customFields) {
           setShowCustom(
             <CustomVariables
@@ -252,6 +288,7 @@ export const ConnectChannels: FC = () => {
                   onClick={getSocialLink(
                     social.identifier,
                     social.isExternal,
+                    social.isWeb3,
                     social.customFields
                   )}
                   className="h-[96px] bg-input flex flex-col justify-center items-center gap-[10px] cursor-pointer"
diff --git a/libraries/nestjs-libraries/src/database/prisma/integrations/integration.service.ts b/libraries/nestjs-libraries/src/database/prisma/integrations/integration.service.ts
index 2985469f3..3512d00f1 100644
--- a/libraries/nestjs-libraries/src/database/prisma/integrations/integration.service.ts
+++ b/libraries/nestjs-libraries/src/database/prisma/integrations/integration.service.ts
@@ -210,7 +210,7 @@ export class IntegrationService {
     const integrations = (
       await this._integrationRepository.getIntegrationsList(org)
     ).filter((f) => !f.disabled);
-    if (integrations.length >= totalChannels) {
+    if (!!process.env.STRIPE_PUBLISHABLE_KEY && integrations.length >= totalChannels) {
       throw new Error('You have reached the maximum number of channels');
     }
 

From 136f20b7edd0d7609c55890ca4b6553f747170d8 Mon Sep 17 00:00:00 2001
From: Nevo David <me@nevos.io>
Date: Thu, 6 Feb 2025 12:46:04 +0700
Subject: [PATCH 30/31] feat: disable bluesky videos, add mastodon character
 validation

---
 .../providers/bluesky/bluesky.provider.tsx       |  3 +++
 .../providers/mastodon/mastodon.provider.tsx     |  2 +-
 .../src/integrations/social/bluesky.provider.ts  | 16 ++++++++++------
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/apps/frontend/src/components/launches/providers/bluesky/bluesky.provider.tsx b/apps/frontend/src/components/launches/providers/bluesky/bluesky.provider.tsx
index c505774fa..cfc1f98cf 100644
--- a/apps/frontend/src/components/launches/providers/bluesky/bluesky.provider.tsx
+++ b/apps/frontend/src/components/launches/providers/bluesky/bluesky.provider.tsx
@@ -1,6 +1,9 @@
 import { withProvider } from '@gitroom/frontend/components/launches/providers/high.order.provider';
 
 export default withProvider(null, undefined, undefined, async (posts) => {
+  if (posts.some((p) => p.some(a => a.path.indexOf('mp4') > -1))) {
+    return 'At the moment BlueSky does not support video posts.';
+  }
   if (posts.some((p) => p.length > 4)) {
     return 'There can be maximum 4 pictures in a post.';
   }
diff --git a/apps/frontend/src/components/launches/providers/mastodon/mastodon.provider.tsx b/apps/frontend/src/components/launches/providers/mastodon/mastodon.provider.tsx
index 08680e28b..538c72c9b 100644
--- a/apps/frontend/src/components/launches/providers/mastodon/mastodon.provider.tsx
+++ b/apps/frontend/src/components/launches/providers/mastodon/mastodon.provider.tsx
@@ -1,3 +1,3 @@
 import { FC } from 'react';
 import { withProvider } from '@gitroom/frontend/components/launches/providers/high.order.provider';
-export default withProvider(null, undefined, undefined, undefined);
+export default withProvider(null, undefined, undefined, undefined, 500);
diff --git a/libraries/nestjs-libraries/src/integrations/social/bluesky.provider.ts b/libraries/nestjs-libraries/src/integrations/social/bluesky.provider.ts
index e81a79c87..246b2a1e0 100644
--- a/libraries/nestjs-libraries/src/integrations/social/bluesky.provider.ts
+++ b/libraries/nestjs-libraries/src/integrations/social/bluesky.provider.ts
@@ -6,7 +6,9 @@ import {
 } from '@gitroom/nestjs-libraries/integrations/social/social.integrations.interface';
 import { makeId } from '@gitroom/nestjs-libraries/services/make.is';
 import {
-  NotEnoughScopes, RefreshToken, SocialAbstract
+  NotEnoughScopes,
+  RefreshToken,
+  SocialAbstract,
 } from '@gitroom/nestjs-libraries/integrations/social.abstract';
 import { BskyAgent, RichText } from '@atproto/api';
 import dayjs from 'dayjs';
@@ -165,11 +167,13 @@ export class BlueskyProvider extends SocialAbstract implements SocialProvider {
     const cidUrl = [] as { cid: string; url: string; rev: string }[];
     for (const post of postDetails) {
       const images = await Promise.all(
-        post.media?.map(async (p) => {
-          return await agent.uploadBlob(
-            new Blob([await reduceImageBySize(p.url)])
-          );
-        }) || []
+        post.media
+          ?.filter((p) => p.url.indexOf('mp4') === -1)
+          .map(async (p) => {
+            return await agent.uploadBlob(
+              new Blob([await reduceImageBySize(p.url)])
+            );
+          }) || []
       );
 
       const rt = new RichText({

From 6716360b5ada3c3bf752c24bd3aff3b794d3f460 Mon Sep 17 00:00:00 2001
From: Nevo David <me@nevos.io>
Date: Thu, 6 Feb 2025 13:55:00 +0700
Subject: [PATCH 31/31] feat: digest notifications, to remove email spam

---
 apps/workers/src/app/posts.controller.ts      |  5 ++
 .../notifications/notification.service.ts     | 54 ++++++++++++++++++-
 .../notifications/notifications.repository.ts | 11 ++++
 .../database/prisma/posts/posts.service.ts    | 44 +++++++++++----
 .../integrations/social/bluesky.provider.ts   |  1 -
 5 files changed, 103 insertions(+), 12 deletions(-)

diff --git a/apps/workers/src/app/posts.controller.ts b/apps/workers/src/app/posts.controller.ts
index a4f33a5c8..f644dc32c 100644
--- a/apps/workers/src/app/posts.controller.ts
+++ b/apps/workers/src/app/posts.controller.ts
@@ -15,4 +15,9 @@ export class PostsController {
   async payout(data: { id: string; releaseURL: string }) {
     return this._postsService.payout(data.id, data.releaseURL);
   }
+
+  @EventPattern('sendDigestEmail', Transport.REDIS)
+  async sendDigestEmail(data: { subject: string, org: string; since: string }) {
+    return this._postsService.sendDigestEmail(data.subject, data.org, data.since);
+  }
 }
diff --git a/libraries/nestjs-libraries/src/database/prisma/notifications/notification.service.ts b/libraries/nestjs-libraries/src/database/prisma/notifications/notification.service.ts
index af007660d..c100e8321 100644
--- a/libraries/nestjs-libraries/src/database/prisma/notifications/notification.service.ts
+++ b/libraries/nestjs-libraries/src/database/prisma/notifications/notification.service.ts
@@ -2,13 +2,17 @@ import { Injectable } from '@nestjs/common';
 import { NotificationsRepository } from '@gitroom/nestjs-libraries/database/prisma/notifications/notifications.repository';
 import { EmailService } from '@gitroom/nestjs-libraries/services/email.service';
 import { OrganizationRepository } from '@gitroom/nestjs-libraries/database/prisma/organizations/organization.repository';
+import { BullMqClient } from '@gitroom/nestjs-libraries/bull-mq-transport-new/client';
+import { ioRedis } from '@gitroom/nestjs-libraries/redis/redis.service';
+import dayjs from 'dayjs';
 
 @Injectable()
 export class NotificationService {
   constructor(
     private _notificationRepository: NotificationsRepository,
     private _emailService: EmailService,
-    private _organizationRepository: OrganizationRepository
+    private _organizationRepository: OrganizationRepository,
+    private _workerServiceProducer: BullMqClient
   ) {}
 
   getMainPageCount(organizationId: string, userId: string) {
@@ -25,12 +29,58 @@ export class NotificationService {
     );
   }
 
-  async inAppNotification(orgId: string, subject: string, message: string, sendEmail = false) {
+  getNotificationsSince(organizationId: string, since: string) {
+    return this._notificationRepository.getNotificationsSince(
+      organizationId,
+      since
+    );
+  }
+
+  async inAppNotification(
+    orgId: string,
+    subject: string,
+    message: string,
+    sendEmail = false,
+    digest = false
+  ) {
+    const date = new Date().toISOString();
     await this._notificationRepository.createNotification(orgId, message);
     if (!sendEmail) {
       return;
     }
 
+    if (digest) {
+      await ioRedis.watch('digest_' + orgId);
+      const value = await ioRedis.get('digest_' + orgId);
+      if (value) {
+        return;
+      }
+
+      await ioRedis
+        .multi()
+        .set('digest_' + orgId, date)
+        .expire('digest_' + orgId, 60)
+        .exec();
+
+      this._workerServiceProducer.emit('sendDigestEmail', {
+        id: 'digest_' + orgId,
+        options: {
+          delay: 60000,
+        },
+        payload: {
+          subject,
+          org: orgId,
+          since: date,
+        },
+      });
+
+      return;
+    }
+
+    await this.sendEmailsToOrg(orgId, subject, message);
+  }
+
+  async sendEmailsToOrg(orgId: string, subject: string, message: string) {
     const userOrg = await this._organizationRepository.getAllUsersOrgs(orgId);
     for (const user of userOrg?.users || []) {
       await this.sendEmail(user.user.email, subject, message);
diff --git a/libraries/nestjs-libraries/src/database/prisma/notifications/notifications.repository.ts b/libraries/nestjs-libraries/src/database/prisma/notifications/notifications.repository.ts
index 2ac87cc50..86cb37ceb 100644
--- a/libraries/nestjs-libraries/src/database/prisma/notifications/notifications.repository.ts
+++ b/libraries/nestjs-libraries/src/database/prisma/notifications/notifications.repository.ts
@@ -45,6 +45,17 @@ export class NotificationsRepository {
     });
   }
 
+  async getNotificationsSince(organizationId: string, since: string) {
+    return this._notifications.model.notifications.findMany({
+      where: {
+        organizationId,
+        createdAt: {
+          gte: new Date(since),
+        },
+      },
+    });
+  }
+
   async getNotifications(organizationId: string, userId: string) {
     const { lastReadNotifications } = (await this.getLastReadNotification(
       userId
diff --git a/libraries/nestjs-libraries/src/database/prisma/posts/posts.service.ts b/libraries/nestjs-libraries/src/database/prisma/posts/posts.service.ts
index 30c588027..89d7390f1 100644
--- a/libraries/nestjs-libraries/src/database/prisma/posts/posts.service.ts
+++ b/libraries/nestjs-libraries/src/database/prisma/posts/posts.service.ts
@@ -46,11 +46,13 @@ export class PostsService {
   async getStatistics(orgId: string, id: string) {
     const getPost = await this.getPostsRecursively(id, true, orgId, true);
     const content = getPost.map((p) => p.content);
-    const shortLinksTracking = await this._shortLinkService.getStatistics(content);
+    const shortLinksTracking = await this._shortLinkService.getStatistics(
+      content
+    );
 
     return {
-      clicks: shortLinksTracking
-    }
+      clicks: shortLinksTracking,
+    };
   }
 
   async getPostsRecursively(
@@ -363,7 +365,10 @@ export class PostsService {
         `Your post has been published on ${capitalize(
           integration.providerIdentifier
         )}`,
-        `Your post has been published at ${publishedPosts[0].releaseURL}`,
+        `Your post has been published on ${capitalize(
+          integration.providerIdentifier
+        )} at ${publishedPosts[0].releaseURL}`,
+        true,
         true
       );
 
@@ -517,10 +522,10 @@ export class PostsService {
     const post = await this._postRepository.deletePost(orgId, group);
     if (post?.id) {
       await this._workerServiceProducer.delete('post', post.id);
-      return {id: post.id};
+      return { id: post.id };
     }
 
-    return {error: true};
+    return { error: true };
   }
 
   async countPostsFromDay(orgId: string, date: Date) {
@@ -566,8 +571,10 @@ export class PostsService {
   async createPost(orgId: string, body: CreatePostDto) {
     const postList = [];
     for (const post of body.posts) {
-      const messages = post.value.map(p => p.content);
-      const updateContent = !body.shortLink ? messages : await this._shortLinkService.convertTextToShortLinks(orgId, messages);
+      const messages = post.value.map((p) => p.content);
+      const updateContent = !body.shortLink
+        ? messages
+        : await this._shortLinkService.convertTextToShortLinks(orgId, messages);
 
       post.value = post.value.map((p, i) => ({
         ...p,
@@ -624,7 +631,7 @@ export class PostsService {
       postList.push({
         postId: posts[0].id,
         integration: post.integration.id,
-      })
+      });
     }
 
     return postList;
@@ -878,4 +885,23 @@ export class PostsService {
   ) {
     return this._postRepository.createComment(orgId, userId, postId, comment);
   }
+
+  async sendDigestEmail(subject: string, orgId: string, since: string) {
+    const getNotificationsForOrgSince =
+      await this._notificationService.getNotificationsSince(orgId, since);
+    if (getNotificationsForOrgSince.length === 0) {
+      return;
+    }
+
+    const message = getNotificationsForOrgSince
+      .map((p) => p.content)
+      .join('<br />');
+    await this._notificationService.sendEmailsToOrg(
+      orgId,
+      getNotificationsForOrgSince.length === 1
+        ? subject
+        : '[Postiz] Your latest notifications',
+      message
+    );
+  }
 }
diff --git a/libraries/nestjs-libraries/src/integrations/social/bluesky.provider.ts b/libraries/nestjs-libraries/src/integrations/social/bluesky.provider.ts
index 246b2a1e0..f2d01a743 100644
--- a/libraries/nestjs-libraries/src/integrations/social/bluesky.provider.ts
+++ b/libraries/nestjs-libraries/src/integrations/social/bluesky.provider.ts
@@ -6,7 +6,6 @@ import {
 } from '@gitroom/nestjs-libraries/integrations/social/social.integrations.interface';
 import { makeId } from '@gitroom/nestjs-libraries/services/make.is';
 import {
-  NotEnoughScopes,
   RefreshToken,
   SocialAbstract,
 } from '@gitroom/nestjs-libraries/integrations/social.abstract';