kavin/sponsorblock-mirror
1
0
Fork 0
mirror of https://github.com/TeamPiped/sponsorblock-mirror.git synced 2024-12-13 05:40:36 +05:30
Code Issues Packages Projects Releases Wiki Activity

Minor unrelated improvements.

Browse Source
This commit is contained in:
Kavin 2022-10-30 18:00:13 +00:00
parent 53936cb9f9
commit 491c5d3f58
No known key found for this signature in database
GPG Key ID: 49451E4482CC5BCD
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/routes.rs
View File

@ -55,7 +55,7 @@ pub async fn skip_segments(
let resp = reqwest::get(format!( let resp = reqwest::get(format!(
"https://sponsor.ajay.app/api/skipSegments/{}?categories={}", "https://sponsor.ajay.app/api/skipSegments/{}?categories={}",
hash, hash,
categories.unwrap_or("[]"), categories.unwrap_or("[\"sponsor\"]"),
)) ))
.await .await
.unwrap() .unwrap()
@ -89,7 +89,7 @@ pub async fn skip_segments_by_id(
let resp = reqwest::get(format!( let resp = reqwest::get(format!(
"https://sponsor.ajay.app/api/skipSegments?videoID={}&categories={}", "https://sponsor.ajay.app/api/skipSegments?videoID={}&categories={}",
videoID, videoID,
categories.unwrap_or("[]"), categories.unwrap_or("[\"sponsor\"]"),
)) ))
.await .await
.unwrap() .unwrap()
@ -154,17 +154,7 @@ async fn find_skip_segments(
}) })
}; };
let segment = Segment { let segment = build_segment(result);
uuid: result.uuid.clone(),
action_type: result.action_type.clone(),
category: result.category.clone(),
description: result.description.clone(),
locked: result.locked,
segment: vec![result.start_time, result.end_time],
user_id: result.user_id.clone(),
video_duration: result.video_duration,
votes: result.votes,
};
let hash = result.hashed_video_id.clone(); let hash = result.hashed_video_id.clone();
@ -214,17 +204,7 @@ fn similar_segments(segment: &Segment, hash: &str, segments: &Vec<SponsorTime>)
let is_similar = is_overlap(segment, &seg.category, &seg.action_type, seg.start_time, seg.end_time); let is_similar = is_overlap(segment, &seg.category, &seg.action_type, seg.start_time, seg.end_time);
if is_similar { if is_similar {
similar_segments.push(Segment { similar_segments.push(build_segment(seg));
uuid: seg.uuid.clone(),
action_type: seg.action_type.clone(),
category: seg.category.clone(),
description: seg.description.clone(),
locked: seg.locked,
segment: vec![seg.start_time, seg.end_time],
user_id: seg.user_id.clone(),
video_duration: seg.video_duration,
votes: seg.votes,
});
} }
} }
@ -266,6 +246,20 @@ fn best_segment(segments: &Vec<Segment>) -> Segment {
best_segment best_segment
} }
fn build_segment (sponsor_time: &SponsorTime) -> Segment {
Segment {
uuid: sponsor_time.uuid.clone(),
action_type: sponsor_time.action_type.clone(),
category: sponsor_time.category.clone(),
description: sponsor_time.description.clone(),
locked: sponsor_time.locked,
segment: vec![sponsor_time.start_time, sponsor_time.end_time],
user_id: sponsor_time.user_id.clone(),
video_duration: sponsor_time.video_duration,
votes: sponsor_time.votes,
}
}
// These additional routes are faked to protect ReVanced from seeing errors. We // These additional routes are faked to protect ReVanced from seeing errors. We
// don't *need* to do this to support ReVanced, but it gets rid of the // don't *need* to do this to support ReVanced, but it gets rid of the
// perpetual "Loading..." in the settings. // perpetual "Loading..." in the settings.