From: asonix <asonix@asonix.dog>
Date: Mon, 20 Apr 2020 17:31:22 +0000 (-0500)
Subject: Guard CreateCommunity, represent impossible error with Infallible
X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/readmes/%7B%7D/%22%7Burl%7D/%7BelementUrl%7D?a=commitdiff_plain;h=904ebf34a5054f5234c7914fc38a253de99b187d;p=lemmy.git

Guard CreateCommunity, represent impossible error with Infallible
---

diff --git a/server/src/routes/api.rs b/server/src/routes/api.rs
index 025c6e0a..629bd49d 100644
--- a/server/src/routes/api.rs
+++ b/server/src/routes/api.rs
@@ -40,10 +40,15 @@ pub fn config(cfg: &mut web::ServiceConfig, rate_limit: &RateLimit) {
           .route(web::get().to(route_get::<Search>)),
       )
       // Community
+      .service(
+        web::resource("/community")
+          .guard(guard::Post())
+          .wrap(rate_limit.post())
+          .route(web::post().to(route_post::<CreateCommunity>)),
+      )
       .service(
         web::scope("/community")
           .wrap(rate_limit.message())
-          .route("", web::post().to(route_post::<CreateCommunity>))
           .route("", web::get().to(route_get::<GetCommunity>))
           .route("", web::put().to(route_post::<EditCommunity>))
           .route("/list", web::get().to(route_get::<ListCommunities>))
diff --git a/server/src/routes/websocket.rs b/server/src/routes/websocket.rs
index eb157590..e1efdc0f 100644
--- a/server/src/routes/websocket.rs
+++ b/server/src/routes/websocket.rs
@@ -120,7 +120,7 @@ impl StreamHandler<Result<ws::Message, ws::ProtocolError>> for WSSession {
           .then(|res, _, ctx| {
             match res {
               Ok(Ok(res)) => ctx.text(res),
-              Ok(Err(e)) => error!("{}", e),
+              Ok(Err(e)) => match e {},
               Err(e) => error!("{}", &e),
             }
             actix::fut::ready(())
diff --git a/server/src/websocket/server.rs b/server/src/websocket/server.rs
index d16ecf85..cd78bbc7 100644
--- a/server/src/websocket/server.rs
+++ b/server/src/websocket/server.rs
@@ -38,7 +38,7 @@ pub struct Disconnect {
 
 /// The messages sent to websocket clients
 #[derive(Serialize, Deserialize, Message)]
-#[rtype(result = "Result<String, failure::Error>")]
+#[rtype(result = "Result<String, std::convert::Infallible>")]
 pub struct StandardMessage {
   /// Id of the client session
   pub id: ConnectionId,
@@ -905,6 +905,7 @@ where
   match op2 {
     UserOperation::Register => rate_limiter.register().wrap(ip, fut).await,
     UserOperation::CreatePost => rate_limiter.post().wrap(ip, fut).await,
+    UserOperation::CreateCommunity => rate_limiter.post().wrap(ip, fut).await,
     _ => rate_limiter.message().wrap(ip, fut).await,
   }
 }
@@ -963,7 +964,7 @@ impl Handler<Disconnect> for ChatServer {
 
 /// Handler for Message message.
 impl Handler<StandardMessage> for ChatServer {
-  type Result = ResponseFuture<Result<String, failure::Error>>;
+  type Result = ResponseFuture<Result<String, std::convert::Infallible>>;
 
   fn handle(&mut self, msg: StandardMessage, ctx: &mut Context<Self>) -> Self::Result {
     let fut = self.parse_json_message(msg, ctx);