tom/ol_rusty
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update to new version compatability

Browse source
This commit is contained in:
Tom 2022-08-17 23:01:19 +02:00
parent d9250ec4c0
commit 4aa918a966
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/commands/links/eurosport.rs
View file

@ -185,7 +185,7 @@ fn get_events(v: Eurosport) -> Result<Vec<ESEvents>, serde_json::Error> {
let sport_name = match &relationships.sport_id { let sport_name = match &relationships.sport_id {
None => None, None => None,
Some(sportid) => match sportid.data.get(0) { Some(sport_id) => match sport_id.data.get(0) {
None => None, None => None,
Some(sv) => match sports.get(&sv.id) { Some(sv) => match sports.get(&sv.id) {
None => None, None => None,
@ -254,7 +254,7 @@ async fn get_eurosport_events(url: String) -> Option<Vec<ESEvents>> {
.get("cookie") .get("cookie")
.expect("Config error, please set the eurosport[cookie] value") .expect("Config error, please set the eurosport[cookie] value")
.clone() .clone()
.into_str() .into_string()
.expect("Config error, please make sure eurosport[cookie] is a string"); .expect("Config error, please make sure eurosport[cookie] is a string");
let client = reqwest::Client::new(); let client = reqwest::Client::new();
let x_disco_client = HeaderName::from_lowercase(b"x-disco-client").unwrap(); let x_disco_client = HeaderName::from_lowercase(b"x-disco-client").unwrap();
@ -302,7 +302,7 @@ async fn get_eurosport_events(url: String) -> Option<Vec<ESEvents>> {
return result; return result;
} }
// #[derive(Debug, poise::SlashChoiceParameter)] // #[derive(Debug, poise::ChoiceParameter)]
// pub enum Timeframe { // pub enum Timeframe {
// #[name = "Currently happening"] // #[name = "Currently happening"]
// Current, // Current,
@ -361,11 +361,13 @@ async fn get_eurosport_events(url: String) -> Option<Vec<ESEvents>> {
// Ok(()) // Ok(())
// } // }
/// Eurosport player events // Eurosport player events
pub async fn proc_eurosport( #[poise::command(slash_command)]
pub async fn eurosport(
ctx: Context<'_>, ctx: Context<'_>,
#[description = "Filter sessions for when they are/were happening, defaults to future"]
timeframe: Option<Timeframe>, timeframe: Option<Timeframe>,
filter: Option<String>, #[description = "Content to filter on"] filter: Option<String>,
) -> Result<(), Error> { ) -> Result<(), Error> {
let url = super::super::super::SETTINGS let url = super::super::super::SETTINGS
.read() .read()
@ -375,7 +377,7 @@ pub async fn proc_eurosport(
.get("url") .get("url")
.expect("Config error, please set the eurosport[url] value") .expect("Config error, please set the eurosport[url] value")
.clone() .clone()
.into_str() .into_string()
.expect("Config error, please make sure eurosport[url] is a string"); .expect("Config error, please make sure eurosport[url] is a string");
let events = get_eurosport_events(url).await; let events = get_eurosport_events(url).await;
match events { match events {
@ -455,6 +457,7 @@ pub async fn proc_eurosport(
// } // }
/// Eurosport olympics events /// Eurosport olympics events
#[allow(dead_code)]
pub async fn proc_olympics( pub async fn proc_olympics(
ctx: Context<'_>, ctx: Context<'_>,
timeframe: Option<Timeframe>, timeframe: Option<Timeframe>,
@ -468,7 +471,7 @@ pub async fn proc_olympics(
.get("olympics") .get("olympics")
.expect("Config error, please set the eurosport[olympics] value") .expect("Config error, please set the eurosport[olympics] value")
.clone() .clone()
.into_str() .into_string()
.expect("Config error, please make sure eurosport[olympics] is a string"); .expect("Config error, please make sure eurosport[olympics] is a string");
let events = get_eurosport_events(url).await; let events = get_eurosport_events(url).await;
match events { match events {