Merge branch 'main' into sentry-ai/mcp

Author: egelhaus

apps/backend/src/api/routes/integrations.controller.ts

@@ -3,6 +3,7 @@ import {
   Controller,
   Delete,
   Get,
+  HttpException,
   Param,
   Post,
   Put,
@@ -261,7 +262,7 @@ export class IntegrationsController {
       throw new Error('Invalid integration');
     }
 
-    let newList: any[] | {none: true} = [];
+    let newList: any[] | { none: true } = [];
     try {
       newList = (await this.functionIntegration(org, body)) || [];
     } catch (err) {
@@ -298,7 +299,7 @@ export class IntegrationsController {
           image: p.image,
           label: p.name,
         })),
-        ...newList as any[],
+        ...(newList as any[]),
       ],
       (p) => p.id
     ).filter((f) => f.label && f.id);
@@ -487,6 +488,18 @@ export class IntegrationsController {
         validName = `Channel_${String(id).slice(0, 8)}`;
       }
     }
+
+    if (
+      process.env.STRIPE_PUBLISHABLE_KEY &&
+      org.isTrailing &&
+      (await this._integrationService.checkPreviousConnections(
+        org.id,
+        String(id)
+      ))
+    ) {
+      throw new HttpException('', 412);
+    }
+
     return this._integrationService.createOrUpdateIntegration(
       additionalSettings,
       !!integrationProvider.oneTimeToken,

apps/cron/src/tasks/check.missing.queues.ts

@@ -19,9 +19,11 @@ export class CheckMissingQueues {
           id: p.id,
           publishDate: p.publishDate,
           isJob:
-            (await this._workerServiceProducer
-              .getQueue('post')
-              .getJobState(p.id)) === 'delayed',
+            ['delayed', 'waiting'].indexOf(
+              await this._workerServiceProducer
+                .getQueue('post')
+                .getJobState(p.id)
+            ) > -1,
         }))
       )
     ).filter((p) => !p.isJob);

apps/cron/src/tasks/post.now.pending.queues.ts

@@ -18,9 +18,11 @@ export class PostNowPendingQueues {
           id: p.id,
           publishDate: p.publishDate,
           isJob:
-            (await this._workerServiceProducer
-              .getQueue('post')
-              .getJobState(p.id)) === 'delayed',
+            ['delayed', 'waiting'].indexOf(
+              await this._workerServiceProducer
+                .getQueue('post')
+                .getJobState(p.id)
+            ) > -1,
         }))
       )
     ).filter((p) => !p.isJob);

apps/frontend/src/app/(app)/layout.tsx

@@ -18,13 +18,13 @@ import { FacebookComponent } from '@gitroom/frontend/components/layout/facebook.
 import { headers } from 'next/headers';
 import { headerName } from '@gitroom/react/translation/i18n.config';
 import { HtmlComponent } from '@gitroom/frontend/components/layout/html.component';
-import dynamicLoad from 'next/dynamic';
-const SetTimezone = dynamicLoad(
-  () => import('@gitroom/frontend/components/layout/set.timezone'),
-  {
-    ssr: false,
-  }
-);
+// import dynamicLoad from 'next/dynamic';
+// const SetTimezone = dynamicLoad(
+//   () => import('@gitroom/frontend/components/layout/set.timezone'),
+//   {
+//     ssr: false,
+//   }
+// );
 
 const jakartaSans = Plus_Jakarta_Sans({
   weight: ['600', '500'],
@@ -79,7 +79,7 @@ export default async function AppLayout({ children }: { children: ReactNode }) {
           }
         >
           <SentryComponent>
-            <SetTimezone />
+            {/*<SetTimezone />*/}
             <HtmlComponent />
             <ToltScript />
             <FacebookComponent />

apps/frontend/src/components/billing/main.billing.component.tsx

@@ -505,7 +505,7 @@ export const MainBillingComponent: FC<{
           {t(
             'your_subscription_will_be_canceled_at',
             'Your subscription will be canceled at'
-          )}
+          )}{' '}
           {newDayjs(subscription.cancelAt).local().format('D MMM, YYYY')}
           <br />
           {t(

apps/frontend/src/components/launches/add.provider.component.tsx

@@ -1,14 +1,14 @@
 'use client';
 
 import { useModals } from '@mantine/modals';
-import React, { FC, useCallback, useMemo } from 'react';
+import React, { FC, useCallback, useEffect, useMemo } from 'react';
 import { useFetch } from '@gitroom/helpers/utils/custom.fetch';
 import { Input } from '@gitroom/react/form/input';
 import { FieldValues, FormProvider, useForm } from 'react-hook-form';
 import { Button } from '@gitroom/react/form/button';
 import { classValidatorResolver } from '@hookform/resolvers/class-validator';
 import { ApiKeyDto } from '@gitroom/nestjs-libraries/dtos/integrations/api.key.dto';
-import { useRouter } from 'next/navigation';
+import { useRouter, useSearchParams } from 'next/navigation';
 import { TopTitle } from '@gitroom/frontend/components/launches/helpers/top.title.component';
 import { useVariables } from '@gitroom/react/helpers/variable.context';
 import { useToaster } from '@gitroom/react/toaster/toaster';
@@ -42,9 +42,16 @@ export const AddProviderButton: FC<{
   update?: () => void;
 }> = (props) => {
   const { update } = props;
+  const query = useSearchParams();
   const add = useAddProvider(update);
   const t = useT();
 
+  useEffect(() => {
+    if (query.get('onboarding')) {
+      add();
+    }
+  }, []);
+
   return (
     <button
       className="text-btnText bg-btnSimple h-[44px] pt-[12px] pb-[14px] ps-[16px] pe-[20px] justify-center items-center flex rounded-[8px] gap-[8px]"

apps/frontend/src/components/launches/continue.integration.tsx

@@ -40,9 +40,14 @@ export const ContinueIntegration: FC<{
 
       const data = await fetch(`/integrations/social/${provider}/connect`, {
         method: 'POST',
-        body: JSON.stringify({...modifiedParams, timezone}),
+        body: JSON.stringify({ ...modifiedParams, timezone }),
       });
 
+      if (data.status === HttpStatusCode.PreconditionFailed) {
+        push(`/launches?precondition=true`);
+        return ;
+      }
+
       if (data.status === HttpStatusCode.NotAcceptable) {
         const { msg } = await data.json();
         push(`/launches?msg=${msg}`);

apps/frontend/src/components/launches/helpers/media.settings.component.tsx

@@ -106,16 +106,12 @@ export const CreateThumbnail: FC<{
   const [isCapturing, setIsCapturing] = useState(false);
 
   const handleLoadedMetadata = useCallback(() => {
-    if (videoRef.current) {
-      setDuration(videoRef.current.duration);
-      setIsLoaded(true);
-    }
+    setDuration(videoRef?.current?.duration);
+    setIsLoaded(true);
   }, []);
 
   const handleTimeUpdate = useCallback(() => {
-    if (videoRef.current) {
-      setCurrentTime(videoRef.current.currentTime);
-    }
+    setCurrentTime(videoRef?.current?.currentTime);
   }, []);
 
   const handleSeek = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
@@ -127,8 +123,6 @@ export const CreateThumbnail: FC<{
   }, []);
 
   const captureFrame = useCallback(async () => {
-    if (!videoRef.current || !canvasRef.current) return;
-
     setIsCapturing(true);
 
     try {
@@ -299,7 +293,14 @@ export const MediaComponentInner: FC<{
     alt: string;
   }) => void;
   media:
-    | { id: string; name: string; path: string; thumbnail: string; alt: string, thumbnailTimestamp?: number }
+    | {
+        id: string;
+        name: string;
+        path: string;
+        thumbnail: string;
+        alt: string;
+        thumbnailTimestamp?: number;
+      }
     | undefined;
 }> = (props) => {
   const { onClose, onSelect, media } = props;

apps/frontend/src/components/layout/layout.settings.tsx

@@ -84,7 +84,6 @@ export const LayoutSettings = ({ children }: { children: ReactNode }) => {
           <Toaster />
           <ShowPostSelector />
           <NewSubscription />
-          {user.tier !== 'FREE' && <Onboarding />}
           <Support />
           <ContinueProvider />
           <div className="min-h-[100vh] w-full max-w-[1440px] mx-auto bg-primary px-6 text-textColor flex flex-col">

apps/frontend/src/components/layout/pre-condition.component.tsx

@@ -0,0 +1,43 @@
+import React, { FC, useEffect } from 'react';
+import { useSearchParams } from 'next/navigation';
+import { ModalWrapperComponent } from '@gitroom/frontend/components/new-launch/modal.wrapper.component';
+import { useModals } from '@mantine/modals';
+import { Button } from '@gitroom/react/form/button';
+
+export const PreConditionComponentModal: FC = () => {
+  return (
+    <div className="flex flex-col gap-[16px]">
+      <div className="whitespace-pre-line">
+        This social channel was connected previously to another Postiz account.{'\n'}
+        To continue, please fast-track your trial for an immediate charge.{'\n'}{'\n'}
+        ** Please be advised that the account will not eligible for a refund, and the charge is final.
+      </div>
+      <div className="flex gap-[2px] justify-center">
+        <Button onClick={() => window.location.href='/billing?finishTrial=true'}>Fast track - Charge me now</Button>
+        <Button secondary={true}>Cancel</Button>
+      </div>
+    </div>
+  );
+};
+export const PreConditionComponent: FC = () => {
+  const modal = useModals();
+  const query = useSearchParams();
+  useEffect(() => {
+    if (query.get('precondition')) {
+      modal.openModal({
+        title: '',
+        withCloseButton: false,
+        classNames: {
+          modal: 'text-textColor',
+        },
+        size: 'auto',
+        children: (
+          <ModalWrapperComponent title="Suspicious activity detected">
+            <PreConditionComponentModal />
+          </ModalWrapperComponent>
+        ),
+      });
+    }
+  }, []);
+  return null;
+};