banlv/cozsweet-frontend-nextjs
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(private-zone): use canonical product name

Browse Source
This commit is contained in:
Codex
2026-07-23 10:53:41 +08:00
parent 4639acf232
commit 9ca56c2a04
103 changed files with 569 additions and 569 deletions
Download Patch File Download Diff File Expand all files Collapse all files
barrelsby.json
+3 -3
View File
@@ -25,9 +25,9 @@
"./src/data/schemas/payment", "./src/data/schemas/payment",
"./src/data/schemas/payment/request", "./src/data/schemas/payment/request",
"./src/data/schemas/payment/response", "./src/data/schemas/payment/response",
"./src/data/schemas/private-zoom", "./src/data/schemas/private-zone",
"./src/data/schemas/private-zoom/request", "./src/data/schemas/private-zone/request",
"./src/data/schemas/private-zoom/response", "./src/data/schemas/private-zone/response",
"./src/data/schemas/user", "./src/data/schemas/user",
"./src/data/storage/app", "./src/data/storage/app",
"./src/data/storage/auth", "./src/data/storage/auth",
docs/backend/FRONTEND_MULTI_ROLE_CHAT_API.md
+5 -5
View File
@@ -63,7 +63,7 @@ Authorization: Bearer <TOKEN>
2. `isActive=true`； 2. `isActive=true`；
3. `capabilities.chat=true`。 3. `capabilities.chat=true`。
服务端目录决定角色是否可聊天及排序；本地目录继续提供 slug、图片、文案和 Tip 能力。`privateZoom` 只有在本地能力和服务端 `privateContent` 同时开启时可用。 服务端目录决定角色是否可聊天及排序；本地目录继续提供 slug、图片、文案和 Tip 能力。`privateZone` 只有在本地能力和服务端 `privateContent` 同时开启时可用。
远端目录返回前，生产环境只使用 Elio 作为临时目录；非生产环境可使用完整本地目录。远端目录加载成功后，以合并结果为准。 远端目录返回前，生产环境只使用 Elio 作为临时目录；非生产环境可使用完整本地目录。远端目录加载成功后，以合并结果为准。
@@ -72,7 +72,7 @@ Authorization: Bearer <TOKEN>
```text ```text
/characters/{slug}/splash /characters/{slug}/splash
/characters/{slug}/chat /characters/{slug}/chat
/characters/{slug}/private-zoom /characters/{slug}/private-zone
/characters/{slug}/tip /characters/{slug}/tip
``` ```
@@ -81,11 +81,11 @@ Authorization: Bearer <TOKEN>
```text ```text
/splash -> /characters/elio/splash /splash -> /characters/elio/splash
/chat -> /characters/elio/chat /chat -> /characters/elio/chat
/private-zoom -> /characters/elio/private-zoom /private-zone -> /characters/elio/private-zone
/tip -> /characters/elio/tip /tip -> /characters/elio/tip
``` ```
Chat Provider 以 `characterId` 为边界，路由角色变化时创建新的 Actor。Private Zoom 的角色边界由 [Private Zoom 权威协议](./FRONTEND_PRIVATE_ZOOM_API.md) 定义。 Chat Provider 以 `characterId` 为边界，路由角色变化时创建新的 Actor。Private Zone 的角色边界由 [Private Zone 权威协议](./FRONTEND_PRIVATE_ZONE_API.md) 定义。
## 3. Chat HTTP 协议 ## 3. Chat HTTP 协议
@@ -308,7 +308,7 @@ conversationKey = {ownerKey}::character:{encodeURIComponent(characterId)}
## 7. 关联业务边界 ## 7. 关联业务边界
- Private Zoom 的相册、解锁、Gallery 和支付回跳由 [Private Zoom 权威协议](./FRONTEND_PRIVATE_ZOOM_API.md) 定义。 - Private Zone 的相册、解锁、Gallery 和支付回跳由 [Private Zone 权威协议](./FRONTEND_PRIVATE_ZONE_API.md) 定义。
- Tip 的角色归属、订单轮询和支付回跳由 [Payment 权威协议](./FRONTEND_PAYMENT_API.md) 定义；Chat 只保存解锁所需的原角色回跳地址。 - Tip 的角色归属、订单轮询和支付回跳由 [Payment 权威协议](./FRONTEND_PAYMENT_API.md) 定义；Chat 只保存解锁所需的原角色回跳地址。
- 登录、支付和解锁回跳保存原角色动态 URL，不能降级为通用 `/chat`。 - 登录、支付和解锁回跳保存原角色动态 URL，不能降级为通用 `/chat`。
- Analytics 可以使用 `characterId`，聊天正文不属于路由或身份协议的一部分。 - Analytics 可以使用 `characterId`，聊天正文不属于路由或身份协议的一部分。
docs/backend/FRONTEND_PAYMENT_API.md
+2 -2
View File
@@ -224,7 +224,7 @@ payChannel = ezpay
subscriptionType = vip | topup | tip subscriptionType = vip | topup | tip
giftCategory（仅 Tip，可空） giftCategory（仅 Tip，可空）
giftPlanId（仅 Tip，可空） giftPlanId（仅 Tip，可空）
returnTo = chat | private-zoom | profile（可选） returnTo = chat | private-zone | profile（可选）
characterSlug（可选） characterSlug（可选）
createdAt createdAt
``` ```
@@ -238,7 +238,7 @@ Tip -> /characters/{slug}/tip?category=...&planId=...&payChannel=ezpay&
恢复页面只接受与当前 `paymentType` 相同的待处理订单。带有 `paymentReturn=1` 时派发 `PaymentReturned` 并继续轮询；普通进入支付页时会清理同类型的旧待处理订单。订单进入 paid、failed 或 expired 后清理持久化记录。缺少 Gift 字段的旧记录由最新目录默认选择第一件商品，不再读取 `coffee_type`。 恢复页面只接受与当前 `paymentType` 相同的待处理订单。带有 `paymentReturn=1` 时派发 `PaymentReturned` 并继续轮询；普通进入支付页时会清理同类型的旧待处理订单。订单进入 paid、failed 或 expired 后清理持久化记录。缺少 Gift 字段的旧记录由最新目录默认选择第一件商品，不再读取 `coffee_type`。
无效或未知 `characterSlug` 回退到默认角色 slug。有效角色回跳必须保留原角色，不能统一返回 Elio。`returnTo=private-zoom` 的最终页面行为由 [Private Zoom 权威协议](./FRONTEND_PRIVATE_ZOOM_API.md) 定义。 无效或未知 `characterSlug` 回退到默认角色 slug。有效角色回跳必须保留原角色，不能统一返回 Elio。`returnTo=private-zone` 的最终页面行为由 [Private Zone 权威协议](./FRONTEND_PRIVATE_ZONE_API.md) 定义。
## 8. 成功后的跨域同步 ## 8. 成功后的跨域同步
docs/backend/FRONTEND_PRIVATE_ZOOM_API.md → docs/backend/FRONTEND_PRIVATE_ZONE_API.md
+26 -26
View File
@@ -1,4 +1,4 @@
# CozSweet Private Zoom 权威协议 # CozSweet Private Zone 权威协议
## 1. 状态与范围 ## 1. 状态与范围
@@ -9,11 +9,11 @@
| 边界 | 实现位置 | | 边界 | 实现位置 |
| --- | --- | | --- | --- |
| API 路径与方法 | `src/data/services/api/api_contract.json` | | API 路径与方法 | `src/data/services/api/api_contract.json` |
| 请求与响应字段 | `src/data/schemas/private-zoom` | | 请求与响应字段 | `src/data/schemas/private-zone` |
| API 与 Repository | `src/data/services/api/private_zoom_api.ts`、`src/data/repositories/private_zoom_repository.ts` | | API 与 Repository | `src/data/services/api/private_zone_api.ts`、`src/data/repositories/private_zone_repository.ts` |
| Private Zoom 状态机 | `src/stores/private-zoom` | | Private Zone 状态机 | `src/stores/private-zone` |
| 页面、Gallery 与导航 | `src/app/private-zoom` | | 页面、Gallery 与导航 | `src/app/private-zone` |
| 角色 Provider | `src/providers/private-zoom-route-provider.tsx` | | 角色 Provider | `src/providers/private-zone-route-provider.tsx` |
修改上述实现时必须在同一变更中更新本文，不能再新增按相册列表、解锁或 Gallery 拆分的并行协议。 修改上述实现时必须在同一变更中更新本文，不能再新增按相册列表、解锁或 Gallery 拆分的并行协议。
@@ -22,13 +22,13 @@
标准路由： 标准路由：
```text ```text
/characters/{characterSlug}/private-zoom /characters/{characterSlug}/private-zone
``` ```
旧地址保留为默认角色重定向，并保留查询参数： 旧地址保留为默认角色重定向，并保留查询参数：
```text ```text
/private-zoom -> /characters/elio/private-zoom /private-zone -> /characters/elio/private-zone
``` ```
URL 使用角色 `slug`，API 和 Actor 使用角色业务 `id`： URL 使用角色 `slug`，API 和 Actor 使用角色业务 `id`：
@@ -39,14 +39,14 @@ URL 使用角色 `slug`，API 和 Actor 使用角色业务 `id`：
| `maya-tan` | `maya` | | `maya-tan` | `maya` |
| `nayeli-cervantes` | `nayeli` | | `nayeli-cervantes` | `nayeli` |
角色必须同时存在于本地目录且 `capabilities.privateZoom=true`。该能力由本地配置和角色目录响应的 `privateContent` 共同决定；能力关闭或 slug 未知时路由返回 Not Found。 角色必须同时存在于本地目录且 `capabilities.privateZone=true`。该能力由本地配置和角色目录响应的 `privateContent` 共同决定；能力关闭或 slug 未知时路由返回 Not Found。
`PrivateZoomProvider` 以 `characterId` 为输入和 React key。切换角色会销毁旧 Actor 并创建空状态，不能复用上一角色的相册、余额或解锁请求。 `PrivateZoneProvider` 以 `characterId` 为输入和 React key。切换角色会销毁旧 Actor 并创建空状态，不能复用上一角色的相册、余额或解锁请求。
## 3. 相册列表 ## 3. 相册列表
```http ```http
GET <API_BASE_URL>/api/private-zoom/albums?characterId=maya-tan&limit=20 GET <API_BASE_URL>/api/private-zone/albums?characterId=maya-tan&limit=20
Authorization: Bearer <TOKEN> Authorization: Bearer <TOKEN>
``` ```
@@ -55,7 +55,7 @@ Authorization: Bearer <TOKEN>
| `characterId` | 是 | 当前角色业务 ID | | `characterId` | 是 | 当前角色业务 ID |
| `limit` | 否 | 当前固定为 20 | | `limit` | 否 | 当前固定为 20 |
前端当前只加载第一页，不实现 Private Zoom 分页，也不把相册列表写入本地缓存。初始化、手动刷新或登录身份变化时重新请求网络。 前端当前只加载第一页，不实现 Private Zone 分页，也不把相册列表写入本地缓存。初始化、手动刷新或登录身份变化时重新请求网络。
标准响应数据： 标准响应数据：
@@ -105,7 +105,7 @@ album.locked || !album.unlocked || album.lockDetail.locked
用户点击锁定相册后，前端先展示确认 Dialog。只有待确认 `albumId` 仍存在于当前 Actor 的 `items` 中，才会发起请求。 用户点击锁定相册后，前端先展示确认 Dialog。只有待确认 `albumId` 仍存在于当前 Actor 的 `items` 中，才会发起请求。
```http ```http
POST <API_BASE_URL>/api/private-zoom/albums/{albumId}/unlock POST <API_BASE_URL>/api/private-zone/albums/{albumId}/unlock
Content-Type: application/json Content-Type: application/json
Authorization: Bearer <TOKEN> Authorization: Bearer <TOKEN>
``` ```
@@ -177,25 +177,25 @@ Schema 同时允许未知字符串，未知失败原因使用通用错误文案
## 5. 身份与支付导航 ## 5. 身份与支付导航
Private Zoom 初始化会复用 Guest 登录引导。Auth 尚未初始化或正在加载时不请求列表；`notLoggedIn` 完成 Guest bootstrap 后再进入列表加载。Guest 和正式用户都可以读取后端允许的相册列表。 Private Zone 初始化会复用 Guest 登录引导。Auth 尚未初始化或正在加载时不请求列表；`notLoggedIn` 完成 Guest bootstrap 后再进入列表加载。Guest 和正式用户都可以读取后端允许的相册列表。
积分不足生成 Paywall 请求后： 积分不足生成 Paywall 请求后：
| 当前身份 | 导航 | | 当前身份 | 导航 |
| --- | --- | | --- | --- |
| Guest 或 Not Logged In | 打开 Auth，redirect 为当前角色 Private Zoom | | Guest 或 Not Logged In | 打开 Auth，redirect 为当前角色 Private Zone |
| 已认证用户 | 打开 Top-up，`returnTo=private-zoom`，保留当前角色来源 | | 已认证用户 | 打开 Top-up，`returnTo=private-zone`，保留当前角色来源 |
Paywall 导航发起后立即消费当前请求，避免 React 重渲染重复导航。支付回跳和订单恢复遵循 [Payment 权威协议](./FRONTEND_PAYMENT_API.md)。 Paywall 导航发起后立即消费当前请求，避免 React 重渲染重复导航。支付回跳和订单恢复遵循 [Payment 权威协议](./FRONTEND_PAYMENT_API.md)。
解锁成功后 `unlockSuccessNonce` 递增，页面桥接到 `UserFetch`，刷新当前积分和权益。Private Zoom 不自行修改 User Store 余额。 解锁成功后 `unlockSuccessNonce` 递增，页面桥接到 `UserFetch`，刷新当前积分和权益。Private Zone 不自行修改 User Store 余额。
## 6. Gallery URL 协议 ## 6. Gallery URL 协议
解锁相册使用查询参数打开页内 Gallery： 解锁相册使用查询参数打开页内 Gallery：
```text ```text
/characters/{slug}/private-zoom?album={albumId}&image={zeroBasedIndex} /characters/{slug}/private-zone?album={albumId}&image={zeroBasedIndex}
``` ```
解析规则： 解析规则：
@@ -208,7 +208,7 @@ Paywall 导航发起后立即消费当前请求，避免 React 重渲染重复
任一条件不满足时，页面通过 replace 删除 `album` 和 `image`，并保留其他查询参数。 任一条件不满足时，页面通过 replace 删除 `album` 和 `image`，并保留其他查询参数。
页面内点击九宫格缩略图时，Gallery 从该图片的后端数组原始索引打开。关闭操作优先使用浏览器 back；直接刷新或外部分享 Gallery URL 时，关闭操作使用 replace 返回当前角色 Private Zoom。 页面内点击九宫格缩略图时，Gallery 从该图片的后端数组原始索引打开。关闭操作优先使用浏览器 back；直接刷新或外部分享 Gallery URL 时，关闭操作使用 replace 返回当前角色 Private Zone。
Gallery 只浏览 `locked=false` 且 URL 非空的图片，但 URL 中的 `image` 仍使用原始数组索引。横向拖动时图片跟随指针，达到视口宽度 18%（最低 56px），或达到 0.45px/ms 且至少移动 24px 时切换；首尾越界拖动使用 0.28 阻尼且不循环。松手后使用 240ms 横向吸附动画，键盘方向键和左右按钮复用相同切换逻辑。Escape 关闭；`prefers-reduced-motion` 下取消吸附过渡。 Gallery 只浏览 `locked=false` 且 URL 非空的图片，但 URL 中的 `image` 仍使用原始数组索引。横向拖动时图片跟随指针，达到视口宽度 18%（最低 56px），或达到 0.45px/ms 且至少移动 24px 时切换；首尾越界拖动使用 0.28 阻尼且不循环。松手后使用 240ms 横向吸附动画，键盘方向键和左右按钮复用相同切换逻辑。Escape 关闭；`prefers-reduced-motion` 下取消吸附过渡。
@@ -222,17 +222,17 @@ Gallery 只浏览 `locked=false` 且 URL 非空的图片，但 URL 中的 `image
- 超过 9 张时卡片显示前九张，末格显示 `+N`，Gallery 仍可浏览全部有效图片； - 超过 9 张时卡片显示前九张，末格显示 `+N`，Gallery 仍可浏览全部有效图片；
- Gallery 只挂载当前图片和相邻图片，避免多图相册同时解码全部原图； - Gallery 只挂载当前图片和相邻图片，避免多图相册同时解码全部原图；
- `creditBalance` 是当前列表/解锁响应快照，不替代 User Store 权益； - `creditBalance` 是当前列表/解锁响应快照，不替代 User Store 权益；
- Private Zoom 不使用 Chat 的 `conversationKey`、消息缓存或媒体缓存； - Private Zone 不使用 Chat 的 `conversationKey`、消息缓存或媒体缓存；
- Private Zoom 不持有 Payment Actor，Top-up 通过路由级导航进入独立 Payment Provider。 - Private Zone 不持有 Payment Actor，Top-up 通过路由级导航进入独立 Payment Provider。
## 8. 变更验收 ## 8. 变更验收
Private Zoom 协议相关变更至少验证： Private Zone 协议相关变更至少验证：
1. `src/data/schemas/private-zoom/__tests__`； 1. `src/data/schemas/private-zone/__tests__`；
2. `src/data/services/api/__tests__/multi_character_api.test.ts` 中的 Private Zoom 请求； 2. `src/data/services/api/__tests__/multi_character_api.test.ts` 中的 Private Zone 请求；
3. `src/stores/private-zoom/__tests__`； 3. `src/stores/private-zone/__tests__`；
4. `src/app/private-zoom/__tests__` 与组件测试； 4. `src/app/private-zone/__tests__` 与组件测试；
5. Elio、Maya、Nayeli 列表互不串联； 5. Elio、Maya、Nayeli 列表互不串联；
6. 登录身份变化会刷新当前角色列表； 6. 登录身份变化会刷新当前角色列表；
7. 成功、余额不足、价格变化、重复解锁、退款失败和 not found 分支； 7. 成功、余额不足、价格变化、重复解锁、退款失败和 not found 分支；
docs/external-entry/README.md
+3 -3
View File
@@ -19,7 +19,7 @@ https://<APP_HOST>/external-entry?<参数>
| 参数 | 可选值或格式 | 用途 | | 参数 | 可选值或格式 | 用途 |
| --- | --- | --- | | --- | --- | --- |
| `target` | `chat`、`tip`、`private-zoom` | 指定进入的页面；不传或值无效时进入聊天页。 | | `target` | `chat`、`tip`、`private-zone` | 指定进入的页面；不传或值无效时进入聊天页。 |
| `character` | `elio`、`maya`、`nayeli` | 指定角色；不传或值无效时使用 Elio。 | | `character` | `elio`、`maya`、`nayeli` | 指定角色；不传或值无效时使用 Elio。 |
| `psid` | string | 传入 Facebook Page-scoped User ID。 | | `psid` | string | 传入 Facebook Page-scoped User ID。 |
| `mode` | `promotion` | 开启聊天促销模式。 | | `mode` | `promotion` | 开启聊天促销模式。 |
@@ -78,13 +78,13 @@ https://<APP_HOST>/external-entry?target=tip
私密空间： 私密空间：
```text ```text
https://<APP_HOST>/external-entry?target=private-zoom https://<APP_HOST>/external-entry?target=private-zone
``` ```
进入 Nayeli 私密空间： 进入 Nayeli 私密空间：
```text ```text
https://<APP_HOST>/external-entry?target=private-zoom&character=nayeli https://<APP_HOST>/external-entry?target=private-zone&character=nayeli
``` ```
`psid` 可以与任意 `target` 或聊天促销参数组合使用。参数值需要进行 URL 编码，不要在入口中传递登录 Token、Page Access Token 或 App Secret。 `psid` 可以与任意 `target` 或聊天促销参数组合使用。参数值需要进行 URL 编码，不要在入口中传递登录 Token、Page Access Token 或 App Secret。
docs/external-entry/debug-links.md
+3 -3
View File
@@ -40,8 +40,8 @@
| 角色 | 链接 | | 角色 | 链接 |
| --- | --- | | --- | --- |
| Elio | [打开 Elio 私密空间](http://localhost:3000/external-entry?target=private-zoom&character=elio) | | Elio | [打开 Elio 私密空间](http://localhost:3000/external-entry?target=private-zone&character=elio) |
| Maya | [打开 Maya 私密空间](http://localhost:3000/external-entry?target=private-zoom&character=maya) | | Maya | [打开 Maya 私密空间](http://localhost:3000/external-entry?target=private-zone&character=maya) |
| Nayeli | [打开 Nayeli 私密空间](http://localhost:3000/external-entry?target=private-zoom&character=nayeli) | | Nayeli | [打开 Nayeli 私密空间](http://localhost:3000/external-entry?target=private-zone&character=nayeli) |
如需为其他入口携带 PSID，在链接末尾追加 `&psid=27511427698460020`。对于不带查询参数的默认入口，请改为追加 `?psid=27511427698460020`。 如需为其他入口携带 PSID，在链接末尾追加 `&psid=27511427698460020`。对于不带查询参数的默认入口，请改为追加 `?psid=27511427698460020`。
docs/external-entry/links.md
+6 -6
View File
@@ -18,9 +18,9 @@
| 咖啡打赏 | [打开咖啡打赏](https://frontend-test.banlv-ai.com/external-entry?target=tip) | | 咖啡打赏 | [打开咖啡打赏](https://frontend-test.banlv-ai.com/external-entry?target=tip) |
| Maya 咖啡打赏 | [打开 Maya 咖啡打赏](https://frontend-test.banlv-ai.com/external-entry?target=tip&character=maya) | | Maya 咖啡打赏 | [打开 Maya 咖啡打赏](https://frontend-test.banlv-ai.com/external-entry?target=tip&character=maya) |
| Nayeli 咖啡打赏 | [打开 Nayeli 咖啡打赏](https://frontend-test.banlv-ai.com/external-entry?target=tip&character=nayeli) | | Nayeli 咖啡打赏 | [打开 Nayeli 咖啡打赏](https://frontend-test.banlv-ai.com/external-entry?target=tip&character=nayeli) |
| 私密空间 | [打开私密空间](https://frontend-test.banlv-ai.com/external-entry?target=private-zoom) | | 私密空间 | [打开私密空间](https://frontend-test.banlv-ai.com/external-entry?target=private-zone) |
| Maya 私密空间 | [打开 Maya 私密空间](https://frontend-test.banlv-ai.com/external-entry?target=private-zoom&character=maya) | | Maya 私密空间 | [打开 Maya 私密空间](https://frontend-test.banlv-ai.com/external-entry?target=private-zone&character=maya) |
| Nayeli 私密空间 | [打开 Nayeli 私密空间](https://frontend-test.banlv-ai.com/external-entry?target=private-zoom&character=nayeli) | | Nayeli 私密空间 | [打开 Nayeli 私密空间](https://frontend-test.banlv-ai.com/external-entry?target=private-zone&character=nayeli) |
## 正式环境 ## 正式环境
@@ -36,8 +36,8 @@
| 咖啡打赏 | [打开咖啡打赏](https://cozsweet.com/external-entry?target=tip) | | 咖啡打赏 | [打开咖啡打赏](https://cozsweet.com/external-entry?target=tip) |
| Maya 咖啡打赏 | [打开 Maya 咖啡打赏](https://cozsweet.com/external-entry?target=tip&character=maya) | | Maya 咖啡打赏 | [打开 Maya 咖啡打赏](https://cozsweet.com/external-entry?target=tip&character=maya) |
| Nayeli 咖啡打赏 | [打开 Nayeli 咖啡打赏](https://cozsweet.com/external-entry?target=tip&character=nayeli) | | Nayeli 咖啡打赏 | [打开 Nayeli 咖啡打赏](https://cozsweet.com/external-entry?target=tip&character=nayeli) |
| 私密空间 | [打开私密空间](https://cozsweet.com/external-entry?target=private-zoom) | | 私密空间 | [打开私密空间](https://cozsweet.com/external-entry?target=private-zone) |
| Maya 私密空间 | [打开 Maya 私密空间](https://cozsweet.com/external-entry?target=private-zoom&character=maya) | | Maya 私密空间 | [打开 Maya 私密空间](https://cozsweet.com/external-entry?target=private-zone&character=maya) |
| Nayeli 私密空间 | [打开 Nayeli 私密空间](https://cozsweet.com/external-entry?target=private-zoom&character=nayeli) | | Nayeli 私密空间 | [打开 Nayeli 私密空间](https://cozsweet.com/external-entry?target=private-zone&character=nayeli) |
如需在其他入口携带 PSID，在链接末尾追加 `&psid=27511427698460020`。 如需在其他入口携带 PSID，在链接末尾追加 `&psid=27511427698460020`。
docs/frontend-integration/2026-07-22-private-zoom-rename.md → docs/frontend-integration/2026-07-22-private-zone-rename.md
+45 -45
View File
@@ -1,4 +1,4 @@
# Private Zoom 全链路改名联调说明 # Private Zone 全链路改名联调说明
- 日期：2026-07-22 - 日期：2026-07-22
- 目标环境：本地、`pre`、生产 - 目标环境：本地、`pre`、生产
@@ -6,7 +6,7 @@
## 1. 目标 ## 1. 目标
原功能名称存在拼写错误。本次将前端、unified 后端、Manager、数据库、埋点和文档中的正式命名统一为 `Private Zoom`，并同步切换页面路由、API 路径和公开枚举值。 原功能名称存在拼写错误。本次将前端、unified 后端、Manager、数据库、埋点和文档中的正式命名统一为 `Private Zone`，并同步切换页面路由、API 路径和公开枚举值。
## 2. 环境地址 ## 2. 环境地址
@@ -19,12 +19,12 @@
前端已完成以下修改： 前端已完成以下修改：
- 页面路由统一为 `/private-zoom` 和 `/characters/{characterSlug}/private-zoom`。 - 页面路由统一为 `/private-zone` 和 `/characters/{characterSlug}/private-zone`。
- 外部入口参数统一为 `target=private-zoom`。 - 外部入口参数统一为 `target=private-zone`。
- 支付回跳参数统一为 `returnTo=private-zoom`。 - 支付回跳参数统一为 `returnTo=private-zone`。
- 类型、Repository、API client、XState actor、Provider 和资源目录统一使用 `privateZoom`、`PrivateZoom`、`private-zoom` 或 `private_zoom`。 - 类型、Repository、API client、XState actor、Provider 和资源目录统一使用 `privateZone`、`PrivateZone`、`private-zone` 或 `private_zone`。
- 埋点键统一为 `navigation.private_zoom`、`chat.open_private_zoom_from_avatar` 等新名称。 - 埋点键统一为 `navigation.private_zone`、`chat.open_private_zone_from_avatar` 等新名称。
- 角色能力字段统一为 `capabilities.privateZoom`。 - 角色能力字段统一为 `capabilities.privateZone`。
旧页面和旧查询参数不再作为正式入口保留。发布时必须让前后端属于同一个发布批次。 旧页面和旧查询参数不再作为正式入口保留。发布时必须让前后端属于同一个发布批次。
@@ -34,19 +34,19 @@
| 方法 | 新路径 | 用途 | | 方法 | 新路径 | 用途 |
| --- | --- | --- | | --- | --- | --- |
| `GET` | `/api/private-zoom/albums` | 查询付费图片包 | | `GET` | `/api/private-zone/albums` | 查询付费图片包 |
| `POST` | `/api/private-zoom/albums/{albumId}/unlock` | 解锁图片包 | | `POST` | `/api/private-zone/albums/{albumId}/unlock` | 解锁图片包 |
| `GET` | `/api/private-zoom/moments` | 查询朋友圈式内容 | | `GET` | `/api/private-zone/moments` | 查询朋友圈式内容 |
| `POST` | `/api/private-zoom/moments/{momentId}/unlock` | 解锁单条内容 | | `POST` | `/api/private-zone/moments/{momentId}/unlock` | 解锁单条内容 |
| `GET` | `/api/private-zoom/config` | 查询当前角色和用户解锁配置 | | `GET` | `/api/private-zone/config` | 查询当前角色和用户解锁配置 |
| `GET` | `/api/private-zoom/diaries` | 查询关系日记 | | `GET` | `/api/private-zone/diaries` | 查询关系日记 |
| `POST` | `/api/private-zoom/diaries/{diaryId}/seen` | 标记关系日记已读 | | `POST` | `/api/private-zone/diaries/{diaryId}/seen` | 标记关系日记已读 |
| `POST` | `/api/private-zoom/diaries/{diaryId}/unlock` | 解锁关系日记 | | `POST` | `/api/private-zone/diaries/{diaryId}/unlock` | 解锁关系日记 |
### 4.1 图片包列表 ### 4.1 图片包列表
```http ```http
GET /api/private-zoom/albums?characterId=elio&limit=20 GET /api/private-zone/albums?characterId=elio&limit=20
Authorization: Bearer <TOKEN> Authorization: Bearer <TOKEN>
``` ```
@@ -59,14 +59,14 @@ Authorization: Bearer <TOKEN>
调用示例： 调用示例：
```bash ```bash
curl 'https://proapi.banlv-ai.com/api/private-zoom/albums?characterId=elio&limit=20' \ curl 'https://proapi.banlv-ai.com/api/private-zone/albums?characterId=elio&limit=20' \
-H 'Authorization: Bearer <TOKEN>' -H 'Authorization: Bearer <TOKEN>'
``` ```
### 4.2 解锁图片包 ### 4.2 解锁图片包
```http ```http
POST /api/private-zoom/albums/{albumId}/unlock POST /api/private-zone/albums/{albumId}/unlock
Authorization: Bearer <TOKEN> Authorization: Bearer <TOKEN>
Content-Type: application/json Content-Type: application/json
``` ```
@@ -77,7 +77,7 @@ Content-Type: application/json
| `expectedCost` | body | integer | 否 | 是 | 前端确认价格；与后端价格不一致时拒绝解锁 | | `expectedCost` | body | integer | 否 | 是 | 前端确认价格；与后端价格不一致时拒绝解锁 |
```bash ```bash
curl -X POST 'https://proapi.banlv-ai.com/api/private-zoom/albums/<ALBUM_ID>/unlock' \ curl -X POST 'https://proapi.banlv-ai.com/api/private-zone/albums/<ALBUM_ID>/unlock' \
-H 'Authorization: Bearer <TOKEN>' \ -H 'Authorization: Bearer <TOKEN>' \
-H 'Content-Type: application/json' \ -H 'Content-Type: application/json' \
-d '{"expectedCost":320}' -d '{"expectedCost":320}'
@@ -86,8 +86,8 @@ curl -X POST 'https://proapi.banlv-ai.com/api/private-zoom/albums/<ALBUM_ID>/unl
### 4.3 Moments 内容与解锁 ### 4.3 Moments 内容与解锁
```http ```http
GET /api/private-zoom/moments?characterId=elio&limit=20 GET /api/private-zone/moments?characterId=elio&limit=20
POST /api/private-zoom/moments/{momentId}/unlock POST /api/private-zone/moments/{momentId}/unlock
``` ```
解锁请求体与图片包一致，`expectedCost` 为可选整数。响应中的正式分类值同步改为： 解锁请求体与图片包一致，`expectedCost` 为可选整数。响应中的正式分类值同步改为：
@@ -95,8 +95,8 @@ POST /api/private-zoom/moments/{momentId}/unlock
```json ```json
{ {
"lockDetail": { "lockDetail": {
"type": "private_zoom_moment", "type": "private_zone_moment",
"reason": "private_zoom_moment" "reason": "private_zone_moment"
} }
} }
``` ```
@@ -105,24 +105,24 @@ POST /api/private-zoom/moments/{momentId}/unlock
| 使用位置 | 新值 | 类型 | | 使用位置 | 新值 | 类型 |
| --- | --- | --- | | --- | --- | --- |
| `/api/chat/unlock-private` 的 `lockType` 别名 | `private_zoom` | string enum | | `/api/chat/unlock-private` 的 `lockType` 别名 | `private_zone` | string enum |
| 日程导入 `contentType` 别名 | `private_zoom` | string enum，归一化为 `paid_content` | | 日程导入 `contentType` 别名 | `private_zone` | string enum，归一化为 `paid_content` |
| 外部入口 `target` | `private-zoom` | string enum | | 外部入口 `target` | `private-zone` | string enum |
| 支付回跳 `returnTo` | `private-zoom` | string enum | | 支付回跳 `returnTo` | `private-zone` | string enum |
| 锁定详情分类 | `private_zoom_moment` | string enum | | 锁定详情分类 | `private_zone_moment` | string enum |
## 6. 数据库迁移 ## 6. 数据库迁移
因为 `pre` 与生产当前共用 `https://dbapi.banlv-ai.com`，预发部署前先执行 unified 仓库中的临时桥接脚本： 因为 `pre` 与生产当前共用 `https://dbapi.banlv-ai.com`，预发部署前先执行 unified 仓库中的临时桥接脚本：
```text ```text
database/private-zoom-bridge.sql database/private-zone-bridge.sql
``` ```
桥接脚本会创建新表并在切换窗口内保持新旧解锁写入双向同步。生产前后端全部切换完成后，再执行最终迁移： 桥接脚本会创建新表并在切换窗口内保持新旧解锁写入双向同步。生产前后端全部切换完成后，再执行最终迁移：
```text ```text
database/private-zoom-migration.sql database/private-zone-migration.sql
``` ```
迁移会在同一事务中完成： 迁移会在同一事务中完成：
@@ -130,7 +130,7 @@ database/private-zoom-migration.sql
- 将历史解锁表无损重命名；新旧表同时存在时先合并再删除旧表。 - 将历史解锁表无损重命名；新旧表同时存在时先合并再删除旧表。
- 重命名关联约束、索引、策略和触发器。 - 重命名关联约束、索引、策略和触发器。
- 合并 `users.preferences` 中历史解锁键，防止已解锁内容重新锁定。 - 合并 `users.preferences` 中历史解锁键，防止已解锁内容重新锁定。
- 把 `credit_ledger` 历史分类迁移到 `private_zoom` 和 `private_zoom_moment`。 - 把 `credit_ledger` 历史分类迁移到 `private_zone` 和 `private_zone_moment`。
- 定向迁移历史埋点键、页面 URL 和系统媒体路径，不改写用户聊天正文。 - 定向迁移历史埋点键、页面 URL 和系统媒体路径，不改写用户聊天正文。
- 删除切换窗口使用的双写触发器和函数。 - 删除切换窗口使用的双写触发器和函数。
- 支持重复执行。 - 支持重复执行。
@@ -140,13 +140,13 @@ database/private-zoom-migration.sql
这是破坏性命名修正，不保留旧 API、旧页面路由或旧公开枚举作为正式兼容层。必须按以下顺序发布： 这是破坏性命名修正，不保留旧 API、旧页面路由或旧公开枚举作为正式兼容层。必须按以下顺序发布：
1. 备份数据库并记录当前 unified、前端和 Manager 版本。 1. 备份数据库并记录当前 unified、前端和 Manager 版本。
2. 执行 `database/private-zoom-bridge.sql`，确认新旧表双向写入一致。 2. 执行 `database/private-zone-bridge.sql`，确认新旧表双向写入一致。
3. 部署 unified `pre`，验证所有 `/api/private-zoom/*` 接口。 3. 部署 unified `pre`，验证所有 `/api/private-zone/*` 接口。
4. 部署前端 `pre`，验证页面、外部入口、解锁和支付回跳。 4. 部署前端 `pre`，验证页面、外部入口、解锁和支付回跳。
5. Manager 更新后验证积分用途显示为新分类。 5. Manager 更新后验证积分用途显示为新分类。
6. `pre` 验证通过后，先启动新生产后端并临时配置旧 API 到新 API 的 Nginx 转发。 6. `pre` 验证通过后，先启动新生产后端并临时配置旧 API 到新 API 的 Nginx 转发。
7. 切换生产后端，再部署同批次生产前端；确认新前端只调用 `/api/private-zoom/*`。 7. 切换生产后端，再部署同批次生产前端；确认新前端只调用 `/api/private-zone/*`。
8. 删除临时 Nginx 转发，执行 `database/private-zoom-migration.sql` 清理旧数据库对象。 8. 删除临时 Nginx 转发，执行 `database/private-zone-migration.sql` 清理旧数据库对象。
## 8. 错误与界面状态 ## 8. 错误与界面状态
@@ -154,34 +154,34 @@ database/private-zoom-migration.sql
- `403`：游客访问仅注册用户可用的关系日记操作，展示现有注册引导。 - `403`：游客访问仅注册用户可用的关系日记操作，展示现有注册引导。
- `404`：角色、图片包、内容或日记不存在，展示现有空状态或失效提示。 - `404`：角色、图片包、内容或日记不存在，展示现有空状态或失效提示。
- `409`：`expectedCost` 与后端价格不同，刷新列表后重新确认。 - `409`：`expectedCost` 与后端价格不同，刷新列表后重新确认。
- `402` 或业务余额不足错误：进入现有充值流程，并使用 `returnTo=private-zoom` 返回原角色页面。 - `402` 或业务余额不足错误：进入现有充值流程，并使用 `returnTo=private-zone` 返回原角色页面。
- 网络失败：不修改本地解锁状态，保留重试入口。 - 网络失败：不修改本地解锁状态，保留重试入口。
## 9. 验收用例 ## 9. 验收用例
1. `/characters/elio/private-zoom`、Maya 和 Nayeli 对应页面均可打开。 1. `/characters/elio/private-zone`、Maya 和 Nayeli 对应页面均可打开。
2. `GET /api/private-zoom/albums` 返回当前角色内容，角色之间不混用。 2. `GET /api/private-zone/albums` 返回当前角色内容，角色之间不混用。
3. 已解锁历史记录在迁移后保持解锁状态，不重复扣积分。 3. 已解锁历史记录在迁移后保持解锁状态，不重复扣积分。
4. 新解锁成功后刷新页面仍为已解锁状态。 4. 新解锁成功后刷新页面仍为已解锁状态。
5. 积分不足进入充值页后，回跳到原角色 `/private-zoom` 页面。 5. 积分不足进入充值页后，回跳到原角色 `/private-zone` 页面。
6. `target=private-zoom&character=nayeli` 进入 Nayeli 对应页面。 6. `target=private-zone&character=nayeli` 进入 Nayeli 对应页面。
7. Manager 的积分用途不再出现旧分类。 7. Manager 的积分用途不再出现旧分类。
8. 三个仓库执行旧命名残留扫描，结果为 `0`。 8. 三个仓库执行旧命名残留扫描，结果为 `0`。
## 10. 当前测试证据 ## 10. 当前测试证据
- unified：`316 passed`。 - unified：`316 passed`。
- 前端：TypeScript 类型检查通过；Vitest `639 passed`；ESLint 通过；契约测试 `4 passed`；生产构建通过并生成三个角色的 `/private-zoom` 页面。 - 前端：TypeScript 类型检查通过；Vitest `639 passed`；ESLint 通过；契约测试 `4 passed`；生产构建通过并生成三个角色的 `/private-zone` 页面。
- Manager：`75 passed`。 - Manager：`75 passed`。
- PostgreSQL 16 临时库：升级、重复升级、回滚和再次升级全部通过；历史解锁、偏好键、积分账本、埋点、媒体路径和数据库对象名均通过断言，临时容器已删除。 - PostgreSQL 16 临时库：升级、重复升级、回滚和再次升级全部通过；历史解锁、偏好键、积分账本、埋点、媒体路径和数据库对象名均通过断言，临时容器已删除。
- `pre`：unified `71da49b` 和前端 `35939e7` 已验证；新 API 已注册 `8` 条 `/api/private-zoom/*` 路径，旧 API 路径数量为 `0`；新页面返回 `200`，旧页面返回 `404`。 - `pre`：unified `71da49b` 和前端 `35939e7` 已验证；新 API 已注册 `8` 条 `/api/private-zone/*` 路径，旧 API 路径数量为 `0`；新页面返回 `200`，旧页面返回 `404`。
- 生产：unified 镜像 `ai-boyfriend-unified:prod-20260722-71da49b`（镜像 ID `sha256:755ef5741856d83d7d808e7df8ee259b6fa5fb94fe333b523ee280ed1d5f674b`）和前端镜像 `prod-35939e7` 已健康运行；Manager 当前版本为 `6eea005`。 - 生产：unified 镜像 `ai-boyfriend-unified:prod-20260722-71da49b`（镜像 ID `sha256:755ef5741856d83d7d808e7df8ee259b6fa5fb94fe333b523ee280ed1d5f674b`）和前端镜像 `prod-35939e7` 已健康运行；Manager 当前版本为 `6eea005`。
- 生产接口：测试账号调用 `GET https://api.banlv-ai.com/api/private-zoom/config?characterId=elio` 返回 `200`，`success=true`；旧版 API 路径在所有公开 API 入口均返回 `404`。 - 生产接口：测试账号调用 `GET https://api.banlv-ai.com/api/private-zone/config?characterId=elio` 返回 `200`，`success=true`；旧版 API 路径在所有公开 API 入口均返回 `404`。
- 生产数据库：最终迁移已执行，旧表、桥接函数、桥接触发器、旧偏好键、旧积分分类和旧埋点值的残留数量均为 `0`。 - 生产数据库：最终迁移已执行，旧表、桥接函数、桥接触发器、旧偏好键、旧积分分类和旧埋点值的残留数量均为 `0`。
## 11. 回滚影响 ## 11. 回滚影响
最终迁移执行前可直接恢复旧应用，桥接表会保留双向一致的数据。最终迁移执行后，回滚必须同时执行 unified 仓库中的 `database/private-zoom-rollback.sql`。回滚前应停止写入，先保存切换后的新增解锁记录，再执行逆向迁移并恢复旧应用版本。不得只恢复前端或只恢复 unified。 最终迁移执行前可直接恢复旧应用，桥接表会保留双向一致的数据。最终迁移执行后，回滚必须同时执行 unified 仓库中的 `database/private-zone-rollback.sql`。回滚前应停止写入，先保存切换后的新增解锁记录，再执行逆向迁移并恢复旧应用版本。不得只恢复前端或只恢复 unified。
## 12. 待确认事项 ## 12. 待确认事项
e2e/specs/mock/chat/chat-avatar-navigation.spec.ts
+3 -3
View File
@@ -42,7 +42,7 @@ test("guest user avatar returns to Profile after sign-in", async ({
}); });
for (const character of characters) { for (const character of characters) {
test(`${character.displayName} avatar opens the matching Private Zoom`, async ({ test(`${character.displayName} avatar opens the matching Private Zone`, async ({
page, page,
}) => { }) => {
await enterCharacterChat(page, character.slug); await enterCharacterChat(page, character.slug);
@@ -50,13 +50,13 @@ for (const character of characters) {
await page await page
.getByRole("button", { .getByRole("button", {
name: `Open ${character.displayName}'s private zoom`, name: `Open ${character.displayName}'s private zone`,
}) })
.last() .last()
.click(); .click();
await expect(page).toHaveURL( await expect(page).toHaveURL(
new RegExp(`/characters/${character.slug}/private-zoom(?:\\?.*)?$`), new RegExp(`/characters/${character.slug}/private-zone(?:\\?.*)?$`),
); );
}); });
} }
e2e/specs/mock/multi-role-commercial.spec.ts
+5 -5
View File
@@ -81,18 +81,18 @@ for (const character of characters) {
} }
}); });
test(`${character.displayName} can open a character-scoped Private Zoom`, async ({ test(`${character.displayName} can open a character-scoped Private Zone`, async ({
page, page,
}) => { }) => {
const albumRequest = page.waitForRequest((request) => { const albumRequest = page.waitForRequest((request) => {
const url = new URL(request.url()); const url = new URL(request.url());
return ( return (
url.pathname === "/api/private-zoom/albums" && url.pathname === "/api/private-zone/albums" &&
url.searchParams.get("characterId") === character.id url.searchParams.get("characterId") === character.id
); );
}); });
await page.goto(`/characters/${character.slug}/private-zoom`); await page.goto(`/characters/${character.slug}/private-zone`);
await albumRequest; await albumRequest;
await expect( await expect(
@@ -134,7 +134,7 @@ for (const character of characters) {
} }
async function registerMultiRoleCommercialMocks(page: Page): Promise<void> { async function registerMultiRoleCommercialMocks(page: Page): Promise<void> {
await page.route("**/api/private-zoom/albums**", async (route) => { await page.route("**/api/private-zone/albums**", async (route) => {
const url = new URL(route.request().url()); const url = new URL(route.request().url());
const characterId = url.searchParams.get("characterId") ?? "elio"; const characterId = url.searchParams.get("characterId") ?? "elio";
const character = const character =
@@ -152,7 +152,7 @@ async function registerMultiRoleCommercialMocks(page: Page): Promise<void> {
imageCount: 8, imageCount: 8,
images: [ images: [
{ {
url: `/images/private-zoom/banner/${character.slug}.png`, url: `/images/private-zone/banner/${character.slug}.png`,
locked: true, locked: true,
index: 0, index: 0,
}, },
public/images/private-zoom/banner/elio.png → public/images/private-zone/banner/elio.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 814 KiB

After

Width:  |  Height:  |  Size: 814 KiB

public/images/private-zoom/banner/maya.png → public/images/private-zone/banner/maya.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 652 KiB

After

Width:  |  Height:  |  Size: 652 KiB

public/images/private-zoom/banner/nayeli.png → public/images/private-zone/banner/nayeli.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 907 KiB

After

Width:  |  Height:  |  Size: 907 KiB

scripts/contracts/__tests__/openapi-contract.test.mjs
+2 -2
View File
@@ -13,13 +13,13 @@ describe("OpenAPI contract comparison", () => {
chatHistory: { method: "get", path: "/api/chat/history" }, chatHistory: { method: "get", path: "/api/chat/history" },
unlockAlbum: { unlockAlbum: {
method: "post", method: "post",
path: "/api/private-zoom/albums/{albumId}/unlock", path: "/api/private-zone/albums/{albumId}/unlock",
}, },
}, },
{ {
paths: { paths: {
"/api/chat/history": { get: {} }, "/api/chat/history": { get: {} },
"/api/private-zoom/albums/{album_id}/unlock/": { post: {} }, "/api/private-zone/albums/{album_id}/unlock/": { post: {} },
}, },
}, },
); );
src/app/_components/__tests__/tailwind-components.test.tsx
+4 -4
View File
@@ -85,8 +85,8 @@ describe("shared Tailwind components", () => {
<CharacterAvatar <CharacterAvatar
src="/images/avatar/elio.png" src="/images/avatar/elio.png"
alt="Elio Silvestri" alt="Elio Silvestri"
actionLabel="Open Elio's private zoom" actionLabel="Open Elio's private zone"
analyticsKey="chat.open_private_zoom_from_avatar" analyticsKey="chat.open_private_zone_from_avatar"
onClick={() => undefined} onClick={() => undefined}
/>, />,
); );
@@ -100,10 +100,10 @@ describe("shared Tailwind components", () => {
expect(characterHtml).toContain('<button type="button"'); expect(characterHtml).toContain('<button type="button"');
expect(characterHtml).toContain( expect(characterHtml).toContain(
'aria-label="Open Elio&#x27;s private zoom"', 'aria-label="Open Elio&#x27;s private zone"',
); );
expect(characterHtml).toContain( expect(characterHtml).toContain(
'data-analytics-key="chat.open_private_zoom_from_avatar"', 'data-analytics-key="chat.open_private_zone_from_avatar"',
); );
expect(userHtml).toContain('<button type="button"'); expect(userHtml).toContain('<button type="button"');
expect(userHtml).toContain('aria-label="Open profile"'); expect(userHtml).toContain('aria-label="Open profile"');
src/app/_components/core/__tests__/tailwind-components.test.tsx
+11 -11
View File
@@ -79,18 +79,18 @@ describe("core Tailwind components", () => {
<AppBottomNav <AppBottomNav
activeItem="chat" activeItem="chat"
variant="dark" variant="dark"
privateZoomLabel="Maya Private Zoom" privateZoneLabel="Maya Private Zone"
onChatClick={() => undefined} onChatClick={() => undefined}
onPrivateZoomClick={() => undefined} onPrivateZoneClick={() => undefined}
/>, />,
); );
const privateZoomHtml = renderToStaticMarkup( const privateZoneHtml = renderToStaticMarkup(
<AppBottomNav <AppBottomNav
activeItem="privateZoom" activeItem="privateZone"
variant="warm" variant="warm"
privateZoomLabel="Maya Private Zoom" privateZoneLabel="Maya Private Zone"
onChatClick={() => undefined} onChatClick={() => undefined}
onPrivateZoomClick={() => undefined} onPrivateZoneClick={() => undefined}
/>, />,
); );
@@ -99,13 +99,13 @@ describe("core Tailwind components", () => {
expect(chatHtml).toMatch( expect(chatHtml).toMatch(
/<button[^>]*aria-current="page"[^>]*>.*?<span>Chat<\/span>/, /<button[^>]*aria-current="page"[^>]*>.*?<span>Chat<\/span>/,
); );
expect(privateZoomHtml).toMatch(/class="[^"]*warm[^"]*"/); expect(privateZoneHtml).toMatch(/class="[^"]*warm[^"]*"/);
expect(privateZoomHtml).toMatch( expect(privateZoneHtml).toMatch(
/<button[^>]*aria-current="page"[^>]*>.*?<span>Maya Private Zoom<\/span>/, /<button[^>]*aria-current="page"[^>]*>.*?<span>Maya Private Zone<\/span>/,
); );
expect(chatHtml).toContain('data-analytics-key="navigation.chat"'); expect(chatHtml).toContain('data-analytics-key="navigation.chat"');
expect(privateZoomHtml).toContain( expect(privateZoneHtml).toContain(
'data-analytics-key="navigation.private_zoom"', 'data-analytics-key="navigation.private_zone"',
); );
}); });
}); });
src/app/_components/core/app-bottom-nav.tsx
+11 -11
View File
@@ -4,23 +4,23 @@ import { Camera, MessageCircle } from "lucide-react";
import styles from "./app-bottom-nav.module.css"; import styles from "./app-bottom-nav.module.css";
export type AppBottomNavItem = "chat" | "privateZoom"; export type AppBottomNavItem = "chat" | "privateZone";
export type AppBottomNavVariant = "warm" | "dark"; export type AppBottomNavVariant = "warm" | "dark";
export interface AppBottomNavProps { export interface AppBottomNavProps {
activeItem?: AppBottomNavItem | null; activeItem?: AppBottomNavItem | null;
variant?: AppBottomNavVariant; variant?: AppBottomNavVariant;
privateZoomLabel: string; privateZoneLabel: string;
onChatClick: () => void; onChatClick: () => void;
onPrivateZoomClick: () => void; onPrivateZoneClick: () => void;
} }
export function AppBottomNav({ export function AppBottomNav({
activeItem = null, activeItem = null,
variant = "warm", variant = "warm",
privateZoomLabel, privateZoneLabel,
onChatClick, onChatClick,
onPrivateZoomClick, onPrivateZoneClick,
}: AppBottomNavProps) { }: AppBottomNavProps) {
return ( return (
<nav className={getRootClass(variant)} aria-label="Primary navigation"> <nav className={getRootClass(variant)} aria-label="Primary navigation">
@@ -37,14 +37,14 @@ export function AppBottomNav({
</button> </button>
<button <button
type="button" type="button"
data-analytics-key="navigation.private_zoom" data-analytics-key="navigation.private_zone"
data-analytics-label="Private Zoom navigation" data-analytics-label="Private Zone navigation"
className={getButtonClass(activeItem === "privateZoom")} className={getButtonClass(activeItem === "privateZone")}
aria-current={activeItem === "privateZoom" ? "page" : undefined} aria-current={activeItem === "privateZone" ? "page" : undefined}
onClick={onPrivateZoomClick} onClick={onPrivateZoneClick}
> >
<Camera size={20} aria-hidden="true" /> <Camera size={20} aria-hidden="true" />
<span>{privateZoomLabel}</span> <span>{privateZoneLabel}</span>
</button> </button>
</nav> </nav>
); );
src/app/characters/[characterSlug]/private-zoom/layout.tsx → src/app/characters/[characterSlug]/private-zone/layout.tsx
+5 -5
View File
@@ -2,9 +2,9 @@ import type { ReactNode } from "react";
import { notFound } from "next/navigation"; import { notFound } from "next/navigation";
import { getCharacterBySlug } from "@/data/constants/character"; import { getCharacterBySlug } from "@/data/constants/character";
import { PrivateZoomRouteProvider } from "@/providers/private-zoom-route-provider"; import { PrivateZoneRouteProvider } from "@/providers/private-zone-route-provider";
export default async function CharacterPrivateZoomLayout({ export default async function CharacterPrivateZoneLayout({
children, children,
params, params,
}: { }: {
@@ -13,11 +13,11 @@ export default async function CharacterPrivateZoomLayout({
}) { }) {
const { characterSlug } = await params; const { characterSlug } = await params;
const character = getCharacterBySlug(characterSlug); const character = getCharacterBySlug(characterSlug);
if (!character?.capabilities.privateZoom) notFound(); if (!character?.capabilities.privateZone) notFound();
return ( return (
<PrivateZoomRouteProvider characterId={character.id}> <PrivateZoneRouteProvider characterId={character.id}>
{children} {children}
</PrivateZoomRouteProvider> </PrivateZoneRouteProvider>
); );
} }
src/app/characters/[characterSlug]/private-zone/page.tsx
+5
View File
@@ -0,0 +1,5 @@
import { PrivateZoneScreen } from "@/app/private-zone/private-zone-screen";
export default function CharacterPrivateZonePage() {
return <PrivateZoneScreen />;
}
src/app/characters/[characterSlug]/private-zoom/page.tsx
-5
View File
@@ -1,5 +0,0 @@
import { PrivateZoomScreen } from "@/app/private-zoom/private-zoom-screen";
export default function CharacterPrivateZoomPage() {
return <PrivateZoomScreen />;
}
src/app/chat/chat-screen.tsx
+3 -3
View File
@@ -253,8 +253,8 @@ export function ChatScreen() {
); );
} }
function handleOpenCharacterPrivateZoom(): void { function handleOpenCharacterPrivateZone(): void {
router.push(characterRoutes.privateZoom); router.push(characterRoutes.privateZone);
} }
return ( return (
@@ -304,7 +304,7 @@ export function ChatScreen() {
onUnlockImageMessage={handleUnlockImageMessage} onUnlockImageMessage={handleUnlockImageMessage}
onOpenImage={handleOpenImage} onOpenImage={handleOpenImage}
onUserAvatarClick={handleOpenUserProfile} onUserAvatarClick={handleOpenUserProfile}
onCharacterAvatarClick={handleOpenCharacterPrivateZoom} onCharacterAvatarClick={handleOpenCharacterPrivateZone}
onLoadMoreHistory={() => { onLoadMoreHistory={() => {
chatDispatch({ type: "ChatLoadMoreHistoryRequested" }); chatDispatch({ type: "ChatLoadMoreHistoryRequested" });
}} }}
src/app/chat/components/__tests__/tailwind-components.test.tsx
+2 -2
View File
@@ -62,10 +62,10 @@ describe("chat Tailwind components", () => {
expect(aiHtml).toContain('<button type="button"'); expect(aiHtml).toContain('<button type="button"');
expect(aiHtml).toContain( expect(aiHtml).toContain(
'data-analytics-key="chat.open_private_zoom_from_avatar"', 'data-analytics-key="chat.open_private_zone_from_avatar"',
); );
expect(aiHtml).toContain( expect(aiHtml).toContain(
'aria-label="Open Elio Silvestri&#x27;s private zoom"', 'aria-label="Open Elio Silvestri&#x27;s private zone"',
); );
expect(userHtml).toContain('<button type="button"'); expect(userHtml).toContain('<button type="button"');
expect(userHtml).toContain( expect(userHtml).toContain(
src/app/chat/components/message-avatar.tsx
+2 -2
View File
@@ -29,8 +29,8 @@ export function MessageAvatar({
imageSize={43} imageSize={43}
priority priority
className={AVATAR_CLASS_NAME} className={AVATAR_CLASS_NAME}
actionLabel={`Open ${character.displayName}'s private zoom`} actionLabel={`Open ${character.displayName}'s private zone`}
analyticsKey="chat.open_private_zoom_from_avatar" analyticsKey="chat.open_private_zone_from_avatar"
onClick={onClick} onClick={onClick}
/> />
); );
src/app/private-zoom/__tests__/private-album-gallery-motion.test.ts → src/app/private-zone/__tests__/private-album-gallery-motion.test.ts
View File
src/app/private-zoom/__tests__/private-album-gallery-url.test.ts → src/app/private-zone/__tests__/private-album-gallery-url.test.ts
+4 -4
View File
@@ -2,7 +2,7 @@ import { describe, expect, it } from "vitest";
import { import {
buildPrivateAlbumGalleryUrl, buildPrivateAlbumGalleryUrl,
buildPrivateZoomWithoutGalleryUrl, buildPrivateZoneWithoutGalleryUrl,
getPrivateAlbumGalleryState, getPrivateAlbumGalleryState,
} from "../private-album-gallery-url"; } from "../private-album-gallery-url";
@@ -11,7 +11,7 @@ describe("private album gallery URL", () => {
const url = buildPrivateAlbumGalleryUrl("album:91", 3); const url = buildPrivateAlbumGalleryUrl("album:91", 3);
const params = new URL(url, "https://cozsweet.test").searchParams; const params = new URL(url, "https://cozsweet.test").searchParams;
expect(url).toBe("/private-zoom?album=album%3A91&image=3"); expect(url).toBe("/private-zone?album=album%3A91&image=3");
expect(getPrivateAlbumGalleryState(params)).toEqual({ expect(getPrivateAlbumGalleryState(params)).toEqual({
albumId: "album:91", albumId: "album:91",
imageIndex: 3, imageIndex: 3,
@@ -29,9 +29,9 @@ describe("private album gallery URL", () => {
it("removes gallery params without dropping other query values", () => { it("removes gallery params without dropping other query values", () => {
expect( expect(
buildPrivateZoomWithoutGalleryUrl( buildPrivateZoneWithoutGalleryUrl(
new URLSearchParams("album=album-1&image=2&source=external"), new URLSearchParams("album=album-1&image=2&source=external"),
), ),
).toBe("/private-zoom?source=external"); ).toBe("/private-zone?source=external");
}); });
}); });
src/app/private-zoom/__tests__/private-album-images.test.ts → src/app/private-zone/__tests__/private-album-images.test.ts
+1 -1
View File
@@ -1,6 +1,6 @@
import { describe, expect, it } from "vitest"; import { describe, expect, it } from "vitest";
import { PrivateAlbumSchema } from "@/data/schemas/private-zoom"; import { PrivateAlbumSchema } from "@/data/schemas/private-zone";
import { import {
findPrivateAlbumDisplayImage, findPrivateAlbumDisplayImage,
src/app/private-zoom/__tests__/use-private-zoom-flow-navigation.test.tsx → src/app/private-zone/__tests__/use-private-zone-flow-navigation.test.tsx
+15 -15
View File
@@ -6,10 +6,10 @@ import { getCharacterBySlug } from "@/data/constants/character";
import type { LoginStatus } from "@/data/schemas/auth"; import type { LoginStatus } from "@/data/schemas/auth";
import { CharacterProvider } from "@/providers/character-provider"; import { CharacterProvider } from "@/providers/character-provider";
import { getCharacterRoutes } from "@/router/routes"; import { getCharacterRoutes } from "@/router/routes";
import type { PrivateZoomEvent } from "@/stores/private-zoom"; import type { PrivateZoneEvent } from "@/stores/private-zone";
import type { PrivateZoomUnlockPaywallRequest } from "@/stores/private-zoom/private-zoom-state"; import type { PrivateZoneUnlockPaywallRequest } from "@/stores/private-zone/private-zone-state";
import { usePrivateZoomUnlockPaywallNavigation } from "../use-private-zoom-flow"; import { usePrivateZoneUnlockPaywallNavigation } from "../use-private-zone-flow";
const mocks = vi.hoisted(() => ({ const mocks = vi.hoisted(() => ({
openAuth: vi.fn(), openAuth: vi.fn(),
@@ -30,7 +30,7 @@ vi.mock("@/lib/analytics", () => ({
}, },
})); }));
const unlockPaywallRequest: PrivateZoomUnlockPaywallRequest = { const unlockPaywallRequest: PrivateZoneUnlockPaywallRequest = {
albumId: "album-1", albumId: "album-1",
reason: "insufficient_credits", reason: "insufficient_credits",
requiredCredits: 10, requiredCredits: 10,
@@ -38,7 +38,7 @@ const unlockPaywallRequest: PrivateZoomUnlockPaywallRequest = {
shortfallCredits: 7, shortfallCredits: 7,
}; };
describe("Private Zoom paywall navigation", () => { describe("Private Zone paywall navigation", () => {
let container: HTMLDivElement; let container: HTMLDivElement;
let root: Root; let root: Root;
@@ -58,31 +58,31 @@ describe("Private Zoom paywall navigation", () => {
container.remove(); container.remove();
}); });
it("opens top up with a private zoom return target", () => { it("opens top up with a private zone return target", () => {
const roomDispatch = vi.fn<Dispatch<PrivateZoomEvent>>(); const roomDispatch = vi.fn<Dispatch<PrivateZoneEvent>>();
renderHarness(root, "email", roomDispatch); renderHarness(root, "email", roomDispatch);
expect(mocks.openSubscription).toHaveBeenCalledWith({ expect(mocks.openSubscription).toHaveBeenCalledWith({
type: "topup", type: "topup",
returnTo: "private-zoom", returnTo: "private-zone",
analytics: { analytics: {
entryPoint: "private_album_unlock", entryPoint: "private_album_unlock",
triggerReason: "insufficient_credits", triggerReason: "insufficient_credits",
}, },
}); });
expect(roomDispatch).toHaveBeenCalledWith({ expect(roomDispatch).toHaveBeenCalledWith({
type: "PrivateZoomUnlockPaywallConsumed", type: "PrivateZoneUnlockPaywallConsumed",
}); });
}); });
it("keeps guest users on the private zoom auth return path", () => { it("keeps guest users on the private zone auth return path", () => {
const roomDispatch = vi.fn<Dispatch<PrivateZoomEvent>>(); const roomDispatch = vi.fn<Dispatch<PrivateZoneEvent>>();
renderHarness(root, "guest", roomDispatch); renderHarness(root, "guest", roomDispatch);
expect(mocks.openAuth).toHaveBeenCalledWith( expect(mocks.openAuth).toHaveBeenCalledWith(
getCharacterRoutes("maya").privateZoom, getCharacterRoutes("maya").privateZone,
); );
expect(mocks.openSubscription).not.toHaveBeenCalled(); expect(mocks.openSubscription).not.toHaveBeenCalled();
}); });
@@ -91,7 +91,7 @@ describe("Private Zoom paywall navigation", () => {
function renderHarness( function renderHarness(
root: Root, root: Root,
loginStatus: LoginStatus, loginStatus: LoginStatus,
roomDispatch: Dispatch<PrivateZoomEvent>, roomDispatch: Dispatch<PrivateZoneEvent>,
): void { ): void {
const character = getCharacterBySlug("maya"); const character = getCharacterBySlug("maya");
if (!character) throw new Error("Missing Maya character fixture"); if (!character) throw new Error("Missing Maya character fixture");
@@ -109,9 +109,9 @@ function Harness({
roomDispatch, roomDispatch,
}: { }: {
loginStatus: LoginStatus; loginStatus: LoginStatus;
roomDispatch: Dispatch<PrivateZoomEvent>; roomDispatch: Dispatch<PrivateZoneEvent>;
}) { }) {
usePrivateZoomUnlockPaywallNavigation({ usePrivateZoneUnlockPaywallNavigation({
loginStatus, loginStatus,
roomDispatch, roomDispatch,
unlockPaywallRequest, unlockPaywallRequest,
src/app/private-zoom/__tests__/use-private-zoom-flow.test.ts → src/app/private-zone/__tests__/use-private-zone-flow.test.ts
+4 -4
View File
@@ -1,19 +1,19 @@
import { describe, expect, it } from "vitest"; import { describe, expect, it } from "vitest";
import { isPrivateZoomAuthRequired } from "../use-private-zoom-flow"; import { isPrivateZoneAuthRequired } from "../use-private-zone-flow";
describe("isPrivateZoomAuthRequired", () => { describe("isPrivateZoneAuthRequired", () => {
it.each(["guest", "notLoggedIn"] as const)( it.each(["guest", "notLoggedIn"] as const)(
"requires auth for %s users", "requires auth for %s users",
(loginStatus) => { (loginStatus) => {
expect(isPrivateZoomAuthRequired(loginStatus)).toBe(true); expect(isPrivateZoneAuthRequired(loginStatus)).toBe(true);
}, },
); );
it.each(["email", "facebook", "google"] as const)( it.each(["email", "facebook", "google"] as const)(
"allows %s users to top up directly", "allows %s users to top up directly",
(loginStatus) => { (loginStatus) => {
expect(isPrivateZoomAuthRequired(loginStatus)).toBe(false); expect(isPrivateZoneAuthRequired(loginStatus)).toBe(false);
}, },
); );
}); });
src/app/private-zoom/components/__tests__/private-album-card.interaction.test.tsx → src/app/private-zone/components/__tests__/private-album-card.interaction.test.tsx
+5 -5
View File
@@ -4,7 +4,7 @@ import { act } from "react";
import { createRoot, type Root } from "react-dom/client"; import { createRoot, type Root } from "react-dom/client";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import { PrivateAlbumSchema } from "@/data/schemas/private-zoom"; import { PrivateAlbumSchema } from "@/data/schemas/private-zone";
import { PrivateAlbumCard } from "../private-album-card"; import { PrivateAlbumCard } from "../private-album-card";
@@ -33,9 +33,9 @@ describe("PrivateAlbumCard interactions", () => {
imageCount: 4, imageCount: 4,
images: [ images: [
{ url: "", locked: false, index: 0 }, { url: "", locked: false, index: 0 },
{ url: "/images/private-zoom/locked.png", locked: true, index: 1 }, { url: "/images/private-zone/locked.png", locked: true, index: 1 },
{ url: "/images/private-zoom/photo-2.png", locked: false, index: 2 }, { url: "/images/private-zone/photo-2.png", locked: false, index: 2 },
{ url: "/images/private-zoom/photo-3.png", locked: false, index: 3 }, { url: "/images/private-zone/photo-3.png", locked: false, index: 3 },
], ],
locked: false, locked: false,
unlocked: true, unlocked: true,
@@ -72,7 +72,7 @@ describe("PrivateAlbumCard interactions", () => {
title: "Locked afternoon", title: "Locked afternoon",
imageCount: 3, imageCount: 3,
images: [ images: [
{ url: "/images/private-zoom/locked.png", locked: true, index: 0 }, { url: "/images/private-zone/locked.png", locked: true, index: 0 },
], ],
locked: true, locked: true,
unlocked: false, unlocked: false,
src/app/private-zoom/components/__tests__/private-album-card.test.tsx → src/app/private-zone/components/__tests__/private-album-card.test.tsx
+3 -3
View File
@@ -5,11 +5,11 @@ import {
PrivateAlbumSchema, PrivateAlbumSchema,
type PrivateAlbum, type PrivateAlbum,
type PrivateAlbumInput, type PrivateAlbumInput,
} from "@/data/schemas/private-zoom"; } from "@/data/schemas/private-zone";
import { PrivateAlbumCard } from "../private-album-card"; import { PrivateAlbumCard } from "../private-album-card";
const COVER_URL = "/images/private-zoom/banner/elio.png"; const COVER_URL = "/images/private-zone/banner/elio.png";
function makeAlbum(overrides: Partial<PrivateAlbumInput> = {}): PrivateAlbum { function makeAlbum(overrides: Partial<PrivateAlbumInput> = {}): PrivateAlbum {
return PrivateAlbumSchema.parse({ return PrivateAlbumSchema.parse({
@@ -157,7 +157,7 @@ describe("PrivateAlbumCard", () => {
function makeImages(count: number) { function makeImages(count: number) {
return Array.from({ length: count }, (_, index) => ({ return Array.from({ length: count }, (_, index) => ({
url: `/images/private-zoom/photo-${index}.png`, url: `/images/private-zone/photo-${index}.png`,
locked: false, locked: false,
index, index,
})); }));
src/app/private-zoom/components/__tests__/private-album-gallery.test.tsx → src/app/private-zone/components/__tests__/private-album-gallery.test.tsx
+5 -5
View File
@@ -4,7 +4,7 @@ import { act } from "react";
import { createRoot, type Root } from "react-dom/client"; import { createRoot, type Root } from "react-dom/client";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import { PrivateAlbumSchema } from "@/data/schemas/private-zoom"; import { PrivateAlbumSchema } from "@/data/schemas/private-zone";
import { PrivateAlbumGallery } from "../private-album-gallery"; import { PrivateAlbumGallery } from "../private-album-gallery";
@@ -13,11 +13,11 @@ const album = PrivateAlbumSchema.parse({
title: "Private afternoon", title: "Private afternoon",
imageCount: 5, imageCount: 5,
images: [ images: [
{ url: "/images/private-zoom/photo-0.png", locked: false, index: 0 }, { url: "/images/private-zone/photo-0.png", locked: false, index: 0 },
{ url: "", locked: false, index: 1 }, { url: "", locked: false, index: 1 },
{ url: "/images/private-zoom/locked.png", locked: true, index: 2 }, { url: "/images/private-zone/locked.png", locked: true, index: 2 },
{ url: "/images/private-zoom/photo-3.png", locked: false, index: 3 }, { url: "/images/private-zone/photo-3.png", locked: false, index: 3 },
{ url: "/images/private-zoom/photo-4.png", locked: false, index: 4 }, { url: "/images/private-zone/photo-4.png", locked: false, index: 4 },
], ],
locked: false, locked: false,
unlocked: true, unlocked: true,
src/app/private-zoom/components/index.ts → src/app/private-zone/components/index.ts
View File
src/app/private-zoom/components/private-album-card.tsx → src/app/private-zone/components/private-album-card.tsx
+3 -3
View File
@@ -3,8 +3,8 @@ import Image from "next/image";
import { Copy, ImageIcon, LockKeyhole } from "lucide-react"; import { Copy, ImageIcon, LockKeyhole } from "lucide-react";
import { CharacterAvatar } from "@/app/_components"; import { CharacterAvatar } from "@/app/_components";
import type { PrivateAlbum } from "@/data/schemas/private-zoom"; import type { PrivateAlbum } from "@/data/schemas/private-zone";
import { isPrivateAlbumLocked } from "@/lib/private-zoom/private_album"; import { isPrivateAlbumLocked } from "@/lib/private-zone/private_album";
import { import {
getPrivateAlbumDisplayImages, getPrivateAlbumDisplayImages,
@@ -12,7 +12,7 @@ import {
PRIVATE_ALBUM_GRID_LIMIT, PRIVATE_ALBUM_GRID_LIMIT,
} from "../private-album-images"; } from "../private-album-images";
import styles from "../private-zoom-screen.module.css"; import styles from "../private-zone-screen.module.css";
export interface PrivateAlbumCardProps { export interface PrivateAlbumCardProps {
album: PrivateAlbum; album: PrivateAlbum;
src/app/private-zoom/components/private-album-gallery.tsx → src/app/private-zone/components/private-album-gallery.tsx
+2 -2
View File
@@ -11,14 +11,14 @@ import {
import Image from "next/image"; import Image from "next/image";
import { ChevronLeft, ChevronRight, X } from "lucide-react"; import { ChevronLeft, ChevronRight, X } from "lucide-react";
import type { PrivateAlbum } from "@/data/schemas/private-zoom"; import type { PrivateAlbum } from "@/data/schemas/private-zone";
import { import {
getResistedGalleryDragDistance, getResistedGalleryDragDistance,
resolveGallerySwipeDirection, resolveGallerySwipeDirection,
} from "../private-album-gallery-motion"; } from "../private-album-gallery-motion";
import { getPrivateAlbumDisplayImages } from "../private-album-images"; import { getPrivateAlbumDisplayImages } from "../private-album-images";
import styles from "../private-zoom-screen.module.css"; import styles from "../private-zone-screen.module.css";
export interface PrivateAlbumGalleryProps { export interface PrivateAlbumGalleryProps {
album: PrivateAlbum; album: PrivateAlbum;
src/app/private-zoom/components/status-card.tsx → src/app/private-zone/components/status-card.tsx
+1 -1
View File
@@ -1,4 +1,4 @@
import styles from "../private-zoom-screen.module.css"; import styles from "../private-zone-screen.module.css";
export interface StatusCardProps { export interface StatusCardProps {
message: string; message: string;
src/app/private-zoom/components/unlock-confirm-dialog.tsx → src/app/private-zone/components/unlock-confirm-dialog.tsx
+2 -2
View File
@@ -1,6 +1,6 @@
import type { PrivateAlbum } from "@/data/schemas/private-zoom"; import type { PrivateAlbum } from "@/data/schemas/private-zone";
import styles from "../private-zoom-screen.module.css"; import styles from "../private-zone-screen.module.css";
export interface UnlockConfirmDialogProps { export interface UnlockConfirmDialogProps {
album: PrivateAlbum; album: PrivateAlbum;
src/app/private-zoom/page.tsx → src/app/private-zone/page.tsx
+2 -2
View File
@@ -7,14 +7,14 @@ import {
type RouteSearchParams, type RouteSearchParams,
} from "@/router/routes"; } from "@/router/routes";
export default async function PrivateZoomPage({ export default async function PrivateZonePage({
searchParams, searchParams,
}: { }: {
searchParams: Promise<RouteSearchParams>; searchParams: Promise<RouteSearchParams>;
}) { }) {
redirect( redirect(
appendRouteSearchParams( appendRouteSearchParams(
getCharacterRoutes(DEFAULT_CHARACTER_SLUG).privateZoom, getCharacterRoutes(DEFAULT_CHARACTER_SLUG).privateZone,
await searchParams, await searchParams,
), ),
); );
src/app/private-zoom/private-album-gallery-motion.ts → src/app/private-zone/private-album-gallery-motion.ts
View File
src/app/private-zoom/private-album-gallery-url.ts → src/app/private-zone/private-album-gallery-url.ts
+3 -3
View File
@@ -15,7 +15,7 @@ export function getPrivateAlbumGalleryState(input: {
export function buildPrivateAlbumGalleryUrl( export function buildPrivateAlbumGalleryUrl(
albumId: string, albumId: string,
imageIndex: number, imageIndex: number,
basePath: string = ROUTES.privateZoom, basePath: string = ROUTES.privateZone,
): string { ): string {
const params = new URLSearchParams({ const params = new URLSearchParams({
[PRIVATE_ALBUM_QUERY_PARAM]: albumId, [PRIVATE_ALBUM_QUERY_PARAM]: albumId,
@@ -24,9 +24,9 @@ export function buildPrivateAlbumGalleryUrl(
return `${basePath}?${params.toString()}`; return `${basePath}?${params.toString()}`;
} }
export function buildPrivateZoomWithoutGalleryUrl( export function buildPrivateZoneWithoutGalleryUrl(
input: { toString: () => string }, input: { toString: () => string },
basePath: string = ROUTES.privateZoom, basePath: string = ROUTES.privateZone,
): string { ): string {
const params = new URLSearchParams(input.toString()); const params = new URLSearchParams(input.toString());
params.delete(PRIVATE_ALBUM_QUERY_PARAM); params.delete(PRIVATE_ALBUM_QUERY_PARAM);
src/app/private-zoom/private-album-images.ts → src/app/private-zone/private-album-images.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import type { PrivateAlbum } from "@/data/schemas/private-zoom"; import type { PrivateAlbum } from "@/data/schemas/private-zone";
export const PRIVATE_ALBUM_GRID_LIMIT = 9; export const PRIVATE_ALBUM_GRID_LIMIT = 9;
src/app/private-zoom/private-zoom-screen.module.css → src/app/private-zone/private-zone-screen.module.css
View File
src/app/private-zoom/private-zoom-screen.tsx → src/app/private-zone/private-zone-screen.tsx
+41 -41
View File
@@ -11,12 +11,12 @@ import {
useActiveCharacter, useActiveCharacter,
useActiveCharacterRoutes, useActiveCharacterRoutes,
} from "@/providers/character-provider"; } from "@/providers/character-provider";
import { isPrivateAlbumLocked } from "@/lib/private-zoom/private_album"; import { isPrivateAlbumLocked } from "@/lib/private-zone/private_album";
import { useAuthDispatch, useAuthState } from "@/stores/auth/auth-context"; import { useAuthDispatch, useAuthState } from "@/stores/auth/auth-context";
import { import {
usePrivateZoomDispatch, usePrivateZoneDispatch,
usePrivateZoomState, usePrivateZoneState,
} from "@/stores/private-zoom"; } from "@/stores/private-zone";
import { import {
PrivateAlbumCard, PrivateAlbumCard,
@@ -24,21 +24,21 @@ import {
StatusCard, StatusCard,
UnlockConfirmDialog, UnlockConfirmDialog,
} from "./components"; } from "./components";
import styles from "./private-zoom-screen.module.css"; import styles from "./private-zone-screen.module.css";
import { import {
isPrivateZoomAuthRequired, isPrivateZoneAuthRequired,
usePrivateZoomBootstrapFlow, usePrivateZoneBootstrapFlow,
usePrivateZoomUnlockPaywallNavigation, usePrivateZoneUnlockPaywallNavigation,
usePrivateZoomUnlockSuccessRefresh, usePrivateZoneUnlockSuccessRefresh,
} from "./use-private-zoom-flow"; } from "./use-private-zone-flow";
import { import {
buildPrivateAlbumGalleryUrl, buildPrivateAlbumGalleryUrl,
buildPrivateZoomWithoutGalleryUrl, buildPrivateZoneWithoutGalleryUrl,
getPrivateAlbumGalleryState, getPrivateAlbumGalleryState,
} from "./private-album-gallery-url"; } from "./private-album-gallery-url";
import { findPrivateAlbumDisplayImage } from "./private-album-images"; import { findPrivateAlbumDisplayImage } from "./private-album-images";
export function PrivateZoomScreen() { export function PrivateZoneScreen() {
const router = useRouter(); const router = useRouter();
const searchParams = useSearchParams(); const searchParams = useSearchParams();
const navigator = useAppNavigator(); const navigator = useAppNavigator();
@@ -46,15 +46,15 @@ export function PrivateZoomScreen() {
const characterRoutes = useActiveCharacterRoutes(); const characterRoutes = useActiveCharacterRoutes();
const authState = useAuthState(); const authState = useAuthState();
const authDispatch = useAuthDispatch(); const authDispatch = useAuthDispatch();
const state = usePrivateZoomState(); const state = usePrivateZoneState();
const dispatch = usePrivateZoomDispatch(); const dispatch = usePrivateZoneDispatch();
const openedGalleryInPageRef = useRef(false); const openedGalleryInPageRef = useRef(false);
const galleryState = useMemo( const galleryState = useMemo(
() => getPrivateAlbumGalleryState(searchParams), () => getPrivateAlbumGalleryState(searchParams),
[searchParams], [searchParams],
); );
usePrivateZoomBootstrapFlow({ usePrivateZoneBootstrapFlow({
authDispatch, authDispatch,
hasInitialized: authState.hasInitialized, hasInitialized: authState.hasInitialized,
isAuthLoading: authState.isLoading, isAuthLoading: authState.isLoading,
@@ -62,17 +62,17 @@ export function PrivateZoomScreen() {
roomDispatch: dispatch, roomDispatch: dispatch,
roomStatus: state.status, roomStatus: state.status,
}); });
usePrivateZoomUnlockPaywallNavigation({ usePrivateZoneUnlockPaywallNavigation({
loginStatus: authState.loginStatus, loginStatus: authState.loginStatus,
roomDispatch: dispatch, roomDispatch: dispatch,
unlockPaywallRequest: state.unlockPaywallRequest, unlockPaywallRequest: state.unlockPaywallRequest,
}); });
usePrivateZoomUnlockSuccessRefresh(state.unlockSuccessNonce); usePrivateZoneUnlockSuccessRefresh(state.unlockSuccessNonce);
const displayName = character.displayName; const displayName = character.displayName;
const avatarUrl = character.assets.avatar; const avatarUrl = character.assets.avatar;
const title = character.copy.privateZoomTitle; const title = character.copy.privateZoneTitle;
const subtitle = character.copy.privateZoomSubtitle; const subtitle = character.copy.privateZoneSubtitle;
const pendingAlbum = useMemo( const pendingAlbum = useMemo(
() => () =>
state.items.find( state.items.find(
@@ -107,15 +107,15 @@ export function PrivateZoomScreen() {
!galleryImage !galleryImage
) { ) {
router.replace( router.replace(
buildPrivateZoomWithoutGalleryUrl( buildPrivateZoneWithoutGalleryUrl(
searchParams, searchParams,
characterRoutes.privateZoom, characterRoutes.privateZone,
), ),
{ scroll: false }, { scroll: false },
); );
} }
}, [ }, [
characterRoutes.privateZoom, characterRoutes.privateZone,
galleryAlbum, galleryAlbum,
galleryImage, galleryImage,
galleryState, galleryState,
@@ -125,15 +125,15 @@ export function PrivateZoomScreen() {
]); ]);
const handleTopUpClick = () => { const handleTopUpClick = () => {
if (isPrivateZoomAuthRequired(authState.loginStatus)) { if (isPrivateZoneAuthRequired(authState.loginStatus)) {
navigator.openAuth(characterRoutes.privateZoom); navigator.openAuth(characterRoutes.privateZone);
return; return;
} }
navigator.openSubscription({ navigator.openSubscription({
type: "topup", type: "topup",
returnTo: "private-zoom", returnTo: "private-zone",
analytics: { analytics: {
entryPoint: "private_zoom", entryPoint: "private_zone",
triggerReason: "vip_cta", triggerReason: "vip_cta",
}, },
}); });
@@ -145,7 +145,7 @@ export function PrivateZoomScreen() {
buildPrivateAlbumGalleryUrl( buildPrivateAlbumGalleryUrl(
albumId, albumId,
imageIndex, imageIndex,
characterRoutes.privateZoom, characterRoutes.privateZone,
), ),
{ scroll: false }, { scroll: false },
); );
@@ -158,9 +158,9 @@ export function PrivateZoomScreen() {
return; return;
} }
router.replace( router.replace(
buildPrivateZoomWithoutGalleryUrl( buildPrivateZoneWithoutGalleryUrl(
searchParams, searchParams,
characterRoutes.privateZoom, characterRoutes.privateZone,
), ),
{ scroll: false }, { scroll: false },
); );
@@ -172,7 +172,7 @@ export function PrivateZoomScreen() {
buildPrivateAlbumGalleryUrl( buildPrivateAlbumGalleryUrl(
galleryAlbum.albumId, galleryAlbum.albumId,
imageIndex, imageIndex,
characterRoutes.privateZoom, characterRoutes.privateZone,
), ),
{ scroll: false }, { scroll: false },
); );
@@ -187,7 +187,7 @@ export function PrivateZoomScreen() {
<section className={styles.hero} aria-label={title}> <section className={styles.hero} aria-label={title}>
<div className={styles.heroCover}> <div className={styles.heroCover}>
<Image <Image
src={character.assets.privateZoomBanner} src={character.assets.privateZoneBanner}
alt="" alt=""
width={2048} width={2048}
height={1152} height={1152}
@@ -213,8 +213,8 @@ export function PrivateZoomScreen() {
<button <button
type="button" type="button"
data-analytics-key="private_zoom.primary_cta" data-analytics-key="private_zone.primary_cta"
data-analytics-label="Open private zoom top up" data-analytics-label="Open private zone top up"
className={styles.primaryCta} className={styles.primaryCta}
onClick={handleTopUpClick} onClick={handleTopUpClick}
> >
@@ -237,7 +237,7 @@ export function PrivateZoomScreen() {
<StatusCard <StatusCard
message={state.errorMessage} message={state.errorMessage}
actionLabel="Retry" actionLabel="Retry"
onAction={() => dispatch({ type: "PrivateZoomRefresh" })} onAction={() => dispatch({ type: "PrivateZoneRefresh" })}
/> />
) : null} ) : null}
@@ -249,7 +249,7 @@ export function PrivateZoomScreen() {
<StatusCard <StatusCard
message="No private albums yet." message="No private albums yet."
actionLabel="Refresh" actionLabel="Refresh"
onAction={() => dispatch({ type: "PrivateZoomRefresh" })} onAction={() => dispatch({ type: "PrivateZoneRefresh" })}
/> />
) : null} ) : null}
@@ -267,7 +267,7 @@ export function PrivateZoomScreen() {
} }
onUnlock={() => onUnlock={() =>
dispatch({ dispatch({
type: "PrivateZoomUnlockRequested", type: "PrivateZoneUnlockRequested",
albumId: album.albumId, albumId: album.albumId,
}) })
} }
@@ -277,12 +277,12 @@ export function PrivateZoomScreen() {
</section> </section>
<AppBottomNav <AppBottomNav
activeItem="privateZoom" activeItem="privateZone"
privateZoomLabel={character.copy.privateZoomTitle} privateZoneLabel={character.copy.privateZoneTitle}
onChatClick={() => onChatClick={() =>
navigator.push(characterRoutes.splash, { scroll: false }) navigator.push(characterRoutes.splash, { scroll: false })
} }
onPrivateZoomClick={() => undefined} onPrivateZoneClick={() => undefined}
/> />
{pendingAlbum ? ( {pendingAlbum ? (
@@ -290,8 +290,8 @@ export function PrivateZoomScreen() {
album={pendingAlbum} album={pendingAlbum}
isUnlocking={state.isUnlocking} isUnlocking={state.isUnlocking}
errorMessage={state.unlockErrorMessage} errorMessage={state.unlockErrorMessage}
onCancel={() => dispatch({ type: "PrivateZoomUnlockCancelled" })} onCancel={() => dispatch({ type: "PrivateZoneUnlockCancelled" })}
onConfirm={() => dispatch({ type: "PrivateZoomUnlockConfirmed" })} onConfirm={() => dispatch({ type: "PrivateZoneUnlockConfirmed" })}
/> />
) : state.unlockErrorMessage ? ( ) : state.unlockErrorMessage ? (
<div className={styles.toast} role="status"> <div className={styles.toast} role="status">
src/app/private-zoom/use-private-zoom-flow.ts → src/app/private-zone/use-private-zone-flow.ts
+20 -20
View File
@@ -8,37 +8,37 @@ import { behaviorAnalytics } from "@/lib/analytics";
import { useActiveCharacterRoutes } from "@/providers/character-provider"; import { useActiveCharacterRoutes } from "@/providers/character-provider";
import { useAppNavigator } from "@/router/use-app-navigator"; import { useAppNavigator } from "@/router/use-app-navigator";
import type { AuthEvent } from "@/stores/auth/auth-events"; import type { AuthEvent } from "@/stores/auth/auth-events";
import type { PrivateZoomEvent } from "@/stores/private-zoom"; import type { PrivateZoneEvent } from "@/stores/private-zone";
import type { PrivateZoomUnlockPaywallRequest } from "@/stores/private-zoom/private-zoom-state"; import type { PrivateZoneUnlockPaywallRequest } from "@/stores/private-zone/private-zone-state";
import { useUserDispatch } from "@/stores/user/user-context"; import { useUserDispatch } from "@/stores/user/user-context";
export interface UsePrivateZoomBootstrapFlowInput { export interface UsePrivateZoneBootstrapFlowInput {
authDispatch: Dispatch<AuthEvent>; authDispatch: Dispatch<AuthEvent>;
hasInitialized: boolean; hasInitialized: boolean;
isAuthLoading: boolean; isAuthLoading: boolean;
loginStatus: LoginStatus; loginStatus: LoginStatus;
roomDispatch: Dispatch<PrivateZoomEvent>; roomDispatch: Dispatch<PrivateZoneEvent>;
roomStatus: string; roomStatus: string;
} }
export interface UsePrivateZoomUnlockPaywallNavigationInput { export interface UsePrivateZoneUnlockPaywallNavigationInput {
loginStatus: LoginStatus; loginStatus: LoginStatus;
roomDispatch: Dispatch<PrivateZoomEvent>; roomDispatch: Dispatch<PrivateZoneEvent>;
unlockPaywallRequest: PrivateZoomUnlockPaywallRequest | null; unlockPaywallRequest: PrivateZoneUnlockPaywallRequest | null;
} }
export function isPrivateZoomAuthRequired(loginStatus: LoginStatus): boolean { export function isPrivateZoneAuthRequired(loginStatus: LoginStatus): boolean {
return loginStatus === "guest" || loginStatus === "notLoggedIn"; return loginStatus === "guest" || loginStatus === "notLoggedIn";
} }
export function usePrivateZoomBootstrapFlow({ export function usePrivateZoneBootstrapFlow({
authDispatch, authDispatch,
hasInitialized, hasInitialized,
isAuthLoading, isAuthLoading,
loginStatus, loginStatus,
roomDispatch, roomDispatch,
roomStatus, roomStatus,
}: UsePrivateZoomBootstrapFlowInput): void { }: UsePrivateZoneBootstrapFlowInput): void {
const previousLoginStatusRef = useRef(loginStatus); const previousLoginStatusRef = useRef(loginStatus);
useGuestLoginBootstrap({ useGuestLoginBootstrap({
@@ -56,12 +56,12 @@ export function usePrivateZoomBootstrapFlow({
previousLoginStatusRef.current = loginStatus; previousLoginStatusRef.current = loginStatus;
if (roomStatus === "idle") { if (roomStatus === "idle") {
roomDispatch({ type: "PrivateZoomInit" }); roomDispatch({ type: "PrivateZoneInit" });
return; return;
} }
if (previousLoginStatus !== loginStatus && roomStatus !== "loading") { if (previousLoginStatus !== loginStatus && roomStatus !== "loading") {
roomDispatch({ type: "PrivateZoomRefresh" }); roomDispatch({ type: "PrivateZoneRefresh" });
} }
}, [ }, [
hasInitialized, hasInitialized,
@@ -72,19 +72,19 @@ export function usePrivateZoomBootstrapFlow({
]); ]);
} }
export function usePrivateZoomUnlockPaywallNavigation({ export function usePrivateZoneUnlockPaywallNavigation({
loginStatus, loginStatus,
roomDispatch, roomDispatch,
unlockPaywallRequest, unlockPaywallRequest,
}: UsePrivateZoomUnlockPaywallNavigationInput): void { }: UsePrivateZoneUnlockPaywallNavigationInput): void {
const navigator = useAppNavigator(); const navigator = useAppNavigator();
const characterRoutes = useActiveCharacterRoutes(); const characterRoutes = useActiveCharacterRoutes();
useEffect(() => { useEffect(() => {
if (!unlockPaywallRequest) return; if (!unlockPaywallRequest) return;
if (isPrivateZoomAuthRequired(loginStatus)) { if (isPrivateZoneAuthRequired(loginStatus)) {
navigator.openAuth(characterRoutes.privateZoom); navigator.openAuth(characterRoutes.privateZone);
} else { } else {
behaviorAnalytics.paywallShown({ behaviorAnalytics.paywallShown({
entryPoint: "private_album_unlock", entryPoint: "private_album_unlock",
@@ -92,16 +92,16 @@ export function usePrivateZoomUnlockPaywallNavigation({
}); });
navigator.openSubscription({ navigator.openSubscription({
type: "topup", type: "topup",
returnTo: "private-zoom", returnTo: "private-zone",
analytics: { analytics: {
entryPoint: "private_album_unlock", entryPoint: "private_album_unlock",
triggerReason: "insufficient_credits", triggerReason: "insufficient_credits",
}, },
}); });
} }
roomDispatch({ type: "PrivateZoomUnlockPaywallConsumed" }); roomDispatch({ type: "PrivateZoneUnlockPaywallConsumed" });
}, [ }, [
characterRoutes.privateZoom, characterRoutes.privateZone,
loginStatus, loginStatus,
navigator, navigator,
roomDispatch, roomDispatch,
@@ -109,7 +109,7 @@ export function usePrivateZoomUnlockPaywallNavigation({
]); ]);
} }
export function usePrivateZoomUnlockSuccessRefresh( export function usePrivateZoneUnlockSuccessRefresh(
unlockSuccessNonce: number, unlockSuccessNonce: number,
): void { ): void {
const userDispatch = useUserDispatch(); const userDispatch = useUserDispatch();
src/app/splash/splash-screen.tsx
+4 -4
View File
@@ -37,8 +37,8 @@ export function SplashScreen() {
navigator.openChat({ replace: true }); navigator.openChat({ replace: true });
}; };
const handleOpenPrivateZoom = () => { const handleOpenPrivateZone = () => {
navigator.push(characterRoutes.privateZoom, { scroll: false }); navigator.push(characterRoutes.privateZone, { scroll: false });
}; };
const handleOpenSplash = () => { const handleOpenSplash = () => {
@@ -77,9 +77,9 @@ export function SplashScreen() {
</div> </div>
<AppBottomNav <AppBottomNav
activeItem="chat" activeItem="chat"
privateZoomLabel={character.copy.privateZoomTitle} privateZoneLabel={character.copy.privateZoneTitle}
onChatClick={handleOpenSplash} onChatClick={handleOpenSplash}
onPrivateZoomClick={handleOpenPrivateZoom} onPrivateZoneClick={handleOpenPrivateZone}
/> />
</div> </div>
</MobileShell> </MobileShell>
src/data/constants/__tests__/character.test.ts
+2 -2
View File
@@ -71,7 +71,7 @@ describe("local character catalog", () => {
expect(snapshot.catalog.getById("maya-tan")).toMatchObject({ expect(snapshot.catalog.getById("maya-tan")).toMatchObject({
displayName: "Maya Backend", displayName: "Maya Backend",
assets: { avatar: "/images/avatar/maya.png" }, assets: { avatar: "/images/avatar/maya.png" },
capabilities: { chat: true, privateZoom: false, tip: true }, capabilities: { chat: true, privateZone: false, tip: true },
}); });
expect(snapshot.defaultCharacter.id).toBe("elio"); expect(snapshot.defaultCharacter.id).toBe("elio");
}); });
@@ -101,7 +101,7 @@ describe("local character catalog", () => {
for (const character of CHARACTERS) { for (const character of CHARACTERS) {
expect(character.capabilities).toEqual({ expect(character.capabilities).toEqual({
chat: true, chat: true,
privateZoom: true, privateZone: true,
tip: true, tip: true,
}); });
expect(character.tagline.length).toBeGreaterThan(0); expect(character.tagline.length).toBeGreaterThan(0);
src/data/constants/character.ts
+18 -18
View File
@@ -1,6 +1,6 @@
export interface CharacterCapabilities { export interface CharacterCapabilities {
readonly chat: boolean; readonly chat: boolean;
readonly privateZoom: boolean; readonly privateZone: boolean;
readonly tip: boolean; readonly tip: boolean;
} }
@@ -17,12 +17,12 @@ export interface CharacterProfile {
readonly avatar: string; readonly avatar: string;
readonly cover: string; readonly cover: string;
readonly chatBackground: string; readonly chatBackground: string;
readonly privateZoomBanner: string; readonly privateZoneBanner: string;
}; };
readonly copy: { readonly copy: {
readonly splashRelationship: string; readonly splashRelationship: string;
readonly privateZoomTitle: string; readonly privateZoneTitle: string;
readonly privateZoomSubtitle: string; readonly privateZoneSubtitle: string;
readonly tipHeader: string; readonly tipHeader: string;
readonly tipTitle: string; readonly tipTitle: string;
}; };
@@ -62,19 +62,19 @@ const CHARACTER_PROFILES: readonly CharacterProfile[] = Object.freeze([
"Finally I can relax. How was your day out?", "Finally I can relax. How was your day out?",
capabilities: { capabilities: {
chat: true, chat: true,
privateZoom: true, privateZone: true,
tip: true, tip: true,
}, },
assets: { assets: {
avatar: "/images/avatar/elio.png", avatar: "/images/avatar/elio.png",
cover: "/images/cover/elio.png", cover: "/images/cover/elio.png",
chatBackground: "/images/chat/bg-chatpage.png", chatBackground: "/images/chat/bg-chatpage.png",
privateZoomBanner: "/images/private-zoom/banner/elio.png", privateZoneBanner: "/images/private-zone/banner/elio.png",
}, },
copy: { copy: {
splashRelationship: "Your exclusive AI boyfriend", splashRelationship: "Your exclusive AI boyfriend",
privateZoomTitle: "Elio Private Zoom", privateZoneTitle: "Elio Private Zone",
privateZoomSubtitle: "Join me, unlock my private zoom", privateZoneSubtitle: "Join me, unlock my private zone",
tipHeader: "Tip Elio", tipHeader: "Tip Elio",
tipTitle: "Buy Elio a coffee", tipTitle: "Buy Elio a coffee",
}, },
@@ -91,19 +91,19 @@ const CHARACTER_PROFILES: readonly CharacterProfile[] = Object.freeze([
"How was your day?", "How was your day?",
capabilities: { capabilities: {
chat: true, chat: true,
privateZoom: true, privateZone: true,
tip: true, tip: true,
}, },
assets: { assets: {
avatar: "/images/avatar/maya.png", avatar: "/images/avatar/maya.png",
cover: "/images/cover/maya.webp", cover: "/images/cover/maya.webp",
chatBackground: "/images/chat/bg-chatpage.png", chatBackground: "/images/chat/bg-chatpage.png",
privateZoomBanner: "/images/private-zoom/banner/maya.png", privateZoneBanner: "/images/private-zone/banner/maya.png",
}, },
copy: { copy: {
splashRelationship: "Your exclusive AI girlfriend", splashRelationship: "Your exclusive AI girlfriend",
privateZoomTitle: "Maya Private Zoom", privateZoneTitle: "Maya Private Zone",
privateZoomSubtitle: "Join me, unlock my private zoom", privateZoneSubtitle: "Join me, unlock my private zone",
tipHeader: "Tip Maya", tipHeader: "Tip Maya",
tipTitle: "Buy Maya a coffee", tipTitle: "Buy Maya a coffee",
}, },
@@ -120,19 +120,19 @@ const CHARACTER_PROFILES: readonly CharacterProfile[] = Object.freeze([
"Tell me how your day went.", "Tell me how your day went.",
capabilities: { capabilities: {
chat: true, chat: true,
privateZoom: true, privateZone: true,
tip: true, tip: true,
}, },
assets: { assets: {
avatar: "/images/avatar/nayeli.png", avatar: "/images/avatar/nayeli.png",
cover: "/images/cover/nayeli.webp", cover: "/images/cover/nayeli.webp",
chatBackground: "/images/chat/bg-chatpage.png", chatBackground: "/images/chat/bg-chatpage.png",
privateZoomBanner: "/images/private-zoom/banner/nayeli.png", privateZoneBanner: "/images/private-zone/banner/nayeli.png",
}, },
copy: { copy: {
splashRelationship: "Your exclusive AI girlfriend", splashRelationship: "Your exclusive AI girlfriend",
privateZoomTitle: "Nayeli Private Zoom", privateZoneTitle: "Nayeli Private Zone",
privateZoomSubtitle: "Join me, unlock my private zoom", privateZoneSubtitle: "Join me, unlock my private zone",
tipHeader: "Tip Nayeli", tipHeader: "Tip Nayeli",
tipTitle: "Buy Nayeli a coffee", tipTitle: "Buy Nayeli a coffee",
}, },
@@ -186,8 +186,8 @@ export function mergeRemoteCharacterCatalog(
sortOrder: item.sortOrder, sortOrder: item.sortOrder,
capabilities: { capabilities: {
chat: item.capabilities.chat, chat: item.capabilities.chat,
privateZoom: privateZone:
local.capabilities.privateZoom && item.capabilities.privateContent, local.capabilities.privateZone && item.capabilities.privateContent,
tip: local.capabilities.tip, tip: local.capabilities.tip,
}, },
}), }),
src/data/repositories/index.ts
+2 -2
View File
@@ -8,7 +8,7 @@ export * from "./character_repository";
export * from "./feedback_repository"; export * from "./feedback_repository";
export * from "./metrics_repository"; export * from "./metrics_repository";
export * from "./payment_repository"; export * from "./payment_repository";
export * from "./private_zoom_repository"; export * from "./private_zone_repository";
export * from "./user_repository"; export * from "./user_repository";
export * from "./interfaces/iauth_repository"; export * from "./interfaces/iauth_repository";
export * from "./interfaces/ichat_repository"; export * from "./interfaces/ichat_repository";
@@ -16,5 +16,5 @@ export * from "./interfaces/icharacter_repository";
export * from "./interfaces/ifeedback_repository"; export * from "./interfaces/ifeedback_repository";
export * from "./interfaces/imetrics_repository"; export * from "./interfaces/imetrics_repository";
export * from "./interfaces/ipayment_repository"; export * from "./interfaces/ipayment_repository";
export * from "./interfaces/iprivate_zoom_repository"; export * from "./interfaces/iprivate_zone_repository";
export * from "./interfaces/iuser_repository"; export * from "./interfaces/iuser_repository";
src/data/repositories/interfaces/index.ts
+1 -1
View File
@@ -8,5 +8,5 @@ export * from "./icharacter_repository";
export * from "./ifeedback_repository"; export * from "./ifeedback_repository";
export * from "./imetrics_repository"; export * from "./imetrics_repository";
export * from "./ipayment_repository"; export * from "./ipayment_repository";
export * from "./iprivate_zoom_repository"; export * from "./iprivate_zone_repository";
export * from "./iuser_repository"; export * from "./iuser_repository";
src/data/repositories/interfaces/iprivate_zoom_repository.ts → src/data/repositories/interfaces/iprivate_zone_repository.ts
+2 -2
View File
@@ -1,7 +1,7 @@
import type { import type {
PrivateAlbumsResponse, PrivateAlbumsResponse,
PrivateAlbumUnlockResponse, PrivateAlbumUnlockResponse,
} from "@/data/schemas/private-zoom"; } from "@/data/schemas/private-zone";
import type { Result } from "@/utils/result"; import type { Result } from "@/utils/result";
export interface GetPrivateAlbumsInput { export interface GetPrivateAlbumsInput {
@@ -9,7 +9,7 @@ export interface GetPrivateAlbumsInput {
limit?: number; limit?: number;
} }
export interface IPrivateZoomRepository { export interface IPrivateZoneRepository {
getAlbums( getAlbums(
input: GetPrivateAlbumsInput, input: GetPrivateAlbumsInput,
): Promise<Result<PrivateAlbumsResponse>>; ): Promise<Result<PrivateAlbumsResponse>>;
src/data/repositories/private_zoom_repository.ts → src/data/repositories/private_zone_repository.ts
+10 -10
View File
@@ -1,22 +1,22 @@
import type { import type {
GetPrivateAlbumsInput, GetPrivateAlbumsInput,
IPrivateZoomRepository, IPrivateZoneRepository,
} from "@/data/repositories/interfaces"; } from "@/data/repositories/interfaces";
import { import {
type PrivateAlbumsResponse, type PrivateAlbumsResponse,
type PrivateAlbumUnlockResponse, type PrivateAlbumUnlockResponse,
UnlockPrivateAlbumRequestSchema, UnlockPrivateAlbumRequestSchema,
} from "@/data/schemas/private-zoom"; } from "@/data/schemas/private-zone";
import { import {
PrivateZoomApi, PrivateZoneApi,
privateZoomApi, privateZoneApi,
} from "@/data/services/api/private_zoom_api"; } from "@/data/services/api/private_zone_api";
import { Result } from "@/utils/result"; import { Result } from "@/utils/result";
import { createLazySingleton } from "./lazy_singleton"; import { createLazySingleton } from "./lazy_singleton";
export class PrivateZoomRepository implements IPrivateZoomRepository { export class PrivateZoneRepository implements IPrivateZoneRepository {
constructor(private readonly api: PrivateZoomApi) {} constructor(private readonly api: PrivateZoneApi) {}
getAlbums( getAlbums(
input: GetPrivateAlbumsInput, input: GetPrivateAlbumsInput,
@@ -37,7 +37,7 @@ export class PrivateZoomRepository implements IPrivateZoomRepository {
} }
} }
export const getPrivateZoomRepository = export const getPrivateZoneRepository =
createLazySingleton<IPrivateZoomRepository>( createLazySingleton<IPrivateZoneRepository>(
() => new PrivateZoomRepository(privateZoomApi), () => new PrivateZoneRepository(privateZoneApi),
); );
src/data/schemas/__tests__/immutable_schema.test.ts
+2 -2
View File
@@ -3,7 +3,7 @@ import { describe, expect, it } from "vitest";
import { FacebookIdentityResponseSchema } from "@/data/schemas/auth"; import { FacebookIdentityResponseSchema } from "@/data/schemas/auth";
import { ChatHistoryResponseSchema } from "@/data/schemas/chat"; import { ChatHistoryResponseSchema } from "@/data/schemas/chat";
import { PaymentPlansResponseSchema } from "@/data/schemas/payment"; import { PaymentPlansResponseSchema } from "@/data/schemas/payment";
import { PrivateAlbumsResponseSchema } from "@/data/schemas/private-zoom"; import { PrivateAlbumsResponseSchema } from "@/data/schemas/private-zone";
import { UserSchema } from "@/data/schemas/user"; import { UserSchema } from "@/data/schemas/user";
describe("immutable schemas", () => { describe("immutable schemas", () => {
@@ -33,7 +33,7 @@ describe("immutable schemas", () => {
expectDeepFrozen(response); expectDeepFrozen(response);
}); });
it("freezes payment and private-zoom collections", () => { it("freezes payment and private-zone collections", () => {
const plans = PaymentPlansResponseSchema.parse({ const plans = PaymentPlansResponseSchema.parse({
firstRechargeOffer: { firstRechargeOffer: {
enabled: true, enabled: true,
src/data/schemas/private-zoom/__tests__/private_album.test.ts → src/data/schemas/private-zone/__tests__/private_album.test.ts
+3 -3
View File
@@ -4,7 +4,7 @@ import {
PrivateAlbumUnlockResponseSchema, PrivateAlbumUnlockResponseSchema,
PrivateAlbumsResponseSchema, PrivateAlbumsResponseSchema,
UnlockPrivateAlbumRequestSchema, UnlockPrivateAlbumRequestSchema,
} from "@/data/schemas/private-zoom"; } from "@/data/schemas/private-zone";
import { ApiPath } from "@/data/services/api"; import { ApiPath } from "@/data/services/api";
const ALBUM_ID = "a1b2c3d4-0000-0000-0000-000000000000"; const ALBUM_ID = "a1b2c3d4-0000-0000-0000-000000000000";
@@ -96,8 +96,8 @@ describe("Private Album schema models", () => {
}); });
it("encodes the album id in the unlock path", () => { it("encodes the album id in the unlock path", () => {
expect(ApiPath.privateZoomAlbumUnlock("album:91")).toBe( expect(ApiPath.privateZoneAlbumUnlock("album:91")).toBe(
"/api/private-zoom/albums/album%3A91/unlock", "/api/private-zone/albums/album%3A91/unlock",
); );
}); });
}); });
src/data/schemas/private-zoom/index.ts → src/data/schemas/private-zone/index.ts
View File
src/data/schemas/private-zoom/private_album.ts → src/data/schemas/private-zone/private_album.ts
View File
src/data/schemas/private-zoom/request/index.ts → src/data/schemas/private-zone/request/index.ts
View File
src/data/schemas/private-zoom/request/unlock_private_album_request.ts → src/data/schemas/private-zone/request/unlock_private_album_request.ts
View File
src/data/schemas/private-zoom/response/index.ts → src/data/schemas/private-zone/response/index.ts
View File
src/data/schemas/private-zoom/response/private_album_unlock_response.ts → src/data/schemas/private-zone/response/private_album_unlock_response.ts
View File
src/data/schemas/private-zoom/response/private_albums_response.ts → src/data/schemas/private-zone/response/private_albums_response.ts
View File
src/data/services/api/__tests__/api_path.test.ts
+3 -3
View File
@@ -6,7 +6,7 @@ import { ApiPath } from "../api_path";
describe("ApiPath contract source", () => { describe("ApiPath contract source", () => {
it("uses the shared contract path for every static operation", () => { it("uses the shared contract path for every static operation", () => {
const staticOperations = Object.entries(apiContract).filter( const staticOperations = Object.entries(apiContract).filter(
([operationId]) => operationId !== "privateZoomAlbumUnlock", ([operationId]) => operationId !== "privateZoneAlbumUnlock",
); );
for (const [operationId, operation] of staticOperations) { for (const [operationId, operation] of staticOperations) {
@@ -17,8 +17,8 @@ describe("ApiPath contract source", () => {
}); });
it("fills and encodes the private album path parameter", () => { it("fills and encodes the private album path parameter", () => {
expect(ApiPath.privateZoomAlbumUnlock("album/id 1")).toBe( expect(ApiPath.privateZoneAlbumUnlock("album/id 1")).toBe(
"/api/private-zoom/albums/album%2Fid%201/unlock", "/api/private-zone/albums/album%2Fid%201/unlock",
); );
}); });
}); });
src/data/services/api/__tests__/multi_character_api.test.ts
+4 -4
View File
@@ -14,7 +14,7 @@ vi.mock("../http_client", () => ({
import { ChatApi } from "../chat_api"; import { ChatApi } from "../chat_api";
import { CharacterApi } from "../character_api"; import { CharacterApi } from "../character_api";
import { PrivateZoomApi } from "../private_zoom_api"; import { PrivateZoneApi } from "../private_zone_api";
const CHARACTER_ID = "elio"; const CHARACTER_ID = "elio";
@@ -146,18 +146,18 @@ describe("multi-character API contract", () => {
); );
}); });
it("scopes private-zoom albums to characterId", async () => { it("scopes private-zone albums to characterId", async () => {
httpClientMock.mockResolvedValue({ httpClientMock.mockResolvedValue({
success: true, success: true,
data: { items: [], creditBalance: 0 }, data: { items: [], creditBalance: 0 },
}); });
await new PrivateZoomApi().getAlbums({ await new PrivateZoneApi().getAlbums({
characterId: CHARACTER_ID, characterId: CHARACTER_ID,
limit: 20, limit: 20,
}); });
expect(httpClientMock).toHaveBeenCalledWith("/api/private-zoom/albums", { expect(httpClientMock).toHaveBeenCalledWith("/api/private-zone/albums", {
query: { characterId: CHARACTER_ID, limit: 20 }, query: { characterId: CHARACTER_ID, limit: 20 },
}); });
}); });
src/data/services/api/api_contract.json
+2 -2
View File
@@ -21,8 +21,8 @@
"chatHistory": { "method": "get", "path": "/api/chat/history" }, "chatHistory": { "method": "get", "path": "/api/chat/history" },
"chatUnlockPrivate": { "method": "post", "path": "/api/chat/unlock-private" }, "chatUnlockPrivate": { "method": "post", "path": "/api/chat/unlock-private" },
"chatUnlockHistory": { "method": "post", "path": "/api/chat/unlock-history" }, "chatUnlockHistory": { "method": "post", "path": "/api/chat/unlock-history" },
"privateZoomAlbums": { "method": "get", "path": "/api/private-zoom/albums" }, "privateZoneAlbums": { "method": "get", "path": "/api/private-zone/albums" },
"privateZoomAlbumUnlock": { "method": "post", "path": "/api/private-zoom/albums/{albumId}/unlock" }, "privateZoneAlbumUnlock": { "method": "post", "path": "/api/private-zone/albums/{albumId}/unlock" },
"metricsPwaEvent": { "method": "post", "path": "/api/metrics/pwa/event" }, "metricsPwaEvent": { "method": "post", "path": "/api/metrics/pwa/event" },
"reportUserInfo": { "method": "post", "path": "/api/data/report-user-info" }, "reportUserInfo": { "method": "post", "path": "/api/data/report-user-info" },
"feedback": { "method": "post", "path": "/api/feedback" }, "feedback": { "method": "post", "path": "/api/feedback" },
src/data/services/api/api_path.ts
+3 -3
View File
@@ -81,11 +81,11 @@ export class ApiPath {
// ============ 私密空间相关 ============ // ============ 私密空间相关 ============
/** 获取私密图片包列表 */ /** 获取私密图片包列表 */
static readonly privateZoomAlbums = apiContract.privateZoomAlbums.path; static readonly privateZoneAlbums = apiContract.privateZoneAlbums.path;
/** 解锁私密图片包 */ /** 解锁私密图片包 */
static privateZoomAlbumUnlock(albumId: string): string { static privateZoneAlbumUnlock(albumId: string): string {
return apiContract.privateZoomAlbumUnlock.path.replace( return apiContract.privateZoneAlbumUnlock.path.replace(
"{albumId}", "{albumId}",
encodeURIComponent(albumId), encodeURIComponent(albumId),
); );
src/data/services/api/index.ts
+1 -1
View File
@@ -12,6 +12,6 @@ export * from "./feedback_api";
export * from "./http_client"; export * from "./http_client";
export * from "./metrics_api"; export * from "./metrics_api";
export * from "./payment_api"; export * from "./payment_api";
export * from "./private_zoom_api"; export * from "./private_zone_api";
export * from "./response_helper"; export * from "./response_helper";
export * from "./user_api"; export * from "./user_api";
src/data/services/api/private_zoom_api.ts → src/data/services/api/private_zone_api.ts
+5 -5
View File
@@ -4,7 +4,7 @@ import {
PrivateAlbumUnlockResponse, PrivateAlbumUnlockResponse,
PrivateAlbumUnlockResponseSchema, PrivateAlbumUnlockResponseSchema,
UnlockPrivateAlbumRequest, UnlockPrivateAlbumRequest,
} from "@/data/schemas/private-zoom"; } from "@/data/schemas/private-zone";
import { ApiPath } from "./api_path"; import { ApiPath } from "./api_path";
import { httpClient } from "./http_client"; import { httpClient } from "./http_client";
@@ -15,12 +15,12 @@ export interface GetPrivateAlbumsInput {
limit?: number; limit?: number;
} }
export class PrivateZoomApi { export class PrivateZoneApi {
async getAlbums( async getAlbums(
input: GetPrivateAlbumsInput, input: GetPrivateAlbumsInput,
): Promise<PrivateAlbumsResponse> { ): Promise<PrivateAlbumsResponse> {
const env = await httpClient<ApiEnvelope<unknown>>( const env = await httpClient<ApiEnvelope<unknown>>(
ApiPath.privateZoomAlbums, ApiPath.privateZoneAlbums,
{ {
query: { query: {
characterId: input.characterId, characterId: input.characterId,
@@ -36,7 +36,7 @@ export class PrivateZoomApi {
body: UnlockPrivateAlbumRequest, body: UnlockPrivateAlbumRequest,
): Promise<PrivateAlbumUnlockResponse> { ): Promise<PrivateAlbumUnlockResponse> {
const env = await httpClient<ApiEnvelope<unknown>>( const env = await httpClient<ApiEnvelope<unknown>>(
ApiPath.privateZoomAlbumUnlock(albumId), ApiPath.privateZoneAlbumUnlock(albumId),
{ {
method: "POST", method: "POST",
body, body,
@@ -46,4 +46,4 @@ export class PrivateZoomApi {
} }
} }
export const privateZoomApi = new PrivateZoomApi(); export const privateZoneApi = new PrivateZoneApi();
src/data/storage/payment/pending_payment_order_storage.ts
+1 -1
View File
@@ -14,7 +14,7 @@ const PendingPaymentOrderSchema = z
subscriptionType: z.enum(["vip", "topup", "tip"]), subscriptionType: z.enum(["vip", "topup", "tip"]),
giftCategory: z.string().min(1).nullable().default(null), giftCategory: z.string().min(1).nullable().default(null),
giftPlanId: z.string().min(1).nullable().default(null), giftPlanId: z.string().min(1).nullable().default(null),
returnTo: z.enum(["chat", "private-zoom", "profile"]).optional(), returnTo: z.enum(["chat", "private-zone", "profile"]).optional(),
characterSlug: z.string().regex(/^[a-z0-9]+(?:-[a-z0-9]+)*$/).optional(), characterSlug: z.string().regex(/^[a-z0-9]+(?:-[a-z0-9]+)*$/).optional(),
createdAt: z.number(), createdAt: z.number(),
}) })
src/lib/analytics/payment_analytics_context.ts
+2 -2
View File
@@ -15,7 +15,7 @@ export type PaymentAnalyticsEntryPoint =
| "chat_input" | "chat_input"
| "chat_unlock" | "chat_unlock"
| "private_album_unlock" | "private_album_unlock"
| "private_zoom" | "private_zone"
| "profile" | "profile"
| "chat_offer_banner" | "chat_offer_banner"
| "subscription_direct" | "subscription_direct"
@@ -32,7 +32,7 @@ const ENTRY_POINTS = new Set<PaymentAnalyticsEntryPoint>([
"chat_input", "chat_input",
"chat_unlock", "chat_unlock",
"private_album_unlock", "private_album_unlock",
"private_zoom", "private_zone",
"profile", "profile",
"chat_offer_banner", "chat_offer_banner",
"subscription_direct", "subscription_direct",
src/lib/navigation/__tests__/external_entry.test.ts
+5 -5
View File
@@ -17,15 +17,15 @@ describe("external entry navigation", () => {
it("resolves only canonical targets", () => { it("resolves only canonical targets", () => {
expect(resolveExternalEntryTarget({ target: "chat" })).toBe(ROUTES.chat); expect(resolveExternalEntryTarget({ target: "chat" })).toBe(ROUTES.chat);
expect(resolveExternalEntryTarget({ target: "tip" })).toBe(ROUTES.tip); expect(resolveExternalEntryTarget({ target: "tip" })).toBe(ROUTES.tip);
expect(resolveExternalEntryTarget({ target: "private-zoom" })).toBe( expect(resolveExternalEntryTarget({ target: "private-zone" })).toBe(
ROUTES.privateZoom, ROUTES.privateZone,
); );
}); });
it("rejects removed aliases and unsupported targets", () => { it("rejects removed aliases and unsupported targets", () => {
expect(resolveExternalEntryTarget({ target: "tips" })).toBe(ROUTES.chat); expect(resolveExternalEntryTarget({ target: "tips" })).toBe(ROUTES.chat);
expect(resolveExternalEntryTarget({ target: "coffee" })).toBe(ROUTES.chat); expect(resolveExternalEntryTarget({ target: "coffee" })).toBe(ROUTES.chat);
expect(resolveExternalEntryTarget({ target: "private_zoom" })).toBe( expect(resolveExternalEntryTarget({ target: "private_zone" })).toBe(
ROUTES.chat, ROUTES.chat,
); );
expect(resolveExternalEntryTarget({ target: "/tip" })).toBe(ROUTES.chat); expect(resolveExternalEntryTarget({ target: "/tip" })).toBe(ROUTES.chat);
@@ -44,10 +44,10 @@ describe("external entry navigation", () => {
).toBe(getCharacterRoutes("maya").chat); ).toBe(getCharacterRoutes("maya").chat);
expect( expect(
resolveExternalEntryDestination({ resolveExternalEntryDestination({
target: "private-zoom", target: "private-zone",
character: "unknown", character: "unknown",
}), }),
).toBe(getCharacterRoutes("elio").privateZoom); ).toBe(getCharacterRoutes("elio").privateZone);
}); });
}); });
src/lib/navigation/__tests__/subscription_exit.test.ts
+8 -8
View File
@@ -89,7 +89,7 @@ describe("subscription exit helpers", () => {
expect(peekPendingChatUnlockMock).not.toHaveBeenCalled(); expect(peekPendingChatUnlockMock).not.toHaveBeenCalled();
}); });
it("returns directly to private zoom without consuming chat state", async () => { it("returns directly to private zone without consuming chat state", async () => {
consumePendingChatImageReturnMock.mockResolvedValue({ consumePendingChatImageReturnMock.mockResolvedValue({
reason: "image_paywall", reason: "image_paywall",
characterId: "elio", characterId: "elio",
@@ -108,18 +108,18 @@ describe("subscription exit helpers", () => {
createdAt: 1, createdAt: 1,
}); });
expect(getSubscriptionFallbackExitUrl("private-zoom")).toBe( expect(getSubscriptionFallbackExitUrl("private-zone")).toBe(
getCharacterRoutes("elio").privateZoom, getCharacterRoutes("elio").privateZone,
); );
await expect(consumeSubscriptionExitUrl("private-zoom")).resolves.toBe( await expect(consumeSubscriptionExitUrl("private-zone")).resolves.toBe(
getCharacterRoutes("elio").privateZoom, getCharacterRoutes("elio").privateZone,
); );
expect(consumePendingChatImageReturnMock).not.toHaveBeenCalled(); expect(consumePendingChatImageReturnMock).not.toHaveBeenCalled();
expect(peekPendingChatUnlockMock).not.toHaveBeenCalled(); expect(peekPendingChatUnlockMock).not.toHaveBeenCalled();
expect(clearPendingChatUnlockMock).not.toHaveBeenCalled(); expect(clearPendingChatUnlockMock).not.toHaveBeenCalled();
}); });
it("keeps private zoom ahead of stale chat state after payment", async () => { it("keeps private zone ahead of stale chat state after payment", async () => {
peekPendingChatUnlockMock.mockResolvedValue({ peekPendingChatUnlockMock.mockResolvedValue({
reason: "single_message_unlock", reason: "single_message_unlock",
characterId: "elio", characterId: "elio",
@@ -132,8 +132,8 @@ describe("subscription exit helpers", () => {
}); });
await expect( await expect(
resolveSubscriptionSuccessExitUrl("private-zoom", "maya"), resolveSubscriptionSuccessExitUrl("private-zone", "maya"),
).resolves.toBe(getCharacterRoutes("maya").privateZoom); ).resolves.toBe(getCharacterRoutes("maya").privateZone);
expect(peekPendingChatUnlockMock).not.toHaveBeenCalled(); expect(peekPendingChatUnlockMock).not.toHaveBeenCalled();
expect(clearPendingChatUnlockMock).not.toHaveBeenCalled(); expect(clearPendingChatUnlockMock).not.toHaveBeenCalled();
}); });
src/lib/navigation/external_entry.ts
+3 -3
View File
@@ -13,7 +13,7 @@ import { getCharacterRoutes, ROUTES } from "@/router/routes";
export type ExternalEntryTarget = export type ExternalEntryTarget =
| typeof ROUTES.chat | typeof ROUTES.chat
| typeof ROUTES.tip | typeof ROUTES.tip
| typeof ROUTES.privateZoom; | typeof ROUTES.privateZone;
export interface ExternalEntryPayload { export interface ExternalEntryPayload {
deviceId?: string | null; deviceId?: string | null;
@@ -91,7 +91,7 @@ export function resolveExternalEntryDestination({
const routes = getCharacterRoutes(characterSlug); const routes = getCharacterRoutes(characterSlug);
const resolvedTarget = resolveExternalEntryTarget({ target }); const resolvedTarget = resolveExternalEntryTarget({ target });
if (resolvedTarget === ROUTES.tip) return routes.tip; if (resolvedTarget === ROUTES.tip) return routes.tip;
if (resolvedTarget === ROUTES.privateZoom) return routes.privateZoom; if (resolvedTarget === ROUTES.privateZone) return routes.privateZone;
return routes.chat; return routes.chat;
} }
@@ -129,7 +129,7 @@ function resolveTarget(
if (target === "chat") return ROUTES.chat; if (target === "chat") return ROUTES.chat;
if (target === "tip") return ROUTES.tip; if (target === "tip") return ROUTES.tip;
if (target === "private-zoom") return ROUTES.privateZoom; if (target === "private-zone") return ROUTES.privateZone;
return null; return null;
} }
src/lib/navigation/subscription_exit.ts
+5 -5
View File
@@ -47,7 +47,7 @@ export function getSubscriptionFallbackExitUrl(
): string { ): string {
const routes = getCharacterRoutes(characterSlug); const routes = getCharacterRoutes(characterSlug);
if (returnTo === "chat") return routes.chat; if (returnTo === "chat") return routes.chat;
if (returnTo === "private-zoom") return routes.privateZoom; if (returnTo === "private-zone") return routes.privateZone;
if (returnTo === "profile") { if (returnTo === "profile") {
return buildGlobalPageUrl(ROUTES.profile, routes.chat); return buildGlobalPageUrl(ROUTES.profile, routes.chat);
} }
@@ -58,8 +58,8 @@ export async function consumeSubscriptionExitUrl(
returnTo: SubscriptionReturnTo, returnTo: SubscriptionReturnTo,
characterSlug: string = DEFAULT_CHARACTER_SLUG, characterSlug: string = DEFAULT_CHARACTER_SLUG,
): Promise<string> { ): Promise<string> {
if (returnTo === "private-zoom") { if (returnTo === "private-zone") {
return getCharacterRoutes(characterSlug).privateZoom; return getCharacterRoutes(characterSlug).privateZone;
} }
if (returnTo === "profile") { if (returnTo === "profile") {
return getSubscriptionFallbackExitUrl(returnTo, characterSlug); return getSubscriptionFallbackExitUrl(returnTo, characterSlug);
@@ -75,8 +75,8 @@ export async function resolveSubscriptionSuccessExitUrl(
returnTo: SubscriptionReturnTo, returnTo: SubscriptionReturnTo,
characterSlug: string = DEFAULT_CHARACTER_SLUG, characterSlug: string = DEFAULT_CHARACTER_SLUG,
): Promise<string> { ): Promise<string> {
if (returnTo === "private-zoom") { if (returnTo === "private-zone") {
return getCharacterRoutes(characterSlug).privateZoom; return getCharacterRoutes(characterSlug).privateZone;
} }
if (returnTo === "profile") { if (returnTo === "profile") {
return getSubscriptionFallbackExitUrl(returnTo, characterSlug); return getSubscriptionFallbackExitUrl(returnTo, characterSlug);
src/lib/payment/__tests__/payment_search_params.test.ts
+3 -3
View File
@@ -39,10 +39,10 @@ describe("payment search params", () => {
it("accepts only supported subscription return targets", () => { it("accepts only supported subscription return targets", () => {
expect(parseSubscriptionReturnTo("chat")).toBe("chat"); expect(parseSubscriptionReturnTo("chat")).toBe("chat");
expect(parseSubscriptionReturnTo("private-zoom")).toBe("private-zoom"); expect(parseSubscriptionReturnTo("private-zone")).toBe("private-zone");
expect(parseSubscriptionReturnTo("profile")).toBe("profile"); expect(parseSubscriptionReturnTo("profile")).toBe("profile");
expect(parseSubscriptionReturnTo(["private-zoom", "chat"])).toBe( expect(parseSubscriptionReturnTo(["private-zone", "chat"])).toBe(
"private-zoom", "private-zone",
); );
expect(parseSubscriptionReturnTo("tip")).toBeNull(); expect(parseSubscriptionReturnTo("tip")).toBeNull();
expect(parseSubscriptionReturnTo(undefined)).toBeNull(); expect(parseSubscriptionReturnTo(undefined)).toBeNull();
src/lib/payment/__tests__/pending_payment_order.test.ts
+8 -8
View File
@@ -20,24 +20,24 @@ describe("pending payment order helpers", () => {
); );
}); });
it("preserves private zoom returns when rebuilding Ezpay urls", () => { it("preserves private zone returns when rebuilding Ezpay urls", () => {
expect( expect(
buildPendingPaymentSubscriptionUrl({ buildPendingPaymentSubscriptionUrl({
payChannel: "ezpay", payChannel: "ezpay",
returnTo: "private-zoom", returnTo: "private-zone",
subscriptionType: "topup", subscriptionType: "topup",
}), }),
).toBe( ).toBe(
"/subscription?type=topup&payChannel=ezpay&paymentReturn=1&returnTo=private-zoom&character=elio", "/subscription?type=topup&payChannel=ezpay&paymentReturn=1&returnTo=private-zone&character=elio",
); );
}); });
it("stores private zoom as an Ezpay return target", async () => { it("stores private zone as an Ezpay return target", async () => {
await clearPendingPaymentOrder(); await clearPendingPaymentOrder();
const saveResult = await savePendingEzpayOrder({ const saveResult = await savePendingEzpayOrder({
orderId: "order-private-zoom", orderId: "order-private-zone",
returnTo: "private-zoom", returnTo: "private-zone",
subscriptionType: "topup", subscriptionType: "topup",
createdAt: 1, createdAt: 1,
}); });
@@ -47,8 +47,8 @@ describe("pending payment order helpers", () => {
expect(storedResult).toMatchObject({ expect(storedResult).toMatchObject({
success: true, success: true,
data: { data: {
orderId: "order-private-zoom", orderId: "order-private-zone",
returnTo: "private-zoom", returnTo: "private-zone",
}, },
}); });
await clearPendingPaymentOrder(); await clearPendingPaymentOrder();
src/lib/payment/payment_search_params.ts
+1 -1
View File
@@ -28,7 +28,7 @@ export function parseSubscriptionReturnTo(
const returnTo = getFirstPaymentSearchParam(value); const returnTo = getFirstPaymentSearchParam(value);
if ( if (
returnTo === "chat" || returnTo === "chat" ||
returnTo === "private-zoom" || returnTo === "private-zone" ||
returnTo === "profile" returnTo === "profile"
) { ) {
return returnTo; return returnTo;
src/lib/private-zoom/private_album.ts → src/lib/private-zone/private_album.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import type { PrivateAlbum } from "@/data/schemas/private-zoom"; import type { PrivateAlbum } from "@/data/schemas/private-zone";
export function isPrivateAlbumLocked(album: PrivateAlbum): boolean { export function isPrivateAlbumLocked(album: PrivateAlbum): boolean {
return album.locked || !album.unlocked || album.lockDetail.locked; return album.locked || !album.unlocked || album.lockDetail.locked;
src/providers/__tests__/character-actor-scope-providers.test.tsx
+17 -17
View File
@@ -7,7 +7,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
const instances = vi.hoisted(() => ({ const instances = vi.hoisted(() => ({
chat: 0, chat: 0,
payment: 0, payment: 0,
privateZoom: 0, privateZone: 0,
})); }));
vi.mock("@/stores/chat/chat-context", async () => { vi.mock("@/stores/chat/chat-context", async () => {
@@ -51,23 +51,23 @@ vi.mock("@/stores/payment/payment-context", async () => {
}; };
}); });
vi.mock("@/stores/private-zoom", async () => { vi.mock("@/stores/private-zone", async () => {
const { createElement, useState } = await import("react"); const { createElement, useState } = await import("react");
return { return {
PrivateZoomProvider({ PrivateZoneProvider({
characterId, characterId,
children, children,
}: { }: {
characterId: string; characterId: string;
children: ReactNode; children: ReactNode;
}) { }) {
const [instanceId] = useState(() => ++instances.privateZoom); const [instanceId] = useState(() => ++instances.privateZone);
return createElement( return createElement(
"div", "div",
{ {
"data-character-id": characterId, "data-character-id": characterId,
"data-instance-id": instanceId, "data-instance-id": instanceId,
"data-testid": "private-zoom-provider", "data-testid": "private-zone-provider",
}, },
children, children,
); );
@@ -85,7 +85,7 @@ vi.mock("@/stores/sync/payment-success-sync", () => ({
import { ChatRouteProviders } from "@/providers/chat-route-providers"; import { ChatRouteProviders } from "@/providers/chat-route-providers";
import { PaymentRouteProvider } from "@/providers/payment-route-provider"; import { PaymentRouteProvider } from "@/providers/payment-route-provider";
import { PrivateZoomRouteProvider } from "@/providers/private-zoom-route-provider"; import { PrivateZoneRouteProvider } from "@/providers/private-zone-route-provider";
describe("character actor route providers", () => { describe("character actor route providers", () => {
let container: HTMLDivElement; let container: HTMLDivElement;
@@ -94,7 +94,7 @@ describe("character actor route providers", () => {
beforeEach(() => { beforeEach(() => {
instances.chat = 0; instances.chat = 0;
instances.payment = 0; instances.payment = 0;
instances.privateZoom = 0; instances.privateZone = 0;
(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }) (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean })
.IS_REACT_ACT_ENVIRONMENT = true; .IS_REACT_ACT_ENVIRONMENT = true;
container = document.createElement("div"); container = document.createElement("div");
@@ -121,14 +121,14 @@ describe("character actor route providers", () => {
); );
}); });
it("recreates the private-zoom actor when the character changes", () => { it("recreates the private-zone actor when the character changes", () => {
renderPrivateZoom("elio"); renderPrivateZone("elio");
const firstInstance = instanceId("private-zoom-provider"); const firstInstance = instanceId("private-zone-provider");
renderPrivateZoom("maya-tan"); renderPrivateZone("maya-tan");
expect(instanceId("private-zoom-provider")).not.toBe(firstInstance); expect(instanceId("private-zone-provider")).not.toBe(firstInstance);
expect(testNode("private-zoom-provider").dataset.characterId).toBe( expect(testNode("private-zone-provider").dataset.characterId).toBe(
"maya-tan", "maya-tan",
); );
}); });
@@ -155,12 +155,12 @@ describe("character actor route providers", () => {
}); });
} }
function renderPrivateZoom(characterId: string): void { function renderPrivateZone(characterId: string): void {
act(() => { act(() => {
root.render( root.render(
<PrivateZoomRouteProvider characterId={characterId}> <PrivateZoneRouteProvider characterId={characterId}>
<span>private zoom</span> <span>private zone</span>
</PrivateZoomRouteProvider>, </PrivateZoneRouteProvider>,
); );
}); });
} }
src/providers/private-zone-route-provider.tsx
+21
View File
@@ -0,0 +1,21 @@
"use client";
import type { ReactNode } from "react";
import { PrivateZoneProvider } from "@/stores/private-zone";
export interface PrivateZoneRouteProviderProps {
children: ReactNode;
characterId: string;
}
export function PrivateZoneRouteProvider({
children,
characterId,
}: PrivateZoneRouteProviderProps) {
return (
<PrivateZoneProvider key={characterId} characterId={characterId}>
{children}
</PrivateZoneProvider>
);
}
src/providers/private-zoom-route-provider.tsx
-21
View File
@@ -1,21 +0,0 @@
"use client";
import type { ReactNode } from "react";
import { PrivateZoomProvider } from "@/stores/private-zoom";
export interface PrivateZoomRouteProviderProps {
children: ReactNode;
characterId: string;
}
export function PrivateZoomRouteProvider({
children,
characterId,
}: PrivateZoomRouteProviderProps) {
return (
<PrivateZoomProvider key={characterId} characterId={characterId}>
{children}
</PrivateZoomProvider>
);
}
src/providers/root-providers.tsx
+1 -1
View File
@@ -4,7 +4,7 @@
* 根级 Client Providers 包装 * 根级 Client Providers 包装
* *
* 这里只保留跨路由的 Character Catalog、Auth、User、消息预览和 viewport * 这里只保留跨路由的 Character Catalog、Auth、User、消息预览和 viewport
* Provider。Chat、Payment、PrivateZoom 状态机由对应路由 layout 按需挂载。 * Provider。Chat、Payment、PrivateZone 状态机由对应路由 layout 按需挂载。
*/ */
import type { ReactNode } from "react"; import type { ReactNode } from "react";
src/router/__tests__/global-route-context.test.ts
+1 -1
View File
@@ -43,7 +43,7 @@ describe("global route context", () => {
"https://example.com/characters/maya/chat", "https://example.com/characters/maya/chat",
"//example.com/characters/maya/chat", "//example.com/characters/maya/chat",
"/characters/unknown/chat", "/characters/unknown/chat",
"/characters/maya/private-zoom", "/characters/maya/private-zone",
"/characters/maya/chat?image=1", "/characters/maya/chat?image=1",
])("falls back to Elio for an invalid return target", (value) => { ])("falls back to Elio for an invalid return target", (value) => {
expect(resolveGlobalRouteContextValue(value)).toBe( expect(resolveGlobalRouteContextValue(value)).toBe(
src/router/__tests__/navigation-resolver.test.ts
+3 -3
View File
@@ -54,15 +54,15 @@ describe("navigation resolver", () => {
).toBe(ROUTE_BUILDERS.authWithRedirect(subscriptionUrl)); ).toBe(ROUTE_BUILDERS.authWithRedirect(subscriptionUrl));
}); });
it("builds private zoom subscription return urls", () => { it("builds private zone subscription return urls", () => {
expect( expect(
ROUTE_BUILDERS.subscription("topup", { ROUTE_BUILDERS.subscription("topup", {
payChannel: "stripe", payChannel: "stripe",
returnTo: "private-zoom", returnTo: "private-zone",
sourceCharacterSlug: "maya", sourceCharacterSlug: "maya",
}), }),
).toBe( ).toBe(
"/subscription?type=topup&payChannel=stripe&returnTo=private-zoom&character=maya", "/subscription?type=topup&payChannel=stripe&returnTo=private-zone&character=maya",
); );
}); });
src/router/__tests__/route-meta.test.ts
+5 -5
View File
@@ -8,7 +8,7 @@ describe("route meta", () => {
expect(getRouteAccess(ROUTES.splash)).toBe("authOnly"); expect(getRouteAccess(ROUTES.splash)).toBe("authOnly");
expect(getRouteAccess(ROUTES.auth)).toBe("authOnly"); expect(getRouteAccess(ROUTES.auth)).toBe("authOnly");
expect(getRouteAccess(ROUTES.chat)).toBe("guestEntry"); expect(getRouteAccess(ROUTES.chat)).toBe("guestEntry");
expect(getRouteAccess(ROUTES.privateZoom)).toBe("guestEntry"); expect(getRouteAccess(ROUTES.privateZone)).toBe("guestEntry");
expect(getRouteAccess(ROUTES.tip)).toBe("public"); expect(getRouteAccess(ROUTES.tip)).toBe("public");
expect(getRouteAccess(ROUTES.externalEntry)).toBe("public"); expect(getRouteAccess(ROUTES.externalEntry)).toBe("public");
expect(getRouteAccess(ROUTES.profile)).toBe("realUser"); expect(getRouteAccess(ROUTES.profile)).toBe("realUser");
@@ -26,12 +26,12 @@ describe("route meta", () => {
expect(routes).toEqual({ expect(routes).toEqual({
splash: "/characters/maya/splash", splash: "/characters/maya/splash",
chat: "/characters/maya/chat", chat: "/characters/maya/chat",
privateZoom: "/characters/maya/private-zoom", privateZone: "/characters/maya/private-zone",
tip: "/characters/maya/tip", tip: "/characters/maya/tip",
}); });
expect(getRouteAccess(routes.splash)).toBe("authOnly"); expect(getRouteAccess(routes.splash)).toBe("authOnly");
expect(getRouteAccess(routes.chat)).toBe("guestEntry"); expect(getRouteAccess(routes.chat)).toBe("guestEntry");
expect(getRouteAccess(routes.privateZoom)).toBe("guestEntry"); expect(getRouteAccess(routes.privateZone)).toBe("guestEntry");
expect(getRouteAccess(routes.tip)).toBe("public"); expect(getRouteAccess(routes.tip)).toBe("public");
}); });
@@ -41,8 +41,8 @@ describe("route meta", () => {
expect(getRouteAccess("/characters/maya/coins-rules")).toBe("public"); expect(getRouteAccess("/characters/maya/coins-rules")).toBe("public");
}); });
it("includes private zoom in static routes", () => { it("includes private zone in static routes", () => {
expect(ALL_STATIC_ROUTES).toContain(ROUTES.privateZoom); expect(ALL_STATIC_ROUTES).toContain(ROUTES.privateZone);
}); });
it("includes tip in static routes", () => { it("includes tip in static routes", () => {
src/router/navigation-types.ts
+1 -1
View File
@@ -9,7 +9,7 @@ import type {
export type AppSubscriptionType = "vip" | "topup"; export type AppSubscriptionType = "vip" | "topup";
export type AppSubscriptionReturnTo = export type AppSubscriptionReturnTo =
| "chat" | "chat"
| "private-zoom" | "private-zone"
| "profile" | "profile"
| null; | null;
src/router/route-meta.ts
+2 -2
View File
@@ -12,7 +12,7 @@ const GLOBAL_ROUTE_ACCESS: Partial<Record<string, RouteAccess>> = {
[ROUTES.splash]: "authOnly", [ROUTES.splash]: "authOnly",
[ROUTES.auth]: "authOnly", [ROUTES.auth]: "authOnly",
[ROUTES.chat]: "guestEntry", [ROUTES.chat]: "guestEntry",
[ROUTES.privateZoom]: "guestEntry", [ROUTES.privateZone]: "guestEntry",
[ROUTES.tip]: "public", [ROUTES.tip]: "public",
[ROUTES.externalEntry]: "public", [ROUTES.externalEntry]: "public",
[ROUTES.profile]: "realUser", [ROUTES.profile]: "realUser",
@@ -24,7 +24,7 @@ const GLOBAL_ROUTE_ACCESS: Partial<Record<string, RouteAccess>> = {
const CHARACTER_ROUTE_ACCESS: Readonly<Record<string, RouteAccess>> = { const CHARACTER_ROUTE_ACCESS: Readonly<Record<string, RouteAccess>> = {
splash: "authOnly", splash: "authOnly",
chat: "guestEntry", chat: "guestEntry",
"private-zoom": "guestEntry", "private-zone": "guestEntry",
tip: "public", tip: "public",
}; };
src/router/routes.ts
+4 -4
View File
@@ -21,7 +21,7 @@ export const ROUTES = {
root: "/", root: "/",
splash: "/splash", splash: "/splash",
chat: "/chat", chat: "/chat",
privateZoom: "/private-zoom", privateZone: "/private-zone",
tip: "/tip", tip: "/tip",
externalEntry: "/external-entry", externalEntry: "/external-entry",
auth: "/auth", auth: "/auth",
@@ -36,7 +36,7 @@ export type StaticRoute = (typeof ROUTES)[keyof typeof ROUTES];
export interface CharacterRoutes { export interface CharacterRoutes {
readonly splash: string; readonly splash: string;
readonly chat: string; readonly chat: string;
readonly privateZoom: string; readonly privateZone: string;
readonly tip: string; readonly tip: string;
} }
@@ -47,7 +47,7 @@ export function getCharacterRoutes(
return { return {
splash: `${root}/splash`, splash: `${root}/splash`,
chat: `${root}/chat`, chat: `${root}/chat`,
privateZoom: `${root}/private-zoom`, privateZone: `${root}/private-zone`,
tip: `${root}/tip`, tip: `${root}/tip`,
}; };
} }
@@ -110,7 +110,7 @@ export const ROUTE_BUILDERS = {
export const ALL_STATIC_ROUTES: readonly StaticRoute[] = [ export const ALL_STATIC_ROUTES: readonly StaticRoute[] = [
ROUTES.splash, ROUTES.splash,
ROUTES.chat, ROUTES.chat,
ROUTES.privateZoom, ROUTES.privateZone,
ROUTES.tip, ROUTES.tip,
ROUTES.externalEntry, ROUTES.externalEntry,
ROUTES.auth, ROUTES.auth,
src/stores/private-zoom/__tests__/private-zoom-album-flow.test.ts → src/stores/private-zone/__tests__/private-zone-album-flow.test.ts
+11 -11
View File
@@ -2,18 +2,18 @@ import { describe, expect, it } from "vitest";
import { createActor, waitFor } from "xstate"; import { createActor, waitFor } from "xstate";
import { import {
createTestPrivateZoomMachine, createTestPrivateZoneMachine,
loadPrivateZoom, loadPrivateZone,
makeAlbum, makeAlbum,
makeAlbumsResponse, makeAlbumsResponse,
TEST_PRIVATE_ZOOM_INPUT, TEST_PRIVATE_ZONE_INPUT,
} from "./private-zoom-machine.test-utils"; } from "./private-zone-machine.test-utils";
describe("private zoom album flow", () => { describe("private zone album flow", () => {
it("loads albums for the supplied character", async () => { it("loads albums for the supplied character", async () => {
let loadedCharacterId: string | null = null; let loadedCharacterId: string | null = null;
const actor = createActor( const actor = createActor(
createTestPrivateZoomMachine({ createTestPrivateZoneMachine({
onLoad: ({ characterId }) => { onLoad: ({ characterId }) => {
loadedCharacterId = characterId; loadedCharacterId = characterId;
}, },
@@ -21,7 +21,7 @@ describe("private zoom album flow", () => {
{ input: { characterId: "character_aria" } }, { input: { characterId: "character_aria" } },
).start(); ).start();
actor.send({ type: "PrivateZoomInit" }); actor.send({ type: "PrivateZoneInit" });
await waitFor(actor, (snapshot) => snapshot.matches("ready")); await waitFor(actor, (snapshot) => snapshot.matches("ready"));
expect(actor.getSnapshot().context.characterId).toBe("character_aria"); expect(actor.getSnapshot().context.characterId).toBe("character_aria");
@@ -30,7 +30,7 @@ describe("private zoom album flow", () => {
}); });
it("loads only the first non-paginated album page", async () => { it("loads only the first non-paginated album page", async () => {
const actor = await loadPrivateZoom({ const actor = await loadPrivateZone({
loadResponse: makeAlbumsResponse({ loadResponse: makeAlbumsResponse({
items: Array.from({ length: 20 }, (_, index) => makeAlbum(index)), items: Array.from({ length: 20 }, (_, index) => makeAlbum(index)),
}), }),
@@ -43,12 +43,12 @@ describe("private zoom album flow", () => {
it("moves to failed when the album actor rejects", async () => { it("moves to failed when the album actor rejects", async () => {
const actor = createActor( const actor = createActor(
createTestPrivateZoomMachine({ createTestPrivateZoneMachine({
loadError: new Error("albums unavailable"), loadError: new Error("albums unavailable"),
}), }),
{ input: TEST_PRIVATE_ZOOM_INPUT }, { input: TEST_PRIVATE_ZONE_INPUT },
).start(); ).start();
actor.send({ type: "PrivateZoomInit" }); actor.send({ type: "PrivateZoneInit" });
await waitFor(actor, (snapshot) => snapshot.matches("failed")); await waitFor(actor, (snapshot) => snapshot.matches("failed"));
expect(actor.getSnapshot().context.errorMessage).toBe( expect(actor.getSnapshot().context.errorMessage).toBe(
"albums unavailable", "albums unavailable",
src/stores/private-zoom/__tests__/private-zoom-machine.test-utils.ts → src/stores/private-zone/__tests__/private-zone-machine.test-utils.ts
+13 -13
View File
@@ -8,13 +8,13 @@ import {
type PrivateAlbumUnlockResponseInput, type PrivateAlbumUnlockResponseInput,
type PrivateAlbumsResponse, type PrivateAlbumsResponse,
type PrivateAlbumsResponseInput, type PrivateAlbumsResponseInput,
} from "@/data/schemas/private-zoom"; } from "@/data/schemas/private-zone";
import { privateZoomMachine } from "@/stores/private-zoom/private-zoom-machine"; import { privateZoneMachine } from "@/stores/private-zone/private-zone-machine";
export const ALBUM_ID = "a1b2c3d4-0000-0000-0000-000000000000"; export const ALBUM_ID = "a1b2c3d4-0000-0000-0000-000000000000";
export const COVER_URL = export const COVER_URL =
"https://dbapi.banlv-ai.com/storage/v1/object/public/elio-schedules/01.jpg"; "https://dbapi.banlv-ai.com/storage/v1/object/public/elio-schedules/01.jpg";
export const TEST_PRIVATE_ZOOM_INPUT = { export const TEST_PRIVATE_ZONE_INPUT = {
characterId: DEFAULT_CHARACTER_ID, characterId: DEFAULT_CHARACTER_ID,
}; };
@@ -65,7 +65,7 @@ export function makeUnlockResponse(
}); });
} }
export function createTestPrivateZoomMachine( export function createTestPrivateZoneMachine(
options: { options: {
loadResponse?: PrivateAlbumsResponse; loadResponse?: PrivateAlbumsResponse;
unlockResponse?: PrivateAlbumUnlockResponse; unlockResponse?: PrivateAlbumUnlockResponse;
@@ -74,7 +74,7 @@ export function createTestPrivateZoomMachine(
onLoad?: (input: { characterId: string }) => void; onLoad?: (input: { characterId: string }) => void;
} = {}, } = {},
) { ) {
return privateZoomMachine.provide({ return privateZoneMachine.provide({
actors: { actors: {
loadAlbums: fromPromise<PrivateAlbumsResponse, { characterId: string }>( loadAlbums: fromPromise<PrivateAlbumsResponse, { characterId: string }>(
async ({ input }) => { async ({ input }) => {
@@ -91,24 +91,24 @@ export function createTestPrivateZoomMachine(
}); });
} }
export async function loadPrivateZoom( export async function loadPrivateZone(
options: Parameters<typeof createTestPrivateZoomMachine>[0] = {}, options: Parameters<typeof createTestPrivateZoneMachine>[0] = {},
) { ) {
const actor = createActor(createTestPrivateZoomMachine(options), { const actor = createActor(createTestPrivateZoneMachine(options), {
input: TEST_PRIVATE_ZOOM_INPUT, input: TEST_PRIVATE_ZONE_INPUT,
}).start(); }).start();
actor.send({ type: "PrivateZoomInit" }); actor.send({ type: "PrivateZoneInit" });
await waitFor(actor, (snapshot) => snapshot.matches("ready")); await waitFor(actor, (snapshot) => snapshot.matches("ready"));
return actor; return actor;
} }
export async function unlockFirstAlbum( export async function unlockFirstAlbum(
actor: Awaited<ReturnType<typeof loadPrivateZoom>>, actor: Awaited<ReturnType<typeof loadPrivateZone>>,
) { ) {
actor.send({ actor.send({
type: "PrivateZoomUnlockRequested", type: "PrivateZoneUnlockRequested",
albumId: ALBUM_ID, albumId: ALBUM_ID,
}); });
actor.send({ type: "PrivateZoomUnlockConfirmed" }); actor.send({ type: "PrivateZoneUnlockConfirmed" });
await waitFor(actor, (snapshot) => snapshot.matches("ready")); await waitFor(actor, (snapshot) => snapshot.matches("ready"));
} }
src/stores/private-zoom/__tests__/private-zoom-unlock-flow.test.ts → src/stores/private-zone/__tests__/private-zone-unlock-flow.test.ts
+9 -9
View File
@@ -3,14 +3,14 @@ import { describe, expect, it } from "vitest";
import { import {
ALBUM_ID, ALBUM_ID,
COVER_URL, COVER_URL,
loadPrivateZoom, loadPrivateZone,
makeUnlockResponse, makeUnlockResponse,
unlockFirstAlbum, unlockFirstAlbum,
} from "./private-zoom-machine.test-utils"; } from "./private-zone-machine.test-utils";
describe("private zoom unlock flow", () => { describe("private zone unlock flow", () => {
it("patches album images after a successful unlock", async () => { it("patches album images after a successful unlock", async () => {
const actor = await loadPrivateZoom(); const actor = await loadPrivateZone();
await unlockFirstAlbum(actor); await unlockFirstAlbum(actor);
expect(actor.getSnapshot().context.items[0]).toMatchObject({ expect(actor.getSnapshot().context.items[0]).toMatchObject({
albumId: ALBUM_ID, albumId: ALBUM_ID,
@@ -24,7 +24,7 @@ describe("private zoom unlock flow", () => {
}); });
it("exposes a paywall request when credits are low", async () => { it("exposes a paywall request when credits are low", async () => {
const actor = await loadPrivateZoom({ const actor = await loadPrivateZone({
unlockResponse: makeUnlockResponse({ unlockResponse: makeUnlockResponse({
locked: true, locked: true,
unlocked: false, unlocked: false,
@@ -47,7 +47,7 @@ describe("private zoom unlock flow", () => {
it("reloads when expected cost changes", async () => { it("reloads when expected cost changes", async () => {
let loadCount = 0; let loadCount = 0;
const actor = await loadPrivateZoom({ const actor = await loadPrivateZone({
onLoad: () => { onLoad: () => {
loadCount += 1; loadCount += 1;
}, },
@@ -66,7 +66,7 @@ describe("private zoom unlock flow", () => {
}); });
it("removes an album that no longer exists", async () => { it("removes an album that no longer exists", async () => {
const actor = await loadPrivateZoom({ const actor = await loadPrivateZone({
unlockResponse: makeUnlockResponse({ unlockResponse: makeUnlockResponse({
locked: true, locked: true,
unlocked: false, unlocked: false,
@@ -80,7 +80,7 @@ describe("private zoom unlock flow", () => {
}); });
it("keeps refunded persistence failures locked", async () => { it("keeps refunded persistence failures locked", async () => {
const actor = await loadPrivateZoom({ const actor = await loadPrivateZone({
unlockResponse: makeUnlockResponse({ unlockResponse: makeUnlockResponse({
locked: true, locked: true,
unlocked: false, unlocked: false,
@@ -99,7 +99,7 @@ describe("private zoom unlock flow", () => {
}); });
it("returns to ready when the unlock actor rejects", async () => { it("returns to ready when the unlock actor rejects", async () => {
const actor = await loadPrivateZoom({ const actor = await loadPrivateZone({
unlockError: new Error("unlock unavailable"), unlockError: new Error("unlock unavailable"),
}); });
await unlockFirstAlbum(actor); await unlockFirstAlbum(actor);
src/stores/private-zoom/helper/albums.ts → src/stores/private-zone/helper/albums.ts
+5 -5
View File
@@ -3,15 +3,15 @@ import {
PrivateAlbumSchema, PrivateAlbumSchema,
type PrivateAlbumsResponse, type PrivateAlbumsResponse,
type PrivateAlbumUnlockResponse, type PrivateAlbumUnlockResponse,
} from "@/data/schemas/private-zoom"; } from "@/data/schemas/private-zone";
import type { PrivateZoomState } from "../private-zoom-state"; import type { PrivateZoneState } from "../private-zone-state";
export const PRIVATE_ZOOM_PAGE_SIZE = 20; export const PRIVATE_ZONE_PAGE_SIZE = 20;
export function applyAlbumsResponse( export function applyAlbumsResponse(
response: PrivateAlbumsResponse, response: PrivateAlbumsResponse,
): Partial<PrivateZoomState> { ): Partial<PrivateZoneState> {
return { return {
items: response.items, items: response.items,
creditBalance: response.creditBalance, creditBalance: response.creditBalance,
@@ -20,7 +20,7 @@ export function applyAlbumsResponse(
} }
export function getPendingAlbum( export function getPendingAlbum(
context: PrivateZoomState, context: PrivateZoneState,
): PrivateAlbum | null { ): PrivateAlbum | null {
if (!context.pendingConfirmAlbumId) return null; if (!context.pendingConfirmAlbumId) return null;
return ( return (
src/stores/private-zoom/helper/index.ts → src/stores/private-zone/helper/index.ts
View File
src/stores/private-zoom/helper/unlock.ts → src/stores/private-zone/helper/unlock.ts
+5 -5
View File
@@ -1,10 +1,10 @@
import type { PrivateAlbumUnlockResponse } from "@/data/schemas/private-zoom"; import type { PrivateAlbumUnlockResponse } from "@/data/schemas/private-zone";
import type { PrivateZoomUnlockPaywallRequest } from "../private-zoom-state"; import type { PrivateZoneUnlockPaywallRequest } from "../private-zone-state";
export function toPrivateZoomErrorMessage(error: unknown): string { export function toPrivateZoneErrorMessage(error: unknown): string {
if (error instanceof Error && error.message) return error.message; if (error instanceof Error && error.message) return error.message;
return "Private Zoom is temporarily unavailable. Please try again."; return "Private Zone is temporarily unavailable. Please try again.";
} }
export function toUnlockErrorMessage( export function toUnlockErrorMessage(
@@ -30,7 +30,7 @@ export function toUnlockErrorMessage(
export function toPaywallRequest( export function toPaywallRequest(
response: PrivateAlbumUnlockResponse, response: PrivateAlbumUnlockResponse,
): PrivateZoomUnlockPaywallRequest { ): PrivateZoneUnlockPaywallRequest {
return { return {
albumId: response.albumId, albumId: response.albumId,
reason: response.reason, reason: response.reason,
src/stores/private-zone/index.ts
+7
View File
@@ -0,0 +1,7 @@
/** @file Private Zone store barrel. */
export * from "./private-zone-context";
export * from "./private-zone-events";
export * from "./helper";
export * from "./private-zone-machine";
export * from "./private-zone-state";
src/stores/private-zoom/machine/actors/albums.ts → src/stores/private-zone/machine/actors/albums.ts
+6 -6
View File
@@ -3,19 +3,19 @@ import { fromPromise } from "xstate";
import type { import type {
PrivateAlbumsResponse, PrivateAlbumsResponse,
PrivateAlbumUnlockResponse, PrivateAlbumUnlockResponse,
} from "@/data/schemas/private-zoom"; } from "@/data/schemas/private-zone";
import { getPrivateZoomRepository } from "@/data/repositories/private_zoom_repository"; import { getPrivateZoneRepository } from "@/data/repositories/private_zone_repository";
import { Result } from "@/utils/result"; import { Result } from "@/utils/result";
import { PRIVATE_ZOOM_PAGE_SIZE } from "../../helper/albums"; import { PRIVATE_ZONE_PAGE_SIZE } from "../../helper/albums";
export const loadPrivateAlbumsActor = export const loadPrivateAlbumsActor =
fromPromise<PrivateAlbumsResponse, { characterId: string }>(async ({ fromPromise<PrivateAlbumsResponse, { characterId: string }>(async ({
input, input,
}) => { }) => {
const result = await getPrivateZoomRepository().getAlbums({ const result = await getPrivateZoneRepository().getAlbums({
characterId: input.characterId, characterId: input.characterId,
limit: PRIVATE_ZOOM_PAGE_SIZE, limit: PRIVATE_ZONE_PAGE_SIZE,
}); });
if (Result.isErr(result)) throw result.error; if (Result.isErr(result)) throw result.error;
return result.data; return result.data;
@@ -25,7 +25,7 @@ export const unlockPrivateAlbumActor = fromPromise<
PrivateAlbumUnlockResponse, PrivateAlbumUnlockResponse,
{ albumId: string; expectedCost: number } { albumId: string; expectedCost: number }
>(async ({ input }) => { >(async ({ input }) => {
const result = await getPrivateZoomRepository().unlockAlbum( const result = await getPrivateZoneRepository().unlockAlbum(
input.albumId, input.albumId,
input.expectedCost, input.expectedCost,
); );
src/stores/private-zoom/machine/album-flow.ts → src/stores/private-zone/machine/album-flow.ts
+12 -12
View File
@@ -1,43 +1,43 @@
import type { DoneActorEvent, ErrorActorEvent } from "xstate"; import type { DoneActorEvent, ErrorActorEvent } from "xstate";
import type { PrivateAlbumsResponse } from "@/data/schemas/private-zoom"; import type { PrivateAlbumsResponse } from "@/data/schemas/private-zone";
import { applyAlbumsResponse } from "../helper/albums"; import { applyAlbumsResponse } from "../helper/albums";
import { toPrivateZoomErrorMessage } from "../helper/unlock"; import { toPrivateZoneErrorMessage } from "../helper/unlock";
import { import {
basePrivateZoomMachineSetup, basePrivateZoneMachineSetup,
createPrivateZoomActorActionSetup, createPrivateZoneActorActionSetup,
} from "./setup"; } from "./setup";
const clearAlbumLoadStateAction = basePrivateZoomMachineSetup.assign({ const clearAlbumLoadStateAction = basePrivateZoneMachineSetup.assign({
errorMessage: null, errorMessage: null,
unlockPaywallRequest: null, unlockPaywallRequest: null,
}); });
export const albumMachineSetup = basePrivateZoomMachineSetup.extend({ export const albumMachineSetup = basePrivateZoneMachineSetup.extend({
actions: { actions: {
clearAlbumLoadState: clearAlbumLoadStateAction, clearAlbumLoadState: clearAlbumLoadStateAction,
}, },
}); });
const albumsDoneSetup = const albumsDoneSetup =
createPrivateZoomActorActionSetup< createPrivateZoneActorActionSetup<
DoneActorEvent<PrivateAlbumsResponse> DoneActorEvent<PrivateAlbumsResponse>
>(); >();
const albumErrorSetup = const albumErrorSetup =
createPrivateZoomActorActionSetup<ErrorActorEvent>(); createPrivateZoneActorActionSetup<ErrorActorEvent>();
const applyAlbumsResponseAction = albumsDoneSetup.assign(({ event }) => const applyAlbumsResponseAction = albumsDoneSetup.assign(({ event }) =>
applyAlbumsResponse(event.output), applyAlbumsResponse(event.output),
); );
const applyAlbumLoadErrorAction = albumErrorSetup.assign(({ event }) => ({ const applyAlbumLoadErrorAction = albumErrorSetup.assign(({ event }) => ({
errorMessage: toPrivateZoomErrorMessage(event.error), errorMessage: toPrivateZoneErrorMessage(event.error),
})); }));
export const idleState = albumMachineSetup.createStateConfig({ export const idleState = albumMachineSetup.createStateConfig({
on: { on: {
PrivateZoomInit: "loading", PrivateZoneInit: "loading",
}, },
}); });
@@ -59,7 +59,7 @@ export const loadingState = albumMachineSetup.createStateConfig({
export const failedState = albumMachineSetup.createStateConfig({ export const failedState = albumMachineSetup.createStateConfig({
on: { on: {
PrivateZoomInit: "loading", PrivateZoneInit: "loading",
PrivateZoomRefresh: "loading", PrivateZoneRefresh: "loading",
}, },
}); });
src/stores/private-zoom/machine/setup.ts → src/stores/private-zone/machine/setup.ts
+14 -14
View File
@@ -1,22 +1,22 @@
import { setup, type ActionFunction, type EventObject } from "xstate"; import { setup, type ActionFunction, type EventObject } from "xstate";
import { getPendingAlbum } from "../helper/albums"; import { getPendingAlbum } from "../helper/albums";
import type { PrivateZoomEvent } from "../private-zoom-events"; import type { PrivateZoneEvent } from "../private-zone-events";
import type { PrivateZoomState } from "../private-zoom-state"; import type { PrivateZoneState } from "../private-zone-state";
import { import {
loadPrivateAlbumsActor, loadPrivateAlbumsActor,
unlockPrivateAlbumActor, unlockPrivateAlbumActor,
} from "./actors/albums"; } from "./actors/albums";
export interface PrivateZoomMachineInput { export interface PrivateZoneMachineInput {
characterId: string; characterId: string;
} }
export const basePrivateZoomMachineSetup = setup({ export const basePrivateZoneMachineSetup = setup({
types: { types: {
context: {} as PrivateZoomState, context: {} as PrivateZoneState,
events: {} as PrivateZoomEvent, events: {} as PrivateZoneEvent,
input: {} as PrivateZoomMachineInput, input: {} as PrivateZoneMachineInput,
}, },
actors: { actors: {
loadAlbums: loadPrivateAlbumsActor, loadAlbums: loadPrivateAlbumsActor,
@@ -27,10 +27,10 @@ export const basePrivateZoomMachineSetup = setup({
}, },
}); });
type PrivateZoomActorAction<TEvent extends EventObject> = ActionFunction< type PrivateZoneActorAction<TEvent extends EventObject> = ActionFunction<
PrivateZoomState, PrivateZoneState,
TEvent, TEvent,
PrivateZoomEvent, PrivateZoneEvent,
undefined, undefined,
never, never,
never, never,
@@ -39,22 +39,22 @@ type PrivateZoomActorAction<TEvent extends EventObject> = ActionFunction<
never never
>; >;
export function createPrivateZoomActorActionSetup< export function createPrivateZoneActorActionSetup<
TEvent extends EventObject, TEvent extends EventObject,
>() { >() {
const actorActionSetup = setup({ const actorActionSetup = setup({
types: { types: {
context: {} as PrivateZoomState, context: {} as PrivateZoneState,
events: {} as TEvent, events: {} as TEvent,
}, },
}); });
return { return {
assign( assign(
assignment: Parameters<typeof actorActionSetup.assign>[0], assignment: Parameters<typeof actorActionSetup.assign>[0],
): PrivateZoomActorAction<TEvent> { ): PrivateZoneActorAction<TEvent> {
return actorActionSetup.assign( return actorActionSetup.assign(
assignment, assignment,
) as unknown as PrivateZoomActorAction<TEvent>; ) as unknown as PrivateZoneActorAction<TEvent>;
}, },
}; };
} }
src/stores/private-zoom/machine/unlock-flow.ts → src/stores/private-zone/machine/unlock-flow.ts
+18 -18
View File
@@ -1,6 +1,6 @@
import type { DoneActorEvent, ErrorActorEvent } from "xstate"; import type { DoneActorEvent, ErrorActorEvent } from "xstate";
import type { PrivateAlbumUnlockResponse } from "@/data/schemas/private-zoom"; import type { PrivateAlbumUnlockResponse } from "@/data/schemas/private-zone";
import { import {
getPendingAlbum, getPendingAlbum,
@@ -9,7 +9,7 @@ import {
} from "../helper/albums"; } from "../helper/albums";
import { import {
toPaywallRequest, toPaywallRequest,
toPrivateZoomErrorMessage, toPrivateZoneErrorMessage,
toUnlockErrorMessage, toUnlockErrorMessage,
} from "../helper/unlock"; } from "../helper/unlock";
import { import {
@@ -18,10 +18,10 @@ import {
idleState, idleState,
loadingState, loadingState,
} from "./album-flow"; } from "./album-flow";
import { createPrivateZoomActorActionSetup } from "./setup"; import { createPrivateZoneActorActionSetup } from "./setup";
const requestUnlockAction = albumMachineSetup.assign(({ event }) => const requestUnlockAction = albumMachineSetup.assign(({ event }) =>
event.type === "PrivateZoomUnlockRequested" event.type === "PrivateZoneUnlockRequested"
? { ? {
pendingConfirmAlbumId: event.albumId, pendingConfirmAlbumId: event.albumId,
unlockErrorMessage: null, unlockErrorMessage: null,
@@ -44,7 +44,7 @@ const beginUnlockAction = albumMachineSetup.assign(({ context }) => ({
unlockPaywallRequest: null, unlockPaywallRequest: null,
})); }));
export const privateZoomMachineSetup = albumMachineSetup.extend({ export const privateZoneMachineSetup = albumMachineSetup.extend({
actions: { actions: {
requestUnlock: requestUnlockAction, requestUnlock: requestUnlockAction,
cancelUnlock: cancelUnlockAction, cancelUnlock: cancelUnlockAction,
@@ -54,11 +54,11 @@ export const privateZoomMachineSetup = albumMachineSetup.extend({
}); });
const unlockDoneSetup = const unlockDoneSetup =
createPrivateZoomActorActionSetup< createPrivateZoneActorActionSetup<
DoneActorEvent<PrivateAlbumUnlockResponse> DoneActorEvent<PrivateAlbumUnlockResponse>
>(); >();
const unlockErrorSetup = const unlockErrorSetup =
createPrivateZoomActorActionSetup<ErrorActorEvent>(); createPrivateZoneActorActionSetup<ErrorActorEvent>();
const applyUnlockSuccessAction = unlockDoneSetup.assign( const applyUnlockSuccessAction = unlockDoneSetup.assign(
({ context, event }) => ({ ({ context, event }) => ({
@@ -111,26 +111,26 @@ const applyUnlockFailureAction = unlockDoneSetup.assign(
const applyUnlockActorErrorAction = unlockErrorSetup.assign(({ event }) => ({ const applyUnlockActorErrorAction = unlockErrorSetup.assign(({ event }) => ({
pendingConfirmAlbumId: null, pendingConfirmAlbumId: null,
unlockingAlbumId: null, unlockingAlbumId: null,
unlockErrorMessage: toPrivateZoomErrorMessage(event.error), unlockErrorMessage: toPrivateZoneErrorMessage(event.error),
})); }));
const readyState = privateZoomMachineSetup.createStateConfig({ const readyState = privateZoneMachineSetup.createStateConfig({
on: { on: {
PrivateZoomInit: "loading", PrivateZoneInit: "loading",
PrivateZoomRefresh: "loading", PrivateZoneRefresh: "loading",
PrivateZoomUnlockRequested: { actions: "requestUnlock" }, PrivateZoneUnlockRequested: { actions: "requestUnlock" },
PrivateZoomUnlockCancelled: { actions: "cancelUnlock" }, PrivateZoneUnlockCancelled: { actions: "cancelUnlock" },
PrivateZoomUnlockConfirmed: [ PrivateZoneUnlockConfirmed: [
{ {
guard: "hasPendingAlbum", guard: "hasPendingAlbum",
target: "unlocking", target: "unlocking",
}, },
], ],
PrivateZoomUnlockPaywallConsumed: { actions: "clearUnlockPaywall" }, PrivateZoneUnlockPaywallConsumed: { actions: "clearUnlockPaywall" },
}, },
}); });
const unlockingState = privateZoomMachineSetup.createStateConfig({ const unlockingState = privateZoneMachineSetup.createStateConfig({
entry: "beginUnlock", entry: "beginUnlock",
invoke: { invoke: {
src: "unlockAlbum", src: "unlockAlbum",
@@ -175,8 +175,8 @@ const unlockingState = privateZoomMachineSetup.createStateConfig({
}, },
}); });
export const privateZoomRootStateConfig = export const privateZoneRootStateConfig =
privateZoomMachineSetup.createStateConfig({ privateZoneMachineSetup.createStateConfig({
initial: "idle", initial: "idle",
states: { states: {
idle: idleState, idle: idleState,
src/stores/private-zoom/private-zoom-context.tsx → src/stores/private-zone/private-zone-context.tsx
+24 -24
View File
@@ -4,14 +4,14 @@ import type { Dispatch, ReactNode } from "react";
import { createActorContext, shallowEqual } from "@xstate/react"; import { createActorContext, shallowEqual } from "@xstate/react";
import type { SnapshotFrom } from "xstate"; import type { SnapshotFrom } from "xstate";
import { privateZoomMachine } from "./private-zoom-machine"; import { privateZoneMachine } from "./private-zone-machine";
import type { import type {
PrivateZoomEvent, PrivateZoneEvent,
PrivateZoomState as MachineContext, PrivateZoneState as MachineContext,
} from "./private-zoom-machine"; } from "./private-zone-machine";
/** Route UI reads this projection instead of the Private Zoom snapshot. */ /** Route UI reads this projection instead of the Private Zone snapshot. */
export interface PrivateZoomContextState { export interface PrivateZoneContextState {
characterId: string; characterId: string;
status: string; status: string;
items: MachineContext["items"]; items: MachineContext["items"];
@@ -26,45 +26,45 @@ export interface PrivateZoomContextState {
isUnlocking: boolean; isUnlocking: boolean;
} }
type PrivateZoomSnapshot = SnapshotFrom<typeof privateZoomMachine>; type PrivateZoneSnapshot = SnapshotFrom<typeof privateZoneMachine>;
type PrivateZoomSelector<T> = (snapshot: PrivateZoomSnapshot) => T; type PrivateZoneSelector<T> = (snapshot: PrivateZoneSnapshot) => T;
const PrivateZoomActorContext = createActorContext(privateZoomMachine); const PrivateZoneActorContext = createActorContext(privateZoneMachine);
export interface PrivateZoomProviderProps { export interface PrivateZoneProviderProps {
children: ReactNode; children: ReactNode;
characterId: string; characterId: string;
} }
export function PrivateZoomProvider({ export function PrivateZoneProvider({
children, children,
characterId, characterId,
}: PrivateZoomProviderProps) { }: PrivateZoneProviderProps) {
return ( return (
<PrivateZoomActorContext.Provider options={{ input: { characterId } }}> <PrivateZoneActorContext.Provider options={{ input: { characterId } }}>
{children} {children}
</PrivateZoomActorContext.Provider> </PrivateZoneActorContext.Provider>
); );
} }
export function usePrivateZoomState(): PrivateZoomContextState { export function usePrivateZoneState(): PrivateZoneContextState {
return usePrivateZoomSelector(selectPrivateZoomState, shallowEqual); return usePrivateZoneSelector(selectPrivateZoneState, shallowEqual);
} }
export function usePrivateZoomDispatch(): Dispatch<PrivateZoomEvent> { export function usePrivateZoneDispatch(): Dispatch<PrivateZoneEvent> {
return PrivateZoomActorContext.useActorRef().send; return PrivateZoneActorContext.useActorRef().send;
} }
export function usePrivateZoomSelector<T>( export function usePrivateZoneSelector<T>(
selector: PrivateZoomSelector<T>, selector: PrivateZoneSelector<T>,
compare?: (previous: T, next: T) => boolean, compare?: (previous: T, next: T) => boolean,
): T { ): T {
return PrivateZoomActorContext.useSelector(selector, compare); return PrivateZoneActorContext.useSelector(selector, compare);
} }
function selectPrivateZoomState( function selectPrivateZoneState(
state: PrivateZoomSnapshot, state: PrivateZoneSnapshot,
): PrivateZoomContextState { ): PrivateZoneContextState {
return { return {
characterId: state.context.characterId, characterId: state.context.characterId,
status: String(state.value), status: String(state.value),
src/stores/private-zone/private-zone-events.ts
+8
View File
@@ -0,0 +1,8 @@
/** Public events for one character-scoped Private Zone actor. */
export type PrivateZoneEvent =
| { type: "PrivateZoneInit" }
| { type: "PrivateZoneRefresh" }
| { type: "PrivateZoneUnlockRequested"; albumId: string }
| { type: "PrivateZoneUnlockConfirmed" }
| { type: "PrivateZoneUnlockCancelled" }
| { type: "PrivateZoneUnlockPaywallConsumed" };
src/stores/private-zone/private-zone-machine.ts
+18
View File
@@ -0,0 +1,18 @@
import {
privateZoneMachineSetup,
privateZoneRootStateConfig,
} from "./machine/unlock-flow";
import { createInitialPrivateZoneState } from "./private-zone-state";
export type { PrivateZoneEvent } from "./private-zone-events";
export type { PrivateZoneState } from "./private-zone-state";
export { initialState } from "./private-zone-state";
export const privateZoneMachine = privateZoneMachineSetup.createMachine({
id: "privateZone",
context: ({ input }) =>
createInitialPrivateZoneState(input.characterId),
...privateZoneRootStateConfig,
});
export type PrivateZoneMachine = typeof privateZoneMachine;
src/stores/private-zoom/private-zoom-state.ts → src/stores/private-zone/private-zone-state.ts
+7 -7
View File
@@ -1,7 +1,7 @@
import { DEFAULT_CHARACTER_ID } from "@/data/constants/character"; import { DEFAULT_CHARACTER_ID } from "@/data/constants/character";
import type { PrivateAlbum } from "@/data/schemas/private-zoom"; import type { PrivateAlbum } from "@/data/schemas/private-zone";
export interface PrivateZoomUnlockPaywallRequest { export interface PrivateZoneUnlockPaywallRequest {
albumId: string; albumId: string;
reason: string; reason: string;
requiredCredits: number; requiredCredits: number;
@@ -9,7 +9,7 @@ export interface PrivateZoomUnlockPaywallRequest {
shortfallCredits: number; shortfallCredits: number;
} }
export interface PrivateZoomState { export interface PrivateZoneState {
characterId: string; characterId: string;
items: readonly PrivateAlbum[]; items: readonly PrivateAlbum[];
creditBalance: number; creditBalance: number;
@@ -17,13 +17,13 @@ export interface PrivateZoomState {
unlockingAlbumId: string | null; unlockingAlbumId: string | null;
unlockErrorMessage: string | null; unlockErrorMessage: string | null;
pendingConfirmAlbumId: string | null; pendingConfirmAlbumId: string | null;
unlockPaywallRequest: PrivateZoomUnlockPaywallRequest | null; unlockPaywallRequest: PrivateZoneUnlockPaywallRequest | null;
unlockSuccessNonce: number; unlockSuccessNonce: number;
} }
export function createInitialPrivateZoomState( export function createInitialPrivateZoneState(
characterId: string, characterId: string,
): PrivateZoomState { ): PrivateZoneState {
return { return {
characterId, characterId,
items: [], items: [],
@@ -37,4 +37,4 @@ export function createInitialPrivateZoomState(
}; };
} }
export const initialState = createInitialPrivateZoomState(DEFAULT_CHARACTER_ID); export const initialState = createInitialPrivateZoneState(DEFAULT_CHARACTER_ID);

Some files were not shown because too many files have changed in this diff Show More