nki/youmubot
1
0
Fork 0
mirror of https://github.com/natsukagami/youmubot.git synced 2025-05-24 17:20:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into osu

Browse source
This commit is contained in:
Natsu Kagami 2020-01-16 01:58:26 -05:00
commit ce09a76dc7
12 changed files with 434 additions and 686 deletions
Download patch file Download diff file Expand all files Collapse all files

8
youmubot-osu/src/lib.rs
View file

@ -8,7 +8,7 @@ mod test;
use models::*;
use request::builders::*;
use request::*;
use reqwest::Client as HTTPClient;
use reqwest::blocking::{Client as HTTPClient, RequestBuilder, Response};
use serenity::framework::standard::CommandError as Error;
use std::convert::TryInto;
@ -35,11 +35,7 @@ impl Client {
}
}
fn build_request(
&self,
c: &HTTPClient,
r: reqwest::RequestBuilder,
) -> Result<reqwest::Response, Error> {
fn build_request(&self, c: &HTTPClient, r: RequestBuilder) -> Result<Response, Error> {
let v = r.query(&[("k", &self.key)]).build()?;
dbg!(v.url());
Ok(c.execute(v)?)

2
youmubot-osu/src/request.rs
View file

@ -1,6 +1,6 @@
use crate::models::{Mode, Mods};
use chrono::{DateTime, Utc};
use reqwest::{Client, RequestBuilder};
use reqwest::blocking::{Client, RequestBuilder};
trait ToQuery {
fn to_query(&self) -> Vec<(&'static str, String)>;