diff --git a/.env.production b/.env.production index 014676a3..31e41a0a 100644 --- a/.env.production +++ b/.env.production @@ -1,3 +1,3 @@ VITE_SENTRY_RELEASE=TeyvatGuide@0.10.0 -VITE_COMMIT_HASH=3ded02e1 -VITE_BUILD_TIME=1776054886 +VITE_COMMIT_HASH=60ddfaee +VITE_BUILD_TIME=1776074393 diff --git a/src/components/pageHome/ph-pool-card.vue b/src/components/pageHome/ph-pool-card.vue index dda02943..978637d9 100644 --- a/src/components/pageHome/ph-pool-card.vue +++ b/src/components/pageHome/ph-pool-card.vue @@ -69,6 +69,7 @@ import TItemBox, { TItemBoxData } from "@comp/app/t-itemBox.vue"; import showSnackbar from "@comp/func/snackbar.js"; import postReq from "@req/postReq.js"; import useHomeStore from "@store/home.js"; +import TGHttps from "@utils/TGHttps.js"; import TGLogger from "@utils/TGLogger.js"; import { createPost, createTGWindow } from "@utils/TGWindow.js"; import { stamp2LastTime } from "@utils/toolFunc.js"; @@ -133,20 +134,29 @@ async function loadCover(): Promise { cover.value = poolCover.value[postId]; return; } - const resp = await postReq.post(postId, {}); - if ("retcode" in resp) { - showSnackbar.error(`[PhPoolCard][${resp.retcode}] ${resp.message}`); - await TGLogger.Error(`[PhPoolCard][${resp.retcode}] ${resp.message}`); + let resp: TGApp.BBS.Post.FullResp | undefined; + try { + resp = await postReq.post(postId, {}); + if (resp.retcode !== 0) { + showSnackbar.error(`[PhPoolCard][${resp.retcode}] ${resp.message}`); + await TGLogger.Warn(`[PhPoolCard][${resp.retcode}] ${resp.message}`); + return; + } + } catch (e) { + const errMsg = TGHttps.getErrMsg(e); + showSnackbar.error(`获取帖子封面失败:${errMsg}`); + await TGLogger.Error(`[PhPoolCard] 获取帖子封面异常`); + await TGLogger.Error(`[PhPoolCard] ${e}`); return; } let coverGet; - if (resp.cover) coverGet = resp.cover.url; - else if (resp.post.cover && resp.post.cover !== "") coverGet = resp.post.cover; - else if (resp.post.images.length > 0) coverGet = resp.post.images[0]; + if (resp.data.cover) coverGet = resp.data.cover.url; + else if (resp.data.post.cover && resp.data.post.cover !== "") coverGet = resp.data.post.cover; + else if (resp.data.post.images.length > 0) coverGet = resp.data.post.images[0]; else coverGet = ""; cover.value = coverGet; - if (!poolCover.value) poolCover.value = { [postId]: resp.post.cover }; - else poolCover.value[postId] = resp.post.cover; + if (!poolCover.value) poolCover.value = { [postId]: resp.data.post.cover }; + else poolCover.value[postId] = resp.data.post.cover; } function handlePosition(): void { diff --git a/src/components/userScripts/tus-mission.vue b/src/components/userScripts/tus-mission.vue index 7f833512..9c59bfa5 100644 --- a/src/components/userScripts/tus-mission.vue +++ b/src/components/userScripts/tus-mission.vue @@ -245,18 +245,26 @@ async function tryAuto(skip: boolean = false): Promise { await TGLogger.Script( `[米游币任务]正在浏览帖子${post.post.post_id} (当前 1 分钟内请求数:${currentCount}/10)`, ); - const detailResp = await postDetailRateLimiter.execute(() => - postReq.post(post.post.post_id, ckPost), - ); - if ("retcode" in detailResp) { - await TGLogger.Script( - `[米游币任务]获取帖子${post.post.post_id}失败:${detailResp.retcode} ${detailResp.message}`, + let detailResp: TGApp.BBS.Post.FullResp | undefined; + try { + detailResp = await postDetailRateLimiter.execute(() => + postReq.post(post.post.post_id, ckPost), ); + if (detailResp.retcode !== 0) { + await TGLogger.Script( + `[米游币任务]获取帖子${post.post.post_id}失败:${detailResp.retcode} ${detailResp.message}`, + "warn", + ); + continue; + } + } catch (e) { + const errMsg = TGHttps.getErrMsg(e); + await TGLogger.Script(`[米游币任务]获取帖子${post.post.post_id}异常:${errMsg}`, "error"); continue; } viewCnt++; if (likeCnt < 5) { - const isLike = (detailResp.self_operation?.upvote_type ?? 0) > 0; + const isLike = (detailResp.data.self_operation?.upvote_type ?? 0) > 0; if (isLike) { await TGLogger.Script(`[米游币任务]帖子${post.post.post_id}已点赞,跳过`); continue; diff --git a/src/components/viewPost/vp-btn-reply.vue b/src/components/viewPost/vp-btn-reply.vue index ebfebfc1..950fa1a5 100644 --- a/src/components/viewPost/vp-btn-reply.vue +++ b/src/components/viewPost/vp-btn-reply.vue @@ -76,6 +76,7 @@ import showSnackbar from "@comp/func/snackbar.js"; import bbsEnum from "@enum/bbs.js"; import postReq from "@req/postReq.js"; import { emit } from "@tauri-apps/api/event"; +import TGHttps from "@utils/TGHttps.js"; import TGLogger from "@utils/TGLogger.js"; import { computed, ref, shallowRef, watch } from "vue"; @@ -171,31 +172,41 @@ async function reloadReply(): Promise { async function loadReply(): Promise { loading.value = true; - const resp = await postReq.reply.main( - props.postId, - props.gid, - isHot.value, - lastId.value, - onlyLz.value, - replyOrder.value, - ); - console.debug("[VpBtnReply] Load Reply Response:", resp); - if ("retcode" in resp) { - showSnackbar.error(`[${resp.retcode}] ${resp.message}`); - await TGLogger.Warn(`[VpBtnReply] Load Reply Error: ${resp.retcode} - ${resp.message}`); + let resp: TGApp.BBS.Reply.MainResp | undefined; + try { + resp = await postReq.reply.main( + props.postId, + props.gid, + isHot.value, + lastId.value, + onlyLz.value, + replyOrder.value, + ); + console.debug("[VpBtnReply] Load Reply Response:", resp); + if (resp.retcode !== 0) { + showSnackbar.error(`[${resp.retcode}] ${resp.message}`); + await TGLogger.Warn(`[VpBtnReply] Load Reply Error: ${resp.retcode} - ${resp.message}`); + loading.value = false; + return; + } + } catch (e) { + const errMsg = TGHttps.getErrMsg(e); + showSnackbar.error(`获取回复失败:${errMsg}`); + await TGLogger.Error(`[VpBtnReply] 获取回复异常`); + await TGLogger.Error(`[VpBtnReply] ${e}`); loading.value = false; return; } - isLast.value = resp.is_last; - lastId.value = resp.last_id; - pinId.value = resp.pin_reply_id; - reply.value = reply.value.concat(resp.list); + isLast.value = resp.data.is_last; + lastId.value = resp.data.last_id; + pinId.value = resp.data.pin_reply_id; + reply.value = reply.value.concat(resp.data.list); loading.value = false; if (isLast.value) { showSnackbar.warn("没有更多了"); return; } - showSnackbar.success(`成功加载${resp.list.length}条回复`); + showSnackbar.success(`成功加载${resp.data.list.length}条回复`); } async function handleDebug(): Promise { diff --git a/src/components/viewPost/vp-overlay-collection.vue b/src/components/viewPost/vp-overlay-collection.vue index 4a8cb7d5..c45d79f9 100644 --- a/src/components/viewPost/vp-overlay-collection.vue +++ b/src/components/viewPost/vp-overlay-collection.vue @@ -25,9 +25,12 @@