jeffemmett
/
postiz
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gitroomhq:main' into discord_limit_fix

This commit is contained in:
Aryan Pokharkar 2024-10-27 14:24:40 +05:30 committed by GitHub
parent 35c017a26f 43b434aa74
commit f72b938d42
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/frontend/src/app/layout.tsx
View File

@ -10,10 +10,15 @@ import { Chakra_Petch } from 'next/font/google';
import PlausibleProvider from 'next-plausible'; import PlausibleProvider from 'next-plausible';
import clsx from 'clsx'; import clsx from 'clsx';
import { VariableContextComponent } from '@gitroom/react/helpers/variable.context'; import { VariableContextComponent } from '@gitroom/react/helpers/variable.context';
import { Fragment } from 'react';
const chakra = Chakra_Petch({ weight: '400', subsets: ['latin'] }); const chakra = Chakra_Petch({ weight: '400', subsets: ['latin'] });
export default async function AppLayout({ children }: { children: ReactNode }) { export default async function AppLayout({ children }: { children: ReactNode }) {
const Plausible = !!process.env.STRIPE_PUBLISHABLE_KEY
? PlausibleProvider
: Fragment;
return ( return (
<html className={interClass}> <html className={interClass}>
<head> <head>
@ -25,7 +30,9 @@ export default async function AppLayout({ children }: { children: ReactNode }) {
</head> </head>
<body className={clsx(chakra.className, 'text-primary dark')}> <body className={clsx(chakra.className, 'text-primary dark')}>
<VariableContextComponent <VariableContextComponent
storageProvider={process.env.STORAGE_PROVIDER! as 'local' | 'cloudflare'} storageProvider={
process.env.STORAGE_PROVIDER! as 'local' | 'cloudflare'
}
backendUrl={process.env.NEXT_PUBLIC_BACKEND_URL!} backendUrl={process.env.NEXT_PUBLIC_BACKEND_URL!}
plontoKey={process.env.NEXT_PUBLIC_POLOTNO!} plontoKey={process.env.NEXT_PUBLIC_POLOTNO!}
billingEnabled={!!process.env.STRIPE_PUBLISHABLE_KEY} billingEnabled={!!process.env.STRIPE_PUBLISHABLE_KEY}
@ -34,11 +41,11 @@ export default async function AppLayout({ children }: { children: ReactNode }) {
isGeneral={!!process.env.IS_GENERAL} isGeneral={!!process.env.IS_GENERAL}
uploadDirectory={process.env.NEXT_PUBLIC_UPLOAD_STATIC_DIRECTORY!} uploadDirectory={process.env.NEXT_PUBLIC_UPLOAD_STATIC_DIRECTORY!}
> >
<PlausibleProvider <Plausible
domain={!!process.env.IS_GENERAL ? 'postiz.com' : 'gitroom.com'} domain={!!process.env.IS_GENERAL ? 'postiz.com' : 'gitroom.com'}
> >
<LayoutContext>{children}</LayoutContext> <LayoutContext>{children}</LayoutContext>
</PlausibleProvider> </Plausible>
</VariableContextComponent> </VariableContextComponent>
</body> </body>
</html> </html>

3
apps/frontend/src/components/billing/main.billing.component.tsx
View File

@ -24,6 +24,7 @@ import { useModals } from '@mantine/modals';
import { AddProviderComponent } from '@gitroom/frontend/components/launches/add.provider.component'; import { AddProviderComponent } from '@gitroom/frontend/components/launches/add.provider.component';
import { TopTitle } from '@gitroom/frontend/components/launches/helpers/top.title.component'; import { TopTitle } from '@gitroom/frontend/components/launches/helpers/top.title.component';
import { Textarea } from '@gitroom/react/form/textarea'; import { Textarea } from '@gitroom/react/form/textarea';
import { useFireEvents } from '@gitroom/helpers/utils/use.fire.events';
export interface Tiers { export interface Tiers {
month: Array<{ month: Array<{
@ -156,9 +157,11 @@ export const Features: FC<{
const Info: FC<{ proceed: (feedback: string) => void }> = (props) => { const Info: FC<{ proceed: (feedback: string) => void }> = (props) => {
const [feedback, setFeedback] = useState(''); const [feedback, setFeedback] = useState('');
const modal = useModals(); const modal = useModals();
const events = useFireEvents();
const cancel = useCallback(() => { const cancel = useCallback(() => {
props.proceed(feedback); props.proceed(feedback);
events('cancel_subscription');
modal.closeAll(); modal.closeAll();
}, [modal, feedback]); }, [modal, feedback]);

19
libraries/helpers/src/utils/use.fire.events.ts
View File

@ -1,9 +1,14 @@
import {usePlausible} from 'next-plausible' import { usePlausible } from 'next-plausible';
import {useCallback} from "react"; import { useCallback } from 'react';
import { useVariables } from '@gitroom/react/helpers/variable.context';
export const useFireEvents = () => { export const useFireEvents = () => {
const plausible = usePlausible(); const { billingEnabled } = useVariables();
return useCallback((name: string, props?: any) => { const plausible = usePlausible();
plausible(name, {props}); return useCallback((name: string, props?: any) => {
}, []); if (!billingEnabled) {
} return;
}
plausible(name, { props });
}, []);
};

2
libraries/nestjs-libraries/src/database/prisma/organizations/organization.repository.ts
View File

@ -149,7 +149,7 @@ export class OrganizationRepository {
}); });
if ( if (
!process.env.STRIPE_PUBLISHABLE_KEY || process.env.STRIPE_PUBLISHABLE_KEY &&
checkForSubscription?.subscription?.subscriptionTier !== checkForSubscription?.subscription?.subscriptionTier !==
SubscriptionTier.PRO SubscriptionTier.PRO
) { ) {

13
libraries/nestjs-libraries/src/integrations/social/tiktok.provider.ts
View File

@ -78,10 +78,10 @@ export class TiktokProvider extends SocialAbstract implements SocialProvider {
`?client_key=${process.env.TIKTOK_CLIENT_ID}` + `?client_key=${process.env.TIKTOK_CLIENT_ID}` +
`&redirect_uri=${encodeURIComponent( `&redirect_uri=${encodeURIComponent(
`${ `${
process.env.NODE_ENV === 'development' || !process.env.NODE_ENV process?.env?.FRONTEND_URL?.indexOf('https') === -1
? `https://integration.git.sn/integrations/social/tiktok` ? 'https://redirectmeto.com/'
: `${process.env.FRONTEND_URL}/integrations/social/tiktok` : ''
}` }${process?.env?.FRONTEND_URL}/integrations/social/tiktok`
)}` + )}` +
`&state=${state}` + `&state=${state}` +
`&response_type=code` + `&response_type=code` +
@ -199,7 +199,9 @@ export class TiktokProvider extends SocialAbstract implements SocialProvider {
? `https://www.tiktok.com/@${id}` ? `https://www.tiktok.com/@${id}`
: `https://www.tiktok.com/@${id}/video/` + : `https://www.tiktok.com/@${id}/video/` +
publicaly_available_post_id, publicaly_available_post_id,
id: !publicaly_available_post_id ? publishId : publicaly_available_post_id?.[0], id: !publicaly_available_post_id
? publishId
: publicaly_available_post_id?.[0],
}; };
} }
@ -210,7 +212,6 @@ export class TiktokProvider extends SocialAbstract implements SocialProvider {
}); });
} }
await timer(3000); await timer(3000);
} }
} }

20
package-lock.json generated
View File

@ -22270,9 +22270,10 @@
} }
}, },
"node_modules/http-proxy-middleware": { "node_modules/http-proxy-middleware": {
"version": "3.0.2", "version": "3.0.3",
"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.2.tgz", "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.3.tgz",
"integrity": "sha512-fBLFpmvDzlxdckwZRjM0wWtwDZ4KBtQ8NFqhrFKoEtK4myzuiumBuNTxD+F4cVbXfOZljIbrynmvByofDzT7Ag==", "integrity": "sha512-usY0HG5nyDUwtqpiZdETNbmKtw3QQ1jwYFZ9wi5iHzX2BcILwQKtYDJPo7XHTsu5Z0B2Hj3W9NNnbd+AjFWjqg==",
"license": "MIT",
"dependencies": { "dependencies": {
"@types/http-proxy": "^1.17.15", "@types/http-proxy": "^1.17.15",
"debug": "^4.3.6", "debug": "^4.3.6",
@ -31760,9 +31761,9 @@
} }
}, },
"node_modules/polotno": { "node_modules/polotno": {
"version": "2.14.3", "version": "2.14.4",
"resolved": "https://registry.npmjs.org/polotno/-/polotno-2.14.3.tgz", "resolved": "https://registry.npmjs.org/polotno/-/polotno-2.14.4.tgz",
"integrity": "sha512-CYf5BmK12wAYpnFnHpe8gSoYksPr5RmJQXHAib00Fx09FSG47jLzVC+R/v7CpDrcOW/1CpQqONz1po0D245xjA==", "integrity": "sha512-Wq6j1BKkBWtSCILHAv04UnJp+F3MvriIo9N65wMRniPcNbwPY1IxhkEJ9co0AaPrQHmOiu25BOl5isYhH5jc4w==",
"license": "SEE LICENSE IN LICENSE.md", "license": "SEE LICENSE IN LICENSE.md",
"dependencies": { "dependencies": {
"@blueprintjs/core": "5.12.0", "@blueprintjs/core": "5.12.0",
@ -39011,9 +39012,10 @@
} }
}, },
"node_modules/webpack-dev-server/node_modules/http-proxy-middleware": { "node_modules/webpack-dev-server/node_modules/http-proxy-middleware": {
"version": "2.0.6", "version": "2.0.7",
"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz", "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
"integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==", "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
"license": "MIT",
"dependencies": { "dependencies": {
"@types/http-proxy": "^1.17.8", "@types/http-proxy": "^1.17.8",
"http-proxy": "^1.18.1", "http-proxy": "^1.18.1",