From e7117db99861e322fcaf0a5c6bcf981b19a0221d Mon Sep 17 00:00:00 2001
From: Adw8 <adwaitgharpure@gmail.com>
Date: Wed, 5 Feb 2025 11:40:55 +0530
Subject: [PATCH 01/16] Setup dynamic routing for generating memes

---
 src/app/memes/[id]/page.tsx | 57 +++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 src/app/memes/[id]/page.tsx

diff --git a/src/app/memes/[id]/page.tsx b/src/app/memes/[id]/page.tsx
new file mode 100644
index 0000000..433a357
--- /dev/null
+++ b/src/app/memes/[id]/page.tsx
@@ -0,0 +1,57 @@
+import type { Metadata, ResolvingMetadata } from 'next'
+
+type Props = {
+  params: { id: string }
+  searchParams: { [key: string]: string | string[] | undefined }
+}
+
+export async function generateMetadata(
+  { params, searchParams }: Props,
+  parent: ResolvingMetadata
+): Promise<Metadata> {
+  const id = (await params).id
+
+  const product = {
+    title: 'Generated meme',
+    imageUrl: 'https://jade-wonderful-barnacle-735.mypinata.cloud/ipfs/bafybeiaojxp5jkr3vc5t4ruopet4fsxgn7kjsmwi3bu6w7g7r2vpt2jj2q',
+    description: 'A funny meme',
+  }
+
+  return {
+    title: product.title,
+    metadataBase: new URL('https://memes.markto.market'),
+    openGraph: {
+       type: "website",
+       url: `https://memes.markto.market/memes/${id}`,
+       siteName: "Mark's meme market",
+       images: [{
+         url: product.imageUrl,
+       }, ],
+     }
+
+  }
+}
+
+export default async function MemePage({ params }: Props) {
+  const product = {
+    title: 'Generated meme',
+    imageUrl: 'https://jade-wonderful-barnacle-735.mypinata.cloud/ipfs/bafybeiaojxp5jkr3vc5t4ruopet4fsxgn7kjsmwi3bu6w7g7r2vpt2jj2q',
+    description: 'A funny meme',
+  }
+
+  return (
+    <main className="flex min-h-screen flex-col items-center justify-between p-24">
+      <div className="relative flex flex-col items-center">
+        <h1 className="text-4xl font-bold mb-8">{product.title}</h1>
+        <div className="relative w-full max-w-2xl aspect-square">
+          <img
+            src={product.imageUrl}
+            alt={product.title}
+            className="object-contain rounded-lg w-full h-full"
+          />
+        </div>
+        <p className="mt-4 text-lg text-gray-600">{product.description}</p>
+      </div>
+    </main>
+  );
+}
-- 
2.45.2


From c7e291c19e10fb23a83bc60444f934037cc25271 Mon Sep 17 00:00:00 2001
From: Adw8 <adwaitgharpure@gmail.com>
Date: Wed, 5 Feb 2025 13:34:57 +0530
Subject: [PATCH 02/16] Derive image URL from params

---
 .env.example                |  2 ++
 src/app/memes/[id]/page.tsx | 69 +++++++++++++++++++------------------
 2 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/.env.example b/.env.example
index 3263b51..bd04e2e 100644
--- a/.env.example
+++ b/.env.example
@@ -10,3 +10,5 @@ NEXT_PUBLIC_USDC_MINT=EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v
 # Get keys from https://app.pinata.cloud/developers/api-keys
 PINATA_JWT=
 PINATA_GATEWAY=
+
+SITE_URL=https://memes.markto.market
diff --git a/src/app/memes/[id]/page.tsx b/src/app/memes/[id]/page.tsx
index 433a357..22cfcef 100644
--- a/src/app/memes/[id]/page.tsx
+++ b/src/app/memes/[id]/page.tsx
@@ -1,56 +1,59 @@
-import type { Metadata, ResolvingMetadata } from 'next'
+import type { Metadata, ResolvingMetadata } from 'next';
 
-type Props = {
-  params: { id: string }
-  searchParams: { [key: string]: string | string[] | undefined }
+interface Props {
+  params: { id: string };
+}
+
+interface Meme {
+  title: string;
+  imageUrl: string;
+  description: string;
+}
+
+function getMeme(baseUrl: string, id: string): Meme {
+  return {
+    title: 'Generated meme',
+    imageUrl: `${baseUrl}/api/images/${id}`,
+    description: 'A funny meme',
+  };
 }
 
 export async function generateMetadata(
-  { params, searchParams }: Props,
+  { params }: Props,
   parent: ResolvingMetadata
 ): Promise<Metadata> {
-  const id = (await params).id
-
-  const product = {
-    title: 'Generated meme',
-    imageUrl: 'https://jade-wonderful-barnacle-735.mypinata.cloud/ipfs/bafybeiaojxp5jkr3vc5t4ruopet4fsxgn7kjsmwi3bu6w7g7r2vpt2jj2q',
-    description: 'A funny meme',
-  }
+  const baseUrl = process.env.SITE_URL!;
+  const meme = getMeme(baseUrl, params.id);
 
   return {
-    title: product.title,
-    metadataBase: new URL('https://memes.markto.market'),
+    title: meme.title,
+    description: meme.description,
+    metadataBase: new URL(baseUrl),
     openGraph: {
-       type: "website",
-       url: `https://memes.markto.market/memes/${id}`,
-       siteName: "Mark's meme market",
-       images: [{
-         url: product.imageUrl,
-       }, ],
-     }
-
-  }
+      type: 'website',
+      url: `${baseUrl}/memes/${params.id}`,
+      siteName: "Mark's meme market",
+      images: [{ url: meme.imageUrl }],
+    },
+  };
 }
 
-export default async function MemePage({ params }: Props) {
-  const product = {
-    title: 'Generated meme',
-    imageUrl: 'https://jade-wonderful-barnacle-735.mypinata.cloud/ipfs/bafybeiaojxp5jkr3vc5t4ruopet4fsxgn7kjsmwi3bu6w7g7r2vpt2jj2q',
-    description: 'A funny meme',
-  }
+export default function MemePage({ params }: Props) {
+  const baseUrl = process.env.SITE_URL!;
+  const meme = getMeme(baseUrl, params.id);
 
   return (
     <main className="flex min-h-screen flex-col items-center justify-between p-24">
       <div className="relative flex flex-col items-center">
-        <h1 className="text-4xl font-bold mb-8">{product.title}</h1>
+        <h1 className="text-4xl font-bold mb-8">{meme.title}</h1>
         <div className="relative w-full max-w-2xl aspect-square">
           <img
-            src={product.imageUrl}
-            alt={product.title}
+            src={meme.imageUrl}
+            alt={meme.title}
             className="object-contain rounded-lg w-full h-full"
           />
         </div>
-        <p className="mt-4 text-lg text-gray-600">{product.description}</p>
+        <p className="mt-4 text-lg text-gray-600">{meme.description}</p>
       </div>
     </main>
   );
-- 
2.45.2


From 1976cfbbe68c901b10b85d75a344d9638f53e787 Mon Sep 17 00:00:00 2001
From: Adw8 <adwaitgharpure@gmail.com>
Date: Wed, 5 Feb 2025 14:19:32 +0530
Subject: [PATCH 03/16] Add button to share generated meme on twitter

---
 src/app/memes/[id]/page.tsx      | 32 ++++++++++----------------------
 src/components/AIServiceCard.tsx | 18 ++++++++++++++++++
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/app/memes/[id]/page.tsx b/src/app/memes/[id]/page.tsx
index 22cfcef..da6942d 100644
--- a/src/app/memes/[id]/page.tsx
+++ b/src/app/memes/[id]/page.tsx
@@ -4,18 +4,9 @@ interface Props {
   params: { id: string };
 }
 
-interface Meme {
-  title: string;
-  imageUrl: string;
-  description: string;
-}
-
-function getMeme(baseUrl: string, id: string): Meme {
-  return {
-    title: 'Generated meme',
-    imageUrl: `${baseUrl}/api/images/${id}`,
-    description: 'A funny meme',
-  };
+function getMeme(id: string): string {
+  const pinataImageUrl = `https://${process.env.PINATA_GATEWAY}/ipfs/${id}`
+  return pinataImageUrl;
 }
 
 export async function generateMetadata(
@@ -23,37 +14,34 @@ export async function generateMetadata(
   parent: ResolvingMetadata
 ): Promise<Metadata> {
   const baseUrl = process.env.SITE_URL!;
-  const meme = getMeme(baseUrl, params.id);
+  const meme = getMeme(params.id);
 
   return {
-    title: meme.title,
-    description: meme.description,
+    title: '',
+    description: '',
     metadataBase: new URL(baseUrl),
     openGraph: {
       type: 'website',
       url: `${baseUrl}/memes/${params.id}`,
       siteName: "Mark's meme market",
-      images: [{ url: meme.imageUrl }],
+      images: [{ url: meme }],
     },
   };
 }
 
 export default function MemePage({ params }: Props) {
-  const baseUrl = process.env.SITE_URL!;
-  const meme = getMeme(baseUrl, params.id);
+  const meme = getMeme(params.id);
 
   return (
     <main className="flex min-h-screen flex-col items-center justify-between p-24">
       <div className="relative flex flex-col items-center">
-        <h1 className="text-4xl font-bold mb-8">{meme.title}</h1>
         <div className="relative w-full max-w-2xl aspect-square">
           <img
-            src={meme.imageUrl}
-            alt={meme.title}
+            src={meme}
+            alt='Generated image'
             className="object-contain rounded-lg w-full h-full"
           />
         </div>
-        <p className="mt-4 text-lg text-gray-600">{meme.description}</p>
       </div>
     </main>
   );
diff --git a/src/components/AIServiceCard.tsx b/src/components/AIServiceCard.tsx
index 12ef008..9f1010d 100644
--- a/src/components/AIServiceCard.tsx
+++ b/src/components/AIServiceCard.tsx
@@ -86,6 +86,14 @@ const AIServiceCard: React.FC<AIServiceCardProps> = ({
     }
   }
 
+  const generateTwitterShareUrl = (imageUrl: string): string => {
+    const baseUrl = window.location.href;
+    const ipfsImageUrl = imageUrl.split("/ipfs/")[1];
+    const memeUrl = `${baseUrl}/memes/${ipfsImageUrl}`;
+
+    return `https://twitter.com/intent/tweet?text=Check%20out%20this%20generated%20image!&url=${encodeURIComponent(memeUrl)}`;
+  };
+
   return (
     <div className="w-full bg-gray-800/50 backdrop-blur-lg rounded-2xl shadow-xl border border-gray-700/50 mb-8">
       <div className="p-6">
@@ -136,6 +144,16 @@ const AIServiceCard: React.FC<AIServiceCardProps> = ({
               alt="Generated content"
               className="w-full h-auto rounded-xl shadow-2xl"
             />
+            <div className="mt-4 text-center">
+              <a
+                href={generateTwitterShareUrl(generationState.imageUrl)}
+                target="_blank"
+                rel="noopener noreferrer"
+                className="inline-block w-full bg-blue-500 hover:bg-blue-600 text-white font-semibold py-4 px-6 rounded-xl transition-all duration-200 shadow-lg hover:shadow-blue-500/25"
+              >
+                Share on Twitter
+              </a>
+            </div>
           </div>
         )}
       </div>
-- 
2.45.2


From 297a4c7ed8b5770ebf9fb90ca6071f8e11366630 Mon Sep 17 00:00:00 2001
From: Adw8 <adwaitgharpure@gmail.com>
Date: Wed, 5 Feb 2025 15:57:22 +0530
Subject: [PATCH 04/16] Generate twitter metadata tags

---
 .env.example                     | 2 ++
 src/app/memes/[id]/page.tsx      | 6 +++++-
 src/components/AIServiceCard.tsx | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.env.example b/.env.example
index bd04e2e..da43a76 100644
--- a/.env.example
+++ b/.env.example
@@ -11,4 +11,6 @@ NEXT_PUBLIC_USDC_MINT=EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v
 PINATA_JWT=
 PINATA_GATEWAY=
 
+# Change to your website URL
+# For development: set to http://localhost:3000
 SITE_URL=https://memes.markto.market
diff --git a/src/app/memes/[id]/page.tsx b/src/app/memes/[id]/page.tsx
index da6942d..7e20528 100644
--- a/src/app/memes/[id]/page.tsx
+++ b/src/app/memes/[id]/page.tsx
@@ -22,8 +22,12 @@ export async function generateMetadata(
     metadataBase: new URL(baseUrl),
     openGraph: {
       type: 'website',
+      title: 'Generated Meme',
       url: `${baseUrl}/memes/${params.id}`,
-      siteName: "Mark's meme market",
+      images: [{ url: meme }],
+    },
+    twitter: {
+      title: 'Generated Meme',
       images: [{ url: meme }],
     },
   };
diff --git a/src/components/AIServiceCard.tsx b/src/components/AIServiceCard.tsx
index 9f1010d..12f99e1 100644
--- a/src/components/AIServiceCard.tsx
+++ b/src/components/AIServiceCard.tsx
@@ -91,7 +91,7 @@ const AIServiceCard: React.FC<AIServiceCardProps> = ({
     const ipfsImageUrl = imageUrl.split("/ipfs/")[1];
     const memeUrl = `${baseUrl}/memes/${ipfsImageUrl}`;
 
-    return `https://twitter.com/intent/tweet?text=Check%20out%20this%20generated%20image!&url=${encodeURIComponent(memeUrl)}`;
+    return `https://twitter.com/intent/tweet?text=Check%20out%20this%20meme%20I%20generated!&url=${encodeURIComponent(memeUrl)}`;
   };
 
   return (
-- 
2.45.2


From a7f255a33db390953c7ca6a28db368d54feb5668 Mon Sep 17 00:00:00 2001
From: IshaVenikar <ishavenikar7@gmail.com>
Date: Wed, 5 Feb 2025 17:43:25 +0530
Subject: [PATCH 05/16] Implement API to verify tweet data

---
 .env.example                     |  1 +
 src/app/api/tweet/route.ts       | 47 ++++++++++++++++++++++++
 src/components/AIServiceCard.tsx | 26 +++++++++++---
 src/components/TweetForm.tsx     | 61 ++++++++++++++++++++++++++++++++
 src/data-source.ts               |  3 +-
 src/entity/Tweets.ts             | 13 +++++++
 src/services/fluxService.ts      |  3 +-
 src/utils/verifyTweet.ts         | 25 +++++++++++++
 8 files changed, 172 insertions(+), 7 deletions(-)
 create mode 100644 src/app/api/tweet/route.ts
 create mode 100644 src/components/TweetForm.tsx
 create mode 100644 src/entity/Tweets.ts
 create mode 100644 src/utils/verifyTweet.ts

diff --git a/.env.example b/.env.example
index da43a76..0b88a49 100644
--- a/.env.example
+++ b/.env.example
@@ -14,3 +14,4 @@ PINATA_GATEWAY=
 # Change to your website URL
 # For development: set to http://localhost:3000
 SITE_URL=https://memes.markto.market
+ACCOUNT_HANDLE=mark_2_market1
diff --git a/src/app/api/tweet/route.ts b/src/app/api/tweet/route.ts
new file mode 100644
index 0000000..b44d0ae
--- /dev/null
+++ b/src/app/api/tweet/route.ts
@@ -0,0 +1,47 @@
+import { NextRequest, NextResponse } from 'next/server'
+import { verifySignatureInTweet } from '../../../utils/verifyTweet';
+
+export async function POST(req: NextRequest): Promise<NextResponse> {
+  try {
+    const { tweetUrl } = await req.json();
+
+    const url = `https://publish.twitter.com/oembed?url=${tweetUrl}&maxwidth=600`;
+
+    const response = await fetch(url);
+    const data = await response.json();
+    const { handle, memeUrl, txHash } = extractData(data.html);
+    if (!handle || !memeUrl || !txHash) {
+      return NextResponse.json(
+        { error: 'Verification failed' },
+        { status: 500 }
+      )
+    }
+
+    const isVerified = await verifySignatureInTweet(txHash);
+    const isHandleCorrect = handle === process.env.ACCOUNT_HANDLE;
+
+    return NextResponse.json({isVerified: isVerified && isHandleCorrect})
+  } catch (error) {
+    console.error('Error while verifying tweet:', error)
+    return NextResponse.json(
+      { error: 'Failed to verify tweet' },
+      { status: 500 }
+    )
+  }
+}
+
+const extractData = (tweet: string | object) => {
+  const tweetText = typeof tweet === 'string' ? tweet : JSON.stringify(tweet);
+
+  const decodedTweet = tweetText.replace(/&#39;/g, "'").replace(/&quot;/g, '"');
+
+  const urlMatch = decodedTweet.match(/<a href="(https:\/\/t.co\/[^"]+)">/);
+  const txHashMatch = decodedTweet.match(/TX Hash: '([^']+)'/);
+  const handleMatch = decodedTweet.match(/@([A-Za-z0-9_]+)/);
+
+  return {
+    memeUrl: urlMatch ? urlMatch[1] : null,
+    txHash: txHashMatch ? txHashMatch[1].trim() : null,
+    handle: handleMatch ? handleMatch[1] : null,
+  };
+};
diff --git a/src/components/AIServiceCard.tsx b/src/components/AIServiceCard.tsx
index 12f99e1..8658c03 100644
--- a/src/components/AIServiceCard.tsx
+++ b/src/components/AIServiceCard.tsx
@@ -4,11 +4,13 @@ import React, { useState } from 'react'
 import BN from 'bn.js';
 import Big from 'big.js';
 
+import TweetUrlForm from './TweetForm';
+
 interface AIServiceCardProps {
   title: string
   description: string
   isWalletConnected: boolean
-  onGenerate: (prompt: string) => Promise<{ imageUrl?: string, error?: string }>
+  onGenerate: (prompt: string) => Promise<{ imageUrl?: string, transactionSignature?: string, error?: string }>
   priceMTM: BN
 }
 
@@ -16,6 +18,7 @@ interface GenerationState {
   loading: boolean
   processing: boolean
   imageUrl: string | null
+  transactionSignature: string | null
   error: string | null
 }
 
@@ -38,6 +41,7 @@ const AIServiceCard: React.FC<AIServiceCardProps> = ({
     loading: false,
     processing: false,
     imageUrl: null,
+    transactionSignature: null,
     error: null,
   })
 
@@ -67,11 +71,12 @@ const AIServiceCard: React.FC<AIServiceCardProps> = ({
         return
       }
 
-      if (result.imageUrl) {
+      if (result.imageUrl && result.transactionSignature) {
         setGenerationState({
           loading: false,
           processing: false,
           imageUrl: result.imageUrl,
+          transactionSignature: result.transactionSignature,
           error: null,
         })
       } else {
@@ -86,7 +91,7 @@ const AIServiceCard: React.FC<AIServiceCardProps> = ({
     }
   }
 
-  const generateTwitterShareUrl = (imageUrl: string): string => {
+  const generateTwitterShareUrl = (imageUrl: string, transactionSignature: string): string => {
     const baseUrl = window.location.href;
     const ipfsImageUrl = imageUrl.split("/ipfs/")[1];
     const memeUrl = `${baseUrl}/memes/${ipfsImageUrl}`;
@@ -94,6 +99,17 @@ const AIServiceCard: React.FC<AIServiceCardProps> = ({
     return `https://twitter.com/intent/tweet?text=Check%20out%20this%20meme%20I%20generated!&url=${encodeURIComponent(memeUrl)}`;
   };
 
+  // const generateTwitterShareUrl = (imageUrl: string, transactionSignature: string): string => {
+  //   const baseUrl = window.location.href;
+  //   const ipfsImageUrl = imageUrl.split("/ipfs/")[1];
+  //   const memeUrl = `${baseUrl}/memes/${ipfsImageUrl}`;
+
+  //   // Ensure the entire tweet text is properly URL-encoded
+  //   const tweetText = `Check out this meme that I generated! TX Hash: ${transactionSignature} @mark_2_market1`;
+
+  //   return `https://twitter.com/intent/tweet?text=${encodeURIComponent(tweetText)}&url=${encodeURIComponent(memeUrl)}`;
+  // };
+
   return (
     <div className="w-full bg-gray-800/50 backdrop-blur-lg rounded-2xl shadow-xl border border-gray-700/50 mb-8">
       <div className="p-6">
@@ -137,7 +153,7 @@ const AIServiceCard: React.FC<AIServiceCardProps> = ({
           </div>
         )}
 
-        {generationState.imageUrl && (
+        {generationState.imageUrl && generationState.transactionSignature && (
           <div className="mt-4">
             <img
               src={generationState.imageUrl}
@@ -146,7 +162,7 @@ const AIServiceCard: React.FC<AIServiceCardProps> = ({
             />
             <div className="mt-4 text-center">
               <a
-                href={generateTwitterShareUrl(generationState.imageUrl)}
+                href={generateTwitterShareUrl(generationState.imageUrl, generationState.transactionSignature)}
                 target="_blank"
                 rel="noopener noreferrer"
                 className="inline-block w-full bg-blue-500 hover:bg-blue-600 text-white font-semibold py-4 px-6 rounded-xl transition-all duration-200 shadow-lg hover:shadow-blue-500/25"
diff --git a/src/components/TweetForm.tsx b/src/components/TweetForm.tsx
new file mode 100644
index 0000000..ad8571b
--- /dev/null
+++ b/src/components/TweetForm.tsx
@@ -0,0 +1,61 @@
+'use client'
+
+import React, { useState } from 'react'
+
+const TweetUrlForm: React.FC = () => {
+  const [inputText, setInputText] = useState<string>('')
+
+  const handleGenerate = async (): Promise<void> => {
+    try {
+      const response = await fetch('/api/tweet', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ tweetUrl: inputText }),
+      })
+
+      if (!response.ok) {
+        throw new Error(`Failed to verify tweet: ${response.statusText}`);
+      }
+
+    } catch (error) {
+      console.error('Failed to fetch price:', error);
+    }
+  }
+
+  return (
+    <div className="w-full bg-gray-800/50 backdrop-blur-lg rounded-2xl shadow-xl border border-gray-700/50 mb-8">
+      <div className="p-6">
+        <div className="mb-4">
+
+        </div>
+
+        <div className="space-y-4">
+          <textarea
+            value={inputText}
+            onChange={(e) => setInputText(e.target.value)}
+            placeholder="Enter the tweet URL here..."
+            className="w-full bg-gray-900/50 text-gray-100 border border-gray-700 rounded-xl p-4
+                     placeholder-gray-500 focus:border-green-500 focus:ring-2 focus:ring-green-500/20
+                     focus:outline-none min-h-[120px] transition-all duration-200
+                     disabled:opacity-50 disabled:cursor-not-allowed"
+            rows={4}
+          />
+          <button
+            onClick={handleGenerate}
+            className="w-full bg-gradient-to-r from-green-500 to-emerald-500 hover:from-green-600
+                     hover:to-emerald-600 text-white font-semibold py-4 px-6 rounded-xl
+                     transition-all duration-200 shadow-lg hover:shadow-green-500/25
+                     disabled:opacity-50 disabled:cursor-not-allowed disabled:hover:shadow-none"
+          >
+            Verify
+          </button>
+        </div>
+
+      </div>
+    </div>
+  )
+}
+
+export default TweetUrlForm
diff --git a/src/data-source.ts b/src/data-source.ts
index 6e63b8d..4b30ab1 100644
--- a/src/data-source.ts
+++ b/src/data-source.ts
@@ -1,13 +1,14 @@
 import { DataSource } from 'typeorm';
 
 import { Payment } from './entity/Payment';
+import { Tweet } from './entity/Tweets';
 
 export const AppDataSource = new DataSource({
   type: 'sqlite',
   database: './database.sqlite',
   synchronize: true,
   logging: false,
-  entities: [Payment],
+  entities: [Payment, Tweet],
   migrations: [],
   subscribers: [],
 });
diff --git a/src/entity/Tweets.ts b/src/entity/Tweets.ts
new file mode 100644
index 0000000..c16b241
--- /dev/null
+++ b/src/entity/Tweets.ts
@@ -0,0 +1,13 @@
+import { Entity, PrimaryGeneratedColumn, Column } from 'typeorm';
+
+@Entity()
+export class Tweet {
+  @PrimaryGeneratedColumn()
+  id!: number;
+
+  @Column({ unique: true })
+  url!: string;
+
+  @Column({ unique: true })
+  transactionSignature!: string;
+}
diff --git a/src/services/fluxService.ts b/src/services/fluxService.ts
index 14c68a0..c4fe218 100644
--- a/src/services/fluxService.ts
+++ b/src/services/fluxService.ts
@@ -1,6 +1,7 @@
 export interface FluxGenerationResult {
   imageUrl?: string
   error?: string
+  transactionSignature?: string
 }
 
 export interface FluxModelConfig {
@@ -58,7 +59,7 @@ export async function generateWithFlux(
     console.log('Raw Flux response:', data)
 
     if (data.imageUrl) {
-      return { imageUrl: data.imageUrl }
+      return { imageUrl: data.imageUrl, transactionSignature }
     } else {
       console.error('Unexpected response structure:', data)
       throw new Error('Invalid response format from Flux API')
diff --git a/src/utils/verifyTweet.ts b/src/utils/verifyTweet.ts
new file mode 100644
index 0000000..eca1fbb
--- /dev/null
+++ b/src/utils/verifyTweet.ts
@@ -0,0 +1,25 @@
+import assert from 'assert';
+
+import { AppDataSource } from '../data-source';
+import { Payment } from '../entity/Payment';
+import { Tweet } from '../entity/Tweets';
+
+assert(process.env.NEXT_PUBLIC_SOLANA_RPC_URL, 'SOLANA_RPC_URL is required');
+
+export async function verifySignatureInTweet(transactionSignature: string): Promise<boolean> {
+  const paymentRepository = AppDataSource.getRepository(Payment);
+  const payment = await paymentRepository.findOneBy({ transactionSignature });
+
+  const tweetRepository = AppDataSource.getRepository(Tweet);
+  const tweet = await tweetRepository.findOneBy({ transactionSignature });
+
+  if (!payment) {
+    return false;
+  }
+
+  if (tweet) {
+    return false;
+  }
+
+  return true;
+}
-- 
2.45.2


From 2959df5dd471b2662c5966c5201fac9ddd6c2159 Mon Sep 17 00:00:00 2001
From: Adw8 <adwaitgharpure@gmail.com>
Date: Wed, 5 Feb 2025 16:53:59 +0530
Subject: [PATCH 06/16] Update README

---
 .env.example |  4 +++-
 README.md    | 22 ++++++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.env.example b/.env.example
index 0b88a49..2e739a6 100644
--- a/.env.example
+++ b/.env.example
@@ -7,8 +7,10 @@ NEXT_PUBLIC_SOLANA_RPC_URL=https://young-radial-orb.solana-mainnet.quiknode.pro/
 NEXT_PUBLIC_SOLANA_WEBSOCKET_URL=wss://young-radial-orb.solana-mainnet.quiknode.pro/67612b364664616c29514e551bf5de38447ca3d4
 NEXT_PUBLIC_USDC_MINT=EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v
 
-# Get keys from https://app.pinata.cloud/developers/api-keys
+# Generate a key at https://app.pinata.cloud/developers/api-keys
 PINATA_JWT=
+
+# Get the gateway from https://app.pinata.cloud/gateway
 PINATA_GATEWAY=
 
 # Change to your website URL
diff --git a/README.md b/README.md
index 526c803..ebc347a 100644
--- a/README.md
+++ b/README.md
@@ -32,12 +32,22 @@ This project is a Solana-based meme generator that allows users to connect their
     FAL_AI_KEY=your_fal_ai_key
     ```
 
-- Setup a project on <https://app.pinata.cloud> then add the following to `.env.example`:
-    ```env
-    # Get keys from https://app.pinata.cloud/developers/api-keys
-    PINATA_JWT=
-    PINATA_GATEWAY=
-    ```
+- Setup a project on <https://app.pinata.cloud>
+
+  - Visit https://app.pinata.cloud/developers/api-keys and click the `New Key` button to create a new key
+
+  - Choose the `Admin` scope and create the API key
+
+  - Copy the JWT that is displayed
+
+  - Add the following to `.env.example`:
+
+      ```env
+      PINATA_JWT=
+
+      # Get the gateway from https://app.pinata.cloud/gateway
+      PINATA_GATEWAY=
+      ```
 
 - Run the development server:
     ```sh
-- 
2.45.2


From 7c3bf21e245bce35069294b21d4d6550fd6bf321 Mon Sep 17 00:00:00 2001
From: AdityaSalunkhe21 <adityasalunkhe2204@gmail.com>
Date: Wed, 5 Feb 2025 12:53:31 +0530
Subject: [PATCH 07/16] Use proxy meme URL in dynamic page

---
 src/app/api/flux/route.ts        |  9 +++++++--
 src/app/api/image/[cid]/route.ts | 30 ++++++++++++++++++++++++++++++
 src/app/memes/[id]/page.tsx      |  4 ++--
 src/components/AIServiceCard.tsx |  4 ++--
 4 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 src/app/api/image/[cid]/route.ts

diff --git a/src/app/api/flux/route.ts b/src/app/api/flux/route.ts
index ff96d38..73b5b2e 100644
--- a/src/app/api/flux/route.ts
+++ b/src/app/api/flux/route.ts
@@ -24,7 +24,9 @@ export async function POST(req: NextRequest): Promise<NextResponse> {
   try {
     await initializeDataSource();
 
-    const { prompt, modelId, transactionSignature } = await req.json()
+    const { prompt, modelId, transactionSignature } = await req.json();
+    const host = req.headers.get("host"); // Get the hostname from request headers
+    const protocol = req.headers.get("x-forwarded-proto") || "http"; // Handle reverse proxies
 
     if (!prompt || !modelId) {
       return NextResponse.json(
@@ -107,7 +109,10 @@ export async function POST(req: NextRequest): Promise<NextResponse> {
       )
     }
 
-    const publicUrl = pinataResult.imageUrl;
+    // Extract CID from the URL
+    const cid = pinataResult.imageUrl!.split("/ipfs/")[1];
+
+    const publicUrl = `${protocol}://${host}/api/image/${cid}`;
 
     return NextResponse.json({ imageUrl: publicUrl })
   } catch (error) {
diff --git a/src/app/api/image/[cid]/route.ts b/src/app/api/image/[cid]/route.ts
new file mode 100644
index 0000000..bc481a6
--- /dev/null
+++ b/src/app/api/image/[cid]/route.ts
@@ -0,0 +1,30 @@
+import { NextRequest, NextResponse } from 'next/server';
+
+export async function GET(req: NextRequest, { params }: { params: { cid?: string } }) {
+  const { cid } = params;
+
+  if (!cid) {
+    return NextResponse.json({ error: 'CID is required' }, { status: 400 });
+  }
+
+  const pinataUrl = `https://${process.env.PINATA_GATEWAY}/ipfs/${cid}`;
+
+  try {
+    const response = await fetch(pinataUrl);
+
+    if (!response.ok) {
+      return NextResponse.json({ error: 'Failed to fetch from Pinata' }, { status: response.status });
+    }
+
+    const contentType = response.headers.get('content-type') || 'application/octet-stream';
+    const buffer = await response.arrayBuffer();
+
+    return new NextResponse(buffer, {
+      status: 200,
+      headers: { 'Content-Type': contentType },
+    });
+  } catch (error) {
+    console.error('Error fetching from Pinata:', error);
+    return NextResponse.json({ error: 'Server error' }, { status: 500 });
+  }
+}
diff --git a/src/app/memes/[id]/page.tsx b/src/app/memes/[id]/page.tsx
index 7e20528..6611728 100644
--- a/src/app/memes/[id]/page.tsx
+++ b/src/app/memes/[id]/page.tsx
@@ -5,8 +5,8 @@ interface Props {
 }
 
 function getMeme(id: string): string {
-  const pinataImageUrl = `https://${process.env.PINATA_GATEWAY}/ipfs/${id}`
-  return pinataImageUrl;
+  const memeUrl = `${process.env.SITE_URL}/api/image/${id}`
+  return memeUrl;
 }
 
 export async function generateMetadata(
diff --git a/src/components/AIServiceCard.tsx b/src/components/AIServiceCard.tsx
index 8658c03..0727eb7 100644
--- a/src/components/AIServiceCard.tsx
+++ b/src/components/AIServiceCard.tsx
@@ -93,8 +93,8 @@ const AIServiceCard: React.FC<AIServiceCardProps> = ({
 
   const generateTwitterShareUrl = (imageUrl: string, transactionSignature: string): string => {
     const baseUrl = window.location.href;
-    const ipfsImageUrl = imageUrl.split("/ipfs/")[1];
-    const memeUrl = `${baseUrl}/memes/${ipfsImageUrl}`;
+    const ipfsImageUrl = imageUrl.split("/image/")[1];
+    const memeUrl = `${baseUrl}memes/${ipfsImageUrl}`;
 
     return `https://twitter.com/intent/tweet?text=Check%20out%20this%20meme%20I%20generated!&url=${encodeURIComponent(memeUrl)}`;
   };
-- 
2.45.2


From 6741d539af675ad93372cbcc4529e2dfade9681e Mon Sep 17 00:00:00 2001
From: IshaVenikar <ishavenikar7@gmail.com>
Date: Wed, 5 Feb 2025 18:20:09 +0530
Subject: [PATCH 08/16] Store tweet after verification

---
 src/app/api/tweet/route.ts         | 23 ++++++++++++++++-------
 src/data-source.ts                 |  2 +-
 src/entity/{Tweets.ts => Tweet.ts} |  0
 src/utils/verifyTweet.ts           | 14 +++++++++-----
 4 files changed, 26 insertions(+), 13 deletions(-)
 rename src/entity/{Tweets.ts => Tweet.ts} (100%)

diff --git a/src/app/api/tweet/route.ts b/src/app/api/tweet/route.ts
index b44d0ae..30d299d 100644
--- a/src/app/api/tweet/route.ts
+++ b/src/app/api/tweet/route.ts
@@ -1,26 +1,35 @@
-import { NextRequest, NextResponse } from 'next/server'
-import { verifySignatureInTweet } from '../../../utils/verifyTweet';
+import { NextRequest, NextResponse } from 'next/server';
+
+import { saveTweet, verifySignatureInTweet } from '../../../utils/verifyTweet';
+import { initializeDataSource } from '../../../data-source';
 
 export async function POST(req: NextRequest): Promise<NextResponse> {
   try {
+    await initializeDataSource();
+
     const { tweetUrl } = await req.json();
 
     const url = `https://publish.twitter.com/oembed?url=${tweetUrl}&maxwidth=600`;
 
     const response = await fetch(url);
     const data = await response.json();
-    const { handle, memeUrl, txHash } = extractData(data.html);
-    if (!handle || !memeUrl || !txHash) {
+    const { handle, txHash } = extractData(data.html);
+    if (!handle || !txHash) {
       return NextResponse.json(
         { error: 'Verification failed' },
         { status: 500 }
       )
     }
 
-    const isVerified = await verifySignatureInTweet(txHash);
+    const isSigVerified = await verifySignatureInTweet(txHash);
     const isHandleCorrect = handle === process.env.ACCOUNT_HANDLE;
 
-    return NextResponse.json({isVerified: isVerified && isHandleCorrect})
+    const isVerified = isSigVerified && isHandleCorrect;
+    if (isVerified) {
+      saveTweet({transactionSignature: txHash})
+    }
+
+    return NextResponse.json({ isVerified })
   } catch (error) {
     console.error('Error while verifying tweet:', error)
     return NextResponse.json(
@@ -40,7 +49,7 @@ const extractData = (tweet: string | object) => {
   const handleMatch = decodedTweet.match(/@([A-Za-z0-9_]+)/);
 
   return {
-    memeUrl: urlMatch ? urlMatch[1] : null,
+    // memeUrl: urlMatch ? urlMatch[1] : null,
     txHash: txHashMatch ? txHashMatch[1].trim() : null,
     handle: handleMatch ? handleMatch[1] : null,
   };
diff --git a/src/data-source.ts b/src/data-source.ts
index 4b30ab1..d81e654 100644
--- a/src/data-source.ts
+++ b/src/data-source.ts
@@ -1,7 +1,7 @@
 import { DataSource } from 'typeorm';
 
 import { Payment } from './entity/Payment';
-import { Tweet } from './entity/Tweets';
+import { Tweet } from './entity/Tweet';
 
 export const AppDataSource = new DataSource({
   type: 'sqlite',
diff --git a/src/entity/Tweets.ts b/src/entity/Tweet.ts
similarity index 100%
rename from src/entity/Tweets.ts
rename to src/entity/Tweet.ts
diff --git a/src/utils/verifyTweet.ts b/src/utils/verifyTweet.ts
index eca1fbb..25216ae 100644
--- a/src/utils/verifyTweet.ts
+++ b/src/utils/verifyTweet.ts
@@ -1,10 +1,6 @@
-import assert from 'assert';
-
 import { AppDataSource } from '../data-source';
 import { Payment } from '../entity/Payment';
-import { Tweet } from '../entity/Tweets';
-
-assert(process.env.NEXT_PUBLIC_SOLANA_RPC_URL, 'SOLANA_RPC_URL is required');
+import { Tweet } from '../entity/Tweet';
 
 export async function verifySignatureInTweet(transactionSignature: string): Promise<boolean> {
   const paymentRepository = AppDataSource.getRepository(Payment);
@@ -23,3 +19,11 @@ export async function verifySignatureInTweet(transactionSignature: string): Prom
 
   return true;
 }
+
+export async function saveTweet(data: Partial<Tweet>): Promise<void> {
+  await AppDataSource.transaction(async (transactionalEntityManager) => {
+    const tweetRepository = transactionalEntityManager.getRepository(Tweet);
+
+    await tweetRepository.save(data);
+  });
+}
-- 
2.45.2


From bce1719f7ea02e6d6ee5280467a7d4883e1c0c81 Mon Sep 17 00:00:00 2001
From: IshaVenikar <ishavenikar7@gmail.com>
Date: Wed, 5 Feb 2025 18:54:08 +0530
Subject: [PATCH 09/16] Add check for fourth recipient

---
 src/app/api/tweet/route.ts | 17 +++++++++++++----
 src/utils/verifyTweet.ts   | 10 +++++++---
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/app/api/tweet/route.ts b/src/app/api/tweet/route.ts
index 30d299d..e22c0bb 100644
--- a/src/app/api/tweet/route.ts
+++ b/src/app/api/tweet/route.ts
@@ -25,11 +25,16 @@ export async function POST(req: NextRequest): Promise<NextResponse> {
     const isHandleCorrect = handle === process.env.ACCOUNT_HANDLE;
 
     const isVerified = isSigVerified && isHandleCorrect;
-    if (isVerified) {
-      saveTweet({transactionSignature: txHash})
+    if (!isVerified) {
+      throw new Error('Tweet is not valid');
     }
 
-    return NextResponse.json({ isVerified })
+    const { isFourth } = await saveTweet({ transactionSignature: txHash });
+    if (isFourth) {
+      createTokenLockForRecipient();
+    }
+
+    return NextResponse.json({ success: isVerified, message: 'Tweet verified' })
   } catch (error) {
     console.error('Error while verifying tweet:', error)
     return NextResponse.json(
@@ -49,8 +54,12 @@ const extractData = (tweet: string | object) => {
   const handleMatch = decodedTweet.match(/@([A-Za-z0-9_]+)/);
 
   return {
-    // memeUrl: urlMatch ? urlMatch[1] : null,
+    memeUrl: urlMatch ? urlMatch[1] : null,
     txHash: txHashMatch ? txHashMatch[1].trim() : null,
     handle: handleMatch ? handleMatch[1] : null,
   };
 };
+
+const createTokenLockForRecipient = () => {
+  console.log('Lock created');
+}
diff --git a/src/utils/verifyTweet.ts b/src/utils/verifyTweet.ts
index 25216ae..b90bb16 100644
--- a/src/utils/verifyTweet.ts
+++ b/src/utils/verifyTweet.ts
@@ -20,10 +20,14 @@ export async function verifySignatureInTweet(transactionSignature: string): Prom
   return true;
 }
 
-export async function saveTweet(data: Partial<Tweet>): Promise<void> {
-  await AppDataSource.transaction(async (transactionalEntityManager) => {
+export async function saveTweet(data: Partial<Tweet>): Promise<{ isFourth: boolean }> {
+  return await AppDataSource.transaction(async (transactionalEntityManager) => {
     const tweetRepository = transactionalEntityManager.getRepository(Tweet);
 
-    await tweetRepository.save(data);
+    const tweet = await tweetRepository.save(data);
+
+    return {
+      isFourth: tweet.id % 4 === 0
+    };
   });
 }
-- 
2.45.2


From af864b4670ebe127b0dd842797b265eacfb795e2 Mon Sep 17 00:00:00 2001
From: Adw8 <adwaitgharpure@gmail.com>
Date: Wed, 5 Feb 2025 19:08:40 +0530
Subject: [PATCH 10/16] Update tweet message

---
 src/components/AIServiceCard.tsx | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/components/AIServiceCard.tsx b/src/components/AIServiceCard.tsx
index 0727eb7..15fe33c 100644
--- a/src/components/AIServiceCard.tsx
+++ b/src/components/AIServiceCard.tsx
@@ -3,6 +3,7 @@
 import React, { useState } from 'react'
 import BN from 'bn.js';
 import Big from 'big.js';
+import dynamic from 'next/dynamic'
 
 import TweetUrlForm from './TweetForm';
 
@@ -93,23 +94,14 @@ const AIServiceCard: React.FC<AIServiceCardProps> = ({
 
   const generateTwitterShareUrl = (imageUrl: string, transactionSignature: string): string => {
     const baseUrl = window.location.href;
-    const ipfsImageUrl = imageUrl.split("/image/")[1];
-    const memeUrl = `${baseUrl}memes/${ipfsImageUrl}`;
+    const cid = imageUrl.split("/image/")[1];
+    const memeUrl = `${baseUrl}memes/${cid}`;
 
-    return `https://twitter.com/intent/tweet?text=Check%20out%20this%20meme%20I%20generated!&url=${encodeURIComponent(memeUrl)}`;
+    const tweetText = `Check out this meme that I generated! \n TX Hash: '${transactionSignature}' \n @${process.env.ACCOUNT_HANDLE} \n`;
+
+    return `https://twitter.com/intent/tweet?text=${encodeURIComponent(tweetText)}&url=${encodeURIComponent(memeUrl)}`;
   };
 
-  // const generateTwitterShareUrl = (imageUrl: string, transactionSignature: string): string => {
-  //   const baseUrl = window.location.href;
-  //   const ipfsImageUrl = imageUrl.split("/ipfs/")[1];
-  //   const memeUrl = `${baseUrl}/memes/${ipfsImageUrl}`;
-
-  //   // Ensure the entire tweet text is properly URL-encoded
-  //   const tweetText = `Check out this meme that I generated! TX Hash: ${transactionSignature} @mark_2_market1`;
-
-  //   return `https://twitter.com/intent/tweet?text=${encodeURIComponent(tweetText)}&url=${encodeURIComponent(memeUrl)}`;
-  // };
-
   return (
     <div className="w-full bg-gray-800/50 backdrop-blur-lg rounded-2xl shadow-xl border border-gray-700/50 mb-8">
       <div className="p-6">
@@ -177,4 +169,6 @@ const AIServiceCard: React.FC<AIServiceCardProps> = ({
   )
 }
 
-export default AIServiceCard
+export default dynamic(() => Promise.resolve(AIServiceCard), {
+  ssr: false
+})
-- 
2.45.2


From 20b4fe3182b6790dcdc394aec7307315c8eb8f37 Mon Sep 17 00:00:00 2001
From: IshaVenikar <ishavenikar7@gmail.com>
Date: Wed, 5 Feb 2025 19:14:43 +0530
Subject: [PATCH 11/16] Update example env for account handle

---
 .env.example               |  2 +-
 README.md                  |  5 ++++-
 src/app/api/tweet/route.ts | 15 ++++++++-------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.env.example b/.env.example
index 2e739a6..d0d1d01 100644
--- a/.env.example
+++ b/.env.example
@@ -16,4 +16,4 @@ PINATA_GATEWAY=
 # Change to your website URL
 # For development: set to http://localhost:3000
 SITE_URL=https://memes.markto.market
-ACCOUNT_HANDLE=mark_2_market1
+NEXT_PUBLIC_ACCOUNT_HANDLE=
diff --git a/README.md b/README.md
index ebc347a..9ea9eef 100644
--- a/README.md
+++ b/README.md
@@ -40,13 +40,16 @@ This project is a Solana-based meme generator that allows users to connect their
 
   - Copy the JWT that is displayed
 
-  - Add the following to `.env.example`:
+  - Add the following to `.env`:
 
       ```env
       PINATA_JWT=
 
       # Get the gateway from https://app.pinata.cloud/gateway
       PINATA_GATEWAY=
+
+      # Add the account handle to be set in the tweet
+      NEXT_PUBLIC_ACCOUNT_HANDLE=
       ```
 
 - Run the development server:
diff --git a/src/app/api/tweet/route.ts b/src/app/api/tweet/route.ts
index e22c0bb..82108cd 100644
--- a/src/app/api/tweet/route.ts
+++ b/src/app/api/tweet/route.ts
@@ -5,6 +5,7 @@ import { initializeDataSource } from '../../../data-source';
 
 export async function POST(req: NextRequest): Promise<NextResponse> {
   try {
+    // TODO: Move initialization to server file
     await initializeDataSource();
 
     const { tweetUrl } = await req.json();
@@ -13,23 +14,23 @@ export async function POST(req: NextRequest): Promise<NextResponse> {
 
     const response = await fetch(url);
     const data = await response.json();
-    const { handle, txHash } = extractData(data.html);
-    if (!handle || !txHash) {
+    const { handle, txSignature } = extractData(data.html);
+    if (!handle || !txSignature) {
       return NextResponse.json(
         { error: 'Verification failed' },
         { status: 500 }
       )
     }
 
-    const isSigVerified = await verifySignatureInTweet(txHash);
-    const isHandleCorrect = handle === process.env.ACCOUNT_HANDLE;
+    const isSigVerified = await verifySignatureInTweet(txSignature);
+    const isHandleCorrect = handle === process.env.NEXT_PUBLIC_ACCOUNT_HANDLE;
 
     const isVerified = isSigVerified && isHandleCorrect;
     if (!isVerified) {
       throw new Error('Tweet is not valid');
     }
 
-    const { isFourth } = await saveTweet({ transactionSignature: txHash });
+    const { isFourth } = await saveTweet({ transactionSignature: txSignature });
     if (isFourth) {
       createTokenLockForRecipient();
     }
@@ -50,12 +51,12 @@ const extractData = (tweet: string | object) => {
   const decodedTweet = tweetText.replace(/&#39;/g, "'").replace(/&quot;/g, '"');
 
   const urlMatch = decodedTweet.match(/<a href="(https:\/\/t.co\/[^"]+)">/);
-  const txHashMatch = decodedTweet.match(/TX Hash: '([^']+)'/);
+  const txSignatureMatch = decodedTweet.match(/TX Hash: '([^']+)'/);
   const handleMatch = decodedTweet.match(/@([A-Za-z0-9_]+)/);
 
   return {
     memeUrl: urlMatch ? urlMatch[1] : null,
-    txHash: txHashMatch ? txHashMatch[1].trim() : null,
+    txSignature: txSignatureMatch ? txSignatureMatch[1].trim() : null,
     handle: handleMatch ? handleMatch[1] : null,
   };
 };
-- 
2.45.2


From 01071372710de8ecc7a033442b3cec07eeedd115 Mon Sep 17 00:00:00 2001
From: Adw8 <adwaitgharpure@gmail.com>
Date: Wed, 5 Feb 2025 19:54:28 +0530
Subject: [PATCH 12/16] Remove title and description from page metadata

---
 src/app/api/tweet/route.ts       |  8 +++++---
 src/app/memes/[id]/page.tsx      |  4 +---
 src/components/AIServiceCard.tsx |  2 --
 src/components/TweetForm.tsx     |  4 ++--
 src/utils/verifyTweet.ts         | 10 +++++-----
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/app/api/tweet/route.ts b/src/app/api/tweet/route.ts
index 82108cd..dcc902f 100644
--- a/src/app/api/tweet/route.ts
+++ b/src/app/api/tweet/route.ts
@@ -17,7 +17,7 @@ export async function POST(req: NextRequest): Promise<NextResponse> {
     const { handle, txSignature } = extractData(data.html);
     if (!handle || !txSignature) {
       return NextResponse.json(
-        { error: 'Verification failed' },
+        { error: 'Could not extract tweet data' },
         { status: 500 }
       )
     }
@@ -25,13 +25,14 @@ export async function POST(req: NextRequest): Promise<NextResponse> {
     const isSigVerified = await verifySignatureInTweet(txSignature);
     const isHandleCorrect = handle === process.env.NEXT_PUBLIC_ACCOUNT_HANDLE;
 
+    // TODO: Verify dynamic page URL in tweet
     const isVerified = isSigVerified && isHandleCorrect;
     if (!isVerified) {
       throw new Error('Tweet is not valid');
     }
 
-    const { isFourth } = await saveTweet({ transactionSignature: txSignature });
-    if (isFourth) {
+    const { isFourthUser } = await saveTweet({ transactionSignature: txSignature });
+    if (isFourthUser) {
       createTokenLockForRecipient();
     }
 
@@ -61,6 +62,7 @@ const extractData = (tweet: string | object) => {
   };
 };
 
+// TODO: Implement function to create lock for a recipient
 const createTokenLockForRecipient = () => {
   console.log('Lock created');
 }
diff --git a/src/app/memes/[id]/page.tsx b/src/app/memes/[id]/page.tsx
index 6611728..2acb110 100644
--- a/src/app/memes/[id]/page.tsx
+++ b/src/app/memes/[id]/page.tsx
@@ -17,8 +17,6 @@ export async function generateMetadata(
   const meme = getMeme(params.id);
 
   return {
-    title: '',
-    description: '',
     metadataBase: new URL(baseUrl),
     openGraph: {
       type: 'website',
@@ -42,7 +40,7 @@ export default function MemePage({ params }: Props) {
         <div className="relative w-full max-w-2xl aspect-square">
           <img
             src={meme}
-            alt='Generated image'
+            alt='Generated meme'
             className="object-contain rounded-lg w-full h-full"
           />
         </div>
diff --git a/src/components/AIServiceCard.tsx b/src/components/AIServiceCard.tsx
index 15fe33c..c0d8d75 100644
--- a/src/components/AIServiceCard.tsx
+++ b/src/components/AIServiceCard.tsx
@@ -5,8 +5,6 @@ import BN from 'bn.js';
 import Big from 'big.js';
 import dynamic from 'next/dynamic'
 
-import TweetUrlForm from './TweetForm';
-
 interface AIServiceCardProps {
   title: string
   description: string
diff --git a/src/components/TweetForm.tsx b/src/components/TweetForm.tsx
index ad8571b..f020319 100644
--- a/src/components/TweetForm.tsx
+++ b/src/components/TweetForm.tsx
@@ -5,7 +5,7 @@ import React, { useState } from 'react'
 const TweetUrlForm: React.FC = () => {
   const [inputText, setInputText] = useState<string>('')
 
-  const handleGenerate = async (): Promise<void> => {
+  const handleVerify = async (): Promise<void> => {
     try {
       const response = await fetch('/api/tweet', {
         method: 'POST',
@@ -43,7 +43,7 @@ const TweetUrlForm: React.FC = () => {
             rows={4}
           />
           <button
-            onClick={handleGenerate}
+            onClick={handleVerify}
             className="w-full bg-gradient-to-r from-green-500 to-emerald-500 hover:from-green-600
                      hover:to-emerald-600 text-white font-semibold py-4 px-6 rounded-xl
                      transition-all duration-200 shadow-lg hover:shadow-green-500/25
diff --git a/src/utils/verifyTweet.ts b/src/utils/verifyTweet.ts
index b90bb16..e4eec30 100644
--- a/src/utils/verifyTweet.ts
+++ b/src/utils/verifyTweet.ts
@@ -6,13 +6,13 @@ export async function verifySignatureInTweet(transactionSignature: string): Prom
   const paymentRepository = AppDataSource.getRepository(Payment);
   const payment = await paymentRepository.findOneBy({ transactionSignature });
 
-  const tweetRepository = AppDataSource.getRepository(Tweet);
-  const tweet = await tweetRepository.findOneBy({ transactionSignature });
-
   if (!payment) {
     return false;
   }
 
+  const tweetRepository = AppDataSource.getRepository(Tweet);
+  const tweet = await tweetRepository.findOneBy({ transactionSignature });
+
   if (tweet) {
     return false;
   }
@@ -20,14 +20,14 @@ export async function verifySignatureInTweet(transactionSignature: string): Prom
   return true;
 }
 
-export async function saveTweet(data: Partial<Tweet>): Promise<{ isFourth: boolean }> {
+export async function saveTweet(data: Partial<Tweet>): Promise<{ isFourthUser: boolean }> {
   return await AppDataSource.transaction(async (transactionalEntityManager) => {
     const tweetRepository = transactionalEntityManager.getRepository(Tweet);
 
     const tweet = await tweetRepository.save(data);
 
     return {
-      isFourth: tweet.id % 4 === 0
+      isFourthUser: tweet.id % 4 === 0
     };
   });
 }
-- 
2.45.2


From 8b80ee2cd6a46f6f070ab5a319b92e271ee615cf Mon Sep 17 00:00:00 2001
From: Adw8 <adwaitgharpure@gmail.com>
Date: Wed, 5 Feb 2025 20:53:28 +0530
Subject: [PATCH 13/16] Update data source intialisation

---
 src/components/AIServiceCard.tsx | 2 +-
 src/data-source.ts               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/AIServiceCard.tsx b/src/components/AIServiceCard.tsx
index c0d8d75..f9e96e7 100644
--- a/src/components/AIServiceCard.tsx
+++ b/src/components/AIServiceCard.tsx
@@ -95,7 +95,7 @@ const AIServiceCard: React.FC<AIServiceCardProps> = ({
     const cid = imageUrl.split("/image/")[1];
     const memeUrl = `${baseUrl}memes/${cid}`;
 
-    const tweetText = `Check out this meme that I generated! \n TX Hash: '${transactionSignature}' \n @${process.env.ACCOUNT_HANDLE} \n`;
+    const tweetText = `Check out this meme that I generated! \n TX Hash: '${transactionSignature}' \n @${process.env.NEXT_PUBLIC_ACCOUNT_HANDLE} \n`;
 
     return `https://twitter.com/intent/tweet?text=${encodeURIComponent(tweetText)}&url=${encodeURIComponent(memeUrl)}`;
   };
diff --git a/src/data-source.ts b/src/data-source.ts
index d81e654..0c4986b 100644
--- a/src/data-source.ts
+++ b/src/data-source.ts
@@ -1,14 +1,14 @@
 import { DataSource } from 'typeorm';
 
 import { Payment } from './entity/Payment';
-import { Tweet } from './entity/Tweet';
 
 export const AppDataSource = new DataSource({
   type: 'sqlite',
   database: './database.sqlite',
   synchronize: true,
   logging: false,
-  entities: [Payment, Tweet],
+  // entities: [__dirname + "./entity/*{.js,.ts}"],
+  entities: [Payment],
   migrations: [],
   subscribers: [],
 });
-- 
2.45.2


From 0e3ca90cef2786f24950431ca25bae9a6db3568d Mon Sep 17 00:00:00 2001
From: IshaVenikar <ishavenikar7@gmail.com>
Date: Wed, 5 Feb 2025 21:11:32 +0530
Subject: [PATCH 14/16] Store tweet URL after verification

---
 src/app/api/tweet/route.ts | 4 ++--
 src/entity/Tweet.ts        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/api/tweet/route.ts b/src/app/api/tweet/route.ts
index dcc902f..bf187c6 100644
--- a/src/app/api/tweet/route.ts
+++ b/src/app/api/tweet/route.ts
@@ -14,7 +14,7 @@ export async function POST(req: NextRequest): Promise<NextResponse> {
 
     const response = await fetch(url);
     const data = await response.json();
-    const { handle, txSignature } = extractData(data.html);
+    const { handle, txSignature, memeUrl } = extractData(data.html);
     if (!handle || !txSignature) {
       return NextResponse.json(
         { error: 'Could not extract tweet data' },
@@ -31,7 +31,7 @@ export async function POST(req: NextRequest): Promise<NextResponse> {
       throw new Error('Tweet is not valid');
     }
 
-    const { isFourthUser } = await saveTweet({ transactionSignature: txSignature });
+    const { isFourthUser } = await saveTweet({ transactionSignature: txSignature, url: memeUrl });
     if (isFourthUser) {
       createTokenLockForRecipient();
     }
diff --git a/src/entity/Tweet.ts b/src/entity/Tweet.ts
index c16b241..0f0d9be 100644
--- a/src/entity/Tweet.ts
+++ b/src/entity/Tweet.ts
@@ -5,8 +5,8 @@ export class Tweet {
   @PrimaryGeneratedColumn()
   id!: number;
 
-  @Column({ unique: true })
-  url!: string;
+  @Column({ unique: true, nullable: true })
+  url!: string | null;
 
   @Column({ unique: true })
   transactionSignature!: string;
-- 
2.45.2


From b5c9cb79563467e0c872a52ccfcb833ae5741b88 Mon Sep 17 00:00:00 2001
From: Nabarun <nabarun@deepstacksoft.com>
Date: Thu, 6 Feb 2025 08:33:12 +0530
Subject: [PATCH 15/16] Use NodeJS global for typeorm

---
 .env.example               |  2 +-
 server.ts                  | 17 +++++++++++++++--
 src/app/api/flux/route.ts  |  3 ---
 src/app/api/tweet/route.ts |  4 ----
 src/data-source.ts         | 31 ++++++++++++++-----------------
 src/utils/verifyPayment.ts |  7 +++----
 src/utils/verifyTweet.ts   | 10 ++++------
 7 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/.env.example b/.env.example
index d0d1d01..69de436 100644
--- a/.env.example
+++ b/.env.example
@@ -14,6 +14,6 @@ PINATA_JWT=
 PINATA_GATEWAY=
 
 # Change to your website URL
-# For development: set to http://localhost:3000
+# For development: SITE_URL=http://localhost:3000
 SITE_URL=https://memes.markto.market
 NEXT_PUBLIC_ACCOUNT_HANDLE=
diff --git a/server.ts b/server.ts
index 55da595..8d23e55 100644
--- a/server.ts
+++ b/server.ts
@@ -1,11 +1,15 @@
 import { createServer } from 'http';
 import { parse } from 'url';
 import next from 'next';
+import { DataSource, EntityTarget } from 'typeorm';
 
 // Reference: https://github.com/motdotla/dotenv?tab=readme-ov-file#how-do-i-use-dotenv-with-import
 import 'dotenv/config'
 
 import { QuotesService } from './quotes-service';
+import { initializeDataSource } from './src/data-source';
+import { Payment } from './src/entity/Payment';
+import { Tweet } from './src/entity/Tweet';
 
 const port = parseInt(process.env.PORT || '3000', 10);
 const app = next({ dev: process.env.NODE_ENV !== 'production' });
@@ -16,16 +20,25 @@ const quotesService = new QuotesService();
 declare global {
   namespace NodeJS {
     interface Global {
-      quotesService: typeof quotesService
+      quotesService: QuotesService
+      appDataSource: DataSource
+      entities: { [key: string]: EntityTarget<any>}
     }
   }
 }
 
 // TODO: Look for a better way to use quotesService
 // Initialize global quotes service
-(global as any).quotesService = quotesService
+global.quotesService = quotesService
+
+global.entities = {
+  Payment,
+  Tweet
+};
 
 app.prepare().then(async() => {
+  global.appDataSource = await initializeDataSource();
+
   const server = createServer(async (req, res) => {
     const parsedUrl = parse(req.url!, true);
 
diff --git a/src/app/api/flux/route.ts b/src/app/api/flux/route.ts
index 73b5b2e..afd9193 100644
--- a/src/app/api/flux/route.ts
+++ b/src/app/api/flux/route.ts
@@ -3,7 +3,6 @@ import BN from 'bn.js';
 
 import { fal } from "@fal-ai/client"
 import { FLUX_MODELS } from '../../../services/fluxService'
-import { initializeDataSource } from '../../../data-source'
 import { verifyPayment, markSignatureAsUsed } from '../../../utils/verifyPayment';
 import { uploadToPinata } from '../../../utils/uploadToPinata';
 
@@ -22,8 +21,6 @@ const IMAGE_HEIGHT: number = 1024
 
 export async function POST(req: NextRequest): Promise<NextResponse> {
   try {
-    await initializeDataSource();
-
     const { prompt, modelId, transactionSignature } = await req.json();
     const host = req.headers.get("host"); // Get the hostname from request headers
     const protocol = req.headers.get("x-forwarded-proto") || "http"; // Handle reverse proxies
diff --git a/src/app/api/tweet/route.ts b/src/app/api/tweet/route.ts
index bf187c6..c965fab 100644
--- a/src/app/api/tweet/route.ts
+++ b/src/app/api/tweet/route.ts
@@ -1,13 +1,9 @@
 import { NextRequest, NextResponse } from 'next/server';
 
 import { saveTweet, verifySignatureInTweet } from '../../../utils/verifyTweet';
-import { initializeDataSource } from '../../../data-source';
 
 export async function POST(req: NextRequest): Promise<NextResponse> {
   try {
-    // TODO: Move initialization to server file
-    await initializeDataSource();
-
     const { tweetUrl } = await req.json();
 
     const url = `https://publish.twitter.com/oembed?url=${tweetUrl}&maxwidth=600`;
diff --git a/src/data-source.ts b/src/data-source.ts
index 0c4986b..df8bfdb 100644
--- a/src/data-source.ts
+++ b/src/data-source.ts
@@ -1,24 +1,21 @@
 import { DataSource } from 'typeorm';
 
-import { Payment } from './entity/Payment';
-
-export const AppDataSource = new DataSource({
-  type: 'sqlite',
-  database: './database.sqlite',
-  synchronize: true,
-  logging: false,
-  // entities: [__dirname + "./entity/*{.js,.ts}"],
-  entities: [Payment],
-  migrations: [],
-  subscribers: [],
-});
-
 export async function initializeDataSource() {
   try {
-    if (!AppDataSource.isInitialized){
-      await AppDataSource.initialize();
-      console.log('Data Source has been initialized!');
-    };
+    console.log('Initializing Data Source');
+
+    const appDataSource = new DataSource({
+      type: 'sqlite',
+      database: './database.sqlite',
+      synchronize: true,
+      logging: false,
+      entities: [global.entities.Payment, global.entities.Tweet],
+      migrations: [],
+      subscribers: [],
+    });
+
+    await appDataSource.initialize();
+    return appDataSource;
   } catch (err) {
     console.error('Error during Data Source initialization:', err);
     throw err;
diff --git a/src/utils/verifyPayment.ts b/src/utils/verifyPayment.ts
index 2b5f91a..92986d8 100644
--- a/src/utils/verifyPayment.ts
+++ b/src/utils/verifyPayment.ts
@@ -4,7 +4,6 @@ import BN from 'bn.js';
 import { Connection } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
 
-import { AppDataSource } from '../data-source';
 import { Payment } from '../entity/Payment';
 
 assert(process.env.NEXT_PUBLIC_SOLANA_RPC_URL, 'SOLANA_RPC_URL is required');
@@ -22,7 +21,7 @@ const connection = new Connection(
 );
 
 export async function isSignatureUsed(transactionSignature: string): Promise<boolean> {
-  const paymentRepository = AppDataSource.getRepository(Payment);
+  const paymentRepository = global.appDataSource.getRepository(global.entities.Payment);
   const payment = await paymentRepository.findOneBy({ transactionSignature });
   if (payment) {
     return true;
@@ -31,8 +30,8 @@ export async function isSignatureUsed(transactionSignature: string): Promise<boo
 }
 
 export async function markSignatureAsUsed(transactionSignature: string): Promise<void> {
-  await AppDataSource.transaction(async (transactionalEntityManager) => {
-    const paymentRepository = transactionalEntityManager.getRepository(Payment);
+  await global.appDataSource.transaction(async (transactionalEntityManager) => {
+    const paymentRepository = transactionalEntityManager.getRepository(global.entities.Payment);
 
     // Check if the payment with the given signature already exists
     const exists = await paymentRepository.exists({ where: { transactionSignature } });
diff --git a/src/utils/verifyTweet.ts b/src/utils/verifyTweet.ts
index e4eec30..c7ddc5e 100644
--- a/src/utils/verifyTweet.ts
+++ b/src/utils/verifyTweet.ts
@@ -1,16 +1,14 @@
-import { AppDataSource } from '../data-source';
-import { Payment } from '../entity/Payment';
 import { Tweet } from '../entity/Tweet';
 
 export async function verifySignatureInTweet(transactionSignature: string): Promise<boolean> {
-  const paymentRepository = AppDataSource.getRepository(Payment);
+  const paymentRepository = global.appDataSource.getRepository(global.entities.Payment);
   const payment = await paymentRepository.findOneBy({ transactionSignature });
 
   if (!payment) {
     return false;
   }
 
-  const tweetRepository = AppDataSource.getRepository(Tweet);
+  const tweetRepository = global.appDataSource.getRepository(global.entities.Tweet);
   const tweet = await tweetRepository.findOneBy({ transactionSignature });
 
   if (tweet) {
@@ -21,8 +19,8 @@ export async function verifySignatureInTweet(transactionSignature: string): Prom
 }
 
 export async function saveTweet(data: Partial<Tweet>): Promise<{ isFourthUser: boolean }> {
-  return await AppDataSource.transaction(async (transactionalEntityManager) => {
-    const tweetRepository = transactionalEntityManager.getRepository(Tweet);
+  return await global.appDataSource.transaction(async (transactionalEntityManager) => {
+    const tweetRepository = transactionalEntityManager.getRepository(global.entities.Tweet);
 
     const tweet = await tweetRepository.save(data);
 
-- 
2.45.2


From 970b7ae00e5e8e529b17cce556fe61793b7c2936 Mon Sep 17 00:00:00 2001
From: IshaVenikar <ishavenikar7@gmail.com>
Date: Thu, 6 Feb 2025 09:39:12 +0530
Subject: [PATCH 16/16] Set type for URL in Tweet entity

---
 src/app/api/tweet/route.ts | 2 ++
 src/entity/Tweet.ts        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/api/tweet/route.ts b/src/app/api/tweet/route.ts
index c965fab..f514ff9 100644
--- a/src/app/api/tweet/route.ts
+++ b/src/app/api/tweet/route.ts
@@ -10,7 +10,9 @@ export async function POST(req: NextRequest): Promise<NextResponse> {
 
     const response = await fetch(url);
     const data = await response.json();
+
     const { handle, txSignature, memeUrl } = extractData(data.html);
+
     if (!handle || !txSignature) {
       return NextResponse.json(
         { error: 'Could not extract tweet data' },
diff --git a/src/entity/Tweet.ts b/src/entity/Tweet.ts
index 0f0d9be..888a9d9 100644
--- a/src/entity/Tweet.ts
+++ b/src/entity/Tweet.ts
@@ -5,7 +5,7 @@ export class Tweet {
   @PrimaryGeneratedColumn()
   id!: number;
 
-  @Column({ unique: true, nullable: true })
+  @Column({ type: 'text', unique: true, nullable: true })
   url!: string | null;
 
   @Column({ unique: true })
-- 
2.45.2