Queued song linked to user
This commit is contained in:
@@ -430,16 +430,26 @@ impl CommitManager {
|
|||||||
|
|
||||||
match up.queue_song(token, song).await {
|
match up.queue_song(token, song).await {
|
||||||
Ok(id) => {
|
Ok(id) => {
|
||||||
|
println!("Song queued");
|
||||||
queued_song_id = id;
|
queued_song_id = id;
|
||||||
}
|
}
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
eprintln!("Error: {err:?}");
|
|
||||||
return Err(std::io::Error::other(err.to_string()));
|
return Err(std::io::Error::other(err.to_string()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
println!("Queued song Id: {queued_song_id:?}");
|
println!("Queued song Id: {queued_song_id:?}");
|
||||||
|
|
||||||
|
match up.link_user_to_queued_song(token, &queued_song_id).await {
|
||||||
|
Ok(_) => {
|
||||||
|
println!("Queued song linked to user");
|
||||||
|
}
|
||||||
|
Err(err) => {
|
||||||
|
return Err(std::io::Error::other(err.to_string()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,3 +19,10 @@ fn retrieve_url_with_id(api: &models::api::Api, id: &uuid::Uuid) -> String {
|
|||||||
|
|
||||||
url
|
url
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn auth_header(token: &icarus_models::token::AccessToken) -> (http::HeaderName, http::HeaderValue) {
|
||||||
|
let auth = reqwest::header::AUTHORIZATION;
|
||||||
|
let auth_value = http::HeaderValue::from_str(&token.bearer_token()).unwrap();
|
||||||
|
|
||||||
|
(auth, auth_value)
|
||||||
|
}
|
||||||
|
|||||||
+31
-2
@@ -84,9 +84,10 @@ impl Upload {
|
|||||||
println!("Url: {url:?}");
|
println!("Url: {url:?}");
|
||||||
|
|
||||||
let mut headers = reqwest::header::HeaderMap::new();
|
let mut headers = reqwest::header::HeaderMap::new();
|
||||||
|
let (auth, auth_val) = syncers::common::auth_header(token).await;
|
||||||
headers.insert(
|
headers.insert(
|
||||||
reqwest::header::AUTHORIZATION,
|
auth,
|
||||||
HeaderValue::from_str(&token.bearer_token()).unwrap(),
|
auth_val
|
||||||
);
|
);
|
||||||
headers.insert("Accept", HeaderValue::from_str("*/*").unwrap());
|
headers.insert("Accept", HeaderValue::from_str("*/*").unwrap());
|
||||||
headers.insert("Connection", HeaderValue::from_str("keep-alive").unwrap());
|
headers.insert("Connection", HeaderValue::from_str("keep-alive").unwrap());
|
||||||
@@ -115,6 +116,34 @@ impl Upload {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn link_user_to_queued_song(&self, token: &icarus_models::token::AccessToken, queued_song_id: &uuid::Uuid) -> Result<(), reqwest::Error> {
|
||||||
|
let endpoint = String::from("api/v2/song/queue/link");
|
||||||
|
let url = format!("{}/{endpoint}", self.api.url);
|
||||||
|
|
||||||
|
let mut headers = reqwest::header::HeaderMap::new();
|
||||||
|
let (auth, auth_val) = syncers::common::auth_header(token).await;
|
||||||
|
headers.insert(
|
||||||
|
auth,
|
||||||
|
auth_val
|
||||||
|
);
|
||||||
|
|
||||||
|
let client = reqwest::Client::builder().build().unwrap();
|
||||||
|
|
||||||
|
let payload = serde_json::json!({
|
||||||
|
"song_queue_id": queued_song_id,
|
||||||
|
"user_id": token.user_id
|
||||||
|
});
|
||||||
|
|
||||||
|
match client.patch(url).headers(headers).json(&payload).send().await {
|
||||||
|
Ok(_) => {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
Err(err) => {
|
||||||
|
Err(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn init_form(
|
fn init_form(
|
||||||
&self,
|
&self,
|
||||||
song: &icarus_models::song::Song,
|
song: &icarus_models::song::Song,
|
||||||
|
|||||||
Reference in New Issue
Block a user