diff --git a/src-tauri/capabilities/TeyvatGuide.json b/src-tauri/capabilities/TeyvatGuide.json index f7eae732..9da827cf 100644 --- a/src-tauri/capabilities/TeyvatGuide.json +++ b/src-tauri/capabilities/TeyvatGuide.json @@ -51,7 +51,7 @@ "allow": [ { "url": "https://*.miyoushe.com/*" }, { "url": "https://*.mihoyo.com/*" }, - { "url": "https://homa.snapgenshin.com/*" }, + { "url": "https://homa.gentle.house/*" }, { "url": "https://*.hoyoverse.com/*" }, { "url": "https://api.hakush.in/*" } ] diff --git a/src/plugins/Hutao/request/abyssReq.ts b/src/plugins/Hutao/request/abyssReq.ts index 10fba0b7..e7ff53e0 100644 --- a/src/plugins/Hutao/request/abyssReq.ts +++ b/src/plugins/Hutao/request/abyssReq.ts @@ -1,111 +1,117 @@ /** * 深渊相关请求 - * @since Beta v0.6.3 + * @since Beta v0.9.1 */ import TGHttp from "@utils/TGHttp.js"; -const AbyssUrl: Readonly = `https://homa.snapgenshin.com/Statistics/`; +const AbyssUrl: Readonly = `https://homa.gentle.house/Statistics/`; /** * 获取深渊概览数据 - * @since Beta v0.6.3 + * @since Beta v0.9.1 * @param isLast - 是否获取上期数据 * @returns 深渊概览数据 */ export async function getAbyssOverview( isLast: boolean = false, -): Promise { +): Promise { const url = `${AbyssUrl}Overview`; const resp = await TGHttp(url, { method: "GET", query: { Last: isLast }, }); - return resp.data; + if (resp.data) return resp.data; + return { retcode: resp.retcode, message: resp.message }; } /** * 获取角色搭配数据 - * @since Beta v0.6.3 + * @since Beta v0.9.1 * @param isLast - 是否获取上期数据 * @returns 角色搭配数据 */ export async function getAvatarCollect( isLast: boolean = false, -): Promise> { +): Promise | TGApp.Plugins.Hutao.Base.Resp> { const url = `${AbyssUrl}Avatar/AvatarCollocation`; const resp = await TGHttp(url, { method: "GET", query: { Last: isLast }, }); - return resp.data; + if (resp.data) return resp.data; + return { retcode: resp.retcode, message: resp.message }; } /** * 获取角色持有率数据 - * @since Beta v0.6.3 + * @since Beta v0.9.1 * @param isLast - 是否获取上期数据 * @returns 角色持有率数据 */ export async function getAvatarHoldRate( isLast: boolean = false, -): Promise> { +): Promise | TGApp.Plugins.Hutao.Base.Resp> { const url = `${AbyssUrl}Avatar/HoldingRate`; const resp = await TGHttp(url, { method: "GET", query: { Last: isLast }, }); - return resp.data; + if (resp.data) return resp.data; + return { retcode: resp.retcode, message: resp.message }; } /** * 获取角色上场率数据 - * @since Beta v0.6.3 + * @since Beta v0.9.1 * @param isLast - 是否获取上期数据 * @returns 角色上场率数据 */ export async function getAvatarUpRate( isLast: boolean = false, -): Promise> { +): Promise | TGApp.Plugins.Hutao.Base.Resp> { const url = `${AbyssUrl}Avatar/AttendanceRate`; const resp = await TGHttp(url, { method: "GET", query: { Last: isLast }, }); - return resp.data; + if (resp.data) return resp.data; + return { retcode: resp.retcode, message: resp.message }; } /** * 获取角色使用率 - * @since Beta v0.6.3 + * @since Beta v0.9.1 * @param isLast - 是否获取上期数据 * @returns 角色使用率 */ export async function getAvatarUseRate( isLast: boolean = false, -): Promise> { +): Promise | TGApp.Plugins.Hutao.Base.Resp> { const url = `${AbyssUrl}Avatar/UtilizationRate`; const resp = await TGHttp(url, { method: "GET", query: { Last: isLast }, }); - return resp.data; + if (resp.data) return resp.data; + return { retcode: resp.retcode, message: resp.message }; } /** * 获取队伍搭配数据 - * @since Beta v0.6.3 + * @since Beta v0.9.1 * @param isLast - 是否获取上期数据 * @returns 队伍搭配数据 */ export async function getTeamCollect( isLast: boolean = false, -): Promise> { +): Promise | TGApp.Plugins.Hutao.Base.Resp> { const url = `${AbyssUrl}Team/Combination`; const resp = await TGHttp(url, { method: "GET", query: { Last: isLast }, }); - return resp.data; + if (resp.data) return resp.data; + return { retcode: resp.retcode, message: resp.message }; } /** @@ -117,7 +123,7 @@ export async function getTeamCollect( export async function uploadAbyssData( data: TGApp.Plugins.Hutao.Abyss.RecordUpload, ): Promise { - const url = "https://homa.snapgenshin.com/Record/Upload"; + const url = "https://homa.gentle.house/Record/Upload"; return await TGHttp(url, { method: "POST", body: JSON.stringify(data), diff --git a/src/plugins/Hutao/request/combatReq.ts b/src/plugins/Hutao/request/combatReq.ts index b0706a5a..47f8a9f8 100644 --- a/src/plugins/Hutao/request/combatReq.ts +++ b/src/plugins/Hutao/request/combatReq.ts @@ -1,26 +1,27 @@ /** * 幻想真境剧诗相关请求 - * @since Beta v0.6.3 + * @since Beta v0.9.1 */ import TGHttp from "@utils/TGHttp.js"; -const CombatUrl: Readonly = "https://homa.snapgenshin.com/RoleCombat/"; +const CombatUrl: Readonly = "https://homa.gentle.house/RoleCombat/"; /** * 获取数据 - * @since Beta v0.6.3 + * @since Beta v0.9.1 * @param isLast - 是否获取上期数据 * @returns 剧诗数据 */ export async function getCombatStatistic( isLast: boolean = false, -): Promise { +): Promise { const url = `${CombatUrl}Statistics`; const resp = await TGHttp(url, { method: "GET", query: { Last: isLast }, }); - return resp.data; + if (resp.data) return resp.data; + return { retcode: resp.retcode, message: resp.message }; } /**