From db4454b52b8e8f71d35ca2b874ee279ed49a5317 Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Mon, 20 Apr 2020 10:25:47 -0500
Subject: [PATCH] Add websockets into the api scope

---
 server/src/main.rs             | 3 +--
 server/src/routes/api.rs       | 2 ++
 server/src/routes/websocket.rs | 6 +-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/server/src/main.rs b/server/src/main.rs
index 6abb22439..c92770f2a 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -8,7 +8,7 @@ use diesel::r2d2::{ConnectionManager, Pool};
 use diesel::PgConnection;
 use lemmy_server::{
   rate_limit::{rate_limiter::RateLimiter, RateLimit},
-  routes::{api, federation, feeds, index, nodeinfo, webfinger, websocket},
+  routes::{api, federation, feeds, index, nodeinfo, webfinger},
   settings::Settings,
   websocket::server::*,
 };
@@ -59,7 +59,6 @@ async fn main() -> io::Result<()> {
       .configure(index::config)
       .configure(nodeinfo::config)
       .configure(webfinger::config)
-      .configure(websocket::config)
       // static files
       .service(actix_files::Files::new(
         "/static",
diff --git a/server/src/routes/api.rs b/server/src/routes/api.rs
index 3ef8ca510..025c6e0a7 100644
--- a/server/src/routes/api.rs
+++ b/server/src/routes/api.rs
@@ -10,6 +10,8 @@ use actix_web::guard;
 pub fn config(cfg: &mut web::ServiceConfig, rate_limit: &RateLimit) {
   cfg.service(
     web::scope("/api/v1")
+      // Websockets
+      .service(web::resource("/ws").to(super::websocket::chat_route))
       // Site
       .service(
         web::scope("/site")
diff --git a/server/src/routes/websocket.rs b/server/src/routes/websocket.rs
index c6bca9aa0..eb1575906 100644
--- a/server/src/routes/websocket.rs
+++ b/server/src/routes/websocket.rs
@@ -2,17 +2,13 @@ use super::*;
 use crate::websocket::server::*;
 use actix_web::{Error, Result};
 
-pub fn config(cfg: &mut web::ServiceConfig) {
-  cfg.service(web::resource("/api/v1/ws").to(chat_route));
-}
-
 /// How often heartbeat pings are sent
 const HEARTBEAT_INTERVAL: Duration = Duration::from_secs(5);
 /// How long before lack of client response causes a timeout
 const CLIENT_TIMEOUT: Duration = Duration::from_secs(10);
 
 /// Entry point for our route
-async fn chat_route(
+pub async fn chat_route(
   req: HttpRequest,
   stream: web::Payload,
   chat_server: web::Data<Addr<ChatServer>>,