diff --git a/bilibili-evolved.offline.user.js b/bilibili-evolved.offline.user.js index 9741e27c1..7f5b54890 100644 --- a/bilibili-evolved.offline.user.js +++ b/bilibili-evolved.offline.user.js @@ -1375,7 +1375,7 @@ offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/m offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/expand-danmaku.min.js"] = (()=>{return(e,a)=>{if(typeof isEmbeddedPlayer!=="undefined"&&isEmbeddedPlayer()){return}Observer.videoChange(async()=>{const e=await SpinQuery.select(".bui-collapse-wrap");if(e&&e.classList.contains("bui-collapse-wrap-folded")){const e=await SpinQuery.select(".bui-collapse-header");e.click()}})}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/expand-description.min.css"] = `.play-up-info .play-up-self,.video-desc .info{height:auto!important}.play-up-info .play-up-self-btn,.video-desc .btn{display:none!important}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/expand-description.min.js"] = (()=>{return(e,p)=>{p.applyStyle("expandDescriptionStyle")}})(); -offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/extend-feeds-live.min.css"] = `.live-up-list{max-height:calc(100vh - 320px);overflow:auto;scrollbar-width:none!important}.live-up-list::-webkit-scrollbar{height:0!important;width:0!important}.live-up-list .live-detail[data-live-title]{color:#000}body.dark .live-up-list .live-detail[data-live-title]{color:#eee}.live-up-list .live-detail[data-live-title] .up-name{font-size:13px!important;opacity:.6}.live-up-list .live-detail[data-live-title]::before{content:attr(data-live-title);color:#000;line-height:1.5;display:block;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}body.dark .live-up-list .live-detail[data-live-title]::before{color:#eee}`; +offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/extend-feeds-live.min.css"] = `.live-up-list{max-height:calc(100vh - 380px);overflow:auto;scrollbar-width:none!important}.live-up-list::-webkit-scrollbar{height:0!important;width:0!important}.live-up-list .live-detail[data-live-title]{color:#000}body.dark .live-up-list .live-detail[data-live-title]{color:#eee}.live-up-list .live-detail[data-live-title] .up-name{font-size:13px!important;opacity:.6}.live-up-list .live-detail[data-live-title]::before{content:attr(data-live-title);color:#000;line-height:1.5;display:block;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}body.dark .live-up-list .live-detail[data-live-title]::before{color:#eee}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/extend-feeds-live.min.js"] = (()=>{return(e,t)=>{(async()=>{if(document.URL.replace(location.search,"")!=="https://t.bilibili.com/"){return}const e=await SpinQuery.select(".live-up-list");if(e===null){return}t.applyStyle("extendFeedsLiveStyle");const i=24;const n=await Ajax.getPages({api:e=>{return Ajax.getJsonWithCredentials(`https://api.live.bilibili.com/relation/v1/feed/feed_list?page=${e}&pagesize=${i}`)},getList:e=>{return _.get(e,"data.list",[])},getTotal:e=>{return _.get(e,"data.results",0)}});const l=dqa(e,".up-name");const a=l.map(e=>e.innerText.trim());const r=n.filter(e=>a.includes(e.uname));const s=n.filter(e=>!a.includes(e.uname));const o=e.children[0];s.forEach(t=>{const i=o.cloneNode(true);dqa(i,"a[href]").forEach(e=>e.setAttribute("href",`https://live.bilibili.com/${t.roomid}`));const n=dq(i,".live-up-img");n.style.backgroundImage=`url(${t.face})`;const l=dq(i,".live-name");l.innerHTML=t.title;l.title=t.title;const a=dq(i,".up-name");a.innerHTML=t.uname;a.title=t.uname;e.insertAdjacentElement("beforeend",i)});const{disableProfilePopup:c}=await t.importAsync("disable-profile-popup");c();console.log(r,s)})()}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/favorites-redirect.min.js"] = (()=>{return(t,e)=>{function i(){const t=document.querySelectorAll("li[data-aid]>a");t.forEach(t=>{const e=t.getAttribute("href");if(e===null||!e.includes("medialist")){return}const i=t.parentElement.getAttribute("data-aid");t.setAttribute("href",`https://www.bilibili.com/video/av${i}`)})}(async()=>{const t=await SpinQuery.select("#app>.s-space");if(t!==null){Observer.childListSubtree("#app>.s-space",i)}})()}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/feeds-apis.min.js"] = (()=>{return(e,t)=>{const n={repost:{id:1,name:"转发"},textWithImages:{id:2,name:"图文"},text:{id:4,name:"文字"},video:{id:8,name:"视频"},miniVideo:{id:16,name:"小视频"},column:{id:64,name:"专栏"},audio:{id:256,name:"音频"},bangumi:{id:512,name:"番剧"},share:{id:2048,name:"分享"},manga:{id:2049,name:"漫画"},film:{id:4098,name:"电影"},tv:{id:4099,name:"TV剧"},chinese:{id:4100,name:"国创"},documentary:{id:4101,name:"纪录片"},mediaList:{id:4300,name:"收藏夹"},liveRecord:{id:2047,name:"开播记录"}};const r=e=>{if(e.querySelector(".repost")){return n.repost}if(e.querySelector(".imagesbox")){return n.textWithImages}if(e.querySelector(".video-container")){return n.video}if(e.querySelector(".bangumi-container")){return n.bangumi}if(e.querySelector(".article-container")){return n.column}if(e.querySelector(".music-container")){return n.audio}if(e.querySelector(".h5share-container")){return n.share}if(e.querySelector(".vc-ctnr")){return n.miniVideo}if(e.querySelector(".live-container")){return n.liveRecord}return n.text};const i=[];class a extends EventTarget{constructor(){super(...arguments);this.watching=false;this.cards=[]}addEventListener(e,t,n){super.addEventListener(e,t,n)}removeEventListener(e,t,n){super.removeEventListener(e,t,n)}async addCard(e){if(e instanceof HTMLElement&&e.classList.contains("card")){if(e.querySelector(".skeleton")!==null){const t=Observer.childList(e,()=>{if(e.querySelector(".skeleton")===null){t.stop();this.addCard(e)}})}else{if(e.parentNode===null){return}const t=await this.parseCard(e);if(!t.presented){return}if(this.cards.find(e=>e.id===t.id)){return}this.cards.push(t);this.cards.sort((e,t)=>{if(e.id===t.id){return 0}return e.id>t.id?-1:1});const n=new CustomEvent("addCard",{detail:t});this.dispatchEvent(n);i.forEach(e=>e.added(t))}}}async removeCard(e){if(e instanceof HTMLElement&&e.classList.contains("card")){const t=(await this.parseCard(e)).id;const n=this.cards.findIndex(e=>e.id===t);if(n===-1){return}const r=this.cards[n];this.cards.splice(n,1);const a=new CustomEvent("removeCard",{detail:r});this.dispatchEvent(a);i.forEach(e=>e.removed(r))}}async parseCard(e){const t=async t=>{const n=await SpinQuery.condition(()=>e.querySelector(t),t=>t!==null||e.parentNode===null);if(e.parentNode===null){return""}if(n===null){console.warn(e,t,e.parentNode);return""}const r=n.innerText.trim();return r};const i=async t=>{if(t===n.bangumi){return""}const r=await SpinQuery.condition(()=>e,t=>Boolean(t.__vue__||!e.parentNode));if(e.parentNode===null){return""}if(r===null){console.warn(r);return""}if(t===n.repost){const e=JSON.parse(r.__vue__.card.origin);const t=r.__vue__.originCardData.pureText;const n=_.get(e,"item.description","");const i=e.title;const a=r.__vue__.card.item.content;return[a,t,n,i].filter(e=>Boolean(e)).join("\n")}const i=r.__vue__.originCardData.pureText;const a=r.__vue__.originCardData.title;return[i,a].filter(e=>Boolean(e)).join("\n")};const a=async e=>{const n=parseInt(await t(e));if(isNaN(n)){return 0}return n};const s={id:e.getAttribute("data-did"),username:await t(".main-content .user-name"),text:"",reposts:await a(".button-bar .single-button:nth-child(1) .text-offset"),comments:await a(".button-bar .single-button:nth-child(2) .text-offset"),likes:await a(".button-bar .single-button:nth-child(3) .text-offset"),element:e,type:r(e),presented:true,async getText(){const e=await i(this.type);this.text=e;return e}};await s.getText();s.presented=e.parentNode!==null;e.setAttribute("data-type",s.type.id.toString());if(s.type===n.repost){const t=s.username;const n=_.get(s,"element.__vue__.card.origin_user.info.uname","");if(t===n){e.setAttribute("data-self-repost","true")}}return s}async startWatching(){const e=e=>{const t=[...e.querySelectorAll(".card[data-did]")];t.forEach(e=>this.addCard(e));return Observer.childList(e,e=>{e.forEach(e=>{e.addedNodes.forEach(e=>this.addCard(e));e.removedNodes.forEach(e=>this.removeCard(e))})})};if(this.watching){return true}this.watching=true;if(document.URL.includes("//space.bilibili.com")){console.log("space watch");const t=await SpinQuery.select(".s-space");if(!t){return false}let n=null;Observer.childList(t,async()=>{if(dq("#page-dynamic")){const t=await SpinQuery.select(".feed-card .content");console.log("enter feeds tab");if(n){n.stop()}n=e(t)}else{console.log("leave feeds tab");if(n){n.stop();n=null}}});this.watching=true;return true}const t=await SpinQuery.select(".feed-card .content, .detail-content .detail-card");if(!t){return false}e(t);return true}}const s=new a;const o=async(e="video")=>{if(!getUID()){return[]}const t=await Ajax.getJsonWithCredentials(`https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/dynamic_new?uid=${getUID()}&type_list=${e==="video"?8:512}`);if(t.code!==0){throw new Error(t.message)}if(e==="video"){return _.uniqBy(t.data.cards.map(e=>{const t=JSON.parse(e.card);const n=_.get(e,"display.topic_info.topic_details",[]).map(e=>{return{id:e.topic_id,name:e.topic_name}});return{id:e.desc.dynamic_id_str,aid:t.aid,bvid:e.desc.bvid||t.bvid,title:t.title,upID:e.desc.user_profile.info.uid,upName:e.desc.user_profile.info.uname,upFaceUrl:e.desc.user_profile.info.face,coverUrl:t.pic,description:t.desc,timestamp:e.timestamp,time:new Date(e.timestamp*1e3),topics:n,dynamic:t.dynamic,like:formatCount(e.desc.like),duration:t.duration,durationText:formatDuration(t.duration,0),playCount:formatCount(t.stat.view),danmakuCount:formatCount(t.stat.danmaku),watchlater:store.state.watchlaterList.includes(t.aid)}}),e=>e.aid)}else if(e==="bangumi"){return t.data.cards.map(e=>{const t=JSON.parse(e.card);return{id:e.desc.dynamic_id_str,aid:t.aid,bvid:e.desc.bvid||t.bvid,epID:t.episode_id,title:t.new_desc,upName:t.apiSeasonInfo.title,upFaceUrl:t.apiSeasonInfo.cover,coverUrl:t.cover,description:"",timestamp:e.timestamp,time:new Date(e.timestamp*1e3),like:formatCount(e.desc.like),durationText:"",playCount:formatCount(t.play_count),danmakuCount:formatCount(t.bullet_count),watchlater:false}})}else{return[]}};const d=e=>{(async()=>{const t=await s.startWatching();if(!t){console.error("feedsCardsManager.startWatching() failed");return}const{added:n}=e;if(n){s.cards.forEach(e=>n(e))}const r=()=>{};i.push({added:r,removed:r,...e})})()};return{export:{feedsCardsManager:s,feedsCardTypes:n,getVideoFeeds:o,forEachFeedsCard:d}}}})(); @@ -1388,7 +1388,7 @@ offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/m offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/fill-with-comments.min.js"] = (()=>{return(t,e)=>{const n="fill-with-comments-style";const l=t=>{};return{export:{fillWithComments:l}}}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/filter-type-switch.vue.min.js"] = (()=>{return(e,s)=>{const t=`
`;return{export:Object.assign({template:t},{components:{Icon:()=>s.importAsync("icon.vue")},props:["name","type"],methods:{setFilter(s,t=true){document.body.classList[s?"add":"remove"](`feeds-filter-block-${this.name}`);if(!t){return}if(s){e[this.settingsKey].push(this.type.id)}else{const s=e[this.settingsKey].indexOf(this.type.id);if(s!==-1){e[this.settingsKey].splice(s,1)}}e[this.settingsKey]=e[this.settingsKey]}},data(){const s=this.type.id>=0?"feedsFilterTypes":"feedsSpecialFilterTypes";const t=e[s].includes(this.type.id);this.setFilter(t,false);return{disabled:t,settingsKey:s}},watch:{disabled(e){this.setFilter(e)}}})}}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/fix-fullscreen.min.js"] = (()=>{return(e,n)=>{unsafeWindow.Element.ALLOW_KEYBOARD_INPUT={};const t=unsafeWindow.Element.prototype.requestFullscreen;unsafeWindow.Element.prototype.requestFullscreen=function(){t.call(this)}}})(); -offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/fixed-sidebars.min.js"] = (()=>{return(n,t)=>{const i=`\n.custom-navbar {\n position: fixed !important;\n}\n.sticky-bar {\n display: none !important;\n}\n.left-panel, .right-panel {\n position: fixed !important;\n}\n.center-panel {\n margin-left: calc(244px + 8px) !important;\n}\n.right-panel {\n margin-left: calc(244px + 16px + 632px) !important;\n}\n.live-panel .live-up-list {\n max-height: calc(100vh - 320px);\n overflow: auto;\n scrollbar-width: none !important;\n}\n.live-panel .live-up-list::-webkit-scrollbar {\n height: 0 !important;\n width: 0 !important;\n}\n.adaptive-scroll {\n min-height: unset !important;\n}\n`;const a="fixed-sidebars-style";const e=()=>{if(document.URL.replace(location.search,"")==="https://t.bilibili.com/"){t.applyStyleFromText(i,a);(async()=>{const{disableProfilePopup:n}=await t.importAsync("disable-profile-popup");n()})()}};const o=()=>{dqa("#"+a).forEach(n=>n.remove())};e();return{reload:e,unload:o}}})(); +offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/fixed-sidebars.min.js"] = (()=>{return(n,t)=>{const i=`\n.custom-navbar {\n position: fixed !important;\n}\n.sticky-bar {\n display: none !important;\n}\n.left-panel, .right-panel {\n position: fixed !important;\n}\n.center-panel {\n margin-left: calc(244px + 8px) !important;\n}\n.right-panel {\n margin-left: calc(244px + 16px + 632px) !important;\n}\n.live-panel .live-up-list {\n max-height: calc(100vh - 380px);\n overflow: auto;\n scrollbar-width: none !important;\n}\n.live-panel .live-up-list::-webkit-scrollbar {\n height: 0 !important;\n width: 0 !important;\n}\n.adaptive-scroll {\n min-height: unset !important;\n}\n`;const a="fixed-sidebars-style";const e=()=>{if(document.URL.replace(location.search,"")==="https://t.bilibili.com/"){t.applyStyleFromText(i,a);(async()=>{const{disableProfilePopup:n}=await t.importAsync("disable-profile-popup");n()})()}};const o=()=>{dqa("#"+a).forEach(n=>n.remove())};e();return{reload:e,unload:o}}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/fold-comment.min.css"] = `.panel-area .bb-comment .fold-comment{position:-webkit-sticky;position:sticky;bottom:0;height:40px;width:calc(100% + 48px);font-size:14px;transform:translateX(-24px);display:flex;align-items:center;justify-content:center;background-color:#fff;color:#99a2aa;cursor:pointer;transition:.2s ease-out;z-index:1000;border-radius:4px}.panel-area .bb-comment .fold-comment:hover{color:#000}body.dark .panel-area .bb-comment .fold-comment{background-color:#444;color:#eee}body.dark .panel-area .bb-comment .fold-comment:hover{color:var(--theme-color)}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/fold-comment.min.js"] = (()=>{return(e,t)=>{(async()=>{if(document.URL.replace(window.location.search,"")!=="https://t.bilibili.com/"&&!document.URL.startsWith("https://space.bilibili.com")){return}const{forEachFeedsCard:e}=await t.importAsync("feeds-apis");t.applyImportantStyle("foldCommentStyle");const n=e=>{const t=t=>{const n=document.createElement("div");n.classList.add("fold-comment");n.innerHTML="收起评论";const l=t.querySelector(".bb-comment");if(l===null){console.error("未找到评论区");return}else if(l.querySelector(".fold-comment")!==null){return}else{n.addEventListener("click",()=>{const t=e.querySelector(".button-bar").children[1];if(t!==null){t.click();e.scrollIntoView()}});l.insertAdjacentElement("beforeend",n)}};const n=e.querySelector(".panel-area");if(n===null){console.log(e)}if(n.childElementCount===0){const e=Observer.childList(n,l=>{if(l.length>0){t(n);e.forEach(e=>e.stop())}})}else{t(n)}};e({added:e=>n(e.element)})})()}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/frame-playback.min.css"] = `.frame-playback{display:none!important;height:100%;align-items:center;padding-left:4px;cursor:pointer;filter:brightness(0) invert(1)!important}.frame-playback.touch{padding-left:8px}.frame-playback.touch span{display:flex;align-items:center}.bilibili-player-video-control-bottom .frame-playback{display:flex!important}.frame-playback i{transition:.4s cubic-bezier(.18,.89,.32,1.28);opacity:.9}.frame-playback:not(.touch) i{margin-top:-2px}.bilibili-player.mode-fullscreen .frame-playback span,.bilibili-player.mode-webfullscreen .frame-playback span{transform:scale(1.2)}.bilibili-player.mode-fullscreen .frame-playback:not(.touch) i,.bilibili-player.mode-webfullscreen .frame-playback:not(.touch) i{margin-top:2px}.bilibili-player.mode-fullscreen .frame-playback,.bilibili-player.mode-webfullscreen .frame-playback{margin-left:0}.bilibili-player.mode-fullscreen .frame-playback.touch,.bilibili-player.mode-webfullscreen .frame-playback.touch{margin-left:6px}.frame-playback.prev-frame i{transform:scale(1.3) rotate(-90deg)}.frame-playback.prev-frame:hover i{transform:scale(1.4) rotate(-90deg);opacity:1}.frame-playback.prev-frame:active i{transform:scale(1.25) rotate(-90deg);opacity:1}.frame-playback.next-frame i{transform:scale(1.3) rotate(90deg)}.frame-playback.next-frame:hover i{transform:scale(1.4) rotate(90deg);opacity:1}.frame-playback.next-frame:active i{transform:scale(1.25) rotate(90deg);opacity:1}`; diff --git a/bilibili-evolved.preview-offline.user.js b/bilibili-evolved.preview-offline.user.js index 47a39f6b8..cca4e35e1 100644 --- a/bilibili-evolved.preview-offline.user.js +++ b/bilibili-evolved.preview-offline.user.js @@ -1375,7 +1375,7 @@ offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/m offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/expand-danmaku.min.js"] = (()=>{return(e,a)=>{if(typeof isEmbeddedPlayer!=="undefined"&&isEmbeddedPlayer()){return}Observer.videoChange(async()=>{const e=await SpinQuery.select(".bui-collapse-wrap");if(e&&e.classList.contains("bui-collapse-wrap-folded")){const e=await SpinQuery.select(".bui-collapse-header");e.click()}})}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/expand-description.min.css"] = `.play-up-info .play-up-self,.video-desc .info{height:auto!important}.play-up-info .play-up-self-btn,.video-desc .btn{display:none!important}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/expand-description.min.js"] = (()=>{return(e,p)=>{p.applyStyle("expandDescriptionStyle")}})(); -offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/extend-feeds-live.min.css"] = `.live-up-list{max-height:calc(100vh - 320px);overflow:auto;scrollbar-width:none!important}.live-up-list::-webkit-scrollbar{height:0!important;width:0!important}.live-up-list .live-detail[data-live-title]{color:#000}body.dark .live-up-list .live-detail[data-live-title]{color:#eee}.live-up-list .live-detail[data-live-title] .up-name{font-size:13px!important;opacity:.6}.live-up-list .live-detail[data-live-title]::before{content:attr(data-live-title);color:#000;line-height:1.5;display:block;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}body.dark .live-up-list .live-detail[data-live-title]::before{color:#eee}`; +offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/extend-feeds-live.min.css"] = `.live-up-list{max-height:calc(100vh - 380px);overflow:auto;scrollbar-width:none!important}.live-up-list::-webkit-scrollbar{height:0!important;width:0!important}.live-up-list .live-detail[data-live-title]{color:#000}body.dark .live-up-list .live-detail[data-live-title]{color:#eee}.live-up-list .live-detail[data-live-title] .up-name{font-size:13px!important;opacity:.6}.live-up-list .live-detail[data-live-title]::before{content:attr(data-live-title);color:#000;line-height:1.5;display:block;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}body.dark .live-up-list .live-detail[data-live-title]::before{color:#eee}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/extend-feeds-live.min.js"] = (()=>{return(e,t)=>{(async()=>{if(document.URL.replace(location.search,"")!=="https://t.bilibili.com/"){return}const e=await SpinQuery.select(".live-up-list");if(e===null){return}t.applyStyle("extendFeedsLiveStyle");const i=24;const n=await Ajax.getPages({api:e=>{return Ajax.getJsonWithCredentials(`https://api.live.bilibili.com/relation/v1/feed/feed_list?page=${e}&pagesize=${i}`)},getList:e=>{return _.get(e,"data.list",[])},getTotal:e=>{return _.get(e,"data.results",0)}});const l=dqa(e,".up-name");const a=l.map(e=>e.innerText.trim());const r=n.filter(e=>a.includes(e.uname));const s=n.filter(e=>!a.includes(e.uname));const o=e.children[0];s.forEach(t=>{const i=o.cloneNode(true);dqa(i,"a[href]").forEach(e=>e.setAttribute("href",`https://live.bilibili.com/${t.roomid}`));const n=dq(i,".live-up-img");n.style.backgroundImage=`url(${t.face})`;const l=dq(i,".live-name");l.innerHTML=t.title;l.title=t.title;const a=dq(i,".up-name");a.innerHTML=t.uname;a.title=t.uname;e.insertAdjacentElement("beforeend",i)});const{disableProfilePopup:c}=await t.importAsync("disable-profile-popup");c();console.log(r,s)})()}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/favorites-redirect.min.js"] = (()=>{return(t,e)=>{function i(){const t=document.querySelectorAll("li[data-aid]>a");t.forEach(t=>{const e=t.getAttribute("href");if(e===null||!e.includes("medialist")){return}const i=t.parentElement.getAttribute("data-aid");t.setAttribute("href",`https://www.bilibili.com/video/av${i}`)})}(async()=>{const t=await SpinQuery.select("#app>.s-space");if(t!==null){Observer.childListSubtree("#app>.s-space",i)}})()}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/feeds-apis.min.js"] = (()=>{return(e,t)=>{const n={repost:{id:1,name:"转发"},textWithImages:{id:2,name:"图文"},text:{id:4,name:"文字"},video:{id:8,name:"视频"},miniVideo:{id:16,name:"小视频"},column:{id:64,name:"专栏"},audio:{id:256,name:"音频"},bangumi:{id:512,name:"番剧"},share:{id:2048,name:"分享"},manga:{id:2049,name:"漫画"},film:{id:4098,name:"电影"},tv:{id:4099,name:"TV剧"},chinese:{id:4100,name:"国创"},documentary:{id:4101,name:"纪录片"},mediaList:{id:4300,name:"收藏夹"},liveRecord:{id:2047,name:"开播记录"}};const r=e=>{if(e.querySelector(".repost")){return n.repost}if(e.querySelector(".imagesbox")){return n.textWithImages}if(e.querySelector(".video-container")){return n.video}if(e.querySelector(".bangumi-container")){return n.bangumi}if(e.querySelector(".article-container")){return n.column}if(e.querySelector(".music-container")){return n.audio}if(e.querySelector(".h5share-container")){return n.share}if(e.querySelector(".vc-ctnr")){return n.miniVideo}if(e.querySelector(".live-container")){return n.liveRecord}return n.text};const i=[];class a extends EventTarget{constructor(){super(...arguments);this.watching=false;this.cards=[]}addEventListener(e,t,n){super.addEventListener(e,t,n)}removeEventListener(e,t,n){super.removeEventListener(e,t,n)}async addCard(e){if(e instanceof HTMLElement&&e.classList.contains("card")){if(e.querySelector(".skeleton")!==null){const t=Observer.childList(e,()=>{if(e.querySelector(".skeleton")===null){t.stop();this.addCard(e)}})}else{if(e.parentNode===null){return}const t=await this.parseCard(e);if(!t.presented){return}if(this.cards.find(e=>e.id===t.id)){return}this.cards.push(t);this.cards.sort((e,t)=>{if(e.id===t.id){return 0}return e.id>t.id?-1:1});const n=new CustomEvent("addCard",{detail:t});this.dispatchEvent(n);i.forEach(e=>e.added(t))}}}async removeCard(e){if(e instanceof HTMLElement&&e.classList.contains("card")){const t=(await this.parseCard(e)).id;const n=this.cards.findIndex(e=>e.id===t);if(n===-1){return}const r=this.cards[n];this.cards.splice(n,1);const a=new CustomEvent("removeCard",{detail:r});this.dispatchEvent(a);i.forEach(e=>e.removed(r))}}async parseCard(e){const t=async t=>{const n=await SpinQuery.condition(()=>e.querySelector(t),t=>t!==null||e.parentNode===null);if(e.parentNode===null){return""}if(n===null){console.warn(e,t,e.parentNode);return""}const r=n.innerText.trim();return r};const i=async t=>{if(t===n.bangumi){return""}const r=await SpinQuery.condition(()=>e,t=>Boolean(t.__vue__||!e.parentNode));if(e.parentNode===null){return""}if(r===null){console.warn(r);return""}if(t===n.repost){const e=JSON.parse(r.__vue__.card.origin);const t=r.__vue__.originCardData.pureText;const n=_.get(e,"item.description","");const i=e.title;const a=r.__vue__.card.item.content;return[a,t,n,i].filter(e=>Boolean(e)).join("\n")}const i=r.__vue__.originCardData.pureText;const a=r.__vue__.originCardData.title;return[i,a].filter(e=>Boolean(e)).join("\n")};const a=async e=>{const n=parseInt(await t(e));if(isNaN(n)){return 0}return n};const s={id:e.getAttribute("data-did"),username:await t(".main-content .user-name"),text:"",reposts:await a(".button-bar .single-button:nth-child(1) .text-offset"),comments:await a(".button-bar .single-button:nth-child(2) .text-offset"),likes:await a(".button-bar .single-button:nth-child(3) .text-offset"),element:e,type:r(e),presented:true,async getText(){const e=await i(this.type);this.text=e;return e}};await s.getText();s.presented=e.parentNode!==null;e.setAttribute("data-type",s.type.id.toString());if(s.type===n.repost){const t=s.username;const n=_.get(s,"element.__vue__.card.origin_user.info.uname","");if(t===n){e.setAttribute("data-self-repost","true")}}return s}async startWatching(){const e=e=>{const t=[...e.querySelectorAll(".card[data-did]")];t.forEach(e=>this.addCard(e));return Observer.childList(e,e=>{e.forEach(e=>{e.addedNodes.forEach(e=>this.addCard(e));e.removedNodes.forEach(e=>this.removeCard(e))})})};if(this.watching){return true}this.watching=true;if(document.URL.includes("//space.bilibili.com")){console.log("space watch");const t=await SpinQuery.select(".s-space");if(!t){return false}let n=null;Observer.childList(t,async()=>{if(dq("#page-dynamic")){const t=await SpinQuery.select(".feed-card .content");console.log("enter feeds tab");if(n){n.stop()}n=e(t)}else{console.log("leave feeds tab");if(n){n.stop();n=null}}});this.watching=true;return true}const t=await SpinQuery.select(".feed-card .content, .detail-content .detail-card");if(!t){return false}e(t);return true}}const s=new a;const o=async(e="video")=>{if(!getUID()){return[]}const t=await Ajax.getJsonWithCredentials(`https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/dynamic_new?uid=${getUID()}&type_list=${e==="video"?8:512}`);if(t.code!==0){throw new Error(t.message)}if(e==="video"){return _.uniqBy(t.data.cards.map(e=>{const t=JSON.parse(e.card);const n=_.get(e,"display.topic_info.topic_details",[]).map(e=>{return{id:e.topic_id,name:e.topic_name}});return{id:e.desc.dynamic_id_str,aid:t.aid,bvid:e.desc.bvid||t.bvid,title:t.title,upID:e.desc.user_profile.info.uid,upName:e.desc.user_profile.info.uname,upFaceUrl:e.desc.user_profile.info.face,coverUrl:t.pic,description:t.desc,timestamp:e.timestamp,time:new Date(e.timestamp*1e3),topics:n,dynamic:t.dynamic,like:formatCount(e.desc.like),duration:t.duration,durationText:formatDuration(t.duration,0),playCount:formatCount(t.stat.view),danmakuCount:formatCount(t.stat.danmaku),watchlater:store.state.watchlaterList.includes(t.aid)}}),e=>e.aid)}else if(e==="bangumi"){return t.data.cards.map(e=>{const t=JSON.parse(e.card);return{id:e.desc.dynamic_id_str,aid:t.aid,bvid:e.desc.bvid||t.bvid,epID:t.episode_id,title:t.new_desc,upName:t.apiSeasonInfo.title,upFaceUrl:t.apiSeasonInfo.cover,coverUrl:t.cover,description:"",timestamp:e.timestamp,time:new Date(e.timestamp*1e3),like:formatCount(e.desc.like),durationText:"",playCount:formatCount(t.play_count),danmakuCount:formatCount(t.bullet_count),watchlater:false}})}else{return[]}};const d=e=>{(async()=>{const t=await s.startWatching();if(!t){console.error("feedsCardsManager.startWatching() failed");return}const{added:n}=e;if(n){s.cards.forEach(e=>n(e))}const r=()=>{};i.push({added:r,removed:r,...e})})()};return{export:{feedsCardsManager:s,feedsCardTypes:n,getVideoFeeds:o,forEachFeedsCard:d}}}})(); @@ -1388,7 +1388,7 @@ offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/m offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/fill-with-comments.min.js"] = (()=>{return(t,e)=>{const n="fill-with-comments-style";const l=t=>{};return{export:{fillWithComments:l}}}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/filter-type-switch.vue.min.js"] = (()=>{return(e,s)=>{const t=``;return{export:Object.assign({template:t},{components:{Icon:()=>s.importAsync("icon.vue")},props:["name","type"],methods:{setFilter(s,t=true){document.body.classList[s?"add":"remove"](`feeds-filter-block-${this.name}`);if(!t){return}if(s){e[this.settingsKey].push(this.type.id)}else{const s=e[this.settingsKey].indexOf(this.type.id);if(s!==-1){e[this.settingsKey].splice(s,1)}}e[this.settingsKey]=e[this.settingsKey]}},data(){const s=this.type.id>=0?"feedsFilterTypes":"feedsSpecialFilterTypes";const t=e[s].includes(this.type.id);this.setFilter(t,false);return{disabled:t,settingsKey:s}},watch:{disabled(e){this.setFilter(e)}}})}}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/fix-fullscreen.min.js"] = (()=>{return(e,n)=>{unsafeWindow.Element.ALLOW_KEYBOARD_INPUT={};const t=unsafeWindow.Element.prototype.requestFullscreen;unsafeWindow.Element.prototype.requestFullscreen=function(){t.call(this)}}})(); -offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/fixed-sidebars.min.js"] = (()=>{return(n,t)=>{const i=`\n.custom-navbar {\n position: fixed !important;\n}\n.sticky-bar {\n display: none !important;\n}\n.left-panel, .right-panel {\n position: fixed !important;\n}\n.center-panel {\n margin-left: calc(244px + 8px) !important;\n}\n.right-panel {\n margin-left: calc(244px + 16px + 632px) !important;\n}\n.live-panel .live-up-list {\n max-height: calc(100vh - 320px);\n overflow: auto;\n scrollbar-width: none !important;\n}\n.live-panel .live-up-list::-webkit-scrollbar {\n height: 0 !important;\n width: 0 !important;\n}\n.adaptive-scroll {\n min-height: unset !important;\n}\n`;const a="fixed-sidebars-style";const e=()=>{if(document.URL.replace(location.search,"")==="https://t.bilibili.com/"){t.applyStyleFromText(i,a);(async()=>{const{disableProfilePopup:n}=await t.importAsync("disable-profile-popup");n()})()}};const o=()=>{dqa("#"+a).forEach(n=>n.remove())};e();return{reload:e,unload:o}}})(); +offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/fixed-sidebars.min.js"] = (()=>{return(n,t)=>{const i=`\n.custom-navbar {\n position: fixed !important;\n}\n.sticky-bar {\n display: none !important;\n}\n.left-panel, .right-panel {\n position: fixed !important;\n}\n.center-panel {\n margin-left: calc(244px + 8px) !important;\n}\n.right-panel {\n margin-left: calc(244px + 16px + 632px) !important;\n}\n.live-panel .live-up-list {\n max-height: calc(100vh - 380px);\n overflow: auto;\n scrollbar-width: none !important;\n}\n.live-panel .live-up-list::-webkit-scrollbar {\n height: 0 !important;\n width: 0 !important;\n}\n.adaptive-scroll {\n min-height: unset !important;\n}\n`;const a="fixed-sidebars-style";const e=()=>{if(document.URL.replace(location.search,"")==="https://t.bilibili.com/"){t.applyStyleFromText(i,a);(async()=>{const{disableProfilePopup:n}=await t.importAsync("disable-profile-popup");n()})()}};const o=()=>{dqa("#"+a).forEach(n=>n.remove())};e();return{reload:e,unload:o}}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/fold-comment.min.css"] = `.panel-area .bb-comment .fold-comment{position:-webkit-sticky;position:sticky;bottom:0;height:40px;width:calc(100% + 48px);font-size:14px;transform:translateX(-24px);display:flex;align-items:center;justify-content:center;background-color:#fff;color:#99a2aa;cursor:pointer;transition:.2s ease-out;z-index:1000;border-radius:4px}.panel-area .bb-comment .fold-comment:hover{color:#000}body.dark .panel-area .bb-comment .fold-comment{background-color:#444;color:#eee}body.dark .panel-area .bb-comment .fold-comment:hover{color:var(--theme-color)}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/fold-comment.min.js"] = (()=>{return(e,t)=>{(async()=>{if(document.URL.replace(window.location.search,"")!=="https://t.bilibili.com/"&&!document.URL.startsWith("https://space.bilibili.com")){return}const{forEachFeedsCard:e}=await t.importAsync("feeds-apis");t.applyImportantStyle("foldCommentStyle");const n=e=>{const t=t=>{const n=document.createElement("div");n.classList.add("fold-comment");n.innerHTML="收起评论";const l=t.querySelector(".bb-comment");if(l===null){console.error("未找到评论区");return}else if(l.querySelector(".fold-comment")!==null){return}else{n.addEventListener("click",()=>{const t=e.querySelector(".button-bar").children[1];if(t!==null){t.click();e.scrollIntoView()}});l.insertAdjacentElement("beforeend",n)}};const n=e.querySelector(".panel-area");if(n===null){console.log(e)}if(n.childElementCount===0){const e=Observer.childList(n,l=>{if(l.length>0){t(n);e.forEach(e=>e.stop())}})}else{t(n)}};e({added:e=>n(e.element)})})()}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/frame-playback.min.css"] = `.frame-playback{display:none!important;height:100%;align-items:center;padding-left:4px;cursor:pointer;filter:brightness(0) invert(1)!important}.frame-playback.touch{padding-left:8px}.frame-playback.touch span{display:flex;align-items:center}.bilibili-player-video-control-bottom .frame-playback{display:flex!important}.frame-playback i{transition:.4s cubic-bezier(.18,.89,.32,1.28);opacity:.9}.frame-playback:not(.touch) i{margin-top:-2px}.bilibili-player.mode-fullscreen .frame-playback span,.bilibili-player.mode-webfullscreen .frame-playback span{transform:scale(1.2)}.bilibili-player.mode-fullscreen .frame-playback:not(.touch) i,.bilibili-player.mode-webfullscreen .frame-playback:not(.touch) i{margin-top:2px}.bilibili-player.mode-fullscreen .frame-playback,.bilibili-player.mode-webfullscreen .frame-playback{margin-left:0}.bilibili-player.mode-fullscreen .frame-playback.touch,.bilibili-player.mode-webfullscreen .frame-playback.touch{margin-left:6px}.frame-playback.prev-frame i{transform:scale(1.3) rotate(-90deg)}.frame-playback.prev-frame:hover i{transform:scale(1.4) rotate(-90deg);opacity:1}.frame-playback.prev-frame:active i{transform:scale(1.25) rotate(-90deg);opacity:1}.frame-playback.next-frame i{transform:scale(1.3) rotate(90deg)}.frame-playback.next-frame:hover i{transform:scale(1.4) rotate(90deg);opacity:1}.frame-playback.next-frame:active i{transform:scale(1.25) rotate(90deg);opacity:1}`; diff --git a/bilibili-evolved.preview.user.js b/bilibili-evolved.preview.user.js index f5afb4f11..cfe228a1d 100644 --- a/bilibili-evolved.preview.user.js +++ b/bilibili-evolved.preview.user.js @@ -1374,7 +1374,7 @@ onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/m onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/expand-danmaku.min.js"] = (()=>{return(e,a)=>{if(typeof isEmbeddedPlayer!=="undefined"&&isEmbeddedPlayer()){return}Observer.videoChange(async()=>{const e=await SpinQuery.select(".bui-collapse-wrap");if(e&&e.classList.contains("bui-collapse-wrap-folded")){const e=await SpinQuery.select(".bui-collapse-header");e.click()}})}})(); onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/expand-description.min.css"] = `.play-up-info .play-up-self,.video-desc .info{height:auto!important}.play-up-info .play-up-self-btn,.video-desc .btn{display:none!important}`; onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/expand-description.min.js"] = (()=>{return(e,p)=>{p.applyStyle("expandDescriptionStyle")}})(); -onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/extend-feeds-live.min.css"] = `.live-up-list{max-height:calc(100vh - 320px);overflow:auto;scrollbar-width:none!important}.live-up-list::-webkit-scrollbar{height:0!important;width:0!important}.live-up-list .live-detail[data-live-title]{color:#000}body.dark .live-up-list .live-detail[data-live-title]{color:#eee}.live-up-list .live-detail[data-live-title] .up-name{font-size:13px!important;opacity:.6}.live-up-list .live-detail[data-live-title]::before{content:attr(data-live-title);color:#000;line-height:1.5;display:block;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}body.dark .live-up-list .live-detail[data-live-title]::before{color:#eee}`; +onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/extend-feeds-live.min.css"] = `.live-up-list{max-height:calc(100vh - 380px);overflow:auto;scrollbar-width:none!important}.live-up-list::-webkit-scrollbar{height:0!important;width:0!important}.live-up-list .live-detail[data-live-title]{color:#000}body.dark .live-up-list .live-detail[data-live-title]{color:#eee}.live-up-list .live-detail[data-live-title] .up-name{font-size:13px!important;opacity:.6}.live-up-list .live-detail[data-live-title]::before{content:attr(data-live-title);color:#000;line-height:1.5;display:block;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}body.dark .live-up-list .live-detail[data-live-title]::before{color:#eee}`; onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/extend-feeds-live.min.js"] = (()=>{return(e,t)=>{(async()=>{if(document.URL.replace(location.search,"")!=="https://t.bilibili.com/"){return}const e=await SpinQuery.select(".live-up-list");if(e===null){return}t.applyStyle("extendFeedsLiveStyle");const i=24;const n=await Ajax.getPages({api:e=>{return Ajax.getJsonWithCredentials(`https://api.live.bilibili.com/relation/v1/feed/feed_list?page=${e}&pagesize=${i}`)},getList:e=>{return _.get(e,"data.list",[])},getTotal:e=>{return _.get(e,"data.results",0)}});const l=dqa(e,".up-name");const a=l.map(e=>e.innerText.trim());const r=n.filter(e=>a.includes(e.uname));const s=n.filter(e=>!a.includes(e.uname));const o=e.children[0];s.forEach(t=>{const i=o.cloneNode(true);dqa(i,"a[href]").forEach(e=>e.setAttribute("href",`https://live.bilibili.com/${t.roomid}`));const n=dq(i,".live-up-img");n.style.backgroundImage=`url(${t.face})`;const l=dq(i,".live-name");l.innerHTML=t.title;l.title=t.title;const a=dq(i,".up-name");a.innerHTML=t.uname;a.title=t.uname;e.insertAdjacentElement("beforeend",i)});const{disableProfilePopup:c}=await t.importAsync("disable-profile-popup");c();console.log(r,s)})()}})(); onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/favorites-redirect.min.js"] = (()=>{return(t,e)=>{function i(){const t=document.querySelectorAll("li[data-aid]>a");t.forEach(t=>{const e=t.getAttribute("href");if(e===null||!e.includes("medialist")){return}const i=t.parentElement.getAttribute("data-aid");t.setAttribute("href",`https://www.bilibili.com/video/av${i}`)})}(async()=>{const t=await SpinQuery.select("#app>.s-space");if(t!==null){Observer.childListSubtree("#app>.s-space",i)}})()}})(); onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/feeds-apis.min.js"] = (()=>{return(e,t)=>{const n={repost:{id:1,name:"转发"},textWithImages:{id:2,name:"图文"},text:{id:4,name:"文字"},video:{id:8,name:"视频"},miniVideo:{id:16,name:"小视频"},column:{id:64,name:"专栏"},audio:{id:256,name:"音频"},bangumi:{id:512,name:"番剧"},share:{id:2048,name:"分享"},manga:{id:2049,name:"漫画"},film:{id:4098,name:"电影"},tv:{id:4099,name:"TV剧"},chinese:{id:4100,name:"国创"},documentary:{id:4101,name:"纪录片"},mediaList:{id:4300,name:"收藏夹"},liveRecord:{id:2047,name:"开播记录"}};const r=e=>{if(e.querySelector(".repost")){return n.repost}if(e.querySelector(".imagesbox")){return n.textWithImages}if(e.querySelector(".video-container")){return n.video}if(e.querySelector(".bangumi-container")){return n.bangumi}if(e.querySelector(".article-container")){return n.column}if(e.querySelector(".music-container")){return n.audio}if(e.querySelector(".h5share-container")){return n.share}if(e.querySelector(".vc-ctnr")){return n.miniVideo}if(e.querySelector(".live-container")){return n.liveRecord}return n.text};const i=[];class a extends EventTarget{constructor(){super(...arguments);this.watching=false;this.cards=[]}addEventListener(e,t,n){super.addEventListener(e,t,n)}removeEventListener(e,t,n){super.removeEventListener(e,t,n)}async addCard(e){if(e instanceof HTMLElement&&e.classList.contains("card")){if(e.querySelector(".skeleton")!==null){const t=Observer.childList(e,()=>{if(e.querySelector(".skeleton")===null){t.stop();this.addCard(e)}})}else{if(e.parentNode===null){return}const t=await this.parseCard(e);if(!t.presented){return}if(this.cards.find(e=>e.id===t.id)){return}this.cards.push(t);this.cards.sort((e,t)=>{if(e.id===t.id){return 0}return e.id>t.id?-1:1});const n=new CustomEvent("addCard",{detail:t});this.dispatchEvent(n);i.forEach(e=>e.added(t))}}}async removeCard(e){if(e instanceof HTMLElement&&e.classList.contains("card")){const t=(await this.parseCard(e)).id;const n=this.cards.findIndex(e=>e.id===t);if(n===-1){return}const r=this.cards[n];this.cards.splice(n,1);const a=new CustomEvent("removeCard",{detail:r});this.dispatchEvent(a);i.forEach(e=>e.removed(r))}}async parseCard(e){const t=async t=>{const n=await SpinQuery.condition(()=>e.querySelector(t),t=>t!==null||e.parentNode===null);if(e.parentNode===null){return""}if(n===null){console.warn(e,t,e.parentNode);return""}const r=n.innerText.trim();return r};const i=async t=>{if(t===n.bangumi){return""}const r=await SpinQuery.condition(()=>e,t=>Boolean(t.__vue__||!e.parentNode));if(e.parentNode===null){return""}if(r===null){console.warn(r);return""}if(t===n.repost){const e=JSON.parse(r.__vue__.card.origin);const t=r.__vue__.originCardData.pureText;const n=_.get(e,"item.description","");const i=e.title;const a=r.__vue__.card.item.content;return[a,t,n,i].filter(e=>Boolean(e)).join("\n")}const i=r.__vue__.originCardData.pureText;const a=r.__vue__.originCardData.title;return[i,a].filter(e=>Boolean(e)).join("\n")};const a=async e=>{const n=parseInt(await t(e));if(isNaN(n)){return 0}return n};const s={id:e.getAttribute("data-did"),username:await t(".main-content .user-name"),text:"",reposts:await a(".button-bar .single-button:nth-child(1) .text-offset"),comments:await a(".button-bar .single-button:nth-child(2) .text-offset"),likes:await a(".button-bar .single-button:nth-child(3) .text-offset"),element:e,type:r(e),presented:true,async getText(){const e=await i(this.type);this.text=e;return e}};await s.getText();s.presented=e.parentNode!==null;e.setAttribute("data-type",s.type.id.toString());if(s.type===n.repost){const t=s.username;const n=_.get(s,"element.__vue__.card.origin_user.info.uname","");if(t===n){e.setAttribute("data-self-repost","true")}}return s}async startWatching(){const e=e=>{const t=[...e.querySelectorAll(".card[data-did]")];t.forEach(e=>this.addCard(e));return Observer.childList(e,e=>{e.forEach(e=>{e.addedNodes.forEach(e=>this.addCard(e));e.removedNodes.forEach(e=>this.removeCard(e))})})};if(this.watching){return true}this.watching=true;if(document.URL.includes("//space.bilibili.com")){console.log("space watch");const t=await SpinQuery.select(".s-space");if(!t){return false}let n=null;Observer.childList(t,async()=>{if(dq("#page-dynamic")){const t=await SpinQuery.select(".feed-card .content");console.log("enter feeds tab");if(n){n.stop()}n=e(t)}else{console.log("leave feeds tab");if(n){n.stop();n=null}}});this.watching=true;return true}const t=await SpinQuery.select(".feed-card .content, .detail-content .detail-card");if(!t){return false}e(t);return true}}const s=new a;const o=async(e="video")=>{if(!getUID()){return[]}const t=await Ajax.getJsonWithCredentials(`https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/dynamic_new?uid=${getUID()}&type_list=${e==="video"?8:512}`);if(t.code!==0){throw new Error(t.message)}if(e==="video"){return _.uniqBy(t.data.cards.map(e=>{const t=JSON.parse(e.card);const n=_.get(e,"display.topic_info.topic_details",[]).map(e=>{return{id:e.topic_id,name:e.topic_name}});return{id:e.desc.dynamic_id_str,aid:t.aid,bvid:e.desc.bvid||t.bvid,title:t.title,upID:e.desc.user_profile.info.uid,upName:e.desc.user_profile.info.uname,upFaceUrl:e.desc.user_profile.info.face,coverUrl:t.pic,description:t.desc,timestamp:e.timestamp,time:new Date(e.timestamp*1e3),topics:n,dynamic:t.dynamic,like:formatCount(e.desc.like),duration:t.duration,durationText:formatDuration(t.duration,0),playCount:formatCount(t.stat.view),danmakuCount:formatCount(t.stat.danmaku),watchlater:store.state.watchlaterList.includes(t.aid)}}),e=>e.aid)}else if(e==="bangumi"){return t.data.cards.map(e=>{const t=JSON.parse(e.card);return{id:e.desc.dynamic_id_str,aid:t.aid,bvid:e.desc.bvid||t.bvid,epID:t.episode_id,title:t.new_desc,upName:t.apiSeasonInfo.title,upFaceUrl:t.apiSeasonInfo.cover,coverUrl:t.cover,description:"",timestamp:e.timestamp,time:new Date(e.timestamp*1e3),like:formatCount(e.desc.like),durationText:"",playCount:formatCount(t.play_count),danmakuCount:formatCount(t.bullet_count),watchlater:false}})}else{return[]}};const d=e=>{(async()=>{const t=await s.startWatching();if(!t){console.error("feedsCardsManager.startWatching() failed");return}const{added:n}=e;if(n){s.cards.forEach(e=>n(e))}const r=()=>{};i.push({added:r,removed:r,...e})})()};return{export:{feedsCardsManager:s,feedsCardTypes:n,getVideoFeeds:o,forEachFeedsCard:d}}}})(); @@ -1387,7 +1387,7 @@ onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/m onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/fill-with-comments.min.js"] = (()=>{return(t,e)=>{const n="fill-with-comments-style";const l=t=>{};return{export:{fillWithComments:l}}}})(); onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/filter-type-switch.vue.min.js"] = (()=>{return(e,s)=>{const t=``;return{export:Object.assign({template:t},{components:{Icon:()=>s.importAsync("icon.vue")},props:["name","type"],methods:{setFilter(s,t=true){document.body.classList[s?"add":"remove"](`feeds-filter-block-${this.name}`);if(!t){return}if(s){e[this.settingsKey].push(this.type.id)}else{const s=e[this.settingsKey].indexOf(this.type.id);if(s!==-1){e[this.settingsKey].splice(s,1)}}e[this.settingsKey]=e[this.settingsKey]}},data(){const s=this.type.id>=0?"feedsFilterTypes":"feedsSpecialFilterTypes";const t=e[s].includes(this.type.id);this.setFilter(t,false);return{disabled:t,settingsKey:s}},watch:{disabled(e){this.setFilter(e)}}})}}})(); onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/fix-fullscreen.min.js"] = (()=>{return(e,n)=>{unsafeWindow.Element.ALLOW_KEYBOARD_INPUT={};const t=unsafeWindow.Element.prototype.requestFullscreen;unsafeWindow.Element.prototype.requestFullscreen=function(){t.call(this)}}})(); -onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/fixed-sidebars.min.js"] = (()=>{return(n,t)=>{const i=`\n.custom-navbar {\n position: fixed !important;\n}\n.sticky-bar {\n display: none !important;\n}\n.left-panel, .right-panel {\n position: fixed !important;\n}\n.center-panel {\n margin-left: calc(244px + 8px) !important;\n}\n.right-panel {\n margin-left: calc(244px + 16px + 632px) !important;\n}\n.live-panel .live-up-list {\n max-height: calc(100vh - 320px);\n overflow: auto;\n scrollbar-width: none !important;\n}\n.live-panel .live-up-list::-webkit-scrollbar {\n height: 0 !important;\n width: 0 !important;\n}\n.adaptive-scroll {\n min-height: unset !important;\n}\n`;const a="fixed-sidebars-style";const e=()=>{if(document.URL.replace(location.search,"")==="https://t.bilibili.com/"){t.applyStyleFromText(i,a);(async()=>{const{disableProfilePopup:n}=await t.importAsync("disable-profile-popup");n()})()}};const o=()=>{dqa("#"+a).forEach(n=>n.remove())};e();return{reload:e,unload:o}}})(); +onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/fixed-sidebars.min.js"] = (()=>{return(n,t)=>{const i=`\n.custom-navbar {\n position: fixed !important;\n}\n.sticky-bar {\n display: none !important;\n}\n.left-panel, .right-panel {\n position: fixed !important;\n}\n.center-panel {\n margin-left: calc(244px + 8px) !important;\n}\n.right-panel {\n margin-left: calc(244px + 16px + 632px) !important;\n}\n.live-panel .live-up-list {\n max-height: calc(100vh - 380px);\n overflow: auto;\n scrollbar-width: none !important;\n}\n.live-panel .live-up-list::-webkit-scrollbar {\n height: 0 !important;\n width: 0 !important;\n}\n.adaptive-scroll {\n min-height: unset !important;\n}\n`;const a="fixed-sidebars-style";const e=()=>{if(document.URL.replace(location.search,"")==="https://t.bilibili.com/"){t.applyStyleFromText(i,a);(async()=>{const{disableProfilePopup:n}=await t.importAsync("disable-profile-popup");n()})()}};const o=()=>{dqa("#"+a).forEach(n=>n.remove())};e();return{reload:e,unload:o}}})(); onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/fold-comment.min.css"] = `.panel-area .bb-comment .fold-comment{position:-webkit-sticky;position:sticky;bottom:0;height:40px;width:calc(100% + 48px);font-size:14px;transform:translateX(-24px);display:flex;align-items:center;justify-content:center;background-color:#fff;color:#99a2aa;cursor:pointer;transition:.2s ease-out;z-index:1000;border-radius:4px}.panel-area .bb-comment .fold-comment:hover{color:#000}body.dark .panel-area .bb-comment .fold-comment{background-color:#444;color:#eee}body.dark .panel-area .bb-comment .fold-comment:hover{color:var(--theme-color)}`; onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/fold-comment.min.js"] = (()=>{return(e,t)=>{(async()=>{if(document.URL.replace(window.location.search,"")!=="https://t.bilibili.com/"&&!document.URL.startsWith("https://space.bilibili.com")){return}const{forEachFeedsCard:e}=await t.importAsync("feeds-apis");t.applyImportantStyle("foldCommentStyle");const n=e=>{const t=t=>{const n=document.createElement("div");n.classList.add("fold-comment");n.innerHTML="收起评论";const l=t.querySelector(".bb-comment");if(l===null){console.error("未找到评论区");return}else if(l.querySelector(".fold-comment")!==null){return}else{n.addEventListener("click",()=>{const t=e.querySelector(".button-bar").children[1];if(t!==null){t.click();e.scrollIntoView()}});l.insertAdjacentElement("beforeend",n)}};const n=e.querySelector(".panel-area");if(n===null){console.log(e)}if(n.childElementCount===0){const e=Observer.childList(n,l=>{if(l.length>0){t(n);e.forEach(e=>e.stop())}})}else{t(n)}};e({added:e=>n(e.element)})})()}})(); onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/frame-playback.min.css"] = `.frame-playback{display:none!important;height:100%;align-items:center;padding-left:4px;cursor:pointer;filter:brightness(0) invert(1)!important}.frame-playback.touch{padding-left:8px}.frame-playback.touch span{display:flex;align-items:center}.bilibili-player-video-control-bottom .frame-playback{display:flex!important}.frame-playback i{transition:.4s cubic-bezier(.18,.89,.32,1.28);opacity:.9}.frame-playback:not(.touch) i{margin-top:-2px}.bilibili-player.mode-fullscreen .frame-playback span,.bilibili-player.mode-webfullscreen .frame-playback span{transform:scale(1.2)}.bilibili-player.mode-fullscreen .frame-playback:not(.touch) i,.bilibili-player.mode-webfullscreen .frame-playback:not(.touch) i{margin-top:2px}.bilibili-player.mode-fullscreen .frame-playback,.bilibili-player.mode-webfullscreen .frame-playback{margin-left:0}.bilibili-player.mode-fullscreen .frame-playback.touch,.bilibili-player.mode-webfullscreen .frame-playback.touch{margin-left:6px}.frame-playback.prev-frame i{transform:scale(1.3) rotate(-90deg)}.frame-playback.prev-frame:hover i{transform:scale(1.4) rotate(-90deg);opacity:1}.frame-playback.prev-frame:active i{transform:scale(1.25) rotate(-90deg);opacity:1}.frame-playback.next-frame i{transform:scale(1.3) rotate(90deg)}.frame-playback.next-frame:hover i{transform:scale(1.4) rotate(90deg);opacity:1}.frame-playback.next-frame:active i{transform:scale(1.25) rotate(90deg);opacity:1}`; diff --git a/bilibili-evolved.user.js b/bilibili-evolved.user.js index 830f0a723..1c7c350b8 100644 --- a/bilibili-evolved.user.js +++ b/bilibili-evolved.user.js @@ -1374,7 +1374,7 @@ onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/mi onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/expand-danmaku.min.js"] = (()=>{return(e,a)=>{if(typeof isEmbeddedPlayer!=="undefined"&&isEmbeddedPlayer()){return}Observer.videoChange(async()=>{const e=await SpinQuery.select(".bui-collapse-wrap");if(e&&e.classList.contains("bui-collapse-wrap-folded")){const e=await SpinQuery.select(".bui-collapse-header");e.click()}})}})(); onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/expand-description.min.css"] = `.play-up-info .play-up-self,.video-desc .info{height:auto!important}.play-up-info .play-up-self-btn,.video-desc .btn{display:none!important}`; onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/expand-description.min.js"] = (()=>{return(e,p)=>{p.applyStyle("expandDescriptionStyle")}})(); -onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/extend-feeds-live.min.css"] = `.live-up-list{max-height:calc(100vh - 320px);overflow:auto;scrollbar-width:none!important}.live-up-list::-webkit-scrollbar{height:0!important;width:0!important}.live-up-list .live-detail[data-live-title]{color:#000}body.dark .live-up-list .live-detail[data-live-title]{color:#eee}.live-up-list .live-detail[data-live-title] .up-name{font-size:13px!important;opacity:.6}.live-up-list .live-detail[data-live-title]::before{content:attr(data-live-title);color:#000;line-height:1.5;display:block;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}body.dark .live-up-list .live-detail[data-live-title]::before{color:#eee}`; +onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/extend-feeds-live.min.css"] = `.live-up-list{max-height:calc(100vh - 380px);overflow:auto;scrollbar-width:none!important}.live-up-list::-webkit-scrollbar{height:0!important;width:0!important}.live-up-list .live-detail[data-live-title]{color:#000}body.dark .live-up-list .live-detail[data-live-title]{color:#eee}.live-up-list .live-detail[data-live-title] .up-name{font-size:13px!important;opacity:.6}.live-up-list .live-detail[data-live-title]::before{content:attr(data-live-title);color:#000;line-height:1.5;display:block;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}body.dark .live-up-list .live-detail[data-live-title]::before{color:#eee}`; onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/extend-feeds-live.min.js"] = (()=>{return(e,t)=>{(async()=>{if(document.URL.replace(location.search,"")!=="https://t.bilibili.com/"){return}const e=await SpinQuery.select(".live-up-list");if(e===null){return}t.applyStyle("extendFeedsLiveStyle");const i=24;const n=await Ajax.getPages({api:e=>{return Ajax.getJsonWithCredentials(`https://api.live.bilibili.com/relation/v1/feed/feed_list?page=${e}&pagesize=${i}`)},getList:e=>{return _.get(e,"data.list",[])},getTotal:e=>{return _.get(e,"data.results",0)}});const l=dqa(e,".up-name");const a=l.map(e=>e.innerText.trim());const r=n.filter(e=>a.includes(e.uname));const s=n.filter(e=>!a.includes(e.uname));const o=e.children[0];s.forEach(t=>{const i=o.cloneNode(true);dqa(i,"a[href]").forEach(e=>e.setAttribute("href",`https://live.bilibili.com/${t.roomid}`));const n=dq(i,".live-up-img");n.style.backgroundImage=`url(${t.face})`;const l=dq(i,".live-name");l.innerHTML=t.title;l.title=t.title;const a=dq(i,".up-name");a.innerHTML=t.uname;a.title=t.uname;e.insertAdjacentElement("beforeend",i)});const{disableProfilePopup:c}=await t.importAsync("disable-profile-popup");c();console.log(r,s)})()}})(); onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/favorites-redirect.min.js"] = (()=>{return(t,e)=>{function i(){const t=document.querySelectorAll("li[data-aid]>a");t.forEach(t=>{const e=t.getAttribute("href");if(e===null||!e.includes("medialist")){return}const i=t.parentElement.getAttribute("data-aid");t.setAttribute("href",`https://www.bilibili.com/video/av${i}`)})}(async()=>{const t=await SpinQuery.select("#app>.s-space");if(t!==null){Observer.childListSubtree("#app>.s-space",i)}})()}})(); onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/feeds-apis.min.js"] = (()=>{return(e,t)=>{const n={repost:{id:1,name:"转发"},textWithImages:{id:2,name:"图文"},text:{id:4,name:"文字"},video:{id:8,name:"视频"},miniVideo:{id:16,name:"小视频"},column:{id:64,name:"专栏"},audio:{id:256,name:"音频"},bangumi:{id:512,name:"番剧"},share:{id:2048,name:"分享"},manga:{id:2049,name:"漫画"},film:{id:4098,name:"电影"},tv:{id:4099,name:"TV剧"},chinese:{id:4100,name:"国创"},documentary:{id:4101,name:"纪录片"},mediaList:{id:4300,name:"收藏夹"},liveRecord:{id:2047,name:"开播记录"}};const r=e=>{if(e.querySelector(".repost")){return n.repost}if(e.querySelector(".imagesbox")){return n.textWithImages}if(e.querySelector(".video-container")){return n.video}if(e.querySelector(".bangumi-container")){return n.bangumi}if(e.querySelector(".article-container")){return n.column}if(e.querySelector(".music-container")){return n.audio}if(e.querySelector(".h5share-container")){return n.share}if(e.querySelector(".vc-ctnr")){return n.miniVideo}if(e.querySelector(".live-container")){return n.liveRecord}return n.text};const i=[];class a extends EventTarget{constructor(){super(...arguments);this.watching=false;this.cards=[]}addEventListener(e,t,n){super.addEventListener(e,t,n)}removeEventListener(e,t,n){super.removeEventListener(e,t,n)}async addCard(e){if(e instanceof HTMLElement&&e.classList.contains("card")){if(e.querySelector(".skeleton")!==null){const t=Observer.childList(e,()=>{if(e.querySelector(".skeleton")===null){t.stop();this.addCard(e)}})}else{if(e.parentNode===null){return}const t=await this.parseCard(e);if(!t.presented){return}if(this.cards.find(e=>e.id===t.id)){return}this.cards.push(t);this.cards.sort((e,t)=>{if(e.id===t.id){return 0}return e.id>t.id?-1:1});const n=new CustomEvent("addCard",{detail:t});this.dispatchEvent(n);i.forEach(e=>e.added(t))}}}async removeCard(e){if(e instanceof HTMLElement&&e.classList.contains("card")){const t=(await this.parseCard(e)).id;const n=this.cards.findIndex(e=>e.id===t);if(n===-1){return}const r=this.cards[n];this.cards.splice(n,1);const a=new CustomEvent("removeCard",{detail:r});this.dispatchEvent(a);i.forEach(e=>e.removed(r))}}async parseCard(e){const t=async t=>{const n=await SpinQuery.condition(()=>e.querySelector(t),t=>t!==null||e.parentNode===null);if(e.parentNode===null){return""}if(n===null){console.warn(e,t,e.parentNode);return""}const r=n.innerText.trim();return r};const i=async t=>{if(t===n.bangumi){return""}const r=await SpinQuery.condition(()=>e,t=>Boolean(t.__vue__||!e.parentNode));if(e.parentNode===null){return""}if(r===null){console.warn(r);return""}if(t===n.repost){const e=JSON.parse(r.__vue__.card.origin);const t=r.__vue__.originCardData.pureText;const n=_.get(e,"item.description","");const i=e.title;const a=r.__vue__.card.item.content;return[a,t,n,i].filter(e=>Boolean(e)).join("\n")}const i=r.__vue__.originCardData.pureText;const a=r.__vue__.originCardData.title;return[i,a].filter(e=>Boolean(e)).join("\n")};const a=async e=>{const n=parseInt(await t(e));if(isNaN(n)){return 0}return n};const s={id:e.getAttribute("data-did"),username:await t(".main-content .user-name"),text:"",reposts:await a(".button-bar .single-button:nth-child(1) .text-offset"),comments:await a(".button-bar .single-button:nth-child(2) .text-offset"),likes:await a(".button-bar .single-button:nth-child(3) .text-offset"),element:e,type:r(e),presented:true,async getText(){const e=await i(this.type);this.text=e;return e}};await s.getText();s.presented=e.parentNode!==null;e.setAttribute("data-type",s.type.id.toString());if(s.type===n.repost){const t=s.username;const n=_.get(s,"element.__vue__.card.origin_user.info.uname","");if(t===n){e.setAttribute("data-self-repost","true")}}return s}async startWatching(){const e=e=>{const t=[...e.querySelectorAll(".card[data-did]")];t.forEach(e=>this.addCard(e));return Observer.childList(e,e=>{e.forEach(e=>{e.addedNodes.forEach(e=>this.addCard(e));e.removedNodes.forEach(e=>this.removeCard(e))})})};if(this.watching){return true}this.watching=true;if(document.URL.includes("//space.bilibili.com")){console.log("space watch");const t=await SpinQuery.select(".s-space");if(!t){return false}let n=null;Observer.childList(t,async()=>{if(dq("#page-dynamic")){const t=await SpinQuery.select(".feed-card .content");console.log("enter feeds tab");if(n){n.stop()}n=e(t)}else{console.log("leave feeds tab");if(n){n.stop();n=null}}});this.watching=true;return true}const t=await SpinQuery.select(".feed-card .content, .detail-content .detail-card");if(!t){return false}e(t);return true}}const s=new a;const o=async(e="video")=>{if(!getUID()){return[]}const t=await Ajax.getJsonWithCredentials(`https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/dynamic_new?uid=${getUID()}&type_list=${e==="video"?8:512}`);if(t.code!==0){throw new Error(t.message)}if(e==="video"){return _.uniqBy(t.data.cards.map(e=>{const t=JSON.parse(e.card);const n=_.get(e,"display.topic_info.topic_details",[]).map(e=>{return{id:e.topic_id,name:e.topic_name}});return{id:e.desc.dynamic_id_str,aid:t.aid,bvid:e.desc.bvid||t.bvid,title:t.title,upID:e.desc.user_profile.info.uid,upName:e.desc.user_profile.info.uname,upFaceUrl:e.desc.user_profile.info.face,coverUrl:t.pic,description:t.desc,timestamp:e.timestamp,time:new Date(e.timestamp*1e3),topics:n,dynamic:t.dynamic,like:formatCount(e.desc.like),duration:t.duration,durationText:formatDuration(t.duration,0),playCount:formatCount(t.stat.view),danmakuCount:formatCount(t.stat.danmaku),watchlater:store.state.watchlaterList.includes(t.aid)}}),e=>e.aid)}else if(e==="bangumi"){return t.data.cards.map(e=>{const t=JSON.parse(e.card);return{id:e.desc.dynamic_id_str,aid:t.aid,bvid:e.desc.bvid||t.bvid,epID:t.episode_id,title:t.new_desc,upName:t.apiSeasonInfo.title,upFaceUrl:t.apiSeasonInfo.cover,coverUrl:t.cover,description:"",timestamp:e.timestamp,time:new Date(e.timestamp*1e3),like:formatCount(e.desc.like),durationText:"",playCount:formatCount(t.play_count),danmakuCount:formatCount(t.bullet_count),watchlater:false}})}else{return[]}};const d=e=>{(async()=>{const t=await s.startWatching();if(!t){console.error("feedsCardsManager.startWatching() failed");return}const{added:n}=e;if(n){s.cards.forEach(e=>n(e))}const r=()=>{};i.push({added:r,removed:r,...e})})()};return{export:{feedsCardsManager:s,feedsCardTypes:n,getVideoFeeds:o,forEachFeedsCard:d}}}})(); @@ -1387,7 +1387,7 @@ onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/mi onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/fill-with-comments.min.js"] = (()=>{return(t,e)=>{const n="fill-with-comments-style";const l=t=>{};return{export:{fillWithComments:l}}}})(); onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/filter-type-switch.vue.min.js"] = (()=>{return(e,s)=>{const t=``;return{export:Object.assign({template:t},{components:{Icon:()=>s.importAsync("icon.vue")},props:["name","type"],methods:{setFilter(s,t=true){document.body.classList[s?"add":"remove"](`feeds-filter-block-${this.name}`);if(!t){return}if(s){e[this.settingsKey].push(this.type.id)}else{const s=e[this.settingsKey].indexOf(this.type.id);if(s!==-1){e[this.settingsKey].splice(s,1)}}e[this.settingsKey]=e[this.settingsKey]}},data(){const s=this.type.id>=0?"feedsFilterTypes":"feedsSpecialFilterTypes";const t=e[s].includes(this.type.id);this.setFilter(t,false);return{disabled:t,settingsKey:s}},watch:{disabled(e){this.setFilter(e)}}})}}})(); onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/fix-fullscreen.min.js"] = (()=>{return(e,n)=>{unsafeWindow.Element.ALLOW_KEYBOARD_INPUT={};const t=unsafeWindow.Element.prototype.requestFullscreen;unsafeWindow.Element.prototype.requestFullscreen=function(){t.call(this)}}})(); -onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/fixed-sidebars.min.js"] = (()=>{return(n,t)=>{const i=`\n.custom-navbar {\n position: fixed !important;\n}\n.sticky-bar {\n display: none !important;\n}\n.left-panel, .right-panel {\n position: fixed !important;\n}\n.center-panel {\n margin-left: calc(244px + 8px) !important;\n}\n.right-panel {\n margin-left: calc(244px + 16px + 632px) !important;\n}\n.live-panel .live-up-list {\n max-height: calc(100vh - 320px);\n overflow: auto;\n scrollbar-width: none !important;\n}\n.live-panel .live-up-list::-webkit-scrollbar {\n height: 0 !important;\n width: 0 !important;\n}\n.adaptive-scroll {\n min-height: unset !important;\n}\n`;const a="fixed-sidebars-style";const e=()=>{if(document.URL.replace(location.search,"")==="https://t.bilibili.com/"){t.applyStyleFromText(i,a);(async()=>{const{disableProfilePopup:n}=await t.importAsync("disable-profile-popup");n()})()}};const o=()=>{dqa("#"+a).forEach(n=>n.remove())};e();return{reload:e,unload:o}}})(); +onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/fixed-sidebars.min.js"] = (()=>{return(n,t)=>{const i=`\n.custom-navbar {\n position: fixed !important;\n}\n.sticky-bar {\n display: none !important;\n}\n.left-panel, .right-panel {\n position: fixed !important;\n}\n.center-panel {\n margin-left: calc(244px + 8px) !important;\n}\n.right-panel {\n margin-left: calc(244px + 16px + 632px) !important;\n}\n.live-panel .live-up-list {\n max-height: calc(100vh - 380px);\n overflow: auto;\n scrollbar-width: none !important;\n}\n.live-panel .live-up-list::-webkit-scrollbar {\n height: 0 !important;\n width: 0 !important;\n}\n.adaptive-scroll {\n min-height: unset !important;\n}\n`;const a="fixed-sidebars-style";const e=()=>{if(document.URL.replace(location.search,"")==="https://t.bilibili.com/"){t.applyStyleFromText(i,a);(async()=>{const{disableProfilePopup:n}=await t.importAsync("disable-profile-popup");n()})()}};const o=()=>{dqa("#"+a).forEach(n=>n.remove())};e();return{reload:e,unload:o}}})(); onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/fold-comment.min.css"] = `.panel-area .bb-comment .fold-comment{position:-webkit-sticky;position:sticky;bottom:0;height:40px;width:calc(100% + 48px);font-size:14px;transform:translateX(-24px);display:flex;align-items:center;justify-content:center;background-color:#fff;color:#99a2aa;cursor:pointer;transition:.2s ease-out;z-index:1000;border-radius:4px}.panel-area .bb-comment .fold-comment:hover{color:#000}body.dark .panel-area .bb-comment .fold-comment{background-color:#444;color:#eee}body.dark .panel-area .bb-comment .fold-comment:hover{color:var(--theme-color)}`; onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/fold-comment.min.js"] = (()=>{return(e,t)=>{(async()=>{if(document.URL.replace(window.location.search,"")!=="https://t.bilibili.com/"&&!document.URL.startsWith("https://space.bilibili.com")){return}const{forEachFeedsCard:e}=await t.importAsync("feeds-apis");t.applyImportantStyle("foldCommentStyle");const n=e=>{const t=t=>{const n=document.createElement("div");n.classList.add("fold-comment");n.innerHTML="收起评论";const l=t.querySelector(".bb-comment");if(l===null){console.error("未找到评论区");return}else if(l.querySelector(".fold-comment")!==null){return}else{n.addEventListener("click",()=>{const t=e.querySelector(".button-bar").children[1];if(t!==null){t.click();e.scrollIntoView()}});l.insertAdjacentElement("beforeend",n)}};const n=e.querySelector(".panel-area");if(n===null){console.log(e)}if(n.childElementCount===0){const e=Observer.childList(n,l=>{if(l.length>0){t(n);e.forEach(e=>e.stop())}})}else{t(n)}};e({added:e=>n(e.element)})})()}})(); onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/frame-playback.min.css"] = `.frame-playback{display:none!important;height:100%;align-items:center;padding-left:4px;cursor:pointer;filter:brightness(0) invert(1)!important}.frame-playback.touch{padding-left:8px}.frame-playback.touch span{display:flex;align-items:center}.bilibili-player-video-control-bottom .frame-playback{display:flex!important}.frame-playback i{transition:.4s cubic-bezier(.18,.89,.32,1.28);opacity:.9}.frame-playback:not(.touch) i{margin-top:-2px}.bilibili-player.mode-fullscreen .frame-playback span,.bilibili-player.mode-webfullscreen .frame-playback span{transform:scale(1.2)}.bilibili-player.mode-fullscreen .frame-playback:not(.touch) i,.bilibili-player.mode-webfullscreen .frame-playback:not(.touch) i{margin-top:2px}.bilibili-player.mode-fullscreen .frame-playback,.bilibili-player.mode-webfullscreen .frame-playback{margin-left:0}.bilibili-player.mode-fullscreen .frame-playback.touch,.bilibili-player.mode-webfullscreen .frame-playback.touch{margin-left:6px}.frame-playback.prev-frame i{transform:scale(1.3) rotate(-90deg)}.frame-playback.prev-frame:hover i{transform:scale(1.4) rotate(-90deg);opacity:1}.frame-playback.prev-frame:active i{transform:scale(1.25) rotate(-90deg);opacity:1}.frame-playback.next-frame i{transform:scale(1.3) rotate(90deg)}.frame-playback.next-frame:hover i{transform:scale(1.4) rotate(90deg);opacity:1}.frame-playback.next-frame:active i{transform:scale(1.25) rotate(90deg);opacity:1}`; diff --git a/min/bundle.json b/min/bundle.json index fc1680eca..8b82d53ea 100644 --- a/min/bundle.json +++ b/min/bundle.json @@ -94,7 +94,7 @@ "expand-danmaku.min.js": "B21658C40085AEA8DC49652AE62EB8610BB2EBEAF7A9C9AF69EF3B11E08EEC8D", "expand-description.min.css": "58C7710A50521B80F7D872BDC4C652610D84C4FABC6874BA66DA37B4F8759224", "expand-description.min.js": "A56857AD6B1C9F431B233D188E857D30DD5A2EB644986DE32A21280B1B7BC7A7", - "extend-feeds-live.min.css": "3C22AA3BA22548D09BCE693DB4DBCB016C62C329CFB3115D6D33808798F26253", + "extend-feeds-live.min.css": "A11096729EB5EF08646A6671FAA39E3B211D70F95C6FB252B82BABE91AADE893", "extend-feeds-live.min.js": "AC4C8018F5597536501DC8450F1572D6CF9D417229B84D2FE9A0F32E18942ED6", "favorites-redirect.min.js": "70D6ECCE0402AA76387D2A3288C1148C60CC88D5378B7A2BDC813F3F78E4EE84", "feeds-apis.min.js": "1FEB6EAFD6FA6948D6E51F29F5C7B91AF3ADB4C1F20654E9857405F4BD37B722", @@ -107,7 +107,7 @@ "fill-with-comments.min.js": "A32B6D4ADFA29C164F9675E07715EAC0A5CFE0BBB346735DD691BDA2D9F338C3", "filter-type-switch.vue.min.js": "4463638B9B5A5F8E0979E6A8DD63351D093149DFD31D175D56FB096B5DE82169", "fix-fullscreen.min.js": "C0628A7CABB4421FCBD7663700EF9965C96F6D79979B9F7523A9F9B0B009C8B6", - "fixed-sidebars.min.js": "409B25F94CD87A1136A77A4F49F83AB933D49D0E5DFD04F883EEA9AE922D923B", + "fixed-sidebars.min.js": "970B90A46183E03618B4B8A70C1820E779ED77BE8E9DBB33CE541670EBBDF51C", "fold-comment.min.css": "74DF4566EB80AD7078E65E8B68633E05FC41D3B4E47A20D6E415E8A743F35378", "fold-comment.min.js": "5282612A73F84F24711CB5E03146317239BAE401B0B829F494FD300D26E32223", "frame-playback.min.css": "45AC8DEBA1DEE2708FB19F8ED72798294A96A341F4FAFAFAFDEAFB79CFB50368", diff --git a/min/bundle.zip b/min/bundle.zip index 34508dc07..34306bf3e 100644 Binary files a/min/bundle.zip and b/min/bundle.zip differ diff --git a/min/extend-feeds-live.min.css b/min/extend-feeds-live.min.css index af216bf27..029720a7d 100644 --- a/min/extend-feeds-live.min.css +++ b/min/extend-feeds-live.min.css @@ -1 +1 @@ -.live-up-list{max-height:calc(100vh - 320px);overflow:auto;scrollbar-width:none!important}.live-up-list::-webkit-scrollbar{height:0!important;width:0!important}.live-up-list .live-detail[data-live-title]{color:#000}body.dark .live-up-list .live-detail[data-live-title]{color:#eee}.live-up-list .live-detail[data-live-title] .up-name{font-size:13px!important;opacity:.6}.live-up-list .live-detail[data-live-title]::before{content:attr(data-live-title);color:#000;line-height:1.5;display:block;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}body.dark .live-up-list .live-detail[data-live-title]::before{color:#eee} \ No newline at end of file +.live-up-list{max-height:calc(100vh - 380px);overflow:auto;scrollbar-width:none!important}.live-up-list::-webkit-scrollbar{height:0!important;width:0!important}.live-up-list .live-detail[data-live-title]{color:#000}body.dark .live-up-list .live-detail[data-live-title]{color:#eee}.live-up-list .live-detail[data-live-title] .up-name{font-size:13px!important;opacity:.6}.live-up-list .live-detail[data-live-title]::before{content:attr(data-live-title);color:#000;line-height:1.5;display:block;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}body.dark .live-up-list .live-detail[data-live-title]::before{color:#eee} \ No newline at end of file diff --git a/min/fixed-sidebars.min.js b/min/fixed-sidebars.min.js index a2dbf001a..152e4449c 100644 --- a/min/fixed-sidebars.min.js +++ b/min/fixed-sidebars.min.js @@ -1 +1 @@ -(()=>{return(n,t)=>{const i=`\n.custom-navbar {\n position: fixed !important;\n}\n.sticky-bar {\n display: none !important;\n}\n.left-panel, .right-panel {\n position: fixed !important;\n}\n.center-panel {\n margin-left: calc(244px + 8px) !important;\n}\n.right-panel {\n margin-left: calc(244px + 16px + 632px) !important;\n}\n.live-panel .live-up-list {\n max-height: calc(100vh - 320px);\n overflow: auto;\n scrollbar-width: none !important;\n}\n.live-panel .live-up-list::-webkit-scrollbar {\n height: 0 !important;\n width: 0 !important;\n}\n.adaptive-scroll {\n min-height: unset !important;\n}\n`;const a="fixed-sidebars-style";const e=()=>{if(document.URL.replace(location.search,"")==="https://t.bilibili.com/"){t.applyStyleFromText(i,a);(async()=>{const{disableProfilePopup:n}=await t.importAsync("disable-profile-popup");n()})()}};const o=()=>{dqa("#"+a).forEach(n=>n.remove())};e();return{reload:e,unload:o}}})(); \ No newline at end of file +(()=>{return(n,t)=>{const i=`\n.custom-navbar {\n position: fixed !important;\n}\n.sticky-bar {\n display: none !important;\n}\n.left-panel, .right-panel {\n position: fixed !important;\n}\n.center-panel {\n margin-left: calc(244px + 8px) !important;\n}\n.right-panel {\n margin-left: calc(244px + 16px + 632px) !important;\n}\n.live-panel .live-up-list {\n max-height: calc(100vh - 380px);\n overflow: auto;\n scrollbar-width: none !important;\n}\n.live-panel .live-up-list::-webkit-scrollbar {\n height: 0 !important;\n width: 0 !important;\n}\n.adaptive-scroll {\n min-height: unset !important;\n}\n`;const a="fixed-sidebars-style";const e=()=>{if(document.URL.replace(location.search,"")==="https://t.bilibili.com/"){t.applyStyleFromText(i,a);(async()=>{const{disableProfilePopup:n}=await t.importAsync("disable-profile-popup");n()})()}};const o=()=>{dqa("#"+a).forEach(n=>n.remove())};e();return{reload:e,unload:o}}})(); \ No newline at end of file diff --git a/src/activity/extend-feeds-live/extend-feeds-live.scss b/src/activity/extend-feeds-live/extend-feeds-live.scss index 9c24bf7cf..8cbe49d01 100644 --- a/src/activity/extend-feeds-live/extend-feeds-live.scss +++ b/src/activity/extend-feeds-live/extend-feeds-live.scss @@ -1,6 +1,6 @@ @import "../../style/common"; .live-up-list { - max-height: calc(100vh - 320px); + max-height: calc(100vh - 380px); overflow: auto; @include no-scrollbar(); .live-detail[data-live-title] { diff --git a/src/activity/fixed-sidebars.ts b/src/activity/fixed-sidebars.ts index ee5faade0..27c1c5032 100644 --- a/src/activity/fixed-sidebars.ts +++ b/src/activity/fixed-sidebars.ts @@ -15,7 +15,7 @@ const style = ` margin-left: calc(244px + 16px + 632px) !important; } .live-panel .live-up-list { - max-height: calc(100vh - 320px); + max-height: calc(100vh - 380px); overflow: auto; scrollbar-width: none !important; }