Skip to content

Commit

Permalink
fix: 🐛 修复伪装登录在搜索页面不生效问题
Browse files Browse the repository at this point in the history 
修复搜索页面评论区的宽度问题
  • Loading branch information
@WhiteSevs
WhiteSevs committed May 17, 2024
1 parent 471b490 commit 0a29fcf
Show file tree
Hide file tree
Showing 8 changed files with 121 additions and 27 deletions.
4 changes: 2 additions & 2 deletions packages/抖音优化/SCRIPT_VERSION.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"time": 1715916586151,
"version": "2024.5.17"
"time": 1715925323705,
"version": "2024.5.17.13"
}
46 changes: 27 additions & 19 deletions packages/抖音优化/dist/抖音优化.min.user.js
View file

Large diffs are not rendered by default.

44 changes: 41 additions & 3 deletions packages/抖音优化/dist/抖音优化.user.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==UserScript==
// @name 抖音优化
// @namespace https://github.com/WhiteSevs/TamperMonkeyScript
// @version 2024.5.17
// @version 2024.5.17.13
// @author WhiteSevs
// @description 过滤广告、过滤直播、可自定义过滤视频的屏蔽关键字、伪装登录、直播屏蔽弹幕、礼物特效等
// @license GPL-3.0-only
Expand Down Expand Up @@ -1077,7 +1077,7 @@
`);
}
};
const MobileCSS$1 = '/* 去除顶部的padding距离 */\r\n#douyin-right-container {\r\n padding-top: 0;\r\n}\r\n/* 放大放大顶部的综合、视频、用户等header的宽度 */\r\n#search-content-area > div > div:nth-child(1) > div:nth-child(1) {\r\n width: 100dvw;\r\n}\r\n/* 放大顶部的综合、视频、用户等header */\r\n#search-content-area > div > div:nth-child(1) > div:nth-child(1) > div {\r\n transform: scale(0.8);\r\n}\r\n/* 视频宽度 */\r\nul[data-e2e="scroll-list"] {\r\n padding: 0px 10px;\r\n}\r\n#sliderVideo {\r\n width: -webkit-fill-available;\r\n}\r\n/* 距离是顶部导航栏的高度 */\r\n#search-content-area {\r\n margin-top: 65px;\r\n}\r\n/* 调整视频列表的宽度 */\r\n@media screen and (max-width: 500px) {\r\n #sliderVideo {\r\n width: 100dvw;\r\n }\r\n /* 调整顶部搜索框的宽度 */\r\n #component-header\r\n div[data-click="doubleClick"]\r\n > div[data-click="doubleClick"]\r\n > div:has(input[data-e2e="searchbar-input"]) {\r\n width: -webkit-fill-available;\r\n padding-right: 0;\r\n }\r\n}\r\n';
const MobileCSS$1 = '/* 去除顶部的padding距离 */\r\n#douyin-right-container {\r\n padding-top: 0;\r\n}\r\n/* 放大放大顶部的综合、视频、用户等header的宽度 */\r\n#search-content-area > div > div:nth-child(1) > div:nth-child(1) {\r\n width: 100dvw;\r\n}\r\n/* 放大顶部的综合、视频、用户等header */\r\n#search-content-area > div > div:nth-child(1) > div:nth-child(1) > div {\r\n transform: scale(0.8);\r\n}\r\n/* 视频宽度 */\r\nul[data-e2e="scroll-list"] {\r\n padding: 0px 10px;\r\n}\r\n#sliderVideo {\r\n width: -webkit-fill-available;\r\n}\r\n/* 距离是顶部导航栏的高度 */\r\n#search-content-area {\r\n margin-top: 65px;\r\n}\r\n/* 调整视频列表的宽度 */\r\n@media screen and (max-width: 550px) {\r\n #sliderVideo {\r\n width: 100dvw;\r\n }\r\n /* 调整顶部搜索框的宽度 */\r\n #component-header\r\n div[data-click="doubleClick"]\r\n > div[data-click="doubleClick"]\r\n > div:has(input[data-e2e="searchbar-input"]) {\r\n width: -webkit-fill-available;\r\n padding-right: 0;\r\n }\r\n}\r\n\r\n';
const DouYinSearch = {
init() {
DouYinSearchHideElement.init();
Expand All @@ -1088,9 +1088,19 @@
mobileMode() {
log.info("搜索-手机模式");
_GM_addStyle(MobileCSS$1);
utils.waitNode("#relatedVideoCard").then(($relatedVideoCard) => {
log.info("评论区展开的className：" + $relatedVideoCard.className);
_GM_addStyle(`
html[data-vertical-screen]
#sliderVideo[data-e2e="feed-active-video"]
#videoSideBar:has(#relatedVideoCard[class*="${$relatedVideoCard.className}"]) {
width: 100dvw !important;
}
`);
});
}
};
const MobileCSS = '/* 右侧工具栏放大 */\r\n.basePlayerContainer .positionBox {\r\n scale: unset !important;\r\n bottom: 80px !important;\r\n padding-right: 5px !important;\r\n transform: scale(1.12) !important;\r\n}\r\n/* 图标再放大 */\r\n.basePlayerContainer .positionBox svg {\r\n transform: scale(1.12);\r\n}\r\n/* 重置关注按钮的scale */\r\n.basePlayerContainer\r\n .positionBox\r\n .dy-tip-container\r\n div[data-e2e="feed-follow-icon"]\r\n svg {\r\n scale: unset;\r\n}\r\n/* 设备处于横向方向，即宽度大于高度。 */\r\n@media screen and (orientation: landscape) {\r\n /* 右侧工具栏放大 */\r\n .basePlayerContainer .positionBox {\r\n /*transform: scale(0.95) !important;\r\n bottom: 42px !important;*/\r\n padding-right: 10px !important;\r\n }\r\n}\r\n/* 该设备是纵向的，即高度大于或等于宽度 */\r\n@media screen and (orientation: portrait) {\r\n}\r\n\r\n/* 调整视频列表的宽度 */\r\n@media screen and (max-width: 500px) {\r\n #slidelist {\r\n width: 100dvw;\r\n }\r\n /* 调整顶部搜索框的宽度 */\r\n #douyin-header\r\n div[data-click="doubleClick"]\r\n > div[data-click="doubleClick"]\r\n > div:has(input[data-e2e="searchbar-input"]) {\r\n width: -webkit-fill-available;\r\n padding-right: 0;\r\n }\r\n}\r\n';
const MobileCSS = '/* 右侧工具栏放大 */\r\n.basePlayerContainer .positionBox {\r\n scale: unset !important;\r\n bottom: 80px !important;\r\n padding-right: 5px !important;\r\n transform: scale(1.12) !important;\r\n}\r\n/* 图标再放大 */\r\n.basePlayerContainer .positionBox svg {\r\n transform: scale(1.12);\r\n}\r\n/* 重置关注按钮的scale */\r\n.basePlayerContainer\r\n .positionBox\r\n .dy-tip-container\r\n div[data-e2e="feed-follow-icon"]\r\n svg {\r\n scale: unset;\r\n}\r\n/* 设备处于横向方向，即宽度大于高度。 */\r\n@media screen and (orientation: landscape) {\r\n /* 右侧工具栏放大 */\r\n .basePlayerContainer .positionBox {\r\n /*transform: scale(0.95) !important;\r\n bottom: 42px !important;*/\r\n padding-right: 10px !important;\r\n }\r\n}\r\n/* 该设备是纵向的，即高度大于或等于宽度 */\r\n@media screen and (orientation: portrait) {\r\n}\r\n\r\n/* 调整视频列表的宽度 */\r\n@media screen and (max-width: 550px) {\r\n #slidelist {\r\n width: 100dvw;\r\n height: 100dvh;\r\n }\r\n /* 调整顶部搜索框的宽度 */\r\n #douyin-header\r\n div[data-click="doubleClick"]\r\n > div[data-click="doubleClick"]\r\n > div:has(input[data-e2e="searchbar-input"]) {\r\n width: -webkit-fill-available;\r\n padding-right: 0;\r\n }\r\n}\r\n';
const DouYinVideo = {
init() {
DouYinVideoHideElement.init();
Expand Down Expand Up @@ -2287,6 +2297,7 @@
let userInfoList = [];
let $react = utils.getReactObj(element);
let reactFiber = $react == null ? void 0 : $react.reactFiber;
$react == null ? void 0 : $react.reactProps;
if ((_c = (_b = (_a2 = reactFiber == null ? void 0 : reactFiber.alternate) == null ? void 0 : _a2.return) == null ? void 0 : _b.memoizedProps) == null ? void 0 : _c.userInfo) {
userInfoList.push(
(_f = (_e = (_d = reactFiber == null ? void 0 : reactFiber.alternate) == null ? void 0 : _d.return) == null ? void 0 : _e.memoizedProps) == null ? void 0 : _f.userInfo
Expand Down Expand Up @@ -2336,6 +2347,7 @@
setLogin(DouYinElement.getOSElement());
}, 70)
});
}).catch((err) => {
});
if (DouYinRouter.isLive()) {
utils.waitNodeWithInterval(
Expand All @@ -2354,6 +2366,32 @@
}, 70)
});
});
} else if (DouYinRouter.isSearch()) {
let setUserInfoBySearch = function($ele) {
var _a2, _b, _c, _d, _e, _f, _g;
let $react = utils.getReactObj($ele);
$react == null ? void 0 : $react.reactFiber;
let reactProps = $react == null ? void 0 : $react.reactProps;
if (typeof ((_d = (_c = (_b = (_a2 = reactProps == null ? void 0 : reactProps.children) == null ? void 0 : _a2[1]) == null ? void 0 : _b.props) == null ? void 0 : _c.userInfo) == null ? void 0 : _d.isLogin) === "boolean") {
reactProps.children[1].props.userInfo.isLogin = true;
}
if (typeof ((_g = (_f = (_e = reactProps == null ? void 0 : reactProps.children) == null ? void 0 : _e[1]) == null ? void 0 : _f.props) == null ? void 0 : _g.isClient) === "boolean") {
reactProps.children[1].props.isClient = true;
}
};
utils.waitNodeWithInterval("#root > div", WAIT_TIME).then(() => {
utils.mutationObserver(document.body, {
config: {
subtree: true,
childList: true
},
callback: utils.debounce((mutation, observer) => {
setUserInfoBySearch(
document.querySelector("#root > div")
);
}, 70)
});
});
}
},
/**
Expand Down
34 changes: 33 additions & 1 deletion packages/抖音优化/src/main/Account/DouYinAccount.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const DouYinAccount = {
let userInfoList = [];
let $react = utils.getReactObj(element);
let reactFiber = $react?.reactFiber;
let reactProps = $react?.reactProps;
if (reactFiber?.alternate?.return?.memoizedProps?.userInfo) {
userInfoList.push(
reactFiber?.alternate?.return?.memoizedProps?.userInfo
Expand Down Expand Up @@ -76,7 +77,8 @@ const DouYinAccount = {
setLogin(DouYinElement.getOSElement());
}, 70),
});
});
})
.catch((err) => {});
/* 直播的顶部live */
if (DouYinRouter.isLive()) {
utils
Expand All @@ -97,6 +99,36 @@ const DouYinAccount = {
}, 70),
});
});
} else if (DouYinRouter.isSearch()) {
/* 搜索 */
function setUserInfoBySearch($ele: HTMLElement) {
/* 搜索页面的用户信息 */
let $react = utils.getReactObj($ele);
let reactFiber = $react?.reactFiber;
let reactProps = $react?.reactProps;
if (
typeof reactProps?.children?.[1]?.props?.userInfo?.isLogin ===
"boolean"
) {
reactProps.children[1].props.userInfo.isLogin = true;
}
if (typeof reactProps?.children?.[1]?.props?.isClient === "boolean") {
reactProps.children[1].props.isClient = true;
}
}
utils.waitNodeWithInterval("#root > div", WAIT_TIME).then(() => {
utils.mutationObserver(document.body, {
config: {
subtree: true,
childList: true,
},
callback: utils.debounce((mutation, observer) => {
setUserInfoBySearch(
document.querySelector("#root > div") as HTMLDivElement
);
}, 70),
});
});
}
},
/**
Expand Down
11 changes: 11 additions & 0 deletions packages/抖音优化/src/main/Search/DouYinSearch.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@ const DouYinSearch = {
mobileMode() {
log.info("搜索-手机模式");
GM_addStyle(MobileCSS);
/* 评论区展开才会出现 */
utils.waitNode("#relatedVideoCard").then(($relatedVideoCard) => {
log.info("评论区展开的className：" + $relatedVideoCard.className);
GM_addStyle(`
html[data-vertical-screen]
#sliderVideo[data-e2e="feed-active-video"]
#videoSideBar:has(#relatedVideoCard[class*="${$relatedVideoCard.className}"]) {
width: 100dvw !important;
}
`);
});
},
};

Expand Down
3 changes: 2 additions & 1 deletion packages/抖音优化/src/main/Search/mobile.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ul[data-e2e="scroll-list"] {
margin-top: 65px;
}
/* 调整视频列表的宽度 */
@media screen and (max-width: 500px) {
@media screen and (max-width: 550px) {
#sliderVideo {
width: 100dvw;
}
Expand All @@ -35,3 +35,4 @@ ul[data-e2e="scroll-list"] {
padding-right: 0;
}
}

3 changes: 2 additions & 1 deletion packages/抖音优化/src/main/Video/mobile.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@
}

/* 调整视频列表的宽度 */
@media screen and (max-width: 500px) {
@media screen and (max-width: 550px) {
#slidelist {
width: 100dvw;
height: 100dvh;
}
/* 调整顶部搜索框的宽度 */
#douyin-header
Expand Down
3 changes: 3 additions & 0 deletions packages/抖音优化/vite.config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,7 @@ export default defineConfig({
minify: isMinify,
emptyOutDir: isEmptyOutDir,
},
server: {
host: "0.0.0.0",
},
});

0 comments on commit 0a29fcf

Please sign in to comment.