Fixed podcast sync
Build and Publish / Build and Publish Docker Image (push) Successful in 2m8s

This commit is contained in:
ab committed 2026-11-22 17:11:37 +02:00
1 parent 441316f78f
commit 319f0bcba7
21 files changed
+1067 -276

No files matched your search

+1
View File
@@ -332,6 +332,7 @@ pub(super) struct ShareDetail {
#[derive(Debug, Serialize, JsonSchema)]
pub(super) struct SearchResults {
pub(super) podcasts: Vec<serde_json::Value>,
pub(super) artists: Vec<ArtistCard>,
pub(super) releases: Vec<ReleaseCard>,
pub(super) tracks: Vec<TrackItem>,
+27 -2
View File
@@ -1046,7 +1046,18 @@ impl PlayerDeviceHub {
.playback_state_by_user
.get(&playback_user_id)
.cloned()
.map(|playback_state| playback_state_at(playback_state, now))
.map(|playback_state| {
let mut playback_state = playback_state_at(playback_state, now);
if playback_user_id != user_id {
for track in &mut playback_state.tracks {
redact_podcast_track(track);
}
if let Some(track) = &mut playback_state.track {
redact_podcast_track(track);
}
}
playback_state
})
}
fn jam_dtos_locked(
@@ -1150,6 +1161,16 @@ fn current_millis() -> i64 {
chrono::Utc::now().timestamp_millis()
}
fn redact_podcast_track(track: &mut serde_json::Value) {
if track.get("podcast_source").is_none()
&& track.get("podcast").and_then(serde_json::Value::as_bool) != Some(true)
{
return;
}
let id = track.get("id").cloned().unwrap_or(serde_json::json!(0));
*track = serde_json::json!({"id":id,"title":"Private item","artists":[],"featured_artists":[],"release_id":0,"release_title":"","cover_url":null,"stream_url":"","duration_seconds":0,"unavailable":true,"podcast_source":{"kind":"private"}});
}
fn fed_virtual_device_id(device_id: &str) -> String {
format!("{FED_DEVICE_PREFIX}{device_id}")
}
@@ -6657,13 +6678,14 @@ async fn search_handler(
pool: &sqlx::PgPool,
query: cot::request::extractors::UrlQuery<SearchQuery>,
) -> cot::Result<cot::response::Response> {
let Some(_user) = auth::get_request_user(&auth_ctx, &session, &db).await else {
let Some(user) = auth::get_request_user(&auth_ctx, &session, &db).await else {
return Ok(json_error(StatusCode::UNAUTHORIZED, "not authenticated"));
};
let q = query.0.q.trim().to_lowercase();
if q.is_empty() {
return Json(SearchResults {
podcasts: Vec::new(),
artists: Vec::new(),
releases: Vec::new(),
tracks: Vec::new(),
@@ -6968,6 +6990,9 @@ async fn search_handler(
.collect();
Json(SearchResults {
podcasts: crate::podcasts::search(pool, user.id, &q, limit)
.await
.map_err(|e| cot::Error::internal(e.to_string()))?,
artists,
releases,
tracks,