summaryrefslogtreecommitdiff
path: root/src/server.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/server.rs')
-rw-r--r--src/server.rs33
1 files changed, 15 insertions, 18 deletions
diff --git a/src/server.rs b/src/server.rs
index f0dd591..9c5618b 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -1,3 +1,4 @@
+use chrono::Utc;
use rocket::config::Config;
use rocket::config::Environment;
use rocket::config::Value;
@@ -13,12 +14,8 @@ use rocket::request::Request;
use rocket::response::Redirect;
use rocket::State;
use rocket_contrib::templates::Template;
-use std::collections::HashMap;
-use std::sync::mpsc::Sender;
-use std::sync::Mutex;
-use threadpool::ThreadPool;
-use chrono::Utc;
use serde_json::to_value;
+use std::collections::HashMap;
use crate::db;
use crate::error::Error;
@@ -133,20 +130,20 @@ fn link_strava_callback(
}
#[get("/import_strava")]
-fn import_strava(
- conn: Db,
- user: LoggedInUser,
-) -> Result<(), Error> {
+fn import_strava(conn: Db, user: LoggedInUser) -> Result<(), Error> {
let user = db::get_user(&*conn, &user.username)?;
- let command =
- importer::Command::ImportStravaUser { username: user.username.clone() };
- db::insert_task(&conn,
- &models::NewTask {
- start_at: Utc::now(),
- state: models::TaskState::NEW,
- username: user.username.as_str(),
- payload: &to_value(command)?,
- })?;
+ let command = importer::Command::ImportStravaUser {
+ username: user.username.clone(),
+ };
+ db::insert_task(
+ &conn,
+ &models::NewTask {
+ start_at: Utc::now(),
+ state: models::TaskState::NEW,
+ username: user.username.as_str(),
+ payload: &to_value(command)?,
+ },
+ )?;
Ok(())
}