From 45341b49da664710a79dc9018c9b6771dc8298f1 Mon Sep 17 00:00:00 2001
From: yinglj <yinglj@gmail.com>
Date: Mon, 1 Apr 2024 08:31:03 +0800
Subject: [PATCH 01/15] delete PORTAL_WEBSITE_URL

---
 api/server/routes/ask/openAI.js     | 3 +--
 api/server/routes/config.js         | 1 -
 packages/data-provider/src/types.ts | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/api/server/routes/ask/openAI.js b/api/server/routes/ask/openAI.js
index 4c55ad3d072..98de7ca5cb8 100644
--- a/api/server/routes/ask/openAI.js
+++ b/api/server/routes/ask/openAI.js
@@ -128,10 +128,9 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
         ],
       });
       let dailyQuota = quota[endpointOption.modelOptions.model].toFixed(0);
-      let portalWebsiteURL = process.env.PORTAL_WEBSITE_URL;
       if (messagesCount >= dailyQuota) {
         throw new Error(
-          `超出了您的使用额度(${endpointOption.modelOptions.model}模型每天${dailyQuota}条消息)。由于需要支付越来越多、每月上万元的API费用，如果您经常使用我们的服务，请打开“我的主页”进行购买，支持我们持续提供GPT服务。更多优惠套餐，请前往网站订购：${portalWebsiteURL}`,
+          `超出了您的使用额度(${endpointOption.modelOptions.model}模型每天${dailyQuota}条消息)。由于需要支付越来越多、每月上万元的API费用，如果您经常使用我们的服务，请打开“我的主页”进行购买，支持我们持续提供GPT服务。}`,
         );
       }
     }
diff --git a/api/server/routes/config.js b/api/server/routes/config.js
index 2823954214d..cc2b6c7e113 100644
--- a/api/server/routes/config.js
+++ b/api/server/routes/config.js
@@ -22,7 +22,6 @@ router.get('/', async function (req, res) {
       registrationEnabled: isEnabled(process.env.ALLOW_REGISTRATION),
       socialLoginEnabled: isEnabled(process.env.ALLOW_SOCIAL_LOGIN),
       proMemberPaymentURL: process.env.PRO_MEMBER_PAYMENT_URL,
-      portalWebsiteURL: process.env.PORTAL_WEBSITE_URL,
       emailEnabled:
         (!!process.env.EMAIL_SERVICE || !!process.env.EMAIL_HOST) &&
         !!process.env.EMAIL_USERNAME &&
diff --git a/packages/data-provider/src/types.ts b/packages/data-provider/src/types.ts
index 5eede8302aa..fd6c174e7da 100644
--- a/packages/data-provider/src/types.ts
+++ b/packages/data-provider/src/types.ts
@@ -192,7 +192,6 @@ export type TStartupConfig = {
   checkBalance: boolean;
   customFooter?: string;
   proMemberPaymentURL: string;
-  portalWebsiteURL: string;
 };
 
 export type TRefreshTokenResponse = {

From e7a9df0762534226fda1ddc05d12d4682fd24562 Mon Sep 17 00:00:00 2001
From: yinglj <yinglj@gmail.com>
Date: Mon, 1 Apr 2024 10:28:12 +0800
Subject: [PATCH 02/15] Further Improvement of Payment via Stripe, without
 WordPress and Flexible Branding #185

---
 client/src/components/Profile/index.tsx | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/client/src/components/Profile/index.tsx b/client/src/components/Profile/index.tsx
index 3bb24024c5c..668533cf704 100644
--- a/client/src/components/Profile/index.tsx
+++ b/client/src/components/Profile/index.tsx
@@ -39,6 +39,8 @@ function ProfileContent() {
   const { userId = '' } = useParams();
   const { user, token } = useAuthContext();
   const localize = useLocalize();
+  let lang = localStorage.getItem('lang');
+  lang = lang ? lang.substring(0, 2) : 'en';
   const navigate = useNavigate();
   useDocumentTitle('Profile');
 
@@ -469,7 +471,11 @@ function ProfileContent() {
                 <button
                   type="submit"
                   className="rounded bg-green-500 px-4 py-1 text-white hover:bg-green-600"
-                  onClick={() => window.open(startupConfig?.proMemberPaymentURL)}
+                  onClick={() =>
+                    window.open(
+                      `${startupConfig?.proMemberPaymentURL}?locale=${lang}&prefilled_email=${profileUser?.email}`,
+                    )
+                  }
                 >
                   {localize('com_ui_renewal_pro_member')}
                 </button>
@@ -482,7 +488,11 @@ function ProfileContent() {
                 <button
                   type="submit"
                   className="rounded bg-green-500 px-4 py-1 text-white hover:bg-green-600"
-                  onClick={() => window.open(startupConfig?.proMemberPaymentURL)}
+                  onClick={() =>
+                    window.open(
+                      `${startupConfig?.proMemberPaymentURL}?locale=${lang}&prefilled_email=${profileUser?.email}`,
+                    )
+                  }
                 >
                   {localize('com_ui_become_pro_member')}
                 </button>

From 254da796ef701bbd66f8b61ad21ca88b5716a03c Mon Sep 17 00:00:00 2001
From: yinglj <yinglj@gmail.com>
Date: Tue, 2 Apr 2024 08:09:34 +0800
Subject: [PATCH 03/15] add some spacing between free and pro button

---
 client/src/components/Profile/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/components/Profile/index.tsx b/client/src/components/Profile/index.tsx
index 668533cf704..3e629937e61 100644
--- a/client/src/components/Profile/index.tsx
+++ b/client/src/components/Profile/index.tsx
@@ -470,7 +470,7 @@ function ProfileContent() {
                 {proMemberExpiredAt.getMonth() + 1}-{proMemberExpiredAt.getDate()}
                 <button
                   type="submit"
-                  className="rounded bg-green-500 px-4 py-1 text-white hover:bg-green-600"
+                  className="ml-2 rounded bg-blue-500 px-4 py-1 text-white hover:bg-blue-600"
                   onClick={() =>
                     window.open(
                       `${startupConfig?.proMemberPaymentURL}?locale=${lang}&prefilled_email=${profileUser?.email}`,
@@ -487,7 +487,7 @@ function ProfileContent() {
                 {localize('com_ui_free_member')}
                 <button
                   type="submit"
-                  className="rounded bg-green-500 px-4 py-1 text-white hover:bg-green-600"
+                  className="ml-2 rounded bg-blue-500 px-4 py-1 text-white hover:bg-blue-600"
                   onClick={() =>
                     window.open(
                       `${startupConfig?.proMemberPaymentURL}?locale=${lang}&prefilled_email=${profileUser?.email}`,

From 7d258d5ddf6c0418a845b8f0ef2d458ae0d77afc Mon Sep 17 00:00:00 2001
From: yinglj <yinglj@gmail.com>
Date: Tue, 2 Apr 2024 08:24:12 +0800
Subject: [PATCH 04/15] Update openAI.js

---
 api/server/routes/ask/openAI.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/server/routes/ask/openAI.js b/api/server/routes/ask/openAI.js
index 98de7ca5cb8..e4309bd86fe 100644
--- a/api/server/routes/ask/openAI.js
+++ b/api/server/routes/ask/openAI.js
@@ -130,7 +130,7 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
       let dailyQuota = quota[endpointOption.modelOptions.model].toFixed(0);
       if (messagesCount >= dailyQuota) {
         throw new Error(
-          `超出了您的使用额度(${endpointOption.modelOptions.model}模型每天${dailyQuota}条消息)。由于需要支付越来越多、每月上万元的API费用，如果您经常使用我们的服务，请打开“我的主页”进行购买，支持我们持续提供GPT服务。}`,
+          `超出了您的使用额度(${endpointOption.modelOptions.model}模型每天${dailyQuota}条消息)。由于需要支付越来越多、每月上万元的API费用，如果您经常使用我们的服务，请打开“我的主页”进行购买，支持我们持续提供GPT服务。`,
         );
       }
     }

From 509dc0fb841934873f7aa8903d57fe29b72274f1 Mon Sep 17 00:00:00 2001
From: Shi Jin <jinzishuai@gmail.com>
Date: Tue, 2 Apr 2024 18:37:32 -0600
Subject: [PATCH 05/15] Basic scalfolding for webhook implemntation within API
 for {{BASE_URL}}/api/webhooks/paid

---
 api/server/index.js                 |  3 +++
 api/server/routes/index.js          |  2 ++
 api/server/routes/webhooks/index.js |  8 ++++++++
 api/server/routes/webhooks/paid.js  | 14 ++++++++++++++
 4 files changed, 27 insertions(+)
 create mode 100644 api/server/routes/webhooks/index.js
 create mode 100644 api/server/routes/webhooks/paid.js

diff --git a/api/server/index.js b/api/server/index.js
index 98add5c1277..4e82a6b205d 100644
--- a/api/server/index.js
+++ b/api/server/index.js
@@ -77,6 +77,9 @@ const startServer = async () => {
     res.sendFile(path.join(projectPath, 'dist', 'index.html'));
   });
 
+  // Web Hooks
+  app.use('/api/webhooks', routes.webhooks);
+
   app.listen(port, host, () => {
     if (host == '0.0.0.0') {
       console.log(
diff --git a/api/server/routes/index.js b/api/server/routes/index.js
index 32a27c4d301..562da6f602c 100644
--- a/api/server/routes/index.js
+++ b/api/server/routes/index.js
@@ -18,6 +18,7 @@ const config = require('./config');
 const leaderboard = require('./leaderboard');
 const assistants = require('./assistants');
 const files = require('./files');
+const webhooks = require('./webhooks');
 
 module.exports = {
   search,
@@ -40,4 +41,5 @@ module.exports = {
   leaderboard,
   assistants,
   files,
+  webhooks,
 };
diff --git a/api/server/routes/webhooks/index.js b/api/server/routes/webhooks/index.js
new file mode 100644
index 00000000000..984517b4d43
--- /dev/null
+++ b/api/server/routes/webhooks/index.js
@@ -0,0 +1,8 @@
+const express = require('express');
+const router = express.Router();
+
+const paid = require('./paid');
+
+router.use('/paid', paid);
+
+module.exports = router;
diff --git a/api/server/routes/webhooks/paid.js b/api/server/routes/webhooks/paid.js
new file mode 100644
index 00000000000..5a8d1d4a3d1
--- /dev/null
+++ b/api/server/routes/webhooks/paid.js
@@ -0,0 +1,14 @@
+const express = require('express');
+const router = express.Router();
+
+// Handling POST requests to the webhook endpoint
+router.post('/', (req, res) => {
+  // Verify the request
+  // Process the data
+  // Respond appropriately
+  res.status(200).send('Webhook on /paid has been received and processed.');
+
+  // Log the Body
+});
+
+module.exports = router;

From 0ee6ab59e829707a5df54c113e8a2af560dbddf2 Mon Sep 17 00:00:00 2001
From: Shi Jin <jinzishuai@gmail.com>
Date: Tue, 2 Apr 2024 22:48:46 -0600
Subject: [PATCH 06/15] Implement the webhook that would renew subscription by
 1 month

---
 api/server/routes/webhooks/paid.js | 41 ++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/api/server/routes/webhooks/paid.js b/api/server/routes/webhooks/paid.js
index 5a8d1d4a3d1..dd2818f2a2a 100644
--- a/api/server/routes/webhooks/paid.js
+++ b/api/server/routes/webhooks/paid.js
@@ -1,3 +1,4 @@
+const User = require('../../../models/User');
 const express = require('express');
 const router = express.Router();
 
@@ -5,10 +6,46 @@ const router = express.Router();
 router.post('/', (req, res) => {
   // Verify the request
   // Process the data
-  // Respond appropriately
+  // Respond immediately to acknowledge receipt
   res.status(200).send('Webhook on /paid has been received and processed.');
 
-  // Log the Body
+  if (req.body.type === 'payment_intent.succeeded') {
+    console.log('processing /paid webhook on type=:', req.body.type);
+    const paymentIntent = req.body.data.object;
+    updateUserOnPaymentSuccess(paymentIntent)
+      .then(() => console.log('User successfully updated after payment.'))
+      .catch((error) => console.error('Failed to update user after payment:', error));
+  } else {
+    console.log('skipping /paid webhook on type=:', req.body.type);
+    // No need for res.status(200); since it has already been sent
+  }
 });
 
+async function updateUserOnPaymentSuccess(paymentIntent) {
+  if (paymentIntent.receipt_email) {
+    console.log('updateUserOnPaymentSuccess() for user', paymentIntent.receipt_email);
+    // Find a user by email
+    try {
+      const user = await User.findOne({ email: paymentIntent.receipt_email });
+      if (user) {
+        console.log(
+          'updating user _id=',
+          user._id.toString(),
+          ' with additional 30 days professional subscription',
+        );
+        // update proMemberExpiredAt based on the max of current time and proMemberExpiredAt
+        user.proMemberExpiredAt =
+          Math.max(user.proMemberExpiredAt, Date.now()) + 31 * 24 * 60 * 60 * 1000;
+        await user.save(); // Assuming this also returns a Promise, so it should be awaited.
+      } else {
+        console.log('User not found for email:', paymentIntent.receipt_email);
+      }
+    } catch (error) {
+      console.error('An error occurred while updating the user:', error);
+    }
+  } else {
+    console.log('updateUserOnPaymentSuccess(): paymentIntent.receipt_email undefined, skip');
+  }
+}
+
 module.exports = router;

From 6064714c4840c998462c1fcc909666179431f158 Mon Sep 17 00:00:00 2001
From: Shi Jin <jinzishuai@gmail.com>
Date: Tue, 2 Apr 2024 23:55:53 -0600
Subject: [PATCH 07/15] refactor stripe webhook to include secrets and keys

---
 api/package.json                   |  1 +
 api/server/routes/webhooks/paid.js | 54 +++++++++++++++++++++---------
 package-lock.json                  | 13 +++++++
 3 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/api/package.json b/api/package.json
index 521700da28a..2fdbb789360 100644
--- a/api/package.json
+++ b/api/package.json
@@ -72,6 +72,7 @@
     "passport-local": "^1.0.0",
     "pino": "^8.12.1",
     "sharp": "^0.32.6",
+    "stripe": "^14.23.0",
     "tiktoken": "^1.0.10",
     "ua-parser-js": "^1.0.36",
     "winston": "^3.10.0",
diff --git a/api/server/routes/webhooks/paid.js b/api/server/routes/webhooks/paid.js
index dd2818f2a2a..3980e813223 100644
--- a/api/server/routes/webhooks/paid.js
+++ b/api/server/routes/webhooks/paid.js
@@ -1,23 +1,44 @@
-const User = require('../../../models/User');
 const express = require('express');
 const router = express.Router();
+const User = require('../../../models/User');
+const stripe = require('stripe')(process.env.STRIPE_SECRET_KEY);
+
+const endpointSecret = process.env.STRIPE_ENDPOINT_SECRET;
+
+// Modified endpoint using async/await
+router.post('/', express.raw({ type: 'application/json' }), async (req, res) => {
+  const sig = req.headers['stripe-signature'];
+
+  let event;
+  try {
+    event = stripe.webhooks.constructEvent(req.body, sig, endpointSecret);
+  } catch (err) {
+    console.error(`Webhook signature verification failed, Error: ${err.message}`);
+    return res.status(400).send(`Webhook Error: ${err.message}`);
+  }
 
-// Handling POST requests to the webhook endpoint
-router.post('/', (req, res) => {
-  // Verify the request
-  // Process the data
-  // Respond immediately to acknowledge receipt
-  res.status(200).send('Webhook on /paid has been received and processed.');
+  if (event.type === 'payment_intent.succeeded') {
+    console.log('Processing /paid webhook on type=:', event.type);
+    const paymentIntent = event.data.object;
 
-  if (req.body.type === 'payment_intent.succeeded') {
-    console.log('processing /paid webhook on type=:', req.body.type);
-    const paymentIntent = req.body.data.object;
-    updateUserOnPaymentSuccess(paymentIntent)
-      .then(() => console.log('User successfully updated after payment.'))
-      .catch((error) => console.error('Failed to update user after payment:', error));
+    try {
+      const updatedUserEmail = await updateUserOnPaymentSuccess(paymentIntent);
+      if (updatedUserEmail) {
+        console.log(`User with email ${updatedUserEmail} successfully updated after payment.`);
+        return res
+          .status(200)
+          .send(`User with email ${updatedUserEmail} successfully updated after payment.`);
+      } else {
+        console.log('User could not be updated because email was not found.');
+        return res.status(404).send('User with given email not found.');
+      }
+    } catch (error) {
+      console.error(`Failed to update user after payment: ${error}`);
+      return res.status(500).send('Internal Server Error');
+    }
   } else {
-    console.log('skipping /paid webhook on type=:', req.body.type);
-    // No need for res.status(200); since it has already been sent
+    console.log('Skipping /paid webhook on type=:', event.type);
+    return res.status(200).send(`Unhandled event type ${event.type}`);
   }
 });
 
@@ -37,14 +58,17 @@ async function updateUserOnPaymentSuccess(paymentIntent) {
         user.proMemberExpiredAt =
           Math.max(user.proMemberExpiredAt, Date.now()) + 31 * 24 * 60 * 60 * 1000;
         await user.save(); // Assuming this also returns a Promise, so it should be awaited.
+        return user.email;
       } else {
         console.log('User not found for email:', paymentIntent.receipt_email);
+        return null;
       }
     } catch (error) {
       console.error('An error occurred while updating the user:', error);
     }
   } else {
     console.log('updateUserOnPaymentSuccess(): paymentIntent.receipt_email undefined, skip');
+    return null;
   }
 }
 
diff --git a/package-lock.json b/package-lock.json
index f0952308b77..6824365e20a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -86,6 +86,7 @@
         "passport-local": "^1.0.0",
         "pino": "^8.12.1",
         "sharp": "^0.32.6",
+        "stripe": "^14.23.0",
         "tiktoken": "^1.0.10",
         "ua-parser-js": "^1.0.36",
         "winston": "^3.10.0",
@@ -22293,6 +22294,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/stripe": {
+      "version": "14.23.0",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-14.23.0.tgz",
+      "integrity": "sha512-OPD7LqBmni6uDdqA05GGgMZyyRWxJOehONBNC9tYgY4Uh089EtXd6QLIgRGrqTDlQH3cA2BXo848nxwa/zsQzw==",
+      "dependencies": {
+        "@types/node": ">=8.1.0",
+        "qs": "^6.11.0"
+      },
+      "engines": {
+        "node": ">=12.*"
+      }
+    },
     "node_modules/strnum": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",

From 9ccdb745fc87474da381a68424fdcab31a7cc634 Mon Sep 17 00:00:00 2001
From: Shi Jin <jinzishuai@gmail.com>
Date: Wed, 3 Apr 2024 09:05:42 -0600
Subject: [PATCH 08/15] Webhook Working: it has to set up before express.json
 (#192)

---
 api/server/index.js                |  6 +++---
 api/server/routes/webhooks/paid.js | 13 +++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/api/server/index.js b/api/server/index.js
index 4e82a6b205d..0fd5d7a2801 100644
--- a/api/server/index.js
+++ b/api/server/index.js
@@ -25,6 +25,9 @@ const startServer = async () => {
   const app = express();
   app.locals.config = config;
 
+  // Web Hooks, note that is has to be ahead of the express.json() call since webhooks uses RAW
+  app.use('/api/webhooks', routes.webhooks);
+
   // Middleware
   app.use(errorController);
   app.use(express.json({ limit: '3mb' }));
@@ -77,9 +80,6 @@ const startServer = async () => {
     res.sendFile(path.join(projectPath, 'dist', 'index.html'));
   });
 
-  // Web Hooks
-  app.use('/api/webhooks', routes.webhooks);
-
   app.listen(port, host, () => {
     if (host == '0.0.0.0') {
       console.log(
diff --git a/api/server/routes/webhooks/paid.js b/api/server/routes/webhooks/paid.js
index 3980e813223..380ad1b076d 100644
--- a/api/server/routes/webhooks/paid.js
+++ b/api/server/routes/webhooks/paid.js
@@ -37,7 +37,7 @@ router.post('/', express.raw({ type: 'application/json' }), async (req, res) =>
       return res.status(500).send('Internal Server Error');
     }
   } else {
-    console.log('Skipping /paid webhook on type=:', event.type);
+    console.log('Skipping /paid webhook on type:', event.type);
     return res.status(200).send(`Unhandled event type ${event.type}`);
   }
 });
@@ -49,15 +49,16 @@ async function updateUserOnPaymentSuccess(paymentIntent) {
     try {
       const user = await User.findOne({ email: paymentIntent.receipt_email });
       if (user) {
-        console.log(
-          'updating user _id=',
-          user._id.toString(),
-          ' with additional 30 days professional subscription',
-        );
         // update proMemberExpiredAt based on the max of current time and proMemberExpiredAt
         user.proMemberExpiredAt =
           Math.max(user.proMemberExpiredAt, Date.now()) + 31 * 24 * 60 * 60 * 1000;
         await user.save(); // Assuming this also returns a Promise, so it should be awaited.
+        console.log(
+          'updating user _id',
+          user._id.toString(),
+          ' with additional 30 days professional subscription:',
+          user.proMemberExpiredAt.toDateString(),
+        );
         return user.email;
       } else {
         console.log('User not found for email:', paymentIntent.receipt_email);

From 8cce7c0df2909dd1908db3ced76b36fe4eec47ac Mon Sep 17 00:00:00 2001
From: Shi Jin <jinzishuai@gmail.com>
Date: Sun, 5 May 2024 14:58:14 -0600
Subject: [PATCH 09/15] Update release-toatu.yml: limit workflow dispatch
 branch (#194)

to avoid problems like https://github.com/aitok-ai/LibreChatInternal/issues/115
---
 .github/workflows/release-toatu.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release-toatu.yml b/.github/workflows/release-toatu.yml
index 616af89aad6..e7a41321cac 100644
--- a/.github/workflows/release-toatu.yml
+++ b/.github/workflows/release-toatu.yml
@@ -1,6 +1,8 @@
 name: Production Release to https://zhao.toatu.com via CloudFront/S3
 on:
-  workflow_dispatch
+  workflow_dispatch:
+    branches:
+      - release/zhao.toatu.com
 
 jobs:
   build:

From d027ec134d7198993b4c10138245331abafc3a43 Mon Sep 17 00:00:00 2001
From: Shi Jin <jinzishuai@gmail.com>
Date: Sun, 5 May 2024 14:59:46 -0600
Subject: [PATCH 10/15] Update release-toatu.yml: limit dispath from one branch
 (#193)

* Update release-toatu.yml: limit dispath from one branch

* Update release-toatu.yml: use environment to limit access

* Update release-toatu.yml: remove :
---
 .github/workflows/release-toatu.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/release-toatu.yml b/.github/workflows/release-toatu.yml
index e7a41321cac..4adef3cdca1 100644
--- a/.github/workflows/release-toatu.yml
+++ b/.github/workflows/release-toatu.yml
@@ -7,6 +7,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    environment: release-zhao.toatu.com
     steps:
       # Check out the repository
       - name: Checkout

From 1f9931ac23e01f7c7013eac44f32e9cfd33a0a96 Mon Sep 17 00:00:00 2001
From: Shi Jin <jinzishuai@gmail.com>
Date: Sat, 11 May 2024 12:12:00 -0600
Subject: [PATCH 11/15] Change quota from daily to monthly (#195)

---
 api/server/routes/ask/openAI.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/server/routes/ask/openAI.js b/api/server/routes/ask/openAI.js
index 50636f58417..4653a50dc29 100644
--- a/api/server/routes/ask/openAI.js
+++ b/api/server/routes/ask/openAI.js
@@ -112,13 +112,13 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
     let quota = 0;
     if ('proMemberExpiredAt' in cur_user && cur_user.proMemberExpiredAt > currentTime) {
       // If not proMember, check quota
-      quota = JSON.parse(process.env['CHAT_QUOTA_PER_DAY_PRO_MEMBER']);
+      quota = JSON.parse(process.env['CHAT_QUOTA_PER_MONTH_PRO_MEMBER']);
     } else {
-      quota = JSON.parse(process.env['CHAT_QUOTA_PER_DAY']);
+      quota = JSON.parse(process.env['CHAT_QUOTA_PER_MONTH']);
     }
 
     let someTimeAgo = currentTime;
-    someTimeAgo.setSeconds(currentTime.getSeconds() - 60 * 60 * 24); // 24 hours
+    someTimeAgo.setSeconds(currentTime.getSeconds() - 60 * 60 * 24 * 30); // 30 days
     if (endpointOption.modelOptions.model in quota) {
       let messagesCount = await getMessagesCount({
         $and: [
@@ -127,11 +127,11 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
           { updatedAt: { $gte: someTimeAgo } },
         ],
       });
-      let dailyQuota = quota[endpointOption.modelOptions.model].toFixed(0);
-      if (messagesCount >= dailyQuota) {
+      let monthlyQuota = quota[endpointOption.modelOptions.model].toFixed(0);
+      if (messagesCount >= monthlyQuota) {
         // TODO: this error message should be implemented by the client based on locale
         throw new Error(
-          `超出了您的使用额度(${endpointOption.modelOptions.model}模型每天${dailyQuota}条消息)。由于需要支付越来越多、每月上万元的API费用，如果您经常使用我们的服务，请打开“我的主页”进行购买，支持我们持续提供GPT服务。`,
+          `超出了您的使用额度(${endpointOption.modelOptions.model}模型每30天${monthlyQuota}条消息)。由于需要支付越来越多、每月上万元的API费用，如果您经常使用我们的服务，请打开“我的主页”进行购买，支持我们持续提供GPT服务。`,
         );
       }
     }

From 26ae33cac360fc8a7ecf9e17fe2254f8ae86322f Mon Sep 17 00:00:00 2001
From: Shi Jin <jinzishuai@gmail.com>
Date: Sun, 12 May 2024 17:27:17 -0600
Subject: [PATCH 12/15] initial commit: add monthlyQuotaConsumed field to GET
 /api/user API

---
 api/server/controllers/UserController.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/api/server/controllers/UserController.js b/api/server/controllers/UserController.js
index 4fd159ab756..5f42ab9b2fd 100644
--- a/api/server/controllers/UserController.js
+++ b/api/server/controllers/UserController.js
@@ -5,8 +5,19 @@ const User = require('../../models/User');
 const getUserController = async (req, res) => {
   try {
     const { userId } = req.params;
-    if (userId == undefined || userId === req.user.id) {res.status(200).send(req.user);}
-    else {
+    if (userId == undefined || userId === req.user.id) {
+      // information about the current user
+      const monthlyQuotaConsumed = 250; // This value might be dynamic based on your application logic
+
+      // Extend req.user with the new field
+      const response = {
+        ...req.user.toJSON(),
+        monthlyQuotaConsumed: monthlyQuotaConsumed,
+      };
+      res.status(200).send(response);
+    } else {
+      // information about another user, without even authentification.
+      // TODO: this might be a security issue
       const user = await User.findById(userId).exec();
       const id = user._id;
       const name = user.name;

From c65a76f02e13078ae50d2a3439294af7ef819a6d Mon Sep 17 00:00:00 2001
From: Shi Jin <jinzishuai@gmail.com>
Date: Sun, 12 May 2024 22:32:59 -0600
Subject: [PATCH 13/15] Got the API to return additional object for quota
 consumption

---
 api/server/controllers/UserController.js |  5 ++--
 api/server/middleware/index.js           |  2 ++
 api/server/middleware/messageQuota.js    | 31 ++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 api/server/middleware/messageQuota.js

diff --git a/api/server/controllers/UserController.js b/api/server/controllers/UserController.js
index 5f42ab9b2fd..eeb0df51eec 100644
--- a/api/server/controllers/UserController.js
+++ b/api/server/controllers/UserController.js
@@ -1,13 +1,14 @@
 const { updateUserPluginsService } = require('../services/UserService');
 const { updateUserPluginAuth, deleteUserPluginAuth } = require('../services/PluginService');
+const { getUserMessageQuotaUsagePastDays } = require('../middleware/messageQuota');
 const User = require('../../models/User');
 
 const getUserController = async (req, res) => {
   try {
     const { userId } = req.params;
-    if (userId == undefined || userId === req.user.id) {
+    if (userId === undefined || userId === req.user.id) {
       // information about the current user
-      const monthlyQuotaConsumed = 250; // This value might be dynamic based on your application logic
+      const monthlyQuotaConsumed = await getUserMessageQuotaUsagePastDays(req.user, 30); // This value might be dynamic based on your application logic
 
       // Extend req.user with the new field
       const response = {
diff --git a/api/server/middleware/index.js b/api/server/middleware/index.js
index 553f2c663ab..47932d8520d 100644
--- a/api/server/middleware/index.js
+++ b/api/server/middleware/index.js
@@ -12,6 +12,7 @@ const concurrentLimiter = require('./concurrentLimiter');
 const validateMessageReq = require('./validateMessageReq');
 const buildEndpointOption = require('./buildEndpointOption');
 const validateRegistration = require('./validateRegistration');
+const messageQuota = require('./messageQuota');
 
 module.exports = {
   ...abortMiddleware,
@@ -28,4 +29,5 @@ module.exports = {
   validateMessageReq,
   buildEndpointOption,
   validateRegistration,
+  messageQuota,
 };
diff --git a/api/server/middleware/messageQuota.js b/api/server/middleware/messageQuota.js
new file mode 100644
index 00000000000..269c19fcf00
--- /dev/null
+++ b/api/server/middleware/messageQuota.js
@@ -0,0 +1,31 @@
+const { getMessagesCount } = require('../../models');
+
+const getUserMessageQuotaUsagePastDays = async (user, days = 30) => {
+  let currentTime = new Date();
+  let quota = 0;
+  if ('proMemberExpiredAt' in user && user.proMemberExpiredAt > currentTime) {
+    // If not proMember, check quota
+    quota = JSON.parse(process.env['CHAT_QUOTA_PER_MONTH_PRO_MEMBER']);
+  } else {
+    quota = JSON.parse(process.env['CHAT_QUOTA_PER_MONTH']);
+  }
+
+  let someTimeAgo = currentTime;
+  someTimeAgo.setSeconds(currentTime.getSeconds() - 60 * 60 * 24 * days); // 30 days
+
+  let quotaUsage = {};
+
+  let promises = Object.keys(quota).map(async (model) => {
+    let messagesCount = await getMessagesCount({
+      $and: [{ senderId: user.id }, { model: model }, { updatedAt: { $gte: someTimeAgo } }],
+    });
+    quotaUsage[model] = messagesCount;
+    console.log('model=%s: %d/%d used', model, quotaUsage[model], quota[model]);
+  });
+  await Promise.all(promises);
+  return quotaUsage;
+};
+
+module.exports = {
+  getUserMessageQuotaUsagePastDays,
+};

From 96d6e1c7f86e9e24282fdb805ab6d75db97ada04 Mon Sep 17 00:00:00 2001
From: Shi Jin <jinzishuai@gmail.com>
Date: Sun, 12 May 2024 22:42:43 -0600
Subject: [PATCH 14/15] restructure output to include both consumption and
 quota

---
 api/server/middleware/messageQuota.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/api/server/middleware/messageQuota.js b/api/server/middleware/messageQuota.js
index 269c19fcf00..daa485490bd 100644
--- a/api/server/middleware/messageQuota.js
+++ b/api/server/middleware/messageQuota.js
@@ -19,8 +19,11 @@ const getUserMessageQuotaUsagePastDays = async (user, days = 30) => {
     let messagesCount = await getMessagesCount({
       $and: [{ senderId: user.id }, { model: model }, { updatedAt: { $gte: someTimeAgo } }],
     });
-    quotaUsage[model] = messagesCount;
-    console.log('model=%s: %d/%d used', model, quotaUsage[model], quota[model]);
+    quotaUsage[model] = {
+      consumed: messagesCount,
+      quota: quota[model],
+    };
+    console.log(model, quotaUsage[model]);
   });
   await Promise.all(promises);
   return quotaUsage;

From 2e158595549251cdf247711071e51086a11c1dea Mon Sep 17 00:00:00 2001
From: Shi Jin <jinzishuai@gmail.com>
Date: Sun, 19 May 2024 22:50:10 -0300
Subject: [PATCH 15/15] Client Changes to Show Quota Consumption under User
 Profile

---
 client/src/components/Profile/index.tsx   | 31 +++++++++++++++++++++++
 client/src/localization/languages/Eng.tsx |  3 +++
 client/src/localization/languages/Zh.tsx  |  3 +++
 packages/data-provider/src/types.ts       |  1 +
 4 files changed, 38 insertions(+)

diff --git a/client/src/components/Profile/index.tsx b/client/src/components/Profile/index.tsx
index 3e629937e61..3a92e1f11fc 100644
--- a/client/src/components/Profile/index.tsx
+++ b/client/src/components/Profile/index.tsx
@@ -34,6 +34,7 @@ function ProfileContent() {
   const [proMemberExpiredAt, setProMemberExpiredAt] = useState<Date>(new Date());
   const [editMode, setEditMode] = useState<boolean>(false);
   const [bio, setBio] = useState(initialBio || '');
+  const [quotaUsage, setQuotaUsage] = useState<object>({}); // Monthly quota usage
   // const [profession, setProfession] = useState(initialProfession || '');
   // new commit
   const { userId = '' } = useParams();
@@ -262,6 +263,12 @@ function ProfileContent() {
       } else {
         setProMemberExpiredAt(new Date());
       }
+
+      if (getUserByIdQuery.data.monthlyQuotaConsumed) {
+        setQuotaUsage(getUserByIdQuery.data.monthlyQuotaConsumed);
+      } else {
+        setQuotaUsage({});
+      }
     }
   }, [getUserByIdQuery.isSuccess, getUserByIdQuery.data, user]);
 
@@ -503,6 +510,30 @@ function ProfileContent() {
           <div></div>
         )}
 
+        {/* Monthly Quota Usage: a table of quota and usage based on object quotaUsage */}
+        <div className="w-full rounded-lg p-6 dark:text-gray-200">
+          <div className="pl-7">
+            <table className="w-full border-collapse border-2 border-gray-500">
+              <thead>
+                <tr>
+                  <th className="border-2 border-gray-500 text-left">{localize('com_ui_model')}</th>
+                  <th className="border-2 border-gray-500 text-left">{localize('com_ui_usage')}</th>
+                  <th className="border-2 border-gray-500 text-left">{localize('com_ui_quota')}</th>
+                </tr>
+              </thead>
+              <tbody>
+                {Object.entries(quotaUsage).map(([key, value]) => (
+                  <tr key={key}>
+                    <td className="border-2 border-gray-500">{key}</td>
+                    <td className="border-2 border-gray-500">{value.consumed}</td>
+                    <td className="border-2 border-gray-500">{value.quota}</td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
+        </div>
+
         {/* User bio */}
         {userId === user?.id ? (
           // Current user's profile view
diff --git a/client/src/localization/languages/Eng.tsx b/client/src/localization/languages/Eng.tsx
index 9017c52d5eb..53033bb1760 100644
--- a/client/src/localization/languages/Eng.tsx
+++ b/client/src/localization/languages/Eng.tsx
@@ -15,6 +15,9 @@ export default {
   com_ui_become_pro_member: 'become pro member',
   com_ui_renewal_pro_member: 'renewal pro member',
   com_ui_free_member: 'Free Member',
+  com_ui_model: 'Model',
+  com_ui_quota: '30-Day Quota',
+  com_ui_usage: 'Consumption (Last 30 Days)',
   com_ui_about_yourself: 'About Yourself',
   com_ui_profession: 'Profession',
   com_ui_share_profile: 'Share Profile',
diff --git a/client/src/localization/languages/Zh.tsx b/client/src/localization/languages/Zh.tsx
index e2bef78d5d2..8d7f563bedd 100644
--- a/client/src/localization/languages/Zh.tsx
+++ b/client/src/localization/languages/Zh.tsx
@@ -28,6 +28,9 @@ export default {
   com_ui_become_pro_member: '成为专业会员',
   com_ui_renewal_pro_member: '续期专业会员',
   com_ui_free_member: '免费用户',
+  com_ui_model: '模型',
+  com_ui_quota: '30天配额',
+  com_ui_usage: '过去30天使用情况',
   com_ui_about_yourself: '关于自己',
   com_ui_profession: '职业',
   com_ui_share_profile: '分享主页',
diff --git a/packages/data-provider/src/types.ts b/packages/data-provider/src/types.ts
index fd6c174e7da..9defd620d84 100644
--- a/packages/data-provider/src/types.ts
+++ b/packages/data-provider/src/types.ts
@@ -69,6 +69,7 @@ export type TUser = {
   followers: object;
   following: object;
   proMemberExpiredAt: Date;
+  monthlyQuotaConsumed: object;
 };
 
 export type TGetConversationsResponse = {