diff --git a/src/_locales/cmn-CN.yml b/src/_locales/cmn-CN.yml index 6a412acc..05ca5ea5 100644 --- a/src/_locales/cmn-CN.yml +++ b/src/_locales/cmn-CN.yml @@ -3,7 +3,9 @@ common: loading: 加载中... undo: 还原 view: '{count}次' + viewWithoutNum: 次 danmaku: '{count} 弹幕' + danmakuWithoutNum: 弹幕 year: 年前 month: 个月前 week: 个星期前 diff --git a/src/_locales/cmn-TW.yml b/src/_locales/cmn-TW.yml index 5ced4c48..c71b0ae7 100644 --- a/src/_locales/cmn-TW.yml +++ b/src/_locales/cmn-TW.yml @@ -3,7 +3,9 @@ common: loading: 載入中... undo: 復原 view: '{count}次' + viewWithoutNum: 次 danmaku: '{count} 彈幕' + danmakuWithoutNum: 彈幕 year: 年前 month: 個月前 week: 個禮拜前 diff --git a/src/_locales/en.yml b/src/_locales/en.yml index 68be5e59..ce3c3f7e 100644 --- a/src/_locales/en.yml +++ b/src/_locales/en.yml @@ -3,7 +3,9 @@ common: loading: Loading... undo: UNDO view: no view | {count} view | {count} views + viewWithoutNum: views danmaku: no danmaku | {count} danmaku | {count} danmakus + danmakuWithoutNum: danmakus year: year ago | years ago month: month ago | months ago week: week ago | weeks ago diff --git a/src/_locales/jyut.yml b/src/_locales/jyut.yml index f60f6a44..c4b66e41 100644 --- a/src/_locales/jyut.yml +++ b/src/_locales/jyut.yml @@ -3,7 +3,9 @@ common: loading: 撈緊... undo: 整返 view: '{count}次' + viewWithoutNum: 次 danmaku: '{count} 彈幕' + danmakuWithoutNum: 彈幕 year: 年前 month: 個月前 week: 個禮拜前 diff --git a/src/background/messageListeners/video.ts b/src/background/messageListeners/video.ts index b8da4691..0cc3ee3d 100644 --- a/src/background/messageListeners/video.ts +++ b/src/background/messageListeners/video.ts @@ -1,7 +1,7 @@ import browser from 'webextension-polyfill' function handleMessage(message: any) { -// #region APP端api,遺棄 + // #region APP端api,遺棄 /** Recommend Videos */ // if (message.contentScriptQuery === 'getRecommendVideos') { // // https://github.com/indefined/UserScripts/blob/master/bilibiliHome/bilibiliHome.API.md#%E8%8E%B7%E5%8F%96%E9%A6%96%E9%A1%B5%E5%86%85%E5%AE%B9 @@ -62,8 +62,8 @@ function handleMessage(message: any) { .catch(error => console.error(error)) } else if (message.contentScriptQuery === 'getAppRecommendVideos') { - const url = `https://app.bilibili.com/x/feed/index?build=1&idx=${message.idx}&appkey=27eb53fc9058f8c3&access_key=${message.accessKey}` - // const url = `https://app.bilibili.com/x/v2/feed/index?build=72100100&idx=${message.idx}&appkey=27eb53fc9058f8c3&access_key=${message.accessKey}` + // const url = `https://app.bilibili.com/x/feed/index?build=1&idx=${message.idx}&appkey=27eb53fc9058f8c3&access_key=${message.accessKey}` + const url = `https://app.bilibili.com/x/v2/feed/index?build=74800100&device=pad&mobi_app=iphone&c_locate=${message.cLocate}&s_locale=${message.sLocale}&idx=${message.idx}&appkey=27eb53fc9058f8c3&access_key=${message.accessKey}` return fetch(url) .then(response => response.json()) .then(data => data) @@ -71,7 +71,9 @@ function handleMessage(message: any) { } // https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/video/info.md#%E8%8E%B7%E5%8F%96%E8%A7%86%E9%A2%91%E8%B6%85%E8%AF%A6%E7%BB%86%E4%BF%A1%E6%81%AFweb%E7%AB%AF else if (message.contentScriptQuery === 'getVideoInfo') { - const url = `https://api.bilibili.com/x/web-interface/view/detail?${message.aid ? `aid=${message.aid}` : `bvid=${message.bvid}`}` + const url = `https://api.bilibili.com/x/web-interface/view/detail?${ + message.aid ? `aid=${message.aid}` : `bvid=${message.bvid}` + }` return fetch(url) .then(response => response.json()) .then(data => data) @@ -79,7 +81,11 @@ function handleMessage(message: any) { } // https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/comment/list.md#%E8%8E%B7%E5%8F%96%E8%AF%84%E8%AE%BA%E5%8C%BA%E6%98%8E%E7%BB%86_%E7%BF%BB%E9%A1%B5%E5%8A%A0%E8%BD%BD else if (message.contentScriptQuery === 'getVideoComments') { - const url = `https://api.bilibili.com/x/v2/reply?csrf=${message.csrf}&type=1&oid=${message.oid}&sort=${message.sort ?? 0}&nohot=${message.nohot ?? 0}&pn=${message.pn ?? 1}&ps=${message.ps ?? 20}` + const url = `https://api.bilibili.com/x/v2/reply?csrf=${ + message.csrf + }&type=1&oid=${message.oid}&sort=${message.sort ?? 0}&nohot=${ + message.nohot ?? 0 + }&pn=${message.pn ?? 1}&ps=${message.ps ?? 20}` return fetch(url) .then(response => response.json()) .then(data => data) diff --git a/src/components/VideoCard.vue b/src/components/VideoCard.vue index 7df4007b..a9926dc8 100644 --- a/src/components/VideoCard.vue +++ b/src/components/VideoCard.vue @@ -5,14 +5,18 @@ import { calcCurrentTime, calcTimeSince, numFormatter } from '~/utils/dataFormat const props = defineProps<{ id: number duration?: number + durationStr?: string title: string cover: string author?: string authorFace?: string mid?: number view?: number + viewStr?: string danmaku?: number + danmakuStr?: string publishedTimestamp?: number + capsuleText?: string bvid?: string aid?: number isFollowed?: boolean @@ -185,7 +189,7 @@ function handelMouseLeave() { >