Skip to content

Commit 4c424d9

Browse files
lanqian528lanqian528
authored
Merge pull request #215 from lanqian528/dev
Dev to Main
2 parents 5539d1c + 0ff6fe1 commit 4c424d9

File tree

5 files changed

+528
-451
lines changed

5 files changed

+528
-451
lines changed

‎gateway/backend.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@
2424
banned_paths = [
2525
"backend-api/accounts/logout_all",
2626
"backend-api/accounts/deactivate",
27-
"backend-api/payments/checkout",
27+
"backend-api/payments",
28+
"backend-api/subscriptions",
2829
"backend-api/user_system_messages",
2930
"backend-api/memories",
3031
"backend-api/settings/clear_account_user_memory",
31-
"backend-api/conversations/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}"
32+
"backend-api/conversations/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}",
33+
"backend-api/accounts/mfa_info",
3234
"backend-api/accounts/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/invites",
3335
"admin",
3436
]

‎templates/chatgpt.html‎

Lines changed: 57 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html data-build="prod-8fd453786418a77beb9a3ce0e16086945c05a492" dir="ltr" class="">
2+
<html data-build="prod-11173c28d7974347784902fe1d57aae3a20e661b" dir="ltr" class="">
33
<head>
44
<meta charSet="UTF-8"/>
55
<meta name="viewport" content="width=device-width, initial-scale=1"/>
@@ -18,35 +18,31 @@
1818
<meta property="og:title" content="ChatGPT"/>
1919
<meta property="og:image" content="/assets/chatgpt-share-og-u7j5uyao.webp"/>
2020
<meta property="og:url" content="https://chatgpt.com"/>
21-
<link rel="modulepreload" href="/assets/manifest-efc09ae7.js"/>
22-
<link rel="modulepreload" href="/assets/g52a1dqtlxhy2bf3.js"/>
23-
<link rel="modulepreload" href="/assets/ogb0m6wfmpkwr4v0.js"/>
24-
<link rel="modulepreload" href="/assets/eoaj9uutkk89ds1v.js"/>
25-
<link rel="modulepreload" href="/assets/b9t2rzfm26s20fe0.js"/>
26-
<link rel="modulepreload" href="/assets/d73y9qmasbzd4wm4.js"/>
27-
<link rel="modulepreload" href="/assets/i7vwmilfvk3pdkih.js"/>
28-
<link rel="modulepreload" href="/assets/m0ujq4si8sio1lz0.js"/>
29-
<link rel="modulepreload" href="/assets/cymro46oa7nb2e4p.js"/>
30-
<link rel="modulepreload" href="/assets/j1agjri6e0deq7qe.js"/>
31-
<link rel="modulepreload" href="/assets/mkm08vgz5itp2vvr.js"/>
32-
<link rel="modulepreload" href="/assets/dbnmdjnv5aff71w4.js"/>
33-
<link rel="modulepreload" href="/assets/1mq4bl028ayzaqnn.js"/>
34-
<link rel="modulepreload" href="/assets/m4vrsstlkv6uutfw.js"/>
35-
<link rel="modulepreload" href="/assets/nscofqxc9zzmcdvh.js"/>
36-
<link rel="modulepreload" href="/assets/hunslofye2gde7y3.js"/>
37-
<link rel="modulepreload" href="/assets/fjtqvuwt5aqn5yh5.js"/>
38-
<link rel="modulepreload" href="/assets/jxguh64ess8asey2.js"/>
39-
<link rel="modulepreload" href="/assets/nath3ahjullxvkj2.js"/>
40-
<link rel="modulepreload" href="/assets/k16m2blxis1lpu5v.js"/>
41-
<link rel="modulepreload" href="/assets/gvbypchrabr3tx6x.js"/>
42-
<link rel="modulepreload" href="/assets/d1lfm62m2dkdm23l.js"/>
43-
<link rel="modulepreload" href="/assets/cof65v04mq70bnz9.js"/>
44-
<link rel="modulepreload" href="/assets/e8jzmnqtk8za3kw1.js"/>
45-
<link rel="modulepreload" href="/assets/bw3tfuc2a2wfbcma.js"/>
46-
<link rel="modulepreload" href="/assets/ccc8zc04i9b4k7n0.js"/>
21+
<link rel="modulepreload" href="/assets/manifest-7d43a138.js"/>
22+
<link rel="modulepreload" href="/assets/mxkyxjre6muko6z4.js"/>
23+
<link rel="modulepreload" href="/assets/nqo5y2f0dorhrqsr.js"/>
24+
<link rel="modulepreload" href="/assets/fpwmsu1awpj0g2ko.js"/>
25+
<link rel="modulepreload" href="/assets/dh0yl0m9q337gmci.js"/>
26+
<link rel="modulepreload" href="/assets/ihbvqeoqhbkuefft.js"/>
27+
<link rel="modulepreload" href="/assets/ty18ymk2wf2zvd35.js"/>
28+
<link rel="modulepreload" href="/assets/ktiwgucld5a8s55m.js"/>
29+
<link rel="modulepreload" href="/assets/dgcxf4c1lo6y3h3a.js"/>
30+
<link rel="modulepreload" href="/assets/nb34aa8izknzna97.js"/>
31+
<link rel="modulepreload" href="/assets/l697z2ouob9b6hw7.js"/>
32+
<link rel="modulepreload" href="/assets/odhzv2q19wc7ynyt.js"/>
33+
<link rel="modulepreload" href="/assets/k56enwh74zn4hbwt.js"/>
34+
<link rel="modulepreload" href="/assets/mfdhaorj0sghs4gl.js"/>
35+
<link rel="modulepreload" href="/assets/fy8orb1z72ox92eg.js"/>
36+
<link rel="modulepreload" href="/assets/cnv95wiq9am77uyo.js"/>
37+
<link rel="modulepreload" href="/assets/gtbc1g1q4ztw05rv.js"/>
38+
<link rel="modulepreload" href="/assets/dvl2tfqalthh42cv.js"/>
39+
<link rel="modulepreload" href="/assets/cb0x1wlgm93n2hpu.js"/>
40+
<link rel="modulepreload" href="/assets/buun9i8g5c97ea0e.js"/>
41+
<link rel="modulepreload" href="/assets/ezyyguzloavludkz.js"/>
42+
<link rel="modulepreload" href="/assets/usnn0symwgs6mmsd.js"/>
4743
<link rel="modulepreload" href="/assets/jjr9on9cxlrbskjq.js"/>
48-
<link rel="stylesheet" href="/assets/root-jhqn5s0d.css"/>
49-
<link rel="stylesheet" href="/assets/conversation-small-lkohtmkm.css"/>
44+
<link rel="stylesheet" href="/assets/root-e6p3mfos.css"/>
45+
<link rel="stylesheet" href="/assets/conversation-small-kq10986g.css"/>
5046
</head>
5147
<body class="">
5248
<script>
@@ -105,7 +101,9 @@ <h2 style="position:absolute;border:0;width:1px;height:1px;padding:0;margin:-1px
105101
</div>
106102
</div>
107103
<div class="flex-col flex-1 transition-opacity duration-500 relative -mr-2 pr-2 overflow-y-auto">
108-
<div class="flex flex-col gap-2 text-token-text-primary text-sm h-full justify-center items-center empty:hidden mt-5 pb-2"></div>
104+
<div class="group/sidebar">
105+
<div class="flex flex-col gap-2 text-token-text-primary text-sm h-full justify-center items-center empty:hidden mt-5 pb-2"></div>
106+
</div>
109107
</div>
110108
</nav>
111109
</div>
@@ -115,7 +113,7 @@ <h2 style="position:absolute;border:0;width:1px;height:1px;padding:0;margin:-1px
115113
<div class="relative flex h-full max-w-full flex-1 flex-col overflow-hidden">
116114
<main class="relative h-full w-full flex-1 overflow-auto transition-width">
117115
<div role="presentation" class="composer-parent flex h-full flex-col focus-visible:outline-0">
118-
<div class="flex-1 overflow-hidden">
116+
<div class="flex-1 overflow-hidden @container/thread">
119117
<div class="relative h-full">
120118
<div class="absolute left-0 right-0">
121119
<div class="draggable no-draggable-children sticky top-0 p-3 mb-1.5 flex items-center justify-between z-10 h-header-height font-semibold bg-token-main-surface-primary max-md:hidden">
@@ -130,22 +128,16 @@ <h2 style="position:absolute;border:0;width:1px;height:1px;padding:0;margin:-1px
130128
<div class="mx-auto flex h-full w-full flex-col text-base lg:justify-center md:max-w-3xl lg:max-w-[40rem] xl:max-w-[48rem]">
131129
<div class="mb-7 hidden text-center lg:block">
132130
<div class="relative inline-flex justify-center text-center text-2xl font-semibold leading-9">
133-
<h1>​</h1>
134-
<h1 class="result-streaming absolute left-full transition-opacity" style="opacity:1">
135-
<span></span>
136-
</h1>
131+
<h1>What can I help with?</h1>
137132
</div>
138133
</div>
139134
<div class="justify-center mt-[var(--screen-optical-compact-offset-amount)] flex h-full flex-shrink flex-col items-center overflow-hidden text-token-text-primary lg:hidden" style="opacity:0;will-change:opacity">
140135
<div class="relative inline-flex justify-center text-center text-2xl font-semibold leading-9">
141-
<h1>​</h1>
142-
<h1 class="result-streaming absolute left-full transition-opacity" style="opacity:1">
143-
<span></span>
144-
</h1>
136+
<h1>What can I help with?</h1>
145137
</div>
146138
<div class="h-[116px]" style="opacity:0;will-change:opacity"></div>
147139
</div>
148-
<div class="lg:w-full lg:absolute lg:bottom-8 lg:left-0">
140+
<div class="lg:absolute lg:bottom-8 lg:left-0 lg:w-full">
149141
<div class="mx-auto flex h-full w-full flex-col text-base lg:justify-center md:max-w-3xl lg:max-w-[40rem] xl:max-w-[48rem]">
150142
<div class="block z-20"></div>
151143
</div>
@@ -156,11 +148,11 @@ <h1 class="result-streaming absolute left-full transition-opacity" style="opacit
156148
<div class="relative flex h-full max-w-full flex-1 flex-col">
157149
<div class="group relative flex w-full items-center">
158150
<div id="composer-background" class="flex w-full cursor-text flex-col rounded-3xl px-2.5 py-1 transition-colors contain-inline-size bg-[#f4f4f4] dark:bg-token-main-surface-secondary">
159-
<div class="flex min-h-[44px] items-center px-2">
160-
<div class="max-w-full flex-1">
151+
<div class="flex min-h-[44px] items-start pl-2">
152+
<div class="min-w-0 max-w-full flex-1">
161153
<div class="_prosemirror-parent_15ceg_1 text-token-text-primary max-h-[25dvh] max-h-52 overflow-auto default-browser">
162154
<textarea class="block h-10 w-full resize-none border-0 bg-transparent px-0 py-2 text-token-text-primary placeholder:text-token-text-secondary" autofocus="" placeholder="Message ChatGPT"></textarea>
163-
<script nonce="2763a2f6-2c23-422d-9dae-db7fc5037af6">
155+
<script nonce="2c1aeec6-392b-43e2-8822-d0f90e909f00">
164156
window.__oai_logHTML ? window.__oai_logHTML() : window.__oai_SSR_HTML = window.__oai_SSR_HTML || Date.now();
165157
requestAnimationFrame((function() {
166158
window.__oai_logTTI ? window.__oai_logTTI() : window.__oai_SSR_TTI = window.__oai_SSR_TTI || Date.now()
@@ -169,6 +161,7 @@ <h1 class="result-streaming absolute left-full transition-opacity" style="opacit
169161
</script>
170162
</div>
171163
</div>
164+
<div class="w-[32px] pt-1"></div>
172165
</div>
173166
<div class="flex h-[44px] items-center justify-between">
174167
<div class="flex gap-x-1">
@@ -231,7 +224,7 @@ <h1 class="result-streaming absolute left-full transition-opacity" style="opacit
231224
<div aria-live="assertive" aria-atomic="true" class="sr-only"></div>
232225
<div aria-live="polite" aria-atomic="true" class="sr-only"></div>
233226
<audio class="fixed bottom-0 left-0 hidden h-0 w-0" autoPlay="" crossorigin="anonymous"></audio>
234-
<script nonce="2763a2f6-2c23-422d-9dae-db7fc5037af6">
227+
<script nonce="2c1aeec6-392b-43e2-8822-d0f90e909f00">
235228
window.__remixContext = {{ remix_context|tojson }};
236229
__remixContext.p = function(v, e, p, x) {
237230
if (typeof e !== 'undefined') {
@@ -286,10 +279,10 @@ <h1 class="result-streaming absolute left-full transition-opacity" style="opacit
286279
Object.assign(__remixContext.state.loaderData["routes/_conversation"], {});
287280
__remixContext.a = 1;
288281
</script>
289-
<script nonce="2763a2f6-2c23-422d-9dae-db7fc5037af6" type="module" async="">
290-
import "/assets/manifest-efc09ae7.js";
291-
import*as route0 from "/assets/d73y9qmasbzd4wm4.js";
292-
import*as route1 from "/assets/ccc8zc04i9b4k7n0.js";
282+
<script nonce="2c1aeec6-392b-43e2-8822-d0f90e909f00" type="module" async="">
283+
import "/assets/manifest-7d43a138.js";
284+
import*as route0 from "/assets/ihbvqeoqhbkuefft.js";
285+
import*as route1 from "/assets/usnn0symwgs6mmsd.js";
293286
import*as route2 from "/assets/jjr9on9cxlrbskjq.js";
294287

295288
window.__remixRouteModules = {
@@ -298,20 +291,20 @@ <h1 class="result-streaming absolute left-full transition-opacity" style="opacit
298291
"routes/_conversation._index": route2
299292
};
300293

301-
import("/assets/g52a1dqtlxhy2bf3.js");
294+
import("/assets/mxkyxjre6muko6z4.js");
302295
</script>
303296
<!--$?-->
304297
<template id="B:0"></template>
305298
<!--/$-->
306299
<div hidden id="S:0">
307-
<script nonce="2763a2f6-2c23-422d-9dae-db7fc5037af6" async="">
300+
<script nonce="2c1aeec6-392b-43e2-8822-d0f90e909f00" async="">
308301
__remixContext.r("root", "rq:[\"account-status\"]", {
309302
"__type": "AccountState",
310303
"accountItems": [{
311304
"data": {
312-
"id": "654b8c6f-f51b-4722-a04d-3c11ca9ea559",
305+
"id": "chatgpt",
313306
"residencyRegion": "no_constraint",
314-
"accountUserId": null,
307+
"accountUserId": "user-chatgpt__chatgpt",
315308
"name": null,
316309
"profilePictureId": null,
317310
"profilePictureUrl": null,
@@ -323,28 +316,33 @@ <h1 class="result-streaming absolute left-full transition-opacity" style="opacit
323316
"subscriptionStatus": {
324317
"billingPeriod": "monthly",
325318
"hasPaidSubscription": true,
326-
"subscriptionPlan": "chatgptplusplan",
327-
"planType": "plus",
328-
"subscriptionExpiresAt": 1734328921,
319+
"isActiveSubscriptionGratis": false,
320+
"subscriptionPlan": "chatgptpro",
321+
"planType": "pro",
322+
"subscriptionExpiresAt": 2524579200,
323+
"scheduledPlanChange": {
324+
"changesAt": 2524579200,
325+
"planType": "pro"
326+
},
329327
"wasPaidCustomer": true,
330328
"hasCustomerObject": true,
331329
"lastActiveSubscription": {
332-
"subscription_id": "37af77dc-ffec-4bd7-9ecf-d1d28a310038",
330+
"subscription_id": "5663ce0c-4d75-4b22-812a-52b65042c886",
333331
"purchase_origin_platform": "chatgpt_web",
334332
"will_renew": true
335333
},
336334
"isResellerHosted": false
337335
},
338-
"features": ["beta_features", "bizmo_settings", "breeze_available", "browsing_available", "canvas", "chart_serialization", "chat_preferences_available", "chatgpt_ios_attest", "chatgpt_team_plan", "code_interpreter_available", "d3_controls", "d3_editor", "d3_editor_gpts", "dalle_3", "gizmo_reviews", "gizmo_support_emails", "graphite", "invite_referral", "mfa", "model_ab_use_v2", "model_switcher", "new_plugin_oauth_endpoint", "no_auth_training_enabled_by_default", "o1_launch", "paragen_mainline_alternative", "plugins_available", "privacy_policy_nov_2023", "search_tool", "sentinel_enabled_for_subscription", "share_multimodal_links", "shareable_links", "starter_prompts", "sunshine_available", "user_settings_announcements", "voice_advanced_ga"],
336+
"features": ["beta_features", "bizmo_settings", "breeze_available", "browsing_available", "canvas", "canvas_code_execution", "canvas_opt_in", "chart_serialization", "chat_preferences_available", "chatgpt_ios_attest", "chatgpt_team_plan", "code_interpreter_available", "d3_controls", "d3_editor", "d3_editor_gpts", "dalle_3", "gizmo_canvas_toggle", "gizmo_reviews", "gizmo_support_emails", "graphite", "mfa", "model_ab_use_v2", "model_switcher", "new_plugin_oauth_endpoint", "no_auth_training_enabled_by_default", "o1_launch", "o1_pro_launch", "paragen_mainline_alternative", "plugins_available", "privacy_policy_nov_2023", "search_tool", "sentinel_enabled_for_subscription", "share_multimodal_links", "shareable_links", "starter_prompts", "sunshine_available", "user_settings_announcements", "voice_advanced_ga"],
339337
"canAccessWithCurrentSession": true,
340338
"ssoConnectionName": null
341339
}
342340
}],
343-
"currentAccountId": "654b8c6f-f51b-4722-a04d-3c11ca9ea559"
341+
"currentAccountId": "chatgpt"
344342
})
345343
</script>
346344
</div>
347-
<script nonce="2763a2f6-2c23-422d-9dae-db7fc5037af6">
345+
<script nonce="2c1aeec6-392b-43e2-8822-d0f90e909f00">
348346
$RC = function(b, c, e) {
349347
c = document.getElementById(c);
350348
c.parentNode.removeChild(c);

0 commit comments

Comments
 (0)