Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

修复第三方弹幕获取和过滤 #56

Merged
merged 2 commits into from
Sep 6, 2024
Merged

修复第三方弹幕获取和过滤 #56

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e9e29d
fix bug
Xarth-Mai Sep 5, 2024
87c44ab
Update ede.js
Xarth-Mai Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions ede.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,20 +977,16 @@
try {
let response = await makeGetRequest(url_all);
let data = isInTampermonkey ? JSON.parse(response) : await response.json();
const nonDandan = /^.{3,}\]/; // 匹配非弹弹play弹幕
let hasRelated = false;
for (const c of data.comments) {
if (nonDandan.test(c.p.split(',').pop())) {
hasRelated = true;
break;
const matchBili = /^\[BiliBili\]/;
let hasBili = false;
if ((danmakuFilter & 1) !== 1) {
for (const c of data.comments) {
if (matchBili.test(c.p.split(',').pop())) {
hasBili = true;
break;
}
}
}
if (hasRelated) { // 实际包含第三方弹幕
showDebugInfo('弹幕下载成功: ' + data.comments.length);
return data.comments;
} else {
showDebugInfo('缺少第三方弹幕，尝试获取');
}
let comments = data.comments;
response = await makeGetRequest(url_related);
data = isInTampermonkey ? JSON.parse(response) : await response.json();
Expand All @@ -1000,7 +996,10 @@
// 根据设置过滤弹幕源
let src = [];
for (const s of data.relateds) {
if ((danmakuFilter & 1) !== 1 && s.url.includes('bilibili')) {
if ((danmakuFilter & 1) !== 1 && !hasBili && s.url.includes('bilibili.com/bangumi')) {
src.push(s.url);
}
if ((danmakuFilter & 1) !== 1 && s.url.includes('bilibili.com/video')) {
src.push(s.url);
}
if ((danmakuFilter & 2) !== 2 && s.url.includes('gamer')) {
Expand Down Expand Up @@ -1406,7 +1405,7 @@
.filter((comment) => {
const user = comment.p.split(',')[3];
const modeId = parseInt(comment.p.split(',')[1], 10);
return !danmakuFilteRule.test(comment.m) && enabledMode.includes(modeId);
return !danmakuFilteRule.test(user) && enabledMode.includes(modeId);
})
.map((comment) => {
const [time, modeId, colorValue] = comment.p.split(',').map((v, i) => i === 0 ? parseFloat(v) : parseInt(v, 10));
Expand Down