From d5aaecbf724b07c0c51f96ef7947c47c60643c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9B=AE=E6=A3=83?= Date: Fri, 7 Mar 2025 17:59:35 +0800 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=BF=81=E7=A7=BB&=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/app/t-postcard.vue | 10 +- src/components/pageAnno/ta-parser.vue | 2 +- src/components/viewPost/tp-avatar.vue | 2 +- src/components/viewPost/tp-backupText.vue | 2 +- src/components/viewPost/tp-divider.vue | 2 +- src/components/viewPost/tp-parser.vue | 6 +- src/components/viewPost/tp-unknown.vue | 2 +- src/components/viewPost/vp-btn-collect.vue | 2 +- .../viewPost/vp-overlay-collect.vue | 2 +- .../viewPost/vp-overlay-collection.vue | 2 +- .../viewPost/vp-overlay-lottery.vue | 4 +- src/components/viewPost/vp-overlay-search.vue | 2 +- src/pages/common/PostCollect.vue | 7 +- src/pages/common/PostForum.vue | 2 +- src/pages/common/PostNews.vue | 8 +- src/pages/common/PostTopic.vue | 2 +- src/plugins/Sqlite/modules/userAccount.ts | 8 +- src/plugins/Sqlite/modules/userCollect.ts | 11 +- src/types/BBS/Account.d.ts | 32 -- src/types/BBS/Collection.d.ts | 17 +- src/types/BBS/Forum.d.ts | 20 +- src/types/BBS/Game.d.ts | 46 ++- src/types/BBS/Lottery.d.ts | 14 +- src/types/BBS/News.d.ts | 32 -- .../Mys/types => types/BBS}/Post.d.ts | 372 +++++++++++------- src/types/BBS/Reply.d.ts | 71 +++- .../Mys/types => types/BBS}/SctPost.d.ts | 18 +- src/types/BBS/Search.d.ts | 36 -- src/types/BBS/Topic.d.ts | 4 +- .../Mys/types => types/BBS}/User.d.ts | 221 +++-------- src/types/Sqlite/Collection.d.ts | 2 +- src/views/t-anno-json.vue | 2 +- src/views/t-post-json.vue | 4 +- src/views/t-post.vue | 14 +- src/web/request/bbsReq.ts | 12 +- src/web/request/painterReq.ts | 6 +- src/web/request/postReq.ts | 16 +- src/web/request/takumiReq.ts | 7 +- src/web/utils/annoParser.ts | 59 ++- 39 files changed, 514 insertions(+), 567 deletions(-) delete mode 100644 src/types/BBS/Account.d.ts delete mode 100644 src/types/BBS/News.d.ts rename src/{plugins/Mys/types => types/BBS}/Post.d.ts (56%) rename src/{plugins/Mys/types => types/BBS}/SctPost.d.ts (66%) delete mode 100644 src/types/BBS/Search.d.ts rename src/{plugins/Mys/types => types/BBS}/User.d.ts (62%) diff --git a/src/components/app/t-postcard.vue b/src/components/app/t-postcard.vue index 9e2e322d..3918a3cb 100644 --- a/src/components/app/t-postcard.vue +++ b/src/components/app/t-postcard.vue @@ -75,7 +75,7 @@ import { computed, onMounted, shallowRef, watch } from "vue"; import { generateShareImg } from "@/utils/TGShare.js"; import { createPost } from "@/utils/TGWindow.js"; -type TPostCardProps = { modelValue: TGApp.Plugins.Mys.Post.FullData; selectMode?: boolean }; +type TPostCardProps = { modelValue: TGApp.BBS.Post.FullData; selectMode?: boolean }; type TPostCardEmits = (e: "onSelected", v: string) => void; type TPostStatus = RenderStatus & { stat: ActStat }; type RenderForum = { name: string; icon: string; id: number }; @@ -86,7 +86,7 @@ export type RenderCard = { cover: string; postId: number; subtitle: string; - user: TGApp.Plugins.Mys.User.Post | null; + user: TGApp.BBS.Post.User | null; forum: RenderForum | null; data: RenderData | null; status?: RenderStatus; @@ -130,7 +130,7 @@ function getActivityStatus(status: number): RenderStatus { return stats[ActStat.UNKNOWN]; } -function getPostCover(item: TGApp.Plugins.Mys.Post.FullData): string { +function getPostCover(item: TGApp.BBS.Post.FullData): string { let cover; if (item.cover) cover = item.cover.url; else if (item.post.cover) cover = item.post.cover; @@ -140,7 +140,7 @@ function getPostCover(item: TGApp.Plugins.Mys.Post.FullData): string { return `${cover}?x-oss-process=image/resize,m_fill,w_360,h_130,limit_0/format,png`; } -function getCommonCard(item: TGApp.Plugins.Mys.Post.FullData): RenderCard { +function getCommonCard(item: TGApp.BBS.Post.FullData): RenderCard { let forumData: RenderForum | null = null; let statData: RenderData | null = null; if (item.forum !== null) { @@ -167,7 +167,7 @@ function getCommonCard(item: TGApp.Plugins.Mys.Post.FullData): RenderCard { }; } -function getPostCard(item: TGApp.Plugins.Mys.Post.FullData): RenderCard { +function getPostCard(item: TGApp.BBS.Post.FullData): RenderCard { const commonCard = getCommonCard(item); if ( item.news_meta !== undefined && diff --git a/src/components/pageAnno/ta-parser.vue b/src/components/pageAnno/ta-parser.vue index b9ac0ebd..15f12a30 100644 --- a/src/components/pageAnno/ta-parser.vue +++ b/src/components/pageAnno/ta-parser.vue @@ -21,7 +21,7 @@ import parseAnnoContent from "@/web/utils/annoParser.js"; type TaParserProps = { data: TGApp.BBS.Announcement.ContentItem }; const props = defineProps(); -function getTaName(ta: TGApp.Plugins.Mys.SctPost.Base): Component { +function getTaName(ta: TGApp.BBS.SctPost.Base): Component { if (ta.children) return TpTexts; if (typeof ta.insert === "string") return TpText; if ("image" in ta.insert) return TpImage; diff --git a/src/components/viewPost/tp-avatar.vue b/src/components/viewPost/tp-avatar.vue index 64f89c8a..7e588e03 100644 --- a/src/components/viewPost/tp-avatar.vue +++ b/src/components/viewPost/tp-avatar.vue @@ -30,7 +30,7 @@ import TMiImg from "@comp/app/t-mi-img.vue"; import { computed } from "vue"; -type TpAvatarProps = { data: TGApp.Plugins.Mys.User.Post; position: "left" | "right" }; +type TpAvatarProps = { data: TGApp.BBS.Post.User; position: "left" | "right" }; const props = defineProps(); diff --git a/src/components/viewPost/tp-backupText.vue b/src/components/viewPost/tp-backupText.vue index d849b840..6e02188c 100644 --- a/src/components/viewPost/tp-backupText.vue +++ b/src/components/viewPost/tp-backupText.vue @@ -22,7 +22,7 @@ - +