Merge branch 'master' into federation_merge_from_master_2

[lemmy.git] / server / src / api / mod.rs

diff --git a/server/src/api/mod.rs b/server/src/api/mod.rs
index f654167fcab54deb0f86453aa29bde28c711b668..afd62aff8011a524cb45e0b748fb96c3af8c5c81 100644 (file)
--- a/server/src/api/mod.rs
+++ b/server/src/api/mod.rs
@@ -1,48 +1,12 @@
-use crate::db::category::*;
-use crate::db::comment::*;
-use crate::db::comment_view::*;
-use crate::db::community::*;
-use crate::db::community_view::*;
-use crate::db::moderator::*;
-use crate::db::moderator_views::*;
-use crate::db::password_reset_request::*;
-use crate::db::post::*;
-use crate::db::post_view::*;
-use crate::db::private_message::*;
-use crate::db::private_message_view::*;
-use crate::db::site::*;
-use crate::db::site_view::*;
-use crate::db::user::*;
-use crate::db::user_mention::*;
-use crate::db::user_mention_view::*;
-use crate::db::user_view::*;
-use crate::db::*;
 use crate::{
-  extract_usernames, fetch_iframely_and_pictshare_data, generate_random_string, naive_from_unix,
-  naive_now, remove_slurs, send_email, slur_check, slurs_vec_to_str,
+  db::{community::*, community_view::*, moderator::*, site::*, user::*, user_view::*},
+  websocket::WebsocketInfo,
 };
-
-use crate::apub::{
-  activities::{follow_community, post_create, post_update},
-  fetcher::search_by_apub_id,
-  signatures::generate_actor_keypair,
-  {make_apub_endpoint, EndpointType},
-};
-use crate::settings::Settings;
-use crate::websocket::UserOperation;
-use crate::websocket::{
-  server::{
-    JoinCommunityRoom, JoinPostRoom, JoinUserRoom, SendAllMessage, SendComment,
-    SendCommunityRoomMessage, SendPost, SendUserRoomMessage,
-  },
-  WebsocketInfo,
+use diesel::{
+  r2d2::{ConnectionManager, Pool},
+  PgConnection,
 };
-use diesel::r2d2::{ConnectionManager, Pool};
-use diesel::PgConnection;
 use failure::Error;
-use log::{debug, error, info};
-use serde::{Deserialize, Serialize};
-use std::str::FromStr;
 
 pub mod comment;
 pub mod community;
@@ -68,14 +32,14 @@ pub struct Oper<T> {
   data: T,
 }
 
-impl<T> Oper<T> {
-  pub fn new(data: T) -> Oper<T> {
+impl<Data> Oper<Data> {
+  pub fn new(data: Data) -> Oper<Data> {
     Oper { data }
   }
 }
 
 pub trait Perform {
-  type Response: serde::ser::Serialize;
+  type Response: serde::ser::Serialize + Send;
 
   fn perform(
     &self,