Reorganize use statements

src/activity_pub/inbox.rs

@@ -8,15 +8,19 @@ use diesel::PgConnection;
 use failure::Error;
 use serde_json;
 
-use activity_pub::{broadcast, Id, IntoId};
+use activity_pub::{
-use activity_pub::actor::Actor as APActor;
+    broadcast, Id, IntoId,
-use activity_pub::sign::*;
+    actor::Actor as APActor,
-use models::blogs::Blog;
+    sign::*
-use models::comments::*;
+};
-use models::follows;
+use models::{
-use models::likes;
+    blogs::Blog,
-use models::posts::*;
+    comments::*,
-use models::users::User;
+    follows,
+    likes,
+    posts::*,
+    users::User
+};
 
 #[derive(Fail, Debug)]
 enum InboxError {

src/activity_pub/mod.rs

@@ -2,9 +2,11 @@ use activitystreams_traits::{Activity, Actor, Object, Link};
 use array_tool::vec::Uniq;
 use diesel::PgConnection;
 use reqwest::Client;
-use rocket::http::{ContentType, Status};
+use rocket::{
-use rocket::response::{Response, Responder, Content};
+    http::{ContentType, Status},
-use rocket::request::Request;
+    response::{Response, Responder, Content},
+    request::Request
+};
 use rocket_contrib::Json;
 use serde_json;
 

src/activity_pub/object.rs

@@ -6,4 +6,3 @@ pub trait Object {
 
     fn compute_id(&self, conn: &PgConnection) -> String;
 }
-

src/activity_pub/request.rs

@@ -27,11 +27,8 @@ pub fn signature<S: Signer>(signer: &S, headers: Headers, conn: &PgConnection) -
     let signed_string = headers.iter().map(|h| format!("{}: {}", h.name().to_lowercase(), h.value_string())).collect::<Vec<String>>().join("\n");
     let signed_headers = headers.iter().map(|h| h.name().to_string()).collect::<Vec<String>>().join(" ").to_lowercase();
     
-    println!("Signing {}", signed_string);
-    println!("signed header {}", signed_headers);
     let data = signer.sign(signed_string);
     let sign = base64::encode(&data[..]);
-    println!("sigature {}", sign);
 
     Signature(format!(
         "keyId=\"{key_id}\",algorithm=\"rsa-sha256\",headers=\"{signed_headers}\",signature=\"{signature}\"",

src/activity_pub/sign.rs

@@ -1,10 +1,12 @@
 use base64;
+use chrono::Utc;
 use diesel::PgConnection;
 use hex;
-use chrono::Utc;
+use openssl::{
-use openssl::pkey::PKey;
+    pkey::PKey,
-use openssl::rsa::Rsa;
+    rsa::Rsa,
-use openssl::sha::sha256;
+    sha::sha256
+};
 use serde_json;
 
 /// Returns (public key, private key)

src/activity_pub/webfinger.rs

@@ -1,7 +1,9 @@
 use diesel::PgConnection;
 use reqwest::Client;
-use reqwest::header::{Accept, qitem};
+use reqwest::{
-use reqwest::mime::Mime;
+    header::{Accept, qitem},
+    mime::Mime
+};
 use serde_json;
 
 use activity_pub::ap_url;

src/db_conn.rs

@@ -1,8 +1,8 @@
-use diesel::pg::PgConnection;
+use diesel::{
-use diesel::r2d2::{ConnectionManager, Pool, PooledConnection};
+    pg::PgConnection,
-use rocket::{Request, State, Outcome};
+    r2d2::{ConnectionManager, Pool, PooledConnection}
-use rocket::http::Status;
+};
-use rocket::request::{self, FromRequest};
+use rocket::{Request, State, Outcome, http::Status, request::{self, FromRequest}};
 use std::ops::Deref;
 
 // From rocket documentation

src/main.rs

@@ -33,8 +33,7 @@ extern crate serde_derive;
 extern crate serde_json;
 extern crate url;
 
-use diesel::pg::PgConnection;
+use diesel::{pg::PgConnection, r2d2::{ConnectionManager, Pool}};
-use diesel::r2d2::{ConnectionManager, Pool};
 use dotenv::dotenv;
 use rocket_contrib::Template;
 use std::env;

src/models/blogs.rs

@@ -1,22 +1,28 @@
 use activitystreams_traits::{Actor, Object};
 use activitystreams_types::collection::OrderedCollection;
-use reqwest::Client;
+use reqwest::{
-use reqwest::header::{Accept, qitem};
+    Client,
-use reqwest::mime::Mime;
+    header::{Accept, qitem},
+    mime::Mime
+};
 use serde_json;
 use url::Url;
 use chrono::NaiveDateTime;
 use diesel::{self, QueryDsl, RunQueryDsl, ExpressionMethods, PgConnection};
-use openssl::hash::MessageDigest;
+use openssl::{
-use openssl::pkey::{PKey, Private};
+    hash::MessageDigest,
-use openssl::rsa::Rsa;
+    pkey::{PKey, Private},
-use openssl::sign::Signer;
+    rsa::Rsa,
+    sign::Signer
+};
 
-use activity_pub::{ActivityStream, Id, IntoId};
+use activity_pub::{
-use activity_pub::actor::{Actor as APActor, ActorType};
+    ActivityStream, Id, IntoId,
-use activity_pub::inbox::WithInbox;
+    actor::{Actor as APActor, ActorType},
-use activity_pub::sign;
+    inbox::WithInbox,
-use activity_pub::webfinger::*;
+    sign,
+    webfinger::*
+};
 use models::instance::Instance;
 use schema::blogs;
 

src/models/comments.rs

@@ -6,11 +6,15 @@ use chrono;
 use diesel::{self, PgConnection, RunQueryDsl, QueryDsl, ExpressionMethods};
 use serde_json;
 
-use activity_pub::{ap_url, IntoId, PUBLIC_VISIBILTY};
+use activity_pub::{
-use activity_pub::actor::Actor;
+    ap_url, IntoId, PUBLIC_VISIBILTY,
-use activity_pub::object::Object;
+    actor::Actor,
-use models::posts::Post;
+    object::Object
-use models::users::User;
+};
+use models::{
+    posts::Post,
+    users::User
+};
 use schema::comments;
 
 #[derive(Queryable, Identifiable, Serialize, Clone)]

src/models/likes.rs

@@ -3,11 +3,15 @@ use chrono;
 use diesel::{self, PgConnection, QueryDsl, RunQueryDsl, ExpressionMethods};
 use serde_json;
 
-use activity_pub::IntoId;
+use activity_pub::{
-use activity_pub::actor::Actor;
+    IntoId,
-use activity_pub::object::Object;
+    actor::Actor,
-use models::posts::Post;
+    object::Object
-use models::users::User;
+};
+use models::{
+    posts::Post,
+    users::User
+};
 use schema::likes;
 
 #[derive(Queryable, Identifiable)]

src/models/post_authors.rs

@@ -1,7 +1,9 @@
 use diesel::{self, PgConnection, QueryDsl, RunQueryDsl, ExpressionMethods};
 
-use models::posts::Post;
+use models::{
-use models::users::User;
+    posts::Post,
+    users::User
+};
 use schema::post_authors;
 
 #[derive(Queryable, Identifiable, Associations)]

src/models/posts.rs

@@ -8,13 +8,17 @@ use diesel::dsl::any;
 use serde_json;
 
 use BASE_URL;
-use activity_pub::{PUBLIC_VISIBILTY, ap_url, Id, IntoId};
+use activity_pub::{
-use activity_pub::actor::Actor;
+    PUBLIC_VISIBILTY, ap_url, Id, IntoId,
-use activity_pub::object::Object;
+    actor::Actor,
-use models::blogs::Blog;
+    object::Object
-use models::likes::Like;
+};
-use models::users::User;
+use models::{
-use models::post_authors::PostAuthor;
+    blogs::Blog,
+    likes::Like,
+    post_authors::PostAuthor,
+    users::User
+};
 use schema::posts;
 
 #[derive(Queryable, Identifiable, Serialize)]

src/models/users.rs

@@ -7,33 +7,42 @@ use activitystreams_types::{
 };
 use bcrypt;
 use chrono::NaiveDateTime;
-use diesel::{self, QueryDsl, RunQueryDsl, ExpressionMethods, BelongingToDsl, PgConnection};
+use diesel::{self, QueryDsl, RunQueryDsl, ExpressionMethods, BelongingToDsl, PgConnection, dsl::any};
-use diesel::dsl::any;
+use openssl::{
-use openssl::hash::MessageDigest;
+    hash::MessageDigest,
-use openssl::pkey::{PKey, Private};
+    pkey::{PKey, Private},
-use openssl::rsa::Rsa;
+    rsa::Rsa,
-use openssl::sign;
+    sign
-use reqwest::Client;
+};
-use reqwest::header::{Accept, qitem};
+use reqwest::{
-use reqwest::mime::Mime;
+    Client,
-use rocket::request::{self, FromRequest, Request};
+    header::{Accept, qitem},
-use rocket::outcome::IntoOutcome;
+    mime::Mime
+};
+use rocket::{
+    request::{self, FromRequest, Request},
+    outcome::IntoOutcome
+};
 use serde_json;
 use url::Url;
 
 use BASE_URL;
-use activity_pub::{ap_url, ActivityStream, Id, IntoId};
+use activity_pub::{
-use activity_pub::actor::{ActorType, Actor as APActor};
+    ap_url, ActivityStream, Id, IntoId,
-use activity_pub::inbox::{Inbox, WithInbox};
+    actor::{ActorType, Actor as APActor},
-use activity_pub::sign::{Signer, gen_keypair};
+    inbox::{Inbox, WithInbox},
-use activity_pub::webfinger::{Webfinger, resolve};
+    sign::{Signer, gen_keypair},
+    webfinger::{Webfinger, resolve}
+};
 use db_conn::DbConn;
-use models::comments::Comment;
+use models::{
-use models::follows::Follow;
+    comments::Comment,
-use models::instance::Instance;
+    follows::Follow,
-use models::notifications::*;
+    instance::Instance,
-use models::post_authors::PostAuthor;
+    notifications::*,
-use models::posts::Post;
+    post_authors::PostAuthor,
+    posts::Post
+};
 use schema::users;
 
 pub const AUTH_COOKIE: &'static str = "user_id";

src/routes/blogs.rs

@@ -1,17 +1,20 @@
 use activitystreams_types::collection::OrderedCollection;
-use rocket::request::Form;
+use rocket::{
-use rocket::response::Redirect;
+    request::Form,
+    response::Redirect
+};
 use rocket_contrib::Template;
 use serde_json;
 
-use activity_pub::{ActivityStream, ActivityPub};
+use activity_pub::{ActivityStream, ActivityPub, actor::Actor};
-use activity_pub::actor::Actor;
 use db_conn::DbConn;
-use models::blog_authors::*;
+use models::{
-use models::blogs::*;
+    blog_authors::*,
-use models::instance::Instance;
+    blogs::*,
-use models::posts::Post;
+    instance::Instance,
-use models::users::User;
+    posts::Post,
+    users::User
+};
 use utils;
 
 #[get("/~/<name>", rank = 2)]

src/routes/comments.rs

@@ -1,12 +1,13 @@
-use rocket::request::Form;
+use rocket::{ request::Form, response::Redirect};
-use rocket::response::Redirect;
 use rocket_contrib::Template;
 
 use activity_pub::broadcast;
 use db_conn::DbConn;
-use models::comments::*;
+use models::{
-use models::posts::Post;
+    comments::*,
-use models::users::User;
+    posts::Post,
+    users::User
+};
 
 #[get("/~/<_blog>/<slug>/comment")]
 fn new(_blog: String, slug: String, user: User, conn: DbConn) -> Template {

src/routes/instance.rs

@@ -1,14 +1,15 @@
-use rocket::request::Form;
+use rocket::{request::Form, response::Redirect};
-use rocket::response::Redirect;
 use rocket_contrib::Template;
 use serde_json;
 
 use BASE_URL;
 use activity_pub::inbox::Inbox;
 use db_conn::DbConn;
-use models::posts::Post;
+use models::{
-use models::users::User;
+    posts::Post,
-use models::instance::*;
+    users::User,
+    instance::*
+};
 
 #[get("/")]
 fn index(conn: DbConn, user: Option<User>) -> Template {

src/routes/likes.rs

@@ -2,9 +2,11 @@ use rocket::response::Redirect;
 
 use activity_pub::broadcast;
 use db_conn::DbConn;
-use models::likes;
+use models::{
-use models::posts::Post;
+    likes,
-use models::users::User;
+    posts::Post,
+    users::User
+};
 
 #[get("/~/<blog>/<slug>/like")]
 fn create(blog: String, slug: String, user: User, conn: DbConn) -> Redirect {

src/routes/notifications.rs

@@ -1,8 +1,7 @@
 use rocket_contrib::Template;
 
 use db_conn::DbConn;
-use models::notifications::Notification;
+use models::{notifications::Notification, users::User};
-use models::users::User;
 
 #[get("/notifications")]
 fn notifications(conn: DbConn, user: User) -> Template {

src/routes/posts.rs

@@ -4,14 +4,15 @@ use rocket::response::Redirect;
 use rocket_contrib::Template;
 use serde_json;
 
-use activity_pub::{broadcast, context, activity_pub, ActivityPub};
+use activity_pub::{broadcast, context, activity_pub, ActivityPub, object::Object};
-use activity_pub::object::Object;
 use db_conn::DbConn;
-use models::blogs::*;
+use models::{
-use models::comments::Comment;
+    blogs::*,
-use models::post_authors::*;
+    comments::Comment,
-use models::posts::*;
+    post_authors::*,
-use models::users::User;
+    posts::*,
+    users::User
+};
 use utils;
 
 #[get("/~/<blog>/<slug>", rank = 4)]

src/routes/session.rs

@@ -1,7 +1,8 @@
-use rocket::http::{Cookie, Cookies};
+use rocket::{
-use rocket::response::Redirect;
+    http::{Cookie, Cookies},
-use rocket::response::status::NotFound;
+    response::{Redirect, status::NotFound},
-use rocket::request::Form;
+    request::Form
+};
 use rocket_contrib::Template;
 
 use db_conn::DbConn;

src/routes/user.rs

@@ -2,19 +2,22 @@ use activitystreams_types::{
     activity::Follow,
     collection::OrderedCollection
 };
-use rocket::request::Form;
+use rocket::{request::Form, response::Redirect};
-use rocket::response::Redirect;
 use rocket_contrib::Template;
 use serde_json;
 
-use activity_pub::{activity_pub, ActivityPub, ActivityStream, context, broadcast, Id, IntoId};
+use activity_pub::{
-use activity_pub::actor::Actor;
+    activity_pub, ActivityPub, ActivityStream, context, broadcast, Id, IntoId,
-use activity_pub::inbox::Inbox;
+    actor::Actor,
+    object::Object
+};
 use db_conn::DbConn;
-use models::follows;
+use models::{
-use models::instance::Instance;
+    follows,
-use models::posts::Post;
+    instance::Instance,
-use models::users::*;
+    posts::Post,
+    users::*
+};
 
 #[get("/me")]
 fn me(user: User) -> Redirect {

src/routes/well_known.rs

@@ -2,11 +2,9 @@ use rocket::http::ContentType;
 use rocket::response::Content;
 
 use BASE_URL;
-use activity_pub::ap_url;
+use activity_pub::{ap_url, webfinger::Webfinger};
-use activity_pub::webfinger::Webfinger;
 use db_conn::DbConn;
-use models::blogs::Blog;
+use models::{blogs::Blog, users::User};
-use models::users::User;
 
 #[get("/.well-known/host-meta", format = "application/xml")]
 fn host_meta() -> String {