Merge branch 'main' into activity-sender

README.md

@@ -112,6 +112,7 @@ Each Lemmy server can set its own moderation policy; appointing site-wide admins
 
 ### Libraries
 
+- [lemmy-js-client](https://github.com/LemmyNet/lemmy-js-client)
 - [Kotlin API ( under development )](https://github.com/eiknat/lemmy-client)
 
 ## Support / Donate

docker/federation-test/run-tests.sh

@@ -13,8 +13,8 @@ pushd ../../ui
 yarn
 popd
 
-mkdir -p volumes/pictrs_{alpha,beta,gamma}
+mkdir -p volumes/pictrs_{alpha,beta,gamma,delta,epsilon}
-sudo chown -R 991:991 volumes/pictrs_{alpha,beta,gamma}
+sudo chown -R 991:991 volumes/pictrs_{alpha,beta,gamma,delta,epsilon}
 
 sudo docker build ../../ --file ../federation/Dockerfile --tag lemmy-federation:latest
 
@@ -28,6 +28,8 @@ echo "Waiting for Lemmy to start..."
 while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8540/api/v1/site')" != "200" ]]; do sleep 1; done
 while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8550/api/v1/site')" != "200" ]]; do sleep 1; done
 while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8560/api/v1/site')" != "200" ]]; do sleep 1; done
+while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8570/api/v1/site')" != "200" ]]; do sleep 1; done
+while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8580/api/v1/site')" != "200" ]]; do sleep 1; done
 yarn api-test || true
 popd
 

docker/federation-test/servers.sh

@@ -12,8 +12,8 @@ pushd ../../ui
 yarn
 popd
 
-mkdir -p volumes/pictrs_{alpha,beta,gamma}
+mkdir -p volumes/pictrs_{alpha,beta,gamma,delta,epsilon}
-sudo chown -R 991:991 volumes/pictrs_{alpha,beta,gamma}
+sudo chown -R 991:991 volumes/pictrs_{alpha,beta,gamma,delta,epsilon}
 
 sudo docker build ../../ --file ../federation/Dockerfile --tag lemmy-federation:latest
 

docker/federation-test/tests.sh

@@ -6,5 +6,7 @@ echo "Waiting for Lemmy to start..."
 while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8540/api/v1/site')" != "200" ]]; do sleep 1; done
 while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8550/api/v1/site')" != "200" ]]; do sleep 1; done
 while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8560/api/v1/site')" != "200" ]]; do sleep 1; done
+while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8570/api/v1/site')" != "200" ]]; do sleep 1; done
+while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8580/api/v1/site')" != "200" ]]; do sleep 1; done
 yarn api-test || true
 popd

docker/federation/docker-compose.yml

@@ -7,16 +7,20 @@ services:
       - "8540:8540"
       - "8550:8550"
       - "8560:8560"
+      - "8570:8570"
+      - "8580:8580"
     volumes:
       # Hack to make this work from both docker/federation/ and docker/federation-test/
       - ../federation/nginx.conf:/etc/nginx/nginx.conf
     restart: on-failure
     depends_on:
-      - lemmy-alpha
       - pictrs
+      - iframely
+      - lemmy-alpha
       - lemmy-beta
       - lemmy-gamma
-      - iframely
+      - lemmy-delta
+      - lemmy-epsilon
 
   pictrs:
     restart: always
@@ -34,7 +38,7 @@ services:
       - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION__ENABLED=true
       - LEMMY_FEDERATION__TLS_ENABLED=false
-      - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta,lemmy-gamma
+      - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta,lemmy-gamma,lemmy-delta,lemmy-epsilon
       - LEMMY_PORT=8540
       - LEMMY_SETUP__ADMIN_USERNAME=lemmy_alpha
       - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
@@ -64,7 +68,7 @@ services:
       - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION__ENABLED=true
       - LEMMY_FEDERATION__TLS_ENABLED=false
-      - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-gamma
+      - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-gamma,lemmy-delta,lemmy-epsilon
       - LEMMY_PORT=8550
       - LEMMY_SETUP__ADMIN_USERNAME=lemmy_beta
       - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
@@ -94,7 +98,7 @@ services:
       - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION__ENABLED=true
       - LEMMY_FEDERATION__TLS_ENABLED=false
-      - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-beta
+      - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-beta,lemmy-delta,lemmy-epsilon
       - LEMMY_PORT=8560
       - LEMMY_SETUP__ADMIN_USERNAME=lemmy_gamma
       - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
@@ -115,6 +119,68 @@ services:
     volumes:
       - ./volumes/postgres_gamma:/var/lib/postgresql/data
 
+  # An instance with only an allowlist for beta
+  lemmy-delta:
+    image: lemmy-federation:latest
+    environment:
+      - LEMMY_HOSTNAME=lemmy-delta:8570
+      - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_delta:5432/lemmy
+      - LEMMY_JWT_SECRET=changeme
+      - LEMMY_FRONT_END_DIR=/app/dist
+      - LEMMY_FEDERATION__ENABLED=true
+      - LEMMY_FEDERATION__TLS_ENABLED=false
+      - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta
+      - LEMMY_PORT=8570
+      - LEMMY_SETUP__ADMIN_USERNAME=lemmy_delta
+      - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
+      - LEMMY_SETUP__SITE_NAME=lemmy-delta
+      - LEMMY_RATE_LIMIT__POST=99999
+      - LEMMY_RATE_LIMIT__REGISTER=99999
+      - LEMMY_CAPTCHA__ENABLED=false
+      - RUST_BACKTRACE=1
+      - RUST_LOG=debug
+    depends_on:
+      - postgres_delta
+  postgres_delta:
+    image: postgres:12-alpine
+    environment:
+      - POSTGRES_USER=lemmy
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_DB=lemmy
+    volumes:
+      - ./volumes/postgres_delta:/var/lib/postgresql/data
+
+  # An instance who has a blocklist, with lemmy-alpha blocked
+  lemmy-epsilon:
+    image: lemmy-federation:latest
+    environment:
+      - LEMMY_HOSTNAME=lemmy-epsilon:8580
+      - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_epsilon:5432/lemmy
+      - LEMMY_JWT_SECRET=changeme
+      - LEMMY_FRONT_END_DIR=/app/dist
+      - LEMMY_FEDERATION__ENABLED=true
+      - LEMMY_FEDERATION__TLS_ENABLED=false
+      - LEMMY_FEDERATION__BLOCKED_INSTANCES=lemmy-alpha
+      - LEMMY_PORT=8580
+      - LEMMY_SETUP__ADMIN_USERNAME=lemmy_epsilon
+      - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
+      - LEMMY_SETUP__SITE_NAME=lemmy-epsilon
+      - LEMMY_RATE_LIMIT__POST=99999
+      - LEMMY_RATE_LIMIT__REGISTER=99999
+      - LEMMY_CAPTCHA__ENABLED=false
+      - RUST_BACKTRACE=1
+      - RUST_LOG=debug
+    depends_on:
+      - postgres_epsilon
+  postgres_epsilon:
+    image: postgres:12-alpine
+    environment:
+      - POSTGRES_USER=lemmy
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_DB=lemmy
+    volumes:
+      - ./volumes/postgres_epsilon:/var/lib/postgresql/data
+
   iframely:
     image: dogbin/iframely:latest
     volumes:

docker/federation/nginx.conf

@@ -95,4 +95,66 @@ http {
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         }
     }
+
+    server {
+        listen 8570;
+        server_name 127.0.0.1;
+        access_log off;
+
+        # Upload limit for pictshare
+        client_max_body_size 50M;
+
+        location / {
+            proxy_pass http://lemmy-delta:8570;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+            # Cuts off the trailing slash on URLs to make them valid
+            rewrite ^(.+)/+$ $1 permanent;
+
+            # WebSocket support
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+        }
+
+        location /iframely/ {
+            proxy_pass http://iframely:80/;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+    }
+
+    server {
+        listen 8580;
+        server_name 127.0.0.1;
+        access_log off;
+
+        # Upload limit for pictshare
+        client_max_body_size 50M;
+
+        location / {
+            proxy_pass http://lemmy-epsilon:8580;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+            # Cuts off the trailing slash on URLs to make them valid
+            rewrite ^(.+)/+$ $1 permanent;
+
+            # WebSocket support
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+        }
+
+        location /iframely/ {
+            proxy_pass http://iframely:80/;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+    }
 }

docker/federation/run-federation-test.bash

@@ -20,7 +20,7 @@ popd || exit
 
 sudo docker build ../../ --file Dockerfile -t lemmy-federation:latest
 
-for Item in alpha beta gamma ; do
+for Item in alpha beta gamma delta epsilon ; do
   sudo mkdir -p volumes/pictrs_$Item
   sudo chown -R 991:991 volumes/pictrs_$Item
 done

docker/travis/docker-compose.yml

@@ -7,16 +7,20 @@ services:
       - "8540:8540"
       - "8550:8550"
       - "8560:8560"
+      - "8570:8570"
+      - "8580:8580"
     volumes:
       # Hack to make this work from both docker/federation/ and docker/federation-test/
       - ../federation/nginx.conf:/etc/nginx/nginx.conf
     restart: on-failure
     depends_on:
-      - lemmy-alpha
       - pictrs
+      - iframely
+      - lemmy-alpha
       - lemmy-beta
       - lemmy-gamma
-      - iframely
+      - lemmy-delta
+      - lemmy-epsilon
 
   pictrs:
     restart: always
@@ -34,7 +38,7 @@ services:
       - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION__ENABLED=true
       - LEMMY_FEDERATION__TLS_ENABLED=false
-      - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta,lemmy-gamma
+      - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta,lemmy-gamma,lemmy-delta,lemmy-epsilon
       - LEMMY_PORT=8540
       - LEMMY_SETUP__ADMIN_USERNAME=lemmy_alpha
       - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
@@ -64,7 +68,7 @@ services:
       - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION__ENABLED=true
       - LEMMY_FEDERATION__TLS_ENABLED=false
-      - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-gamma
+      - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-gamma,lemmy-delta,lemmy-epsilon
       - LEMMY_PORT=8550
       - LEMMY_SETUP__ADMIN_USERNAME=lemmy_beta
       - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
@@ -94,7 +98,7 @@ services:
       - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION__ENABLED=true
       - LEMMY_FEDERATION__TLS_ENABLED=false
-      - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-beta
+      - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-beta,lemmy-delta,lemmy-epsilon
       - LEMMY_PORT=8560
       - LEMMY_SETUP__ADMIN_USERNAME=lemmy_gamma
       - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
@@ -115,6 +119,68 @@ services:
     volumes:
       - ./volumes/postgres_gamma:/var/lib/postgresql/data
 
+  # An instance with only an allowlist for beta
+  lemmy-delta:
+    image: dessalines/lemmy:travis
+    environment:
+      - LEMMY_HOSTNAME=lemmy-delta:8570
+      - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_delta:5432/lemmy
+      - LEMMY_JWT_SECRET=changeme
+      - LEMMY_FRONT_END_DIR=/app/dist
+      - LEMMY_FEDERATION__ENABLED=true
+      - LEMMY_FEDERATION__TLS_ENABLED=false
+      - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta
+      - LEMMY_PORT=8570
+      - LEMMY_SETUP__ADMIN_USERNAME=lemmy_delta
+      - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
+      - LEMMY_SETUP__SITE_NAME=lemmy-delta
+      - LEMMY_RATE_LIMIT__POST=99999
+      - LEMMY_RATE_LIMIT__REGISTER=99999
+      - LEMMY_CAPTCHA__ENABLED=false
+      - RUST_BACKTRACE=1
+      - RUST_LOG=debug
+    depends_on:
+      - postgres_delta
+  postgres_delta:
+    image: postgres:12-alpine
+    environment:
+      - POSTGRES_USER=lemmy
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_DB=lemmy
+    volumes:
+      - ./volumes/postgres_delta:/var/lib/postgresql/data
+
+  # An instance who has a blocklist, with lemmy-alpha blocked
+  lemmy-epsilon:
+    image: dessalines/lemmy:travis
+    environment:
+      - LEMMY_HOSTNAME=lemmy-epsilon:8580
+      - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_epsilon:5432/lemmy
+      - LEMMY_JWT_SECRET=changeme
+      - LEMMY_FRONT_END_DIR=/app/dist
+      - LEMMY_FEDERATION__ENABLED=true
+      - LEMMY_FEDERATION__TLS_ENABLED=false
+      - LEMMY_FEDERATION__BLOCKED_INSTANCES=lemmy-alpha
+      - LEMMY_PORT=8580
+      - LEMMY_SETUP__ADMIN_USERNAME=lemmy_epsilon
+      - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
+      - LEMMY_SETUP__SITE_NAME=lemmy-epsilon
+      - LEMMY_RATE_LIMIT__POST=99999
+      - LEMMY_RATE_LIMIT__REGISTER=99999
+      - LEMMY_CAPTCHA__ENABLED=false
+      - RUST_BACKTRACE=1
+      - RUST_LOG=debug
+    depends_on:
+      - postgres_epsilon
+  postgres_epsilon:
+    image: postgres:12-alpine
+    environment:
+      - POSTGRES_USER=lemmy
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_DB=lemmy
+    volumes:
+      - ./volumes/postgres_epsilon:/var/lib/postgresql/data
+
   iframely:
     image: dogbin/iframely:latest
     volumes:

docker/travis/run-tests.sh

@@ -5,8 +5,8 @@ set -e
 sudo docker-compose down
 sudo rm -rf volumes
 
-mkdir -p volumes/pictrs_{alpha,beta,gamma}
+mkdir -p volumes/pictrs_{alpha,beta,gamma,delta,epsilon}
-sudo chown -R 991:991 volumes/pictrs_{alpha,beta,gamma}
+sudo chown -R 991:991 volumes/pictrs_{alpha,beta,gamma,delta,epsilon}
 
 sudo docker build ../../ --file ../prod/Dockerfile --tag dessalines/lemmy:travis
 
@@ -17,6 +17,8 @@ echo "Waiting for Lemmy to start..."
 while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8540/api/v1/site')" != "200" ]]; do sleep 1; done
 while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8550/api/v1/site')" != "200" ]]; do sleep 1; done
 while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8560/api/v1/site')" != "200" ]]; do sleep 1; done
+while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8570/api/v1/site')" != "200" ]]; do sleep 1; done
+while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8580/api/v1/site')" != "200" ]]; do sleep 1; done
 yarn
 yarn api-test
 popd

server/src/api/comment.rs

@@ -1,6 +1,7 @@
 use crate::{
   api::{
     check_community_ban,
+    get_post,
     get_user_from_jwt,
     get_user_from_jwt_opt,
     is_mod_or_admin,
@@ -12,8 +13,8 @@ use crate::{
   websocket::{
     server::{JoinCommunityRoom, SendComment},
     UserOperation,
-    WebsocketInfo,
   },
+  ConnectionId,
   DbPool,
   LemmyContext,
   LemmyError,
@@ -128,7 +129,7 @@ impl Perform for CreateComment {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<CommentResponse, LemmyError> {
     let data: &CreateComment = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -151,7 +152,7 @@ impl Perform for CreateComment {
 
     // Check for a community ban
     let post_id = data.post_id;
-    let post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
+    let post = get_post(post_id, context.pool()).await?;
 
     check_community_ban(user.id, post.community_id, context.pool()).await?;
 
@@ -225,17 +226,15 @@ impl Perform for CreateComment {
       form_id: data.form_id.to_owned(),
     };
 
-    if let Some(ws) = websocket_info {
+    context.chat_server().do_send(SendComment {
-      ws.chatserver.do_send(SendComment {
+      op: UserOperation::CreateComment,
-        op: UserOperation::CreateComment,
+      comment: res.clone(),
-        comment: res.clone(),
+      websocket_id,
-        my_id: ws.id,
+    });
-      });
 
-      // strip out the recipient_ids, so that
+    // strip out the recipient_ids, so that
-      // users don't get double notifs
+    // users don't get double notifs
-      res.recipient_ids = Vec::new();
+    res.recipient_ids = Vec::new();
-    }
 
     Ok(res)
   }
@@ -248,7 +247,7 @@ impl Perform for EditComment {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<CommentResponse, LemmyError> {
     let data: &EditComment = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -283,7 +282,7 @@ impl Perform for EditComment {
 
     // Do the mentions / recipients
     let post_id = orig_comment.post_id;
-    let post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
+    let post = get_post(post_id, context.pool()).await?;
 
     let updated_comment_content = updated_comment.content.to_owned();
     let mentions = scrape_text_for_mentions(&updated_comment_content);
@@ -310,17 +309,15 @@ impl Perform for EditComment {
       form_id: data.form_id.to_owned(),
     };
 
-    if let Some(ws) = websocket_info {
+    context.chat_server().do_send(SendComment {
-      ws.chatserver.do_send(SendComment {
+      op: UserOperation::EditComment,
-        op: UserOperation::EditComment,
+      comment: res.clone(),
-        comment: res.clone(),
+      websocket_id,
-        my_id: ws.id,
+    });
-      });
 
-      // strip out the recipient_ids, so that
+    // strip out the recipient_ids, so that
-      // users don't get double notifs
+    // users don't get double notifs
-      res.recipient_ids = Vec::new();
+    res.recipient_ids = Vec::new();
-    }
 
     Ok(res)
   }
@@ -333,7 +330,7 @@ impl Perform for DeleteComment {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<CommentResponse, LemmyError> {
     let data: &DeleteComment = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -379,7 +376,7 @@ impl Perform for DeleteComment {
 
     // Build the recipients
     let post_id = comment_view.post_id;
-    let post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
+    let post = get_post(post_id, context.pool()).await?;
     let mentions = vec![];
     let recipient_ids = send_local_notifs(
       mentions,
@@ -397,17 +394,15 @@ impl Perform for DeleteComment {
       form_id: None,
     };
 
-    if let Some(ws) = websocket_info {
+    context.chat_server().do_send(SendComment {
-      ws.chatserver.do_send(SendComment {
+      op: UserOperation::DeleteComment,
-        op: UserOperation::DeleteComment,
+      comment: res.clone(),
-        comment: res.clone(),
+      websocket_id,
-        my_id: ws.id,
+    });
-      });
 
-      // strip out the recipient_ids, so that
+    // strip out the recipient_ids, so that
-      // users don't get double notifs
+    // users don't get double notifs
-      res.recipient_ids = Vec::new();
+    res.recipient_ids = Vec::new();
-    }
 
     Ok(res)
   }
@@ -420,7 +415,7 @@ impl Perform for RemoveComment {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<CommentResponse, LemmyError> {
     let data: &RemoveComment = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -476,7 +471,7 @@ impl Perform for RemoveComment {
 
     // Build the recipients
     let post_id = comment_view.post_id;
-    let post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
+    let post = get_post(post_id, context.pool()).await?;
     let mentions = vec![];
     let recipient_ids = send_local_notifs(
       mentions,
@@ -494,17 +489,15 @@ impl Perform for RemoveComment {
       form_id: None,
     };
 
-    if let Some(ws) = websocket_info {
+    context.chat_server().do_send(SendComment {
-      ws.chatserver.do_send(SendComment {
+      op: UserOperation::RemoveComment,
-        op: UserOperation::RemoveComment,
+      comment: res.clone(),
-        comment: res.clone(),
+      websocket_id,
-        my_id: ws.id,
+    });
-      });
 
-      // strip out the recipient_ids, so that
+    // strip out the recipient_ids, so that
-      // users don't get double notifs
+    // users don't get double notifs
-      res.recipient_ids = Vec::new();
+    res.recipient_ids = Vec::new();
-    }
 
     Ok(res)
   }
@@ -517,7 +510,7 @@ impl Perform for MarkCommentAsRead {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<CommentResponse, LemmyError> {
     let data: &MarkCommentAsRead = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -589,7 +582,7 @@ impl Perform for SaveComment {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<CommentResponse, LemmyError> {
     let data: &SaveComment = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -633,7 +626,7 @@ impl Perform for CreateCommentLike {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<CommentResponse, LemmyError> {
     let data: &CreateCommentLike = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -655,7 +648,7 @@ impl Perform for CreateCommentLike {
     .await??;
 
     let post_id = orig_comment.post_id;
-    let post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
+    let post = get_post(post_id, context.pool()).await?;
     check_community_ban(user.id, post.community_id, context.pool()).await?;
 
     let comment_id = data.comment_id;
@@ -725,17 +718,15 @@ impl Perform for CreateCommentLike {
       form_id: None,
     };
 
-    if let Some(ws) = websocket_info {
+    context.chat_server().do_send(SendComment {
-      ws.chatserver.do_send(SendComment {
+      op: UserOperation::CreateCommentLike,
-        op: UserOperation::CreateCommentLike,
+      comment: res.clone(),
-        comment: res.clone(),
+      websocket_id,
-        my_id: ws.id,
+    });
-      });
 
-      // strip out the recipient_ids, so that
+    // strip out the recipient_ids, so that
-      // users don't get double notifs
+    // users don't get double notifs
-      res.recipient_ids = Vec::new();
+    res.recipient_ids = Vec::new();
-    }
 
     Ok(res)
   }
@@ -748,7 +739,7 @@ impl Perform for GetComments {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<GetCommentsResponse, LemmyError> {
     let data: &GetComments = &self;
     let user = get_user_from_jwt_opt(&data.auth, context.pool()).await?;
@@ -776,17 +767,15 @@ impl Perform for GetComments {
       Err(_) => return Err(APIError::err("couldnt_get_comments").into()),
     };
 
-    if let Some(ws) = websocket_info {
+    if let Some(id) = websocket_id {
       // You don't need to join the specific community room, bc this is already handled by
       // GetCommunity
       if data.community_id.is_none() {
-        if let Some(id) = ws.id {
+        // 0 is the "all" community
-          // 0 is the "all" community
+        context.chat_server().do_send(JoinCommunityRoom {
-          ws.chatserver.do_send(JoinCommunityRoom {
+          community_id: 0,
-            community_id: 0,
+          id,
-            id,
+        });
-          });
-        }
       }
     }
 

server/src/api/community.rs

@@ -6,8 +6,8 @@ use crate::{
   websocket::{
     server::{GetCommunityUsersOnline, JoinCommunityRoom, SendCommunityRoomMessage},
     UserOperation,
-    WebsocketInfo,
   },
+  ConnectionId,
 };
 use anyhow::Context;
 use lemmy_db::{
@@ -166,7 +166,7 @@ impl Perform for GetCommunity {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<GetCommunityResponse, LemmyError> {
     let data: &GetCommunity = &self;
     let user = get_user_from_jwt_opt(&data.auth, context.pool()).await?;
@@ -205,20 +205,17 @@ impl Perform for GetCommunity {
       Err(_e) => return Err(APIError::err("couldnt_find_community").into()),
     };
 
-    let online = if let Some(ws) = websocket_info {
+    if let Some(id) = websocket_id {
-      if let Some(id) = ws.id {
+      context
-        ws.chatserver.do_send(JoinCommunityRoom {
+        .chat_server()
-          community_id: community.id,
+        .do_send(JoinCommunityRoom { community_id, id });
-          id,
+    }
-        });
+
-      }
+    let online = context
-      ws.chatserver
+      .chat_server()
-        .send(GetCommunityUsersOnline { community_id })
+      .send(GetCommunityUsersOnline { community_id })
-        .await
+      .await
-        .unwrap_or(1)
+      .unwrap_or(1);
-    } else {
-      0
-    };
 
     let res = GetCommunityResponse {
       community: community_view,
@@ -238,7 +235,7 @@ impl Perform for CreateCommunity {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<CommunityResponse, LemmyError> {
     let data: &CreateCommunity = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -333,7 +330,7 @@ impl Perform for EditCommunity {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<CommunityResponse, LemmyError> {
     let data: &EditCommunity = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -403,7 +400,7 @@ impl Perform for EditCommunity {
       community: community_view,
     };
 
-    send_community_websocket(&res, websocket_info, UserOperation::EditCommunity);
+    send_community_websocket(&res, context, websocket_id, UserOperation::EditCommunity);
 
     Ok(res)
   }
@@ -416,7 +413,7 @@ impl Perform for DeleteCommunity {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<CommunityResponse, LemmyError> {
     let data: &DeleteCommunity = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -459,7 +456,7 @@ impl Perform for DeleteCommunity {
       community: community_view,
     };
 
-    send_community_websocket(&res, websocket_info, UserOperation::DeleteCommunity);
+    send_community_websocket(&res, context, websocket_id, UserOperation::DeleteCommunity);
 
     Ok(res)
   }
@@ -472,7 +469,7 @@ impl Perform for RemoveCommunity {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<CommunityResponse, LemmyError> {
     let data: &RemoveCommunity = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -527,7 +524,7 @@ impl Perform for RemoveCommunity {
       community: community_view,
     };
 
-    send_community_websocket(&res, websocket_info, UserOperation::RemoveCommunity);
+    send_community_websocket(&res, context, websocket_id, UserOperation::RemoveCommunity);
 
     Ok(res)
   }
@@ -540,7 +537,7 @@ impl Perform for ListCommunities {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<ListCommunitiesResponse, LemmyError> {
     let data: &ListCommunities = &self;
     let user = get_user_from_jwt_opt(&data.auth, context.pool()).await?;
@@ -582,7 +579,7 @@ impl Perform for FollowCommunity {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<CommunityResponse, LemmyError> {
     let data: &FollowCommunity = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -643,7 +640,7 @@ impl Perform for GetFollowedCommunities {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<GetFollowedCommunitiesResponse, LemmyError> {
     let data: &GetFollowedCommunities = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -670,7 +667,7 @@ impl Perform for BanFromCommunity {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<BanFromCommunityResponse, LemmyError> {
     let data: &BanFromCommunity = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -757,14 +754,12 @@ impl Perform for BanFromCommunity {
       banned: data.ban,
     };
 
-    if let Some(ws) = websocket_info {
+    context.chat_server().do_send(SendCommunityRoomMessage {
-      ws.chatserver.do_send(SendCommunityRoomMessage {
+      op: UserOperation::BanFromCommunity,
-        op: UserOperation::BanFromCommunity,
+      response: res.clone(),
-        response: res.clone(),
+      community_id,
-        community_id: data.community_id,
+      websocket_id,
-        my_id: ws.id,
+    });
-      });
-    }
 
     Ok(res)
   }
@@ -777,7 +772,7 @@ impl Perform for AddModToCommunity {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<AddModToCommunityResponse, LemmyError> {
     let data: &AddModToCommunity = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -824,14 +819,12 @@ impl Perform for AddModToCommunity {
 
     let res = AddModToCommunityResponse { moderators };
 
-    if let Some(ws) = websocket_info {
+    context.chat_server().do_send(SendCommunityRoomMessage {
-      ws.chatserver.do_send(SendCommunityRoomMessage {
+      op: UserOperation::AddModToCommunity,
-        op: UserOperation::AddModToCommunity,
+      response: res.clone(),
-        response: res.clone(),
+      community_id,
-        community_id: data.community_id,
+      websocket_id,
-        my_id: ws.id,
+    });
-      });
-    }
 
     Ok(res)
   }
@@ -844,7 +837,7 @@ impl Perform for TransferCommunity {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<GetCommunityResponse, LemmyError> {
     let data: &TransferCommunity = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -957,20 +950,19 @@ impl Perform for TransferCommunity {
 
 pub fn send_community_websocket(
   res: &CommunityResponse,
-  websocket_info: Option<WebsocketInfo>,
+  context: &Data<LemmyContext>,
+  websocket_id: Option<ConnectionId>,
   op: UserOperation,
 ) {
-  if let Some(ws) = websocket_info {
+  // Strip out the user id and subscribed when sending to others
-    // Strip out the user id and subscribed when sending to others
+  let mut res_sent = res.clone();
-    let mut res_sent = res.clone();
+  res_sent.community.user_id = None;
-    res_sent.community.user_id = None;
+  res_sent.community.subscribed = None;
-    res_sent.community.subscribed = None;
 
-    ws.chatserver.do_send(SendCommunityRoomMessage {
+  context.chat_server().do_send(SendCommunityRoomMessage {
-      op,
+    op,
-      response: res_sent,
+    response: res_sent,
-      community_id: res.community.id,
+    community_id: res.community.id,
-      my_id: ws.id,
+    websocket_id,
-    });
+  });
-  }
 }

server/src/api/mod.rs

@@ -1,16 +1,10 @@
-use crate::{
+use crate::{api::claims::Claims, blocking, ConnectionId, DbPool, LemmyContext, LemmyError};
-  api::claims::Claims,
-  blocking,
-  websocket::WebsocketInfo,
-  DbPool,
-  LemmyContext,
-  LemmyError,
-};
 use actix_web::web::Data;
 use lemmy_db::{
   community::*,
   community_view::*,
   moderator::*,
+  post::Post,
   site::*,
   user::*,
   user_view::*,
@@ -47,7 +41,7 @@ pub trait Perform {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<Self::Response, LemmyError>;
 }
 
@@ -73,6 +67,13 @@ pub async fn is_admin(pool: &DbPool, user_id: i32) -> Result<(), LemmyError> {
   Ok(())
 }
 
+pub(in crate::api) async fn get_post(post_id: i32, pool: &DbPool) -> Result<Post, LemmyError> {
+  match blocking(pool, move |conn| Post::read(conn, post_id)).await? {
+    Ok(post) => Ok(post),
+    Err(_e) => Err(APIError::err("couldnt_find_post").into()),
+  }
+}
+
 pub(in crate::api) async fn get_user_from_jwt(
   jwt: &str,
   pool: &DbPool,

server/src/api/post.rs

@@ -15,8 +15,8 @@ use crate::{
   websocket::{
     server::{GetPostUsersOnline, JoinCommunityRoom, JoinPostRoom, SendPost},
     UserOperation,
-    WebsocketInfo,
   },
+  ConnectionId,
   LemmyContext,
   LemmyError,
 };
@@ -146,7 +146,7 @@ impl Perform for CreatePost {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<PostResponse, LemmyError> {
     let data: &CreatePost = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -247,13 +247,11 @@ impl Perform for CreatePost {
 
     let res = PostResponse { post: post_view };
 
-    if let Some(ws) = websocket_info {
+    context.chat_server().do_send(SendPost {
-      ws.chatserver.do_send(SendPost {
+      op: UserOperation::CreatePost,
-        op: UserOperation::CreatePost,
+      post: res.clone(),
-        post: res.clone(),
+      websocket_id,
-        my_id: ws.id,
+    });
-      });
-    }
 
     Ok(res)
   }
@@ -266,7 +264,7 @@ impl Perform for GetPost {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<GetPostResponse, LemmyError> {
     let data: &GetPost = &self;
     let user = get_user_from_jwt_opt(&data.auth, context.pool()).await?;
@@ -304,20 +302,18 @@ impl Perform for GetPost {
     })
     .await??;
 
-    let online = if let Some(ws) = websocket_info {
+    if let Some(id) = websocket_id {
-      if let Some(id) = ws.id {
+      context.chat_server().do_send(JoinPostRoom {
-        ws.chatserver.do_send(JoinPostRoom {
+        post_id: data.id,
-          post_id: data.id,
+        id,
-          id,
+      });
-        });
+    }
-      }
+
-      ws.chatserver
+    let online = context
-        .send(GetPostUsersOnline { post_id: data.id })
+      .chat_server()
-        .await
+      .send(GetPostUsersOnline { post_id: data.id })
-        .unwrap_or(1)
+      .await
-    } else {
+      .unwrap_or(1);
-      0
-    };
 
     // Return the jwt
     Ok(GetPostResponse {
@@ -337,7 +333,7 @@ impl Perform for GetPosts {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<GetPostsResponse, LemmyError> {
     let data: &GetPosts = &self;
     let user = get_user_from_jwt_opt(&data.auth, context.pool()).await?;
@@ -377,17 +373,15 @@ impl Perform for GetPosts {
       Err(_e) => return Err(APIError::err("couldnt_get_posts").into()),
     };
 
-    if let Some(ws) = websocket_info {
+    if let Some(id) = websocket_id {
       // You don't need to join the specific community room, bc this is already handled by
       // GetCommunity
       if data.community_id.is_none() {
-        if let Some(id) = ws.id {
+        // 0 is the "all" community
-          // 0 is the "all" community
+        context.chat_server().do_send(JoinCommunityRoom {
-          ws.chatserver.do_send(JoinCommunityRoom {
+          community_id: 0,
-            community_id: 0,
+          id,
-            id,
+        });
-          });
-        }
       }
     }
 
@@ -402,7 +396,7 @@ impl Perform for CreatePostLike {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<PostResponse, LemmyError> {
     let data: &CreatePostLike = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -465,13 +459,11 @@ impl Perform for CreatePostLike {
 
     let res = PostResponse { post: post_view };
 
-    if let Some(ws) = websocket_info {
+    context.chat_server().do_send(SendPost {
-      ws.chatserver.do_send(SendPost {
+      op: UserOperation::CreatePostLike,
-        op: UserOperation::CreatePostLike,
+      post: res.clone(),
-        post: res.clone(),
+      websocket_id,
-        my_id: ws.id,
+    });
-      });
-    }
 
     Ok(res)
   }
@@ -484,7 +476,7 @@ impl Perform for EditPost {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<PostResponse, LemmyError> {
     let data: &EditPost = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -560,13 +552,11 @@ impl Perform for EditPost {
 
     let res = PostResponse { post: post_view };
 
-    if let Some(ws) = websocket_info {
+    context.chat_server().do_send(SendPost {
-      ws.chatserver.do_send(SendPost {
+      op: UserOperation::EditPost,
-        op: UserOperation::EditPost,
+      post: res.clone(),
-        post: res.clone(),
+      websocket_id,
-        my_id: ws.id,
+    });
-      });
-    }
 
     Ok(res)
   }
@@ -579,7 +569,7 @@ impl Perform for DeletePost {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<PostResponse, LemmyError> {
     let data: &DeletePost = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -618,13 +608,11 @@ impl Perform for DeletePost {
 
     let res = PostResponse { post: post_view };
 
-    if let Some(ws) = websocket_info {
+    context.chat_server().do_send(SendPost {
-      ws.chatserver.do_send(SendPost {
+      op: UserOperation::DeletePost,
-        op: UserOperation::DeletePost,
+      post: res.clone(),
-        post: res.clone(),
+      websocket_id,
-        my_id: ws.id,
+    });
-      });
-    }
 
     Ok(res)
   }
@@ -637,7 +625,7 @@ impl Perform for RemovePost {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<PostResponse, LemmyError> {
     let data: &RemovePost = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -687,13 +675,11 @@ impl Perform for RemovePost {
 
     let res = PostResponse { post: post_view };
 
-    if let Some(ws) = websocket_info {
+    context.chat_server().do_send(SendPost {
-      ws.chatserver.do_send(SendPost {
+      op: UserOperation::RemovePost,
-        op: UserOperation::RemovePost,
+      post: res.clone(),
-        post: res.clone(),
+      websocket_id,
-        my_id: ws.id,
+    });
-      });
-    }
 
     Ok(res)
   }
@@ -706,7 +692,7 @@ impl Perform for LockPost {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<PostResponse, LemmyError> {
     let data: &LockPost = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -747,13 +733,11 @@ impl Perform for LockPost {
 
     let res = PostResponse { post: post_view };
 
-    if let Some(ws) = websocket_info {
+    context.chat_server().do_send(SendPost {
-      ws.chatserver.do_send(SendPost {
+      op: UserOperation::LockPost,
-        op: UserOperation::LockPost,
+      post: res.clone(),
-        post: res.clone(),
+      websocket_id,
-        my_id: ws.id,
+    });
-      });
-    }
 
     Ok(res)
   }
@@ -766,7 +750,7 @@ impl Perform for StickyPost {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<PostResponse, LemmyError> {
     let data: &StickyPost = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -811,13 +795,11 @@ impl Perform for StickyPost {
 
     let res = PostResponse { post: post_view };
 
-    if let Some(ws) = websocket_info {
+    context.chat_server().do_send(SendPost {
-      ws.chatserver.do_send(SendPost {
+      op: UserOperation::StickyPost,
-        op: UserOperation::StickyPost,
+      post: res.clone(),
-        post: res.clone(),
+      websocket_id,
-        my_id: ws.id,
+    });
-      });
-    }
 
     Ok(res)
   }
@@ -830,7 +812,7 @@ impl Perform for SavePost {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<PostResponse, LemmyError> {
     let data: &SavePost = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;

server/src/api/site.rs

@@ -15,8 +15,8 @@ use crate::{
   websocket::{
     server::{GetUsersOnline, SendAllMessage},
     UserOperation,
-    WebsocketInfo,
   },
+  ConnectionId,
   LemmyContext,
   LemmyError,
 };
@@ -167,7 +167,7 @@ impl Perform for ListCategories {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<ListCategoriesResponse, LemmyError> {
     let _data: &ListCategories = &self;
 
@@ -185,7 +185,7 @@ impl Perform for GetModlog {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<GetModlogResponse, LemmyError> {
     let data: &GetModlog = &self;
 
@@ -259,7 +259,7 @@ impl Perform for CreateSite {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<SiteResponse, LemmyError> {
     let data: &CreateSite = &self;
 
@@ -300,7 +300,7 @@ impl Perform for EditSite {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<SiteResponse, LemmyError> {
     let data: &EditSite = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -337,13 +337,11 @@ impl Perform for EditSite {
 
     let res = SiteResponse { site: site_view };
 
-    if let Some(ws) = websocket_info {
+    context.chat_server().do_send(SendAllMessage {
-      ws.chatserver.do_send(SendAllMessage {
+      op: UserOperation::EditSite,
-        op: UserOperation::EditSite,
+      response: res.clone(),
-        response: res.clone(),
+      websocket_id,
-        my_id: ws.id,
+    });
-      });
-    }
 
     Ok(res)
   }
@@ -356,7 +354,7 @@ impl Perform for GetSite {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<GetSiteResponse, LemmyError> {
     let data: &GetSite = &self;
 
@@ -375,7 +373,7 @@ impl Perform for GetSite {
         captcha_uuid: None,
         captcha_answer: None,
       };
-      let login_response = register.perform(context, websocket_info.clone()).await?;
+      let login_response = register.perform(context, websocket_id).await?;
       info!("Admin {} created", setup.admin_username);
 
       let create_site = CreateSite {
@@ -388,7 +386,7 @@ impl Perform for GetSite {
         enable_nsfw: true,
         auth: login_response.jwt,
       };
-      create_site.perform(context, websocket_info.clone()).await?;
+      create_site.perform(context, websocket_id).await?;
       info!("Site {} created", setup.site_name);
       Some(blocking(context.pool(), move |conn| SiteView::read(conn)).await??)
     } else {
@@ -410,11 +408,11 @@ impl Perform for GetSite {
 
     let banned = blocking(context.pool(), move |conn| UserView::banned(conn)).await??;
 
-    let online = if let Some(ws) = websocket_info {
+    let online = context
-      ws.chatserver.send(GetUsersOnline).await.unwrap_or(1)
+      .chat_server()
-    } else {
+      .send(GetUsersOnline)
-      0
+      .await
-    };
+      .unwrap_or(1);
 
     let my_user = get_user_from_jwt_opt(&data.auth, context.pool())
       .await?
@@ -444,7 +442,7 @@ impl Perform for Search {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<SearchResponse, LemmyError> {
     let data: &Search = &self;
 
@@ -608,7 +606,7 @@ impl Perform for TransferSite {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<GetSiteResponse, LemmyError> {
     let data: &TransferSite = &self;
     let mut user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -671,7 +669,7 @@ impl Perform for GetSiteConfig {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<GetSiteConfigResponse, LemmyError> {
     let data: &GetSiteConfig = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -692,7 +690,7 @@ impl Perform for SaveSiteConfig {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<GetSiteConfigResponse, LemmyError> {
     let data: &SaveSiteConfig = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;

server/src/api/user.rs

@@ -14,8 +14,8 @@ use crate::{
   websocket::{
     server::{CaptchaItem, CheckCaptcha, JoinUserRoom, SendAllMessage, SendUserRoomMessage},
     UserOperation,
-    WebsocketInfo,
   },
+  ConnectionId,
   LemmyContext,
   LemmyError,
 };
@@ -303,7 +303,7 @@ impl Perform for Login {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<LoginResponse, LemmyError> {
     let data: &Login = &self;
 
@@ -338,7 +338,7 @@ impl Perform for Register {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<LoginResponse, LemmyError> {
     let data: &Register = &self;
 
@@ -357,27 +357,22 @@ impl Perform for Register {
 
     // If its not the admin, check the captcha
     if !data.admin && Settings::get().captcha.enabled {
-      match websocket_info {
+      let check = context
-        Some(ws) => {
+        .chat_server()
-          let check = ws
+        .send(CheckCaptcha {
-            .chatserver
+          uuid: data
-            .send(CheckCaptcha {
+            .captcha_uuid
-              uuid: data
+            .to_owned()
-                .captcha_uuid
+            .unwrap_or_else(|| "".to_string()),
-                .to_owned()
+          answer: data
-                .unwrap_or_else(|| "".to_string()),
+            .captcha_answer
-              answer: data
+            .to_owned()
-                .captcha_answer
+            .unwrap_or_else(|| "".to_string()),
-                .to_owned()
+        })
-                .unwrap_or_else(|| "".to_string()),
+        .await?;
-            })
+      if !check {
-            .await?;
+        return Err(APIError::err("captcha_incorrect").into());
-          if !check {
+      }
-            return Err(APIError::err("captcha_incorrect").into());
-          }
-        }
-        None => return Err(APIError::err("captcha_incorrect").into()),
-      };
     }
 
     check_slurs(&data.username)?;
@@ -515,8 +510,8 @@ impl Perform for GetCaptcha {
 
   async fn perform(
     &self,
-    _context: &Data<LemmyContext>,
+    context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<Self::Response, LemmyError> {
     let captcha_settings = Settings::get().captcha;
 
@@ -547,9 +542,8 @@ impl Perform for GetCaptcha {
       expires: naive_now() + Duration::minutes(10), // expires in 10 minutes
     };
 
-    if let Some(ws) = websocket_info {
+    // Stores the captcha item on the queue
-      ws.chatserver.do_send(captcha_item);
+    context.chat_server().do_send(captcha_item);
-    }
 
     Ok(GetCaptchaResponse {
       ok: Some(CaptchaResponse { png, uuid, wav }),
@@ -564,7 +558,7 @@ impl Perform for SaveUserSettings {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<LoginResponse, LemmyError> {
     let data: &SaveUserSettings = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -690,7 +684,7 @@ impl Perform for GetUserDetails {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<GetUserDetailsResponse, LemmyError> {
     let data: &GetUserDetails = &self;
     let user = get_user_from_jwt_opt(&data.auth, context.pool()).await?;
@@ -788,7 +782,7 @@ impl Perform for AddAdmin {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<AddAdminResponse, LemmyError> {
     let data: &AddAdmin = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -827,13 +821,11 @@ impl Perform for AddAdmin {
 
     let res = AddAdminResponse { admins };
 
-    if let Some(ws) = websocket_info {
+    context.chat_server().do_send(SendAllMessage {
-      ws.chatserver.do_send(SendAllMessage {
+      op: UserOperation::AddAdmin,
-        op: UserOperation::AddAdmin,
+      response: res.clone(),
-        response: res.clone(),
+      websocket_id,
-        my_id: ws.id,
+    });
-      });
-    }
 
     Ok(res)
   }
@@ -846,7 +838,7 @@ impl Perform for BanUser {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<BanUserResponse, LemmyError> {
     let data: &BanUser = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -909,13 +901,11 @@ impl Perform for BanUser {
       banned: data.ban,
     };
 
-    if let Some(ws) = websocket_info {
+    context.chat_server().do_send(SendAllMessage {
-      ws.chatserver.do_send(SendAllMessage {
+      op: UserOperation::BanUser,
-        op: UserOperation::BanUser,
+      response: res.clone(),
-        response: res.clone(),
+      websocket_id,
-        my_id: ws.id,
+    });
-      });
-    }
 
     Ok(res)
   }
@@ -928,7 +918,7 @@ impl Perform for GetReplies {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<GetRepliesResponse, LemmyError> {
     let data: &GetReplies = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -960,7 +950,7 @@ impl Perform for GetUserMentions {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<GetUserMentionsResponse, LemmyError> {
     let data: &GetUserMentions = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -992,7 +982,7 @@ impl Perform for MarkUserMentionAsRead {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<UserMentionResponse, LemmyError> {
     let data: &MarkUserMentionAsRead = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -1034,7 +1024,7 @@ impl Perform for MarkAllAsRead {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<GetRepliesResponse, LemmyError> {
     let data: &MarkAllAsRead = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -1086,7 +1076,7 @@ impl Perform for DeleteAccount {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<LoginResponse, LemmyError> {
     let data: &DeleteAccount = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -1123,7 +1113,7 @@ impl Perform for PasswordReset {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<PasswordResetResponse, LemmyError> {
     let data: &PasswordReset = &self;
 
@@ -1171,7 +1161,7 @@ impl Perform for PasswordChange {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<LoginResponse, LemmyError> {
     let data: &PasswordChange = &self;
 
@@ -1212,7 +1202,7 @@ impl Perform for CreatePrivateMessage {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<PrivateMessageResponse, LemmyError> {
     let data: &CreatePrivateMessage = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -1290,14 +1280,12 @@ impl Perform for CreatePrivateMessage {
 
     let res = PrivateMessageResponse { message };
 
-    if let Some(ws) = websocket_info {
+    context.chat_server().do_send(SendUserRoomMessage {
-      ws.chatserver.do_send(SendUserRoomMessage {
+      op: UserOperation::CreatePrivateMessage,
-        op: UserOperation::CreatePrivateMessage,
+      response: res.clone(),
-        response: res.clone(),
+      recipient_id,
-        recipient_id: recipient_user.id,
+      websocket_id,
-        my_id: ws.id,
+    });
-      });
-    }
 
     Ok(res)
   }
@@ -1310,7 +1298,7 @@ impl Perform for EditPrivateMessage {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<PrivateMessageResponse, LemmyError> {
     let data: &EditPrivateMessage = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -1349,14 +1337,12 @@ impl Perform for EditPrivateMessage {
 
     let res = PrivateMessageResponse { message };
 
-    if let Some(ws) = websocket_info {
+    context.chat_server().do_send(SendUserRoomMessage {
-      ws.chatserver.do_send(SendUserRoomMessage {
+      op: UserOperation::EditPrivateMessage,
-        op: UserOperation::EditPrivateMessage,
+      response: res.clone(),
-        response: res.clone(),
+      recipient_id,
-        recipient_id,
+      websocket_id,
-        my_id: ws.id,
+    });
-      });
-    }
 
     Ok(res)
   }
@@ -1369,7 +1355,7 @@ impl Perform for DeletePrivateMessage {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<PrivateMessageResponse, LemmyError> {
     let data: &DeletePrivateMessage = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -1414,14 +1400,12 @@ impl Perform for DeletePrivateMessage {
 
     let res = PrivateMessageResponse { message };
 
-    if let Some(ws) = websocket_info {
+    context.chat_server().do_send(SendUserRoomMessage {
-      ws.chatserver.do_send(SendUserRoomMessage {
+      op: UserOperation::DeletePrivateMessage,
-        op: UserOperation::DeletePrivateMessage,
+      response: res.clone(),
-        response: res.clone(),
+      recipient_id,
-        recipient_id,
+      websocket_id,
-        my_id: ws.id,
+    });
-      });
-    }
 
     Ok(res)
   }
@@ -1434,7 +1418,7 @@ impl Perform for MarkPrivateMessageAsRead {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<PrivateMessageResponse, LemmyError> {
     let data: &MarkPrivateMessageAsRead = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -1472,14 +1456,12 @@ impl Perform for MarkPrivateMessageAsRead {
 
     let res = PrivateMessageResponse { message };
 
-    if let Some(ws) = websocket_info {
+    context.chat_server().do_send(SendUserRoomMessage {
-      ws.chatserver.do_send(SendUserRoomMessage {
+      op: UserOperation::MarkPrivateMessageAsRead,
-        op: UserOperation::MarkPrivateMessageAsRead,
+      response: res.clone(),
-        response: res.clone(),
+      recipient_id,
-        recipient_id,
+      websocket_id,
-        my_id: ws.id,
+    });
-      });
-    }
 
     Ok(res)
   }
@@ -1492,7 +1474,7 @@ impl Perform for GetPrivateMessages {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_info: Option<WebsocketInfo>,
+    _websocket_id: Option<ConnectionId>,
   ) -> Result<PrivateMessagesResponse, LemmyError> {
     let data: &GetPrivateMessages = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
@@ -1521,18 +1503,16 @@ impl Perform for UserJoin {
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_info: Option<WebsocketInfo>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<UserJoinResponse, LemmyError> {
     let data: &UserJoin = &self;
     let user = get_user_from_jwt(&data.auth, context.pool()).await?;
 
-    if let Some(ws) = websocket_info {
+    if let Some(ws_id) = websocket_id {
-      if let Some(id) = ws.id {
+      context.chat_server().do_send(JoinUserRoom {
-        ws.chatserver.do_send(JoinUserRoom {
+        user_id: user.id,
-          user_id: user.id,
+        id: ws_id,
-          id,
+      });
-        });
-      }
     }
 
     Ok(UserJoinResponse { user_id: user.id })

server/src/apub/inbox/activities/create.rs

@@ -75,7 +75,7 @@ async fn receive_create_post(
   context.chat_server().do_send(SendPost {
     op: UserOperation::CreatePost,
     post: res,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(create, &user, context).await?;
@@ -128,7 +128,7 @@ async fn receive_create_comment(
   context.chat_server().do_send(SendComment {
     op: UserOperation::CreateComment,
     comment: res,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(create, &user, context).await?;

server/src/apub/inbox/activities/delete.rs

@@ -100,7 +100,7 @@ async fn receive_delete_post(
   context.chat_server().do_send(SendPost {
     op: UserOperation::EditPost,
     post: res,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(delete, &user, context).await?;
@@ -158,7 +158,7 @@ async fn receive_delete_comment(
   context.chat_server().do_send(SendComment {
     op: UserOperation::EditComment,
     comment: res,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(delete, &user, context).await?;
@@ -222,7 +222,7 @@ async fn receive_delete_community(
     op: UserOperation::EditCommunity,
     response: res,
     community_id,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(delete, &user, context).await?;

server/src/apub/inbox/activities/dislike.rs

@@ -85,7 +85,7 @@ async fn receive_dislike_post(
   context.chat_server().do_send(SendPost {
     op: UserOperation::CreatePostLike,
     post: res,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(dislike, &user, context).await?;
@@ -142,7 +142,7 @@ async fn receive_dislike_comment(
   context.chat_server().do_send(SendComment {
     op: UserOperation::CreateCommentLike,
     comment: res,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(dislike, &user, context).await?;

server/src/apub/inbox/activities/like.rs

@@ -76,7 +76,7 @@ async fn receive_like_post(like: Like, context: &LemmyContext) -> Result<HttpRes
   context.chat_server().do_send(SendPost {
     op: UserOperation::CreatePostLike,
     post: res,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(like, &user, context).await?;
@@ -127,7 +127,7 @@ async fn receive_like_comment(
   context.chat_server().do_send(SendComment {
     op: UserOperation::CreateCommentLike,
     comment: res,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(like, &user, context).await?;

server/src/apub/inbox/activities/remove.rs

@@ -107,7 +107,7 @@ async fn receive_remove_post(
   context.chat_server().do_send(SendPost {
     op: UserOperation::EditPost,
     post: res,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(remove, &mod_, context).await?;
@@ -165,7 +165,7 @@ async fn receive_remove_comment(
   context.chat_server().do_send(SendComment {
     op: UserOperation::EditComment,
     comment: res,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(remove, &mod_, context).await?;
@@ -229,7 +229,7 @@ async fn receive_remove_community(
     op: UserOperation::EditCommunity,
     response: res,
     community_id,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(remove, &mod_, context).await?;

server/src/apub/inbox/activities/undo.rs

@@ -202,7 +202,7 @@ async fn receive_undo_delete_comment(
   context.chat_server().do_send(SendComment {
     op: UserOperation::EditComment,
     comment: res,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(undo, &user, context).await?;
@@ -261,7 +261,7 @@ async fn receive_undo_remove_comment(
   context.chat_server().do_send(SendComment {
     op: UserOperation::EditComment,
     comment: res,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(undo, &mod_, context).await?;
@@ -321,7 +321,7 @@ async fn receive_undo_delete_post(
   context.chat_server().do_send(SendPost {
     op: UserOperation::EditPost,
     post: res,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(undo, &user, context).await?;
@@ -381,7 +381,7 @@ async fn receive_undo_remove_post(
   context.chat_server().do_send(SendPost {
     op: UserOperation::EditPost,
     post: res,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(undo, &mod_, context).await?;
@@ -446,7 +446,7 @@ async fn receive_undo_delete_community(
     op: UserOperation::EditCommunity,
     response: res,
     community_id,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(undo, &user, context).await?;
@@ -511,7 +511,7 @@ async fn receive_undo_remove_community(
     op: UserOperation::EditCommunity,
     response: res,
     community_id,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(undo, &mod_, context).await?;
@@ -556,7 +556,7 @@ async fn receive_undo_like_comment(
   context.chat_server().do_send(SendComment {
     op: UserOperation::CreateCommentLike,
     comment: res,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(undo, &user, context).await?;
@@ -595,7 +595,7 @@ async fn receive_undo_like_post(
   context.chat_server().do_send(SendPost {
     op: UserOperation::CreatePostLike,
     post: res,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(undo, &user, context).await?;
@@ -646,7 +646,7 @@ async fn receive_undo_dislike_comment(
   context.chat_server().do_send(SendComment {
     op: UserOperation::CreateCommentLike,
     comment: res,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(undo, &user, context).await?;
@@ -691,7 +691,7 @@ async fn receive_undo_dislike_post(
   context.chat_server().do_send(SendPost {
     op: UserOperation::CreatePostLike,
     post: res,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(undo, &user, context).await?;

server/src/apub/inbox/activities/update.rs

@@ -81,7 +81,7 @@ async fn receive_update_post(
   context.chat_server().do_send(SendPost {
     op: UserOperation::EditPost,
     post: res,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(update, &user, context).await?;
@@ -136,7 +136,7 @@ async fn receive_update_comment(
   context.chat_server().do_send(SendComment {
     op: UserOperation::EditComment,
     comment: res,
-    my_id: None,
+    websocket_id: None,
   });
 
   announce_if_community_is_local(update, &user, context).await?;

server/src/apub/inbox/user_inbox.rs

@@ -152,7 +152,7 @@ async fn receive_create_private_message(
     op: UserOperation::CreatePrivateMessage,
     response: res,
     recipient_id,
-    my_id: None,
+    websocket_id: None,
   });
 
   Ok(HttpResponse::Ok().finish())
@@ -201,7 +201,7 @@ async fn receive_update_private_message(
     op: UserOperation::EditPrivateMessage,
     response: res,
     recipient_id,
-    my_id: None,
+    websocket_id: None,
   });
 
   Ok(HttpResponse::Ok().finish())
@@ -262,7 +262,7 @@ async fn receive_delete_private_message(
     op: UserOperation::EditPrivateMessage,
     response: res,
     recipient_id,
-    my_id: None,
+    websocket_id: None,
   });
 
   Ok(HttpResponse::Ok().finish())
@@ -323,7 +323,7 @@ async fn receive_undo_delete_private_message(
     op: UserOperation::EditPrivateMessage,
     response: res,
     recipient_id,
-    my_id: None,
+    websocket_id: None,
   });
 
   Ok(HttpResponse::Ok().finish())

server/src/main.rs

@@ -75,18 +75,14 @@ async fn main() -> Result<(), LemmyError> {
     settings.bind, settings.port
   );
 
+  let activity_queue = create_activity_queue();
+  let chat_server =
+    ChatServer::startup(pool.clone(), rate_limiter.clone(), Client::default(), activity_queue.clone()).start();
+
   // Create Http server with websocket support
   HttpServer::new(move || {
-    let activity_queue = create_activity_queue();
-    let chat_server = ChatServer::startup(
-      pool.clone(),
-      rate_limiter.clone(),
-      Client::default(),
-      activity_queue.clone(),
-    )
-    .start();
     let context =
-      LemmyContext::create(pool.clone(), chat_server, Client::default(), activity_queue);
+      LemmyContext::create(pool.clone(), chat_server.to_owned(), Client::default(), activity_queue.to_owned());
     let settings = Settings::get();
     let rate_limiter = rate_limiter.clone();
     App::new()

server/src/routes/api.rs

@@ -1,7 +1,6 @@
 use crate::{
   api::{comment::*, community::*, post::*, site::*, user::*, Perform},
   rate_limit::RateLimit,
-  websocket::WebsocketInfo,
   LemmyContext,
 };
 use actix_web::{error::ErrorBadRequest, *};
@@ -94,7 +93,8 @@ pub fn config(cfg: &mut web::ServiceConfig, rate_limit: &RateLimit) {
             web::post().to(route_post::<MarkCommentAsRead>),
           )
           .route("/like", web::post().to(route_post::<CreateCommentLike>))
-          .route("/save", web::put().to(route_post::<SaveComment>)),
+          .route("/save", web::put().to(route_post::<SaveComment>))
+          .route("/list", web::get().to(route_get::<GetComments>)),
       )
       // Private Message
       .service(
@@ -136,6 +136,7 @@ pub fn config(cfg: &mut web::ServiceConfig, rate_limit: &RateLimit) {
             "/followed_communities",
             web::get().to(route_get::<GetFollowedCommunities>),
           )
+          .route("/join", web::post().to(route_post::<UserJoin>))
           // Admin action. I don't like that it's in /user
           .route("/ban", web::post().to(route_post::<BanUser>))
           // Account actions. I don't like that they're in /user maybe /accounts
@@ -180,13 +181,8 @@ where
   Request: Perform,
   Request: Send + 'static,
 {
-  let ws_info = WebsocketInfo {
-    chatserver: context.chat_server().to_owned(),
-    id: None,
-  };
-
   let res = data
-    .perform(&context, Some(ws_info))
+    .perform(&context, None)
     .await
     .map(|json| HttpResponse::Ok().json(json))
     .map_err(ErrorBadRequest)?;

server/src/websocket/mod.rs

@@ -1,6 +1,5 @@
 pub mod server;
 
-use crate::ConnectionId;
 use actix::prelude::*;
 use diesel::{
   r2d2::{ConnectionManager, Pool},
@@ -10,7 +9,6 @@ use log::{error, info};
 use rand::{rngs::ThreadRng, Rng};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use server::ChatServer;
 use std::{
   collections::{HashMap, HashSet},
   str::FromStr,
@@ -77,9 +75,3 @@ pub enum UserOperation {
   GetSiteConfig,
   SaveSiteConfig,
 }
-
-#[derive(Clone)]
-pub struct WebsocketInfo {
-  pub chatserver: Addr<ChatServer>,
-  pub id: Option<ConnectionId>,
-}

server/src/websocket/server.rs

@@ -59,7 +59,7 @@ pub struct StandardMessage {
 pub struct SendAllMessage<Response> {
   pub op: UserOperation,
   pub response: Response,
-  pub my_id: Option<ConnectionId>,
+  pub websocket_id: Option<ConnectionId>,
 }
 
 #[derive(Message)]
@@ -68,7 +68,7 @@ pub struct SendUserRoomMessage<Response> {
   pub op: UserOperation,
   pub response: Response,
   pub recipient_id: UserId,
-  pub my_id: Option<ConnectionId>,
+  pub websocket_id: Option<ConnectionId>,
 }
 
 #[derive(Message)]
@@ -77,7 +77,7 @@ pub struct SendCommunityRoomMessage<Response> {
   pub op: UserOperation,
   pub response: Response,
   pub community_id: CommunityId,
-  pub my_id: Option<ConnectionId>,
+  pub websocket_id: Option<ConnectionId>,
 }
 
 #[derive(Message)]
@@ -85,7 +85,7 @@ pub struct SendCommunityRoomMessage<Response> {
 pub struct SendPost {
   pub op: UserOperation,
   pub post: PostResponse,
-  pub my_id: Option<ConnectionId>,
+  pub websocket_id: Option<ConnectionId>,
 }
 
 #[derive(Message)]
@@ -93,7 +93,7 @@ pub struct SendPost {
 pub struct SendComment {
   pub op: UserOperation,
   pub comment: CommentResponse,
-  pub my_id: Option<ConnectionId>,
+  pub websocket_id: Option<ConnectionId>,
 }
 
 #[derive(Message)]
@@ -290,7 +290,7 @@ impl ChatServer {
     op: &UserOperation,
     response: &Response,
     post_id: PostId,
-    my_id: Option<ConnectionId>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<(), LemmyError>
   where
     Response: Serialize,
@@ -298,7 +298,7 @@ impl ChatServer {
     let res_str = &to_json_string(op, response)?;
     if let Some(sessions) = self.post_rooms.get(&post_id) {
       for id in sessions {
-        if let Some(my_id) = my_id {
+        if let Some(my_id) = websocket_id {
           if *id == my_id {
             continue;
           }
@@ -314,7 +314,7 @@ impl ChatServer {
     op: &UserOperation,
     response: &Response,
     community_id: CommunityId,
-    my_id: Option<ConnectionId>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<(), LemmyError>
   where
     Response: Serialize,
@@ -322,7 +322,7 @@ impl ChatServer {
     let res_str = &to_json_string(op, response)?;
     if let Some(sessions) = self.community_rooms.get(&community_id) {
       for id in sessions {
-        if let Some(my_id) = my_id {
+        if let Some(my_id) = websocket_id {
           if *id == my_id {
             continue;
           }
@@ -337,14 +337,14 @@ impl ChatServer {
     &self,
     op: &UserOperation,
     response: &Response,
-    my_id: Option<ConnectionId>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<(), LemmyError>
   where
     Response: Serialize,
   {
     let res_str = &to_json_string(op, response)?;
     for id in self.sessions.keys() {
-      if let Some(my_id) = my_id {
+      if let Some(my_id) = websocket_id {
         if *id == my_id {
           continue;
         }
@@ -359,7 +359,7 @@ impl ChatServer {
     op: &UserOperation,
     response: &Response,
     recipient_id: UserId,
-    my_id: Option<ConnectionId>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<(), LemmyError>
   where
     Response: Serialize,
@@ -367,7 +367,7 @@ impl ChatServer {
     let res_str = &to_json_string(op, response)?;
     if let Some(sessions) = self.user_rooms.get(&recipient_id) {
       for id in sessions {
-        if let Some(my_id) = my_id {
+        if let Some(my_id) = websocket_id {
           if *id == my_id {
             continue;
           }
@@ -382,7 +382,7 @@ impl ChatServer {
     &self,
     user_operation: &UserOperation,
     comment: &CommentResponse,
-    my_id: Option<ConnectionId>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<(), LemmyError> {
     let mut comment_reply_sent = comment.clone();
     comment_reply_sent.comment.my_vote = None;
@@ -396,21 +396,26 @@ impl ChatServer {
       user_operation,
       &comment_post_sent,
       comment_post_sent.comment.post_id,
-      my_id,
+      websocket_id,
     )?;
 
     // Send it to the recipient(s) including the mentioned users
     for recipient_id in &comment_reply_sent.recipient_ids {
-      self.send_user_room_message(user_operation, &comment_reply_sent, *recipient_id, my_id)?;
+      self.send_user_room_message(
+        user_operation,
+        &comment_reply_sent,
+        *recipient_id,
+        websocket_id,
+      )?;
     }
 
     // Send it to the community too
-    self.send_community_room_message(user_operation, &comment_post_sent, 0, my_id)?;
+    self.send_community_room_message(user_operation, &comment_post_sent, 0, websocket_id)?;
     self.send_community_room_message(
       user_operation,
       &comment_post_sent,
       comment.comment.community_id,
-      my_id,
+      websocket_id,
     )?;
 
     Ok(())
@@ -420,7 +425,7 @@ impl ChatServer {
     &self,
     user_operation: &UserOperation,
     post: &PostResponse,
-    my_id: Option<ConnectionId>,
+    websocket_id: Option<ConnectionId>,
   ) -> Result<(), LemmyError> {
     let community_id = post.post.community_id;
 
@@ -430,11 +435,11 @@ impl ChatServer {
     post_sent.post.user_id = None;
 
     // Send it to /c/all and that community
-    self.send_community_room_message(user_operation, &post_sent, 0, my_id)?;
+    self.send_community_room_message(user_operation, &post_sent, 0, websocket_id)?;
-    self.send_community_room_message(user_operation, &post_sent, community_id, my_id)?;
+    self.send_community_room_message(user_operation, &post_sent, community_id, websocket_id)?;
 
     // Send it to the post room
-    self.send_post_room_message(user_operation, &post_sent, post.post.id, my_id)?;
+    self.send_post_room_message(user_operation, &post_sent, post.post.id, websocket_id)?;
 
     Ok(())
   }
@@ -478,7 +483,7 @@ impl ChatServer {
         activity_queue,
       };
       let args = Args {
-        context: &context,
+        context,
         rate_limiter,
         id: msg.id,
         ip,
@@ -572,7 +577,7 @@ impl ChatServer {
 }
 
 struct Args<'a> {
-  context: &'a LemmyContext,
+  context: LemmyContext,
   rate_limiter: RateLimit,
   id: ConnectionId,
   ip: IPAddr,
@@ -594,18 +599,13 @@ where
     data,
   } = args;
 
-  let ws_info = WebsocketInfo {
-    chatserver: context.chat_server().to_owned(),
-    id: Some(id),
-  };
-
   let data = data.to_string();
   let op2 = op.clone();
 
   let fut = async move {
     let parsed_data: Data = serde_json::from_str(&data)?;
     let res = parsed_data
-      .perform(&web::Data::new(context.to_owned()), Some(ws_info))
+      .perform(&web::Data::new(context), Some(id))
       .await?;
     to_json_string(&op, &res)
   };
@@ -699,7 +699,7 @@ where
 
   fn handle(&mut self, msg: SendAllMessage<Response>, _: &mut Context<Self>) {
     self
-      .send_all_message(&msg.op, &msg.response, msg.my_id)
+      .send_all_message(&msg.op, &msg.response, msg.websocket_id)
       .ok();
   }
 }
@@ -712,7 +712,7 @@ where
 
   fn handle(&mut self, msg: SendUserRoomMessage<Response>, _: &mut Context<Self>) {
     self
-      .send_user_room_message(&msg.op, &msg.response, msg.recipient_id, msg.my_id)
+      .send_user_room_message(&msg.op, &msg.response, msg.recipient_id, msg.websocket_id)
       .ok();
   }
 }
@@ -725,7 +725,7 @@ where
 
   fn handle(&mut self, msg: SendCommunityRoomMessage<Response>, _: &mut Context<Self>) {
     self
-      .send_community_room_message(&msg.op, &msg.response, msg.community_id, msg.my_id)
+      .send_community_room_message(&msg.op, &msg.response, msg.community_id, msg.websocket_id)
       .ok();
   }
 }
@@ -734,7 +734,7 @@ impl Handler<SendPost> for ChatServer {
   type Result = ();
 
   fn handle(&mut self, msg: SendPost, _: &mut Context<Self>) {
-    self.send_post(&msg.op, &msg.post, msg.my_id).ok();
+    self.send_post(&msg.op, &msg.post, msg.websocket_id).ok();
   }
 }
 
@@ -742,7 +742,9 @@ impl Handler<SendComment> for ChatServer {
   type Result = ();
 
   fn handle(&mut self, msg: SendComment, _: &mut Context<Self>) {
-    self.send_comment(&msg.op, &msg.comment, msg.my_id).ok();
+    self
+      .send_comment(&msg.op, &msg.comment, msg.websocket_id)
+      .ok();
   }
 }
 

ui/package.json

@@ -37,6 +37,7 @@
     "inferno-router": "^7.4.2",
     "js-cookie": "^2.2.0",
     "jwt-decode": "^2.2.0",
+    "lemmy-js-client": "^1.0.8",
     "markdown-it": "^11.0.0",
     "markdown-it-container": "^3.0.0",
     "markdown-it-emoji": "^1.4.0",

ui/src/api_tests/comment.spec.ts

@@ -21,7 +21,7 @@ import {
   API,
 } from './shared';
 
-import { PostResponse } from '../interfaces';
+import { PostResponse } from 'lemmy-js-client';
 
 let postRes: PostResponse;
 
@@ -57,6 +57,11 @@ test('Create a comment', async () => {
   expect(betaComment.score).toBe(1);
 });
 
+test('Create a comment in a non-existent post', async () => {
+  let commentRes = await createComment(alpha, -1);
+  expect(commentRes).toStrictEqual({ error: 'couldnt_find_post' });
+});
+
 test('Update a comment', async () => {
   let commentRes = await createComment(alpha, postRes.post.id);
   let updateCommentRes = await updateComment(alpha, commentRes.comment.id);
@@ -131,7 +136,7 @@ test('Remove a comment from admin and community on the same instance', async ()
 test('Remove a comment from admin and community on different instance', async () => {
   let alphaUser = await registerUser(alpha);
   let newAlphaApi: API = {
-    url: alpha.url,
+    client: alpha.client,
     auth: alphaUser.jwt,
   };
 

ui/src/api_tests/post.spec.ts

@@ -2,6 +2,8 @@ import {
   alpha,
   beta,
   gamma,
+  delta,
+  epsilon,
   setupLogins,
   createPost,
   updatePost,
@@ -22,11 +24,15 @@ beforeAll(async () => {
   await setupLogins();
   await followBeta(alpha);
   await followBeta(gamma);
+  await followBeta(delta);
+  await followBeta(epsilon);
 });
 
 afterAll(async () => {
   await unfollowRemotes(alpha);
   await unfollowRemotes(gamma);
+  await unfollowRemotes(delta);
+  await unfollowRemotes(epsilon);
 });
 
 test('Create a post', async () => {
@@ -45,6 +51,19 @@ test('Create a post', async () => {
   expect(betaPost.community_local).toBe(true);
   expect(betaPost.creator_local).toBe(false);
   expect(betaPost.score).toBe(1);
+
+  // Delta only follows beta, so it should not see an alpha ap_id
+  let searchDelta = await searchPost(delta, postRes.post);
+  expect(searchDelta.posts[0]).toBeUndefined();
+
+  // Epsilon has alpha blocked, it should not see the alpha post
+  let searchEpsilon = await searchPost(epsilon, postRes.post);
+  expect(searchEpsilon.posts[0]).toBeUndefined();
+});
+
+test('Create a post in a non-existent community', async () => {
+  let postRes = await createPost(alpha, -2);
+  expect(postRes).toStrictEqual({ error: 'couldnt_create_post' });
 });
 
 test('Unlike a post', async () => {
@@ -53,6 +72,10 @@ test('Unlike a post', async () => {
   let unlike = await likePost(alpha, 0, postRes.post);
   expect(unlike.post.score).toBe(0);
 
+  // Try to unlike it again, make sure it stays at 0
+  let unlike2 = await likePost(alpha, 0, postRes.post);
+  expect(unlike2.post.score).toBe(0);
+
   // Make sure that post is unliked on beta
   let searchBeta = await searchPost(beta, postRes.post);
   let betaPost = searchBeta.posts[0];
@@ -67,10 +90,22 @@ test('Update a post', async () => {
   let search = await searchForBetaCommunity(alpha);
   let postRes = await createPost(alpha, search.communities[0].id);
 
+  let updatedName = 'A jest test federated post, updated';
   let updatedPost = await updatePost(alpha, postRes.post);
-  expect(updatedPost.post.name).toBe('A jest test federated post, updated');
+  expect(updatedPost.post.name).toBe(updatedName);
   expect(updatedPost.post.community_local).toBe(false);
   expect(updatedPost.post.creator_local).toBe(true);
+
+  // Make sure that post is updated on beta
+  let searchBeta = await searchPost(beta, postRes.post);
+  let betaPost = searchBeta.posts[0];
+  expect(betaPost.community_local).toBe(true);
+  expect(betaPost.creator_local).toBe(false);
+  expect(betaPost.name).toBe(updatedName);
+
+  // Make sure lemmy beta cannot update the post
+  let updatedPostBeta = await updatePost(beta, betaPost);
+  expect(updatedPostBeta).toStrictEqual({ error: 'no_post_edit_allowed' });
 });
 
 test('Sticky a post', async () => {
@@ -97,6 +132,15 @@ test('Sticky a post', async () => {
   expect(betaPost2.community_local).toBe(true);
   expect(betaPost2.creator_local).toBe(false);
   expect(betaPost2.stickied).toBe(false);
+
+  // Make sure that gamma cannot sticky the post on beta
+  let searchGamma = await searchPost(gamma, postRes.post);
+  let gammaPost = searchGamma.posts[0];
+  let gammaTrySticky = await stickyPost(gamma, true, gammaPost);
+  let searchBeta3 = await searchPost(beta, postRes.post);
+  let betaPost3 = searchBeta3.posts[0];
+  expect(gammaTrySticky.post.stickied).toBe(true);
+  expect(betaPost3.stickied).toBe(false);
 });
 
 test('Lock a post', async () => {
@@ -152,6 +196,10 @@ test('Delete a post', async () => {
   // Make sure lemmy beta sees post is undeleted
   let betaPost2 = await getPost(beta, createFakeBetaPostToGetId);
   expect(betaPost2.post.deleted).toBe(false);
+
+  // Make sure lemmy beta cannot delete the post
+  let deletedPostBeta = await deletePost(beta, true, betaPost2.post);
+  expect(deletedPostBeta).toStrictEqual({ error: 'no_post_edit_allowed' });
 });
 
 test('Remove a post from admin and community on different instance', async () => {

ui/src/api_tests/shared.ts

@@ -1,5 +1,3 @@
-import fetch from 'node-fetch';
-
 import {
   LoginForm,
   LoginResponse,
@@ -20,15 +18,21 @@ import {
   CommentForm,
   DeleteCommentForm,
   RemoveCommentForm,
+  SearchForm,
   CommentResponse,
   CommunityForm,
   DeleteCommunityForm,
   RemoveCommunityForm,
+  GetUserMentionsForm,
   CommentLikeForm,
   CreatePostLikeForm,
   PrivateMessageForm,
   EditPrivateMessageForm,
   DeletePrivateMessageForm,
+  GetFollowedCommunitiesForm,
+  GetPrivateMessagesForm,
+  GetSiteForm,
+  GetPostForm,
   PrivateMessageResponse,
   PrivateMessagesResponse,
   GetUserMentionsResponse,
@@ -36,73 +40,79 @@ import {
   SortType,
   ListingType,
   GetSiteResponse,
-} from '../interfaces';
+  SearchType,
+  LemmyHttp,
+} from 'lemmy-js-client';
 
 export interface API {
-  url: string;
+  client: LemmyHttp;
   auth?: string;
 }
 
-function apiUrl(api: API) {
-  return `${api.url}/api/v1`;
-}
-
 export let alpha: API = {
-  url: 'http://localhost:8540',
+  client: new LemmyHttp('http://localhost:8540/api/v1'),
 };
 
 export let beta: API = {
-  url: 'http://localhost:8550',
+  client: new LemmyHttp('http://localhost:8550/api/v1'),
 };
 
 export let gamma: API = {
-  url: 'http://localhost:8560',
+  client: new LemmyHttp('http://localhost:8560/api/v1'),
+};
+
+export let delta: API = {
+  client: new LemmyHttp('http://localhost:8570/api/v1'),
+};
+
+export let epsilon: API = {
+  client: new LemmyHttp('http://localhost:8580/api/v1'),
 };
 
 export async function setupLogins() {
-  let form: LoginForm = {
+  let formAlpha: LoginForm = {
     username_or_email: 'lemmy_alpha',
     password: 'lemmy',
   };
+  let resAlpha = alpha.client.login(formAlpha);
 
-  let resA: Promise<LoginResponse> = fetch(`${apiUrl(alpha)}/user/login`, {
+  let formBeta = {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: wrapper(form),
-  }).then(d => d.json());
-
-  let formB = {
     username_or_email: 'lemmy_beta',
     password: 'lemmy',
   };
+  let resBeta = beta.client.login(formBeta);
 
-  let resB: Promise<LoginResponse> = fetch(`${apiUrl(beta)}/user/login`, {
+  let formGamma = {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: wrapper(formB),
-  }).then(d => d.json());
-
-  let formC = {
     username_or_email: 'lemmy_gamma',
     password: 'lemmy',
   };
+  let resGamma = gamma.client.login(formGamma);
 
-  let resG: Promise<LoginResponse> = fetch(`${apiUrl(gamma)}/user/login`, {
+  let formDelta = {
-    method: 'POST',
+    username_or_email: 'lemmy_delta',
-    headers: {
+    password: 'lemmy',
-      'Content-Type': 'application/json',
+  };
-    },
+  let resDelta = delta.client.login(formDelta);
-    body: wrapper(formC),
+
-  }).then(d => d.json());
+  let formEpsilon = {
+    username_or_email: 'lemmy_epsilon',
+    password: 'lemmy',
+  };
+  let resEpsilon = epsilon.client.login(formEpsilon);
+
+  let res = await Promise.all([
+    resAlpha,
+    resBeta,
+    resGamma,
+    resDelta,
+    resEpsilon,
+  ]);
 
-  let res = await Promise.all([resA, resB, resG]);
   alpha.auth = res[0].jwt;
   beta.auth = res[1].jwt;
   gamma.auth = res[2].jwt;
+  delta.auth = res[3].jwt;
+  epsilon.auth = res[4].jwt;
 }
 
 export async function createPost(
@@ -110,40 +120,24 @@ export async function createPost(
   community_id: number
 ): Promise<PostResponse> {
   let name = 'A jest test post';
-  let postForm: PostForm = {
+  let form: PostForm = {
     name,
     auth: api.auth,
     community_id,
     nsfw: false,
   };
-
+  return api.client.createPost(form);
-  let createPostRes: PostResponse = await fetch(`${apiUrl(api)}/post`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: wrapper(postForm),
-  }).then(d => d.json());
-  return createPostRes;
 }
 
 export async function updatePost(api: API, post: Post): Promise<PostResponse> {
   let name = 'A jest test federated post, updated';
-  let postForm: PostForm = {
+  let form: PostForm = {
     name,
     edit_id: post.id,
     auth: api.auth,
     nsfw: false,
   };
-
+  return api.client.editPost(form);
-  let updateResponse: PostResponse = await fetch(`${apiUrl(api)}/post`, {
-    method: 'PUT',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: wrapper(postForm),
-  }).then(d => d.json());
-  return updateResponse;
 }
 
 export async function deletePost(
@@ -151,20 +145,12 @@ export async function deletePost(
   deleted: boolean,
   post: Post
 ): Promise<PostResponse> {
-  let deletePostForm: DeletePostForm = {
+  let form: DeletePostForm = {
     edit_id: post.id,
     deleted: deleted,
     auth: api.auth,
   };
-
+  return api.client.deletePost(form);
-  let deletePostRes: PostResponse = await fetch(`${apiUrl(api)}/post/delete`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: wrapper(deletePostForm),
-  }).then(d => d.json());
-  return deletePostRes;
 }
 
 export async function removePost(
@@ -172,20 +158,12 @@ export async function removePost(
   removed: boolean,
   post: Post
 ): Promise<PostResponse> {
-  let removePostForm: RemovePostForm = {
+  let form: RemovePostForm = {
     edit_id: post.id,
     removed,
     auth: api.auth,
   };
-
+  return api.client.removePost(form);
-  let removePostRes: PostResponse = await fetch(`${apiUrl(api)}/post/remove`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: wrapper(removePostForm),
-  }).then(d => d.json());
-  return removePostRes;
 }
 
 export async function stickyPost(
@@ -193,21 +171,12 @@ export async function stickyPost(
   stickied: boolean,
   post: Post
 ): Promise<PostResponse> {
-  let stickyPostForm: StickyPostForm = {
+  let form: StickyPostForm = {
     edit_id: post.id,
     stickied,
     auth: api.auth,
   };
-
+  return api.client.stickyPost(form);
-  let stickyRes: PostResponse = await fetch(`${apiUrl(api)}/post/sticky`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: wrapper(stickyPostForm),
-  }).then(d => d.json());
-
-  return stickyRes;
 }
 
 export async function lockPost(
@@ -215,57 +184,46 @@ export async function lockPost(
   locked: boolean,
   post: Post
 ): Promise<PostResponse> {
-  let lockPostForm: LockPostForm = {
+  let form: LockPostForm = {
     edit_id: post.id,
     locked,
     auth: api.auth,
   };
-
+  return api.client.lockPost(form);
-  let lockRes: PostResponse = await fetch(`${apiUrl(api)}/post/lock`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: wrapper(lockPostForm),
-  }).then(d => d.json());
-
-  return lockRes;
 }
 
 export async function searchPost(
   api: API,
   post: Post
 ): Promise<SearchResponse> {
-  let searchUrl = `${apiUrl(api)}/search?q=${post.ap_id}&type_=All&sort=TopAll`;
+  let form: SearchForm = {
-  let searchResponse: SearchResponse = await fetch(searchUrl, {
+    q: post.ap_id,
-    method: 'GET',
+    type_: SearchType.All,
-  }).then(d => d.json());
+    sort: SortType.TopAll,
-  return searchResponse;
+  };
+  return api.client.search(form);
 }
 
 export async function getPost(
   api: API,
   post_id: number
 ): Promise<GetPostResponse> {
-  let getPostUrl = `${apiUrl(api)}/post?id=${post_id}`;
+  let form: GetPostForm = {
-  let getPostRes: GetPostResponse = await fetch(getPostUrl, {
+    id: post_id,
-    method: 'GET',
+  };
-  }).then(d => d.json());
+  return api.client.getPost(form);
-
-  return getPostRes;
 }
 
 export async function searchComment(
   api: API,
   comment: Comment
 ): Promise<SearchResponse> {
-  let searchUrl = `${apiUrl(api)}/search?q=${
+  let form: SearchForm = {
-    comment.ap_id
+    q: comment.ap_id,
-  }&type_=All&sort=TopAll`;
+    type_: SearchType.All,
-  let searchResponse: SearchResponse = await fetch(searchUrl, {
+    sort: SortType.TopAll,
-    method: 'GET',
+  };
-  }).then(d => d.json());
+  return api.client.search(form);
-  return searchResponse;
 }
 
 export async function searchForBetaCommunity(
@@ -273,14 +231,12 @@ export async function searchForBetaCommunity(
 ): Promise<SearchResponse> {
   // Make sure lemmy-beta/c/main is cached on lemmy_alpha
   // Use short-hand search url
-  let searchUrl = `${apiUrl(
+  let form: SearchForm = {
-    api
+    q: '!main@lemmy-beta:8550',
-  )}/search?q=!main@lemmy-beta:8550&type_=All&sort=TopAll`;
+    type_: SearchType.All,
-
+    sort: SortType.TopAll,
-  let searchResponse: SearchResponse = await fetch(searchUrl, {
+  };
-    method: 'GET',
+  return api.client.search(form);
-  }).then(d => d.json());
-  return searchResponse;
 }
 
 export async function searchForUser(
@@ -289,14 +245,12 @@ export async function searchForUser(
 ): Promise<SearchResponse> {
   // Make sure lemmy-beta/c/main is cached on lemmy_alpha
   // Use short-hand search url
-  let searchUrl = `${apiUrl(
+  let form: SearchForm = {
-    api
+    q: apShortname,
-  )}/search?q=${apShortname}&type_=All&sort=TopAll`;
+    type_: SearchType.All,
-
+    sort: SortType.TopAll,
-  let searchResponse: SearchResponse = await fetch(searchUrl, {
+  };
-    method: 'GET',
+  return api.client.search(form);
-  }).then(d => d.json());
-  return searchResponse;
 }
 
 export async function followCommunity(
@@ -304,41 +258,21 @@ export async function followCommunity(
   follow: boolean,
   community_id: number
 ): Promise<CommunityResponse> {
-  let followForm: FollowCommunityForm = {
+  let form: FollowCommunityForm = {
     community_id,
     follow,
     auth: api.auth,
   };
-
+  return api.client.followCommunity(form);
-  let followRes: CommunityResponse = await fetch(
-    `${apiUrl(api)}/community/follow`,
-    {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: wrapper(followForm),
-    }
-  )
-    .then(d => d.json())
-    .catch(_e => {});
-
-  return followRes;
 }
 
 export async function checkFollowedCommunities(
   api: API
 ): Promise<GetFollowedCommunitiesResponse> {
-  let followedCommunitiesUrl = `${apiUrl(
+  let form: GetFollowedCommunitiesForm = {
-    api
+    auth: api.auth,
-  )}/user/followed_communities?&auth=${api.auth}`;
+  };
-  let followedCommunitiesRes: GetFollowedCommunitiesResponse = await fetch(
+  return api.client.getFollowedCommunities(form);
-    followedCommunitiesUrl,
-    {
-      method: 'GET',
-    }
-  ).then(d => d.json());
-  return followedCommunitiesRes;
 }
 
 export async function likePost(
@@ -346,21 +280,13 @@ export async function likePost(
   score: number,
   post: Post
 ): Promise<PostResponse> {
-  let likePostForm: CreatePostLikeForm = {
+  let form: CreatePostLikeForm = {
     post_id: post.id,
     score: score,
     auth: api.auth,
   };
 
-  let likePostRes: PostResponse = await fetch(`${apiUrl(api)}/post/like`, {
+  return api.client.likePost(form);
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: wrapper(likePostForm),
-  }).then(d => d.json());
-
-  return likePostRes;
 }
 
 export async function createComment(
@@ -369,21 +295,13 @@ export async function createComment(
   parent_id?: number,
   content = 'a jest test comment'
 ): Promise<CommentResponse> {
-  let commentForm: CommentForm = {
+  let form: CommentForm = {
     content,
     post_id,
     parent_id,
     auth: api.auth,
   };
-
+  return api.client.createComment(form);
-  let createResponse: CommentResponse = await fetch(`${apiUrl(api)}/comment`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: wrapper(commentForm),
-  }).then(d => d.json());
-  return createResponse;
 }
 
 export async function updateComment(
@@ -391,20 +309,12 @@ export async function updateComment(
   edit_id: number,
   content = 'A jest test federated comment update'
 ): Promise<CommentResponse> {
-  let commentForm: CommentForm = {
+  let form: CommentForm = {
     content,
     edit_id,
     auth: api.auth,
   };
-
+  return api.client.editComment(form);
-  let updateResponse: CommentResponse = await fetch(`${apiUrl(api)}/comment`, {
-    method: 'PUT',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: wrapper(commentForm),
-  }).then(d => d.json());
-  return updateResponse;
 }
 
 export async function deleteComment(
@@ -412,23 +322,12 @@ export async function deleteComment(
   deleted: boolean,
   edit_id: number
 ): Promise<CommentResponse> {
-  let deleteCommentForm: DeleteCommentForm = {
+  let form: DeleteCommentForm = {
     edit_id,
     deleted,
     auth: api.auth,
   };
-
+  return api.client.deleteComment(form);
-  let deleteCommentRes: CommentResponse = await fetch(
-    `${apiUrl(api)}/comment/delete`,
-    {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: wrapper(deleteCommentForm),
-    }
-  ).then(d => d.json());
-  return deleteCommentRes;
 }
 
 export async function removeComment(
@@ -436,33 +335,21 @@ export async function removeComment(
   removed: boolean,
   edit_id: number
 ): Promise<CommentResponse> {
-  let removeCommentForm: RemoveCommentForm = {
+  let form: RemoveCommentForm = {
     edit_id,
     removed,
     auth: api.auth,
   };
-
+  return api.client.removeComment(form);
-  let removeCommentRes: CommentResponse = await fetch(
-    `${apiUrl(api)}/comment/remove`,
-    {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: wrapper(removeCommentForm),
-    }
-  ).then(d => d.json());
-  return removeCommentRes;
 }
 
 export async function getMentions(api: API): Promise<GetUserMentionsResponse> {
-  let getMentionUrl = `${apiUrl(
+  let form: GetUserMentionsForm = {
-    api
+    sort: SortType.New,
-  )}/user/mention?sort=New&unread_only=false&auth=${api.auth}`;
+    unread_only: false,
-  let getMentionsRes: GetUserMentionsResponse = await fetch(getMentionUrl, {
+    auth: api.auth,
-    method: 'GET',
+  };
-  }).then(d => d.json());
+  return api.client.getUserMentions(form);
-  return getMentionsRes;
 }
 
 export async function likeComment(
@@ -470,48 +357,26 @@ export async function likeComment(
   score: number,
   comment: Comment
 ): Promise<CommentResponse> {
-  let likeCommentForm: CommentLikeForm = {
+  let form: CommentLikeForm = {
     comment_id: comment.id,
     score,
     auth: api.auth,
   };
-
+  return api.client.likeComment(form);
-  let likeCommentRes: CommentResponse = await fetch(
-    `${apiUrl(api)}/comment/like`,
-    {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: wrapper(likeCommentForm),
-    }
-  ).then(d => d.json());
-  return likeCommentRes;
 }
 
 export async function createCommunity(
   api: API,
   name_: string = randomString(5)
 ): Promise<CommunityResponse> {
-  let communityForm: CommunityForm = {
+  let form: CommunityForm = {
     name: name_,
     title: name_,
     category_id: 1,
     nsfw: false,
     auth: api.auth,
   };
-
+  return api.client.createCommunity(form);
-  let createCommunityRes: CommunityResponse = await fetch(
-    `${apiUrl(api)}/community`,
-    {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: wrapper(communityForm),
-    }
-  ).then(d => d.json());
-  return createCommunityRes;
 }
 
 export async function deleteCommunity(
@@ -519,23 +384,12 @@ export async function deleteCommunity(
   deleted: boolean,
   edit_id: number
 ): Promise<CommunityResponse> {
-  let deleteCommunityForm: DeleteCommunityForm = {
+  let form: DeleteCommunityForm = {
     edit_id,
     deleted,
     auth: api.auth,
   };
-
+  return api.client.deleteCommunity(form);
-  let deleteResponse: CommunityResponse = await fetch(
-    `${apiUrl(api)}/community/delete`,
-    {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: wrapper(deleteCommunityForm),
-    }
-  ).then(d => d.json());
-  return deleteResponse;
 }
 
 export async function removeCommunity(
@@ -543,23 +397,12 @@ export async function removeCommunity(
   removed: boolean,
   edit_id: number
 ): Promise<CommunityResponse> {
-  let removeCommunityForm: RemoveCommunityForm = {
+  let form: RemoveCommunityForm = {
     edit_id,
     removed,
     auth: api.auth,
   };
-
+  return api.client.removeCommunity(form);
-  let removeResponse: CommunityResponse = await fetch(
-    `${apiUrl(api)}/community/remove`,
-    {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: wrapper(removeCommunityForm),
-    }
-  ).then(d => d.json());
-  return removeResponse;
 }
 
 export async function createPrivateMessage(
@@ -567,23 +410,12 @@ export async function createPrivateMessage(
   recipient_id: number
 ): Promise<PrivateMessageResponse> {
   let content = 'A jest test federated private message';
-  let privateMessageForm: PrivateMessageForm = {
+  let form: PrivateMessageForm = {
     content,
     recipient_id,
     auth: api.auth,
   };
-
+  return api.client.createPrivateMessage(form);
-  let createRes: PrivateMessageResponse = await fetch(
-    `${apiUrl(api)}/private_message`,
-    {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: wrapper(privateMessageForm),
-    }
-  ).then(d => d.json());
-  return createRes;
 }
 
 export async function updatePrivateMessage(
@@ -591,23 +423,12 @@ export async function updatePrivateMessage(
   edit_id: number
 ): Promise<PrivateMessageResponse> {
   let updatedContent = 'A jest test federated private message edited';
-  let updatePrivateMessageForm: EditPrivateMessageForm = {
+  let form: EditPrivateMessageForm = {
     content: updatedContent,
     edit_id,
     auth: api.auth,
   };
-
+  return api.client.editPrivateMessage(form);
-  let updateRes: PrivateMessageResponse = await fetch(
-    `${apiUrl(api)}/private_message`,
-    {
-      method: 'PUT',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: wrapper(updatePrivateMessageForm),
-    }
-  ).then(d => d.json());
-  return updateRes;
 }
 
 export async function deletePrivateMessage(
@@ -615,50 +436,26 @@ export async function deletePrivateMessage(
   deleted: boolean,
   edit_id: number
 ): Promise<PrivateMessageResponse> {
-  let deletePrivateMessageForm: DeletePrivateMessageForm = {
+  let form: DeletePrivateMessageForm = {
     deleted,
     edit_id,
     auth: api.auth,
   };
-
+  return api.client.deletePrivateMessage(form);
-  let deleteRes: PrivateMessageResponse = await fetch(
-    `${apiUrl(api)}/private_message/delete`,
-    {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: wrapper(deletePrivateMessageForm),
-    }
-  ).then(d => d.json());
-
-  return deleteRes;
 }
 
 export async function registerUser(
   api: API,
   username: string = randomString(5)
 ): Promise<LoginResponse> {
-  let registerForm: RegisterForm = {
+  let form: RegisterForm = {
     username,
     password: 'test',
     password_verify: 'test',
     admin: false,
     show_nsfw: true,
   };
-
+  return api.client.register(form);
-  let registerRes: Promise<LoginResponse> = fetch(
-    `${apiUrl(api)}/user/register`,
-    {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: wrapper(registerForm),
-    }
-  ).then(d => d.json());
-
-  return registerRes;
 }
 
 export async function saveUserSettingsBio(
@@ -668,54 +465,36 @@ export async function saveUserSettingsBio(
   let form: UserSettingsForm = {
     show_nsfw: true,
     theme: 'darkly',
-    default_sort_type: SortType.Active,
+    default_sort_type: Object.keys(SortType).indexOf(SortType.Active),
-    default_listing_type: ListingType.All,
+    default_listing_type: Object.keys(ListingType).indexOf(ListingType.All),
     lang: 'en',
     show_avatars: true,
     send_notifications_to_email: false,
     bio: 'a changed bio',
     auth,
   };
-
+  return api.client.saveUserSettings(form);
-  let res: Promise<LoginResponse> = fetch(
-    `${apiUrl(api)}/user/save_user_settings`,
-    {
-      method: 'PUT',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: wrapper(form),
-    }
-  ).then(d => d.json());
-  return res;
 }
 
 export async function getSite(
   api: API,
   auth: string
 ): Promise<GetSiteResponse> {
-  let siteUrl = `${apiUrl(api)}/site?auth=${auth}`;
+  let form: GetSiteForm = {
-
+    auth,
-  let res: GetSiteResponse = await fetch(siteUrl, {
+  };
-    method: 'GET',
+  return api.client.getSite(form);
-  }).then(d => d.json());
-  return res;
 }
 
 export async function listPrivateMessages(
   api: API
 ): Promise<PrivateMessagesResponse> {
-  let getPrivateMessagesUrl = `${apiUrl(api)}/private_message/list?auth=${
+  let form: GetPrivateMessagesForm = {
-    api.auth
+    auth: api.auth,
-  }&unread_only=false&limit=999`;
+    unread_only: false,
-
+    limit: 999,
-  let getPrivateMessagesRes: PrivateMessagesResponse = await fetch(
+  };
-    getPrivateMessagesUrl,
+  return api.client.getPrivateMessages(form);
-    {
-      method: 'GET',
-    }
-  ).then(d => d.json());
-  return getPrivateMessagesRes;
 }
 
 export async function unfollowRemotes(

ui/src/components/admin-settings.tsx

@@ -9,7 +9,7 @@ import {
   SiteConfigForm,
   GetSiteConfigResponse,
   WebSocketJsonResponse,
-} from '../interfaces';
+} from 'lemmy-js-client';
 import { WebSocketService } from '../services';
 import { wsJsonToRes, capitalizeFirstLetter, toast, randomStr } from '../utils';
 import autosize from 'autosize';

ui/src/components/comment-form.tsx

@@ -8,7 +8,7 @@ import {
   WebSocketJsonResponse,
   UserOperation,
   CommentResponse,
-} from '../interfaces';
+} from 'lemmy-js-client';
 import { capitalizeFirstLetter, wsJsonToRes } from '../utils';
 import { WebSocketService, UserService } from '../services';
 import { i18n } from '../i18next';

ui/src/components/comment-node.tsx

@@ -16,10 +16,9 @@ import {
   AddAdminForm,
   TransferCommunityForm,
   TransferSiteForm,
-  BanType,
-  CommentSortType,
   SortType,
-} from '../interfaces';
+} from 'lemmy-js-client';
+import { CommentSortType, BanType } from '../interfaces';
 import { WebSocketService, UserService } from '../services';
 import {
   mdToHtml,

ui/src/components/comment-nodes.tsx

@@ -1,11 +1,11 @@
 import { Component } from 'inferno';
+import { CommentSortType } from '../interfaces';
 import {
   CommentNode as CommentNodeI,
   CommunityUser,
   UserView,
-  CommentSortType,
   SortType,
-} from '../interfaces';
+} from 'lemmy-js-client';
 import { commentSort, commentSortSortType } from '../utils';
 import { CommentNode } from './comment-node';
 

ui/src/components/communities.tsx

@@ -13,7 +13,7 @@ import {
   WebSocketJsonResponse,
   GetSiteResponse,
   Site,
-} from '../interfaces';
+} from 'lemmy-js-client';
 import { WebSocketService } from '../services';
 import { wsJsonToRes, toast, getPageFromProps } from '../utils';
 import { CommunityLink } from './community-link';
@@ -218,7 +218,7 @@ export class Communities extends Component<any, CommunitiesState> {
 
   refetch() {
     let listCommunitiesForm: ListCommunitiesForm = {
-      sort: SortType[SortType.TopAll],
+      sort: SortType.TopAll,
       limit: communityLimit,
       page: this.state.page,
     };

ui/src/components/community-form.tsx

@@ -9,12 +9,12 @@ import {
   ListCategoriesResponse,
   CommunityResponse,
   WebSocketJsonResponse,
-} from '../interfaces';
+  Community,
+} from 'lemmy-js-client';
 import { WebSocketService } from '../services';
 import { wsJsonToRes, capitalizeFirstLetter, toast, randomStr } from '../utils';
 import { i18n } from '../i18next';
 
-import { Community } from '../interfaces';
 import { MarkdownTextArea } from './markdown-textarea';
 import { ImageUploadForm } from './image-upload-form';
 

ui/src/components/community-link.tsx

@@ -1,6 +1,6 @@
 import { Component } from 'inferno';
 import { Link } from 'inferno-router';
-import { Community } from '../interfaces';
+import { Community } from 'lemmy-js-client';
 import { hostname, pictrsAvatarThumbnail, showAvatars } from '../utils';
 
 interface CommunityOther {

ui/src/components/community.tsx

@@ -2,6 +2,7 @@ import { Component, linkEvent } from 'inferno';
 import { Helmet } from 'inferno-helmet';
 import { Subscription } from 'rxjs';
 import { retryWhen, delay, take } from 'rxjs/operators';
+import { DataType } from '../interfaces';
 import {
   UserOperation,
   Community as CommunityI,
@@ -14,7 +15,6 @@ import {
   GetPostsForm,
   GetCommunityForm,
   ListingType,
-  DataType,
   GetPostsResponse,
   PostResponse,
   AddModToCommunityResponse,
@@ -26,7 +26,7 @@ import {
   WebSocketJsonResponse,
   GetSiteResponse,
   Site,
-} from '../interfaces';
+} from 'lemmy-js-client';
 import { WebSocketService } from '../services';
 import { PostListings } from './post-listings';
 import { CommentNodes } from './comment-nodes';
@@ -78,7 +78,7 @@ interface CommunityProps {
 
 interface UrlParams {
   dataType?: string;
-  sort?: string;
+  sort?: SortType;
   page?: number;
 }
 
@@ -287,9 +287,7 @@ export class Community extends Component<any, State> {
           <SortSelect sort={this.state.sort} onChange={this.handleSortChange} />
         </span>
         <a
-          href={`/feeds/c/${this.state.communityName}.xml?sort=${
+          href={`/feeds/c/${this.state.communityName}.xml?sort=${this.state.sort}`}
-            SortType[this.state.sort]
-          }`}
           target="_blank"
           title="RSS"
           rel="noopener"
@@ -336,20 +334,18 @@ export class Community extends Component<any, State> {
   }
 
   handleSortChange(val: SortType) {
-    this.updateUrl({ sort: SortType[val].toLowerCase(), page: 1 });
+    this.updateUrl({ sort: val, page: 1 });
     window.scrollTo(0, 0);
   }
 
   handleDataTypeChange(val: DataType) {
-    this.updateUrl({ dataType: DataType[val].toLowerCase(), page: 1 });
+    this.updateUrl({ dataType: DataType[val], page: 1 });
     window.scrollTo(0, 0);
   }
 
   updateUrl(paramUpdates: UrlParams) {
-    const dataTypeStr =
+    const dataTypeStr = paramUpdates.dataType || DataType[this.state.dataType];
-      paramUpdates.dataType || DataType[this.state.dataType].toLowerCase();
+    const sortStr = paramUpdates.sort || this.state.sort;
-    const sortStr =
-      paramUpdates.sort || SortType[this.state.sort].toLowerCase();
     const page = paramUpdates.page || this.state.page;
     this.props.history.push(
       `/c/${this.state.community.name}/data_type/${dataTypeStr}/sort/${sortStr}/page/${page}`
@@ -361,8 +357,8 @@ export class Community extends Component<any, State> {
       let getPostsForm: GetPostsForm = {
         page: this.state.page,
         limit: fetchLimit,
-        sort: SortType[this.state.sort],
+        sort: this.state.sort,
-        type_: ListingType[ListingType.Community],
+        type_: ListingType.Community,
         community_id: this.state.community.id,
       };
       WebSocketService.Instance.getPosts(getPostsForm);
@@ -370,8 +366,8 @@ export class Community extends Component<any, State> {
       let getCommentsForm: GetCommentsForm = {
         page: this.state.page,
         limit: fetchLimit,
-        sort: SortType[this.state.sort],
+        sort: this.state.sort,
-        type_: ListingType[ListingType.Community],
+        type_: ListingType.Community,
         community_id: this.state.community.id,
       };
       WebSocketService.Instance.getComments(getCommentsForm);

ui/src/components/create-community.tsx

@@ -9,7 +9,7 @@ import {
   WebSocketJsonResponse,
   GetSiteResponse,
   Site,
-} from '../interfaces';
+} from 'lemmy-js-client';
 import { toast, wsJsonToRes } from '../utils';
 import { WebSocketService, UserService } from '../services';
 import { i18n } from '../i18next';

ui/src/components/create-post.tsx

@@ -11,7 +11,7 @@ import {
   WebSocketJsonResponse,
   GetSiteResponse,
   Site,
-} from '../interfaces';
+} from 'lemmy-js-client';
 import { i18n } from '../i18next';
 
 interface CreatePostState {

ui/src/components/create-private-message.tsx

@@ -10,7 +10,7 @@ import {
   GetSiteResponse,
   Site,
   PrivateMessageFormParams,
-} from '../interfaces';
+} from 'lemmy-js-client';
 import { toast, wsJsonToRes } from '../utils';
 import { i18n } from '../i18next';
 

ui/src/components/footer.tsx

@@ -9,7 +9,7 @@ import {
   UserOperation,
   WebSocketJsonResponse,
   GetSiteResponse,
-} from '../interfaces';
+} from 'lemmy-js-client';
 
 interface FooterState {
   version: string;

ui/src/components/iframely-card.tsx

@@ -1,5 +1,5 @@
 import { Component, linkEvent } from 'inferno';
-import { Post } from '../interfaces';
+import { Post } from 'lemmy-js-client';
 import { mdToHtml } from '../utils';
 import { i18n } from '../i18next';
 

ui/src/components/inbox.tsx

@@ -19,7 +19,7 @@ import {
   PrivateMessageResponse,
   GetSiteResponse,
   Site,
-} from '../interfaces';
+} from 'lemmy-js-client';
 import { WebSocketService, UserService } from '../services';
 import {
   wsJsonToRes,
@@ -399,7 +399,7 @@ export class Inbox extends Component<any, InboxState> {
 
   refetch() {
     let repliesForm: GetRepliesForm = {
-      sort: SortType[this.state.sort],
+      sort: this.state.sort,
       unread_only: this.state.unreadOrAll == UnreadOrAll.Unread,
       page: this.state.page,
       limit: fetchLimit,
@@ -407,7 +407,7 @@ export class Inbox extends Component<any, InboxState> {
     WebSocketService.Instance.getReplies(repliesForm);
 
     let userMentionsForm: GetUserMentionsForm = {
-      sort: SortType[this.state.sort],
+      sort: this.state.sort,
       unread_only: this.state.unreadOrAll == UnreadOrAll.Unread,
       page: this.state.page,
       limit: fetchLimit,

ui/src/components/instances.tsx

@@ -6,7 +6,7 @@ import {
   UserOperation,
   WebSocketJsonResponse,
   GetSiteResponse,
-} from '../interfaces';
+} from 'lemmy-js-client';
 import { WebSocketService } from '../services';
 import { wsJsonToRes, toast } from '../utils';
 import { i18n } from '../i18next';

ui/src/components/listing-type-select.tsx

@@ -1,7 +1,7 @@
 import { Component, linkEvent } from 'inferno';
-import { ListingType } from '../interfaces';
+import { ListingType } from 'lemmy-js-client';
 import { UserService } from '../services';
-
+import { randomStr } from '../utils';
 import { i18n } from '../i18next';
 
 interface ListingTypeSelectProps {
@@ -17,6 +17,8 @@ export class ListingTypeSelect extends Component<
   ListingTypeSelectProps,
   ListingTypeSelectState
 > {
+  private id = `listing-type-input-${randomStr()}`;
+
   private emptyState: ListingTypeSelectState = {
     type_: this.props.type_,
   };
@@ -42,6 +44,7 @@ export class ListingTypeSelect extends Component<
           `}
         >
           <input
+            id={`${this.id}-subscribed`}
             type="radio"
             value={ListingType.Subscribed}
             checked={this.state.type_ == ListingType.Subscribed}
@@ -56,6 +59,7 @@ export class ListingTypeSelect extends Component<
           }`}
         >
           <input
+            id={`${this.id}-all`}
             type="radio"
             value={ListingType.All}
             checked={this.state.type_ == ListingType.All}
@@ -68,6 +72,6 @@ export class ListingTypeSelect extends Component<
   }
 
   handleTypeChange(i: ListingTypeSelect, event: any) {
-    i.props.onChange(Number(event.target.value));
+    i.props.onChange(event.target.value);
   }
 }

ui/src/components/login.tsx

@@ -12,7 +12,7 @@ import {
   GetCaptchaResponse,
   WebSocketJsonResponse,
   Site,
-} from '../interfaces';
+} from 'lemmy-js-client';
 import { WebSocketService, UserService } from '../services';
 import { wsJsonToRes, validEmail, toast } from '../utils';
 import { i18n } from '../i18next';

ui/src/components/main.tsx

@@ -13,7 +13,6 @@ import {
   SortType,
   GetSiteResponse,
   ListingType,
-  DataType,
   SiteResponse,
   GetPostsResponse,
   PostResponse,
@@ -26,7 +25,8 @@ import {
   AddAdminResponse,
   BanUserResponse,
   WebSocketJsonResponse,
-} from '../interfaces';
+} from 'lemmy-js-client';
+import { DataType } from '../interfaces';
 import { WebSocketService, UserService } from '../services';
 import { PostListings } from './post-listings';
 import { CommentNodes } from './comment-nodes';
@@ -82,9 +82,9 @@ interface MainProps {
 }
 
 interface UrlParams {
-  listingType?: string;
+  listingType?: ListingType;
   dataType?: string;
-  sort?: string;
+  sort?: SortType;
   page?: number;
 }
 
@@ -151,7 +151,7 @@ export class Main extends Component<any, MainState> {
     }
 
     let listCommunitiesForm: ListCommunitiesForm = {
-      sort: SortType[SortType.Hot],
+      sort: SortType.Hot,
       limit: 6,
     };
 
@@ -334,13 +334,9 @@ export class Main extends Component<any, MainState> {
   }
 
   updateUrl(paramUpdates: UrlParams) {
-    const listingTypeStr =
+    const listingTypeStr = paramUpdates.listingType || this.state.listingType;
-      paramUpdates.listingType ||
+    const dataTypeStr = paramUpdates.dataType || DataType[this.state.dataType];
-      ListingType[this.state.listingType].toLowerCase();
+    const sortStr = paramUpdates.sort || this.state.sort;
-    const dataTypeStr =
-      paramUpdates.dataType || DataType[this.state.dataType].toLowerCase();
-    const sortStr =
-      paramUpdates.sort || SortType[this.state.sort].toLowerCase();
     const page = paramUpdates.page || this.state.page;
     this.props.history.push(
       `/home/data_type/${dataTypeStr}/listing_type/${listingTypeStr}/sort/${sortStr}/page/${page}`
@@ -549,7 +545,7 @@ export class Main extends Component<any, MainState> {
         </span>
         {this.state.listingType == ListingType.All && (
           <a
-            href={`/feeds/all.xml?sort=${SortType[this.state.sort]}`}
+            href={`/feeds/all.xml?sort=${this.state.sort}`}
             target="_blank"
             rel="noopener"
             title="RSS"
@@ -562,9 +558,7 @@ export class Main extends Component<any, MainState> {
         {UserService.Instance.user &&
           this.state.listingType == ListingType.Subscribed && (
             <a
-              href={`/feeds/front/${UserService.Instance.auth}.xml?sort=${
+              href={`/feeds/front/${UserService.Instance.auth}.xml?sort=${this.state.sort}`}
-                SortType[this.state.sort]
-              }`}
               target="_blank"
               title="RSS"
               rel="noopener"
@@ -631,17 +625,17 @@ export class Main extends Component<any, MainState> {
   }
 
   handleSortChange(val: SortType) {
-    this.updateUrl({ sort: SortType[val].toLowerCase(), page: 1 });
+    this.updateUrl({ sort: val, page: 1 });
     window.scrollTo(0, 0);
   }
 
   handleListingTypeChange(val: ListingType) {
-    this.updateUrl({ listingType: ListingType[val].toLowerCase(), page: 1 });
+    this.updateUrl({ listingType: val, page: 1 });
     window.scrollTo(0, 0);
   }
 
   handleDataTypeChange(val: DataType) {
-    this.updateUrl({ dataType: DataType[val].toLowerCase(), page: 1 });
+    this.updateUrl({ dataType: DataType[val], page: 1 });
     window.scrollTo(0, 0);
   }
 
@@ -650,16 +644,16 @@ export class Main extends Component<any, MainState> {
       let getPostsForm: GetPostsForm = {
         page: this.state.page,
         limit: fetchLimit,
-        sort: SortType[this.state.sort],
+        sort: this.state.sort,
-        type_: ListingType[this.state.listingType],
+        type_: this.state.listingType,
       };
       WebSocketService.Instance.getPosts(getPostsForm);
     } else {
       let getCommentsForm: GetCommentsForm = {
         page: this.state.page,
         limit: fetchLimit,
-        sort: SortType[this.state.sort],
+        sort: this.state.sort,
-        type_: ListingType[this.state.listingType],
+        type_: this.state.listingType,
       };
       WebSocketService.Instance.getComments(getCommentsForm);
     }

ui/src/components/modlog.tsx

@@ -19,7 +19,7 @@ import {
   WebSocketJsonResponse,
   GetSiteResponse,
   Site,
-} from '../interfaces';
+} from 'lemmy-js-client';
 import { WebSocketService } from '../services';
 import { wsJsonToRes, addTypeInfo, fetchLimit, toast } from '../utils';
 import { MomentTime } from './moment-time';

ui/src/components/navbar.tsx

@@ -18,7 +18,7 @@ import {
   PrivateMessage,
   PrivateMessageResponse,
   WebSocketJsonResponse,
-} from '../interfaces';
+} from 'lemmy-js-client';
 import {
   wsJsonToRes,
   pictrsAvatarThumbnail,
@@ -137,7 +137,7 @@ export class Navbar extends Component<any, NavbarState> {
       this.context.router.history.push(`/search/`);
     } else {
       this.context.router.history.push(
-        `/search/q/${searchParam}/type/all/sort/topall/page/1`
+        `/search/q/${searchParam}/type/All/sort/TopAll/page/1`
       );
     }
   }
@@ -477,14 +477,14 @@ export class Navbar extends Component<any, NavbarState> {
   fetchUnreads() {
     console.log('Fetching unreads...');
     let repliesForm: GetRepliesForm = {
-      sort: SortType[SortType.New],
+      sort: SortType.New,
       unread_only: true,
       page: 1,
       limit: fetchLimit,
     };
 
     let userMentionsForm: GetUserMentionsForm = {
-      sort: SortType[SortType.New],
+      sort: SortType.New,
       unread_only: true,
       page: 1,
       limit: fetchLimit,

ui/src/components/password_change.tsx

@@ -9,7 +9,7 @@ import {
   WebSocketJsonResponse,
   GetSiteResponse,
   Site,
-} from '../interfaces';
+} from 'lemmy-js-client';
 import { WebSocketService, UserService } from '../services';
 import { wsJsonToRes, capitalizeFirstLetter, toast } from '../utils';
 import { i18n } from '../i18next';

ui/src/components/post-form.tsx

@@ -18,7 +18,7 @@ import {
   SearchType,
   SearchResponse,
   WebSocketJsonResponse,
-} from '../interfaces';
+} from 'lemmy-js-client';
 import { WebSocketService, UserService } from '../services';
 import {
   wsJsonToRes,
@@ -121,7 +121,7 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
       );
 
     let listCommunitiesForm: ListCommunitiesForm = {
-      sort: SortType[SortType.TopAll],
+      sort: SortType.TopAll,
       limit: 9999,
     };
 
@@ -405,8 +405,8 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
     if (validURL(this.state.postForm.url)) {
       let form: SearchForm = {
         q: this.state.postForm.url,
-        type_: SearchType[SearchType.Url],
+        type_: SearchType.Url,
-        sort: SortType[SortType.TopAll],
+        sort: SortType.TopAll,
         page: 1,
         limit: 6,
       };
@@ -433,8 +433,8 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
   fetchSimilarPosts() {
     let form: SearchForm = {
       q: this.state.postForm.name,
-      type_: SearchType[SearchType.Posts],
+      type_: SearchType.Posts,
-      sort: SortType[SortType.TopAll],
+      sort: SortType.TopAll,
       community_id: this.state.postForm.community_id,
       page: 1,
       limit: 6,

ui/src/components/post-listing.tsx

@@ -11,14 +11,14 @@ import {
   SavePostForm,
   CommunityUser,
   UserView,
-  BanType,
   BanFromCommunityForm,
   BanUserForm,
   AddModToCommunityForm,
   AddAdminForm,
   TransferSiteForm,
   TransferCommunityForm,
-} from '../interfaces';
+} from 'lemmy-js-client';
+import { BanType } from '../interfaces';
 import { MomentTime } from './moment-time';
 import { PostForm } from './post-form';
 import { IFramelyCard } from './iframely-card';

ui/src/components/post-listings.tsx

@@ -1,6 +1,6 @@
 import { Component } from 'inferno';
 import { Link } from 'inferno-router';
-import { Post, SortType } from '../interfaces';
+import { Post, SortType } from 'lemmy-js-client';
 import { postSort } from '../utils';
 import { PostListing } from './post-listing';
 import { i18n } from '../i18next';

ui/src/components/post.tsx

@@ -11,8 +11,6 @@ import {
   Comment,
   MarkCommentAsReadForm,
   CommentResponse,
-  CommentSortType,
-  CommentViewType,
   CommunityUser,
   CommunityResponse,
   CommentNode as CommentNodeI,
@@ -28,7 +26,8 @@ import {
   GetSiteResponse,
   GetCommunityResponse,
   WebSocketJsonResponse,
-} from '../interfaces';
+} from 'lemmy-js-client';
+import { CommentSortType, CommentViewType } from '../interfaces';
 import { WebSocketService, UserService } from '../services';
 import {
   wsJsonToRes,
@@ -439,8 +438,8 @@ export class Post extends Component<any, PostState> {
       if (this.state.post.url) {
         let form: SearchForm = {
           q: this.state.post.url,
-          type_: SearchType[SearchType.Url],
+          type_: SearchType.Url,
-          sort: SortType[SortType.TopAll],
+          sort: SortType.TopAll,
           page: 1,
           limit: 6,
         };

ui/src/components/private-message-form.tsx

@@ -14,7 +14,7 @@ import {
   GetUserDetailsForm,
   SortType,
   WebSocketJsonResponse,
-} from '../interfaces';
+} from 'lemmy-js-client';
 import { WebSocketService } from '../services';
 import {
   capitalizeFirstLetter,
@@ -77,7 +77,7 @@ export class PrivateMessageForm extends Component<
       this.state.privateMessageForm.recipient_id = this.props.params.recipient_id;
       let form: GetUserDetailsForm = {
         user_id: this.state.privateMessageForm.recipient_id,
-        sort: SortType[SortType.New],
+        sort: SortType.New,
         saved_only: false,
       };
       WebSocketService.Instance.getUserDetails(form);

ui/src/components/private-message.tsx

@@ -4,7 +4,7 @@ import {
   PrivateMessage as PrivateMessageI,
   DeletePrivateMessageForm,
   MarkPrivateMessageAsReadForm,
-} from '../interfaces';
+} from 'lemmy-js-client';
 import { WebSocketService, UserService } from '../services';
 import { mdToHtml, pictrsAvatarThumbnail, showAvatars, toast } from '../utils';
 import { MomentTime } from './moment-time';

ui/src/components/search.tsx

@@ -17,7 +17,7 @@ import {
   WebSocketJsonResponse,
   GetSiteResponse,
   Site,
-} from '../interfaces';
+} from 'lemmy-js-client';
 import { WebSocketService } from '../services';
 import {
   wsJsonToRes,
@@ -57,8 +57,8 @@ interface SearchProps {
 
 interface UrlParams {
   q?: string;
-  type_?: string;
+  type_?: SearchType;
-  sort?: string;
+  sort?: SortType;
   page?: number;
 }
 
@@ -461,8 +461,8 @@ export class Search extends Component<any, SearchState> {
   search() {
     let form: SearchForm = {
       q: this.state.q,
-      type_: SearchType[this.state.type_],
+      type_: this.state.type_,
-      sort: SortType[this.state.sort],
+      sort: this.state.sort,
       page: this.state.page,
       limit: fetchLimit,
     };
@@ -473,12 +473,12 @@ export class Search extends Component<any, SearchState> {
   }
 
   handleSortChange(val: SortType) {
-    this.updateUrl({ sort: SortType[val].toLowerCase(), page: 1 });
+    this.updateUrl({ sort: val, page: 1 });
   }
 
   handleTypeChange(i: Search, event: any) {
     i.updateUrl({
-      type_: SearchType[Number(event.target.value)].toLowerCase(),
+      type_: SearchType[event.target.value],
       page: 1,
     });
   }
@@ -487,8 +487,8 @@ export class Search extends Component<any, SearchState> {
     event.preventDefault();
     i.updateUrl({
       q: i.state.searchText,
-      type_: SearchType[i.state.type_].toLowerCase(),
+      type_: i.state.type_,
-      sort: SortType[i.state.sort].toLowerCase(),
+      sort: i.state.sort,
       page: i.state.page,
     });
   }
@@ -499,10 +499,8 @@ export class Search extends Component<any, SearchState> {
 
   updateUrl(paramUpdates: UrlParams) {
     const qStr = paramUpdates.q || this.state.q;
-    const typeStr =
+    const typeStr = paramUpdates.type_ || this.state.type_;
-      paramUpdates.type_ || SearchType[this.state.type_].toLowerCase();
+    const sortStr = paramUpdates.sort || this.state.sort;
-    const sortStr =
-      paramUpdates.sort || SortType[this.state.sort].toLowerCase();
     const page = paramUpdates.page || this.state.page;
     this.props.history.push(
       `/search/q/${qStr}/type/${typeStr}/sort/${sortStr}/page/${page}`

ui/src/components/setup.tsx

@@ -7,7 +7,7 @@ import {
   LoginResponse,
   UserOperation,
   WebSocketJsonResponse,
-} from '../interfaces';
+} from 'lemmy-js-client';
 import { WebSocketService, UserService } from '../services';
 import { wsJsonToRes, toast } from '../utils';
 import { SiteForm } from './site-form';

ui/src/components/sidebar.tsx

@@ -8,7 +8,7 @@ import {
   RemoveCommunityForm,
   UserView,
   AddModToCommunityForm,
-} from '../interfaces';
+} from 'lemmy-js-client';
 import { WebSocketService, UserService } from '../services';
 import { mdToHtml, getUnixTime } from '../utils';
 import { CommunityForm } from './community-form';

ui/src/components/site-form.tsx

@@ -2,7 +2,7 @@ import { Component, linkEvent } from 'inferno';
 import { Prompt } from 'inferno-router';
 import { MarkdownTextArea } from './markdown-textarea';
 import { ImageUploadForm } from './image-upload-form';
-import { Site, SiteForm as SiteFormI } from '../interfaces';
+import { Site, SiteForm as SiteFormI } from 'lemmy-js-client';
 import { WebSocketService } from '../services';
 import { capitalizeFirstLetter, randomStr } from '../utils';
 import { i18n } from '../i18next';

ui/src/components/sort-select.tsx

@@ -1,6 +1,6 @@
 import { Component, linkEvent } from 'inferno';
-import { SortType } from '../interfaces';
+import { SortType } from 'lemmy-js-client';
-import { sortingHelpUrl } from '../utils';
+import { sortingHelpUrl, randomStr } from '../utils';
 import { i18n } from '../i18next';
 
 interface SortSelectProps {
@@ -14,6 +14,7 @@ interface SortSelectState {
 }
 
 export class SortSelect extends Component<SortSelectProps, SortSelectState> {
+  private id = `sort-select-${randomStr()}`;
   private emptyState: SortSelectState = {
     sort: this.props.sort,
   };
@@ -33,6 +34,8 @@ export class SortSelect extends Component<SortSelectProps, SortSelectState> {
     return (
       <>
         <select
+          id={this.id}
+          name={this.id}
           value={this.state.sort}
           onChange={linkEvent(this, this.handleSortChange)}
           class="custom-select w-auto mr-2 mb-2"
@@ -68,6 +71,6 @@ export class SortSelect extends Component<SortSelectProps, SortSelectState> {
   }
 
   handleSortChange(i: SortSelect, event: any) {
-    i.props.onChange(Number(event.target.value));
+    i.props.onChange(event.target.value);
   }
 }

ui/src/components/sponsors.tsx

@@ -8,7 +8,7 @@ import {
   Site,
   WebSocketJsonResponse,
   UserOperation,
-} from '../interfaces';
+} from 'lemmy-js-client';
 import { i18n } from '../i18next';
 import { T } from 'inferno-i18next';
 import { repoUrl, wsJsonToRes, toast } from '../utils';

ui/src/components/user-details.tsx

@@ -12,11 +12,11 @@ import {
   UserDetailsResponse,
   UserView,
   WebSocketJsonResponse,
-  UserDetailsView,
   CommentResponse,
   BanUserResponse,
   PostResponse,
-} from '../interfaces';
+} from 'lemmy-js-client';
+import { UserDetailsView } from '../interfaces';
 import {
   wsJsonToRes,
   toast,
@@ -35,7 +35,7 @@ interface UserDetailsProps {
   user_id?: number;
   page: number;
   limit: number;
-  sort: string;
+  sort: SortType;
   enableDownvotes: boolean;
   enableNsfw: boolean;
   view: UserDetailsView;
@@ -137,7 +137,7 @@ export class UserDetails extends Component<UserDetailsProps, UserDetailsState> {
     ];
 
     // Sort it
-    if (SortType[this.props.sort] === SortType.New) {
+    if (this.props.sort === SortType.New) {
       combined.sort((a, b) => b.data.published.localeCompare(a.data.published));
     } else {
       combined.sort((a, b) => b.data.score - a.data.score);

ui/src/components/user-listing.tsx

@@ -1,6 +1,6 @@
 import { Component } from 'inferno';
 import { Link } from 'inferno-router';
-import { UserView } from '../interfaces';
+import { UserView } from 'lemmy-js-client';
 import {
   pictrsAvatarThumbnail,
   showAvatars,

ui/src/components/user.tsx

@@ -14,10 +14,10 @@ import {
   DeleteAccountForm,
   WebSocketJsonResponse,
   GetSiteResponse,
-  UserDetailsView,
   UserDetailsResponse,
   AddAdminResponse,
-} from '../interfaces';
+} from 'lemmy-js-client';
+import { UserDetailsView } from '../interfaces';
 import { WebSocketService, UserService } from '../services';
 import {
   wsJsonToRes,
@@ -73,7 +73,7 @@ interface UserProps {
 
 interface UrlParams {
   view?: string;
-  sort?: string;
+  sort?: SortType;
   page?: number;
 }
 
@@ -190,17 +190,15 @@ export class User extends Component<any, UserState> {
     );
   }
 
-  static getViewFromProps(view: any): UserDetailsView {
+  static getViewFromProps(view: string): UserDetailsView {
-    return view
+    return view ? UserDetailsView[view] : UserDetailsView.Overview;
-      ? UserDetailsView[capitalizeFirstLetter(view)]
-      : UserDetailsView.Overview;
   }
 
-  static getSortTypeFromProps(sort: any): SortType {
+  static getSortTypeFromProps(sort: string): SortType {
     return sort ? routeSortTypeToEnum(sort) : SortType.New;
   }
 
-  static getPageFromProps(page: any): number {
+  static getPageFromProps(page: number): number {
     return page ? Number(page) : 1;
   }
 
@@ -272,7 +270,7 @@ export class User extends Component<any, UserState> {
             <UserDetails
               user_id={this.state.user_id}
               username={this.state.username}
-              sort={SortType[this.state.sort]}
+              sort={this.state.sort}
               page={this.state.page}
               limit={fetchLimit}
               enableDownvotes={this.state.siteRes.site.enable_downvotes}
@@ -364,9 +362,7 @@ export class User extends Component<any, UserState> {
           hideHot
         />
         <a
-          href={`/feeds/u/${this.state.username}.xml?sort=${
+          href={`/feeds/u/${this.state.username}.xml?sort=${this.state.sort}`}
-            SortType[this.state.sort]
-          }`}
           target="_blank"
           rel="noopener"
           title="RSS"
@@ -538,7 +534,11 @@ export class User extends Component<any, UserState> {
                   <div class="mr-2">{i18n.t('sort_type')}</div>
                 </label>
                 <ListingTypeSelect
-                  type_={this.state.userSettingsForm.default_listing_type}
+                  type_={
+                    Object.values(ListingType)[
+                      this.state.userSettingsForm.default_listing_type
+                    ]
+                  }
                   onChange={this.handleUserSettingsListingTypeChange}
                 />
               </form>
@@ -547,7 +547,11 @@ export class User extends Component<any, UserState> {
                   <div class="mr-2">{i18n.t('type')}</div>
                 </label>
                 <SortSelect
-                  sort={this.state.userSettingsForm.default_sort_type}
+                  sort={
+                    Object.values(SortType)[
+                      this.state.userSettingsForm.default_sort_type
+                    ]
+                  }
                   onChange={this.handleUserSettingsSortTypeChange}
                 />
               </form>
@@ -859,10 +863,8 @@ export class User extends Component<any, UserState> {
 
   updateUrl(paramUpdates: UrlParams) {
     const page = paramUpdates.page || this.state.page;
-    const viewStr =
+    const viewStr = paramUpdates.view || UserDetailsView[this.state.view];
-      paramUpdates.view || UserDetailsView[this.state.view].toLowerCase();
+    const sortStr = paramUpdates.sort || this.state.sort;
-    const sortStr =
-      paramUpdates.sort || SortType[this.state.sort].toLowerCase();
     this.props.history.push(
       `/u/${this.state.username}/view/${viewStr}/sort/${sortStr}/page/${page}`
     );
@@ -873,12 +875,12 @@ export class User extends Component<any, UserState> {
   }
 
   handleSortChange(val: SortType) {
-    this.updateUrl({ sort: SortType[val].toLowerCase(), page: 1 });
+    this.updateUrl({ sort: val, page: 1 });
   }
 
   handleViewChange(i: User, event: any) {
     i.updateUrl({
-      view: UserDetailsView[Number(event.target.value)].toLowerCase(),
+      view: UserDetailsView[Number(event.target.value)],
       page: 1,
     });
   }
@@ -912,12 +914,16 @@ export class User extends Component<any, UserState> {
   }
 
   handleUserSettingsSortTypeChange(val: SortType) {
-    this.state.userSettingsForm.default_sort_type = val;
+    this.state.userSettingsForm.default_sort_type = Object.keys(
+      SortType
+    ).indexOf(val);
     this.setState(this.state);
   }
 
   handleUserSettingsListingTypeChange(val: ListingType) {
-    this.state.userSettingsForm.default_listing_type = val;
+    this.state.userSettingsForm.default_listing_type = Object.keys(
+      ListingType
+    ).indexOf(val);
     this.setState(this.state);
   }
 

ui/src/services/UserService.ts

@@ -1,9 +1,14 @@
 import Cookies from 'js-cookie';
-import { User, Claims, LoginResponse } from '../interfaces';
+import { User, LoginResponse } from 'lemmy-js-client';
 import { setTheme } from '../utils';
 import jwt_decode from 'jwt-decode';
 import { Subject, BehaviorSubject } from 'rxjs';
 
+interface Claims {
+  id: number;
+  iss: string;
+}
+
 export class UserService {
   private static _instance: UserService;
   public user: User;

ui/src/services/WebSocketService.ts

@@ -1,8 +1,8 @@
 import { wsUri } from '../env';
 import {
+  LemmyWebsocket,
   LoginForm,
   RegisterForm,
-  UserOperation,
   CommunityForm,
   DeleteCommunityForm,
   RemoveCommunityForm,
@@ -53,9 +53,9 @@ import {
   GetSiteConfig,
   GetSiteForm,
   SiteConfigForm,
-  MessageType,
+  MarkAllAsReadForm,
   WebSocketJsonResponse,
-} from '../interfaces';
+} from 'lemmy-js-client';
 import { UserService } from './';
 import { i18n } from '../i18next';
 import { toast } from '../utils';
@@ -70,6 +70,7 @@ export class WebSocketService {
 
   public admins: Array<UserView>;
   public banned: Array<UserView>;
+  private client = new LemmyWebsocket();
 
   private constructor() {
     this.ws = new ReconnectingWebSocket(wsUri);
@@ -100,301 +101,287 @@ export class WebSocketService {
 
   public userJoin() {
     let form: UserJoinForm = { auth: UserService.Instance.auth };
-    this.ws.send(this.wsSendWrapper(UserOperation.UserJoin, form));
+    this.ws.send(this.client.userJoin(form));
   }
 
-  public login(loginForm: LoginForm) {
+  public login(form: LoginForm) {
-    this.ws.send(this.wsSendWrapper(UserOperation.Login, loginForm));
+    this.ws.send(this.client.login(form));
   }
 
-  public register(registerForm: RegisterForm) {
+  public register(form: RegisterForm) {
-    this.ws.send(this.wsSendWrapper(UserOperation.Register, registerForm));
+    this.ws.send(this.client.register(form));
   }
 
   public getCaptcha() {
-    this.ws.send(this.wsSendWrapper(UserOperation.GetCaptcha, {}));
+    this.ws.send(this.client.getCaptcha());
   }
 
   public createCommunity(form: CommunityForm) {
-    this.setAuth(form);
+    this.setAuth(form); // TODO all these setauths at some point would be good to make required
-    this.ws.send(this.wsSendWrapper(UserOperation.CreateCommunity, form));
+    this.ws.send(this.client.createCommunity(form));
   }
 
   public editCommunity(form: CommunityForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.EditCommunity, form));
+    this.ws.send(this.client.editCommunity(form));
   }
 
   public deleteCommunity(form: DeleteCommunityForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.DeleteCommunity, form));
+    this.ws.send(this.client.deleteCommunity(form));
   }
 
   public removeCommunity(form: RemoveCommunityForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.RemoveCommunity, form));
+    this.ws.send(this.client.removeCommunity(form));
   }
 
-  public followCommunity(followCommunityForm: FollowCommunityForm) {
+  public followCommunity(form: FollowCommunityForm) {
-    this.setAuth(followCommunityForm);
+    this.setAuth(form);
-    this.ws.send(
+    this.ws.send(this.client.followCommunity(form));
-      this.wsSendWrapper(UserOperation.FollowCommunity, followCommunityForm)
-    );
   }
 
   public listCommunities(form: ListCommunitiesForm) {
     this.setAuth(form, false);
-    this.ws.send(this.wsSendWrapper(UserOperation.ListCommunities, form));
+    this.ws.send(this.client.listCommunities(form));
   }
 
   public getFollowedCommunities() {
     let form: GetFollowedCommunitiesForm = { auth: UserService.Instance.auth };
-    this.ws.send(
+    this.ws.send(this.client.getFollowedCommunities(form));
-      this.wsSendWrapper(UserOperation.GetFollowedCommunities, form)
-    );
   }
 
   public listCategories() {
-    this.ws.send(this.wsSendWrapper(UserOperation.ListCategories, {}));
+    this.ws.send(this.client.listCategories());
   }
 
   public createPost(form: PostForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.CreatePost, form));
+    this.ws.send(this.client.createPost(form));
   }
 
   public getPost(form: GetPostForm) {
     this.setAuth(form, false);
-    this.ws.send(this.wsSendWrapper(UserOperation.GetPost, form));
+    this.ws.send(this.client.getPost(form));
   }
 
   public getCommunity(form: GetCommunityForm) {
     this.setAuth(form, false);
-    this.ws.send(this.wsSendWrapper(UserOperation.GetCommunity, form));
+    this.ws.send(this.client.getCommunity(form));
   }
 
   public createComment(form: CommentForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.CreateComment, form));
+    this.ws.send(this.client.createComment(form));
   }
 
   public editComment(form: CommentForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.EditComment, form));
+    this.ws.send(this.client.editComment(form));
   }
 
   public deleteComment(form: DeleteCommentForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.DeleteComment, form));
+    this.ws.send(this.client.deleteComment(form));
   }
 
   public removeComment(form: RemoveCommentForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.RemoveComment, form));
+    this.ws.send(this.client.removeComment(form));
   }
 
   public markCommentAsRead(form: MarkCommentAsReadForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.MarkCommentAsRead, form));
+    this.ws.send(this.client.markCommentAsRead(form));
   }
 
   public likeComment(form: CommentLikeForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.CreateCommentLike, form));
+    this.ws.send(this.client.likeComment(form));
   }
 
   public saveComment(form: SaveCommentForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.SaveComment, form));
+    this.ws.send(this.client.saveComment(form));
   }
 
   public getPosts(form: GetPostsForm) {
     this.setAuth(form, false);
-    this.ws.send(this.wsSendWrapper(UserOperation.GetPosts, form));
+    this.ws.send(this.client.getPosts(form));
   }
 
   public getComments(form: GetCommentsForm) {
     this.setAuth(form, false);
-    this.ws.send(this.wsSendWrapper(UserOperation.GetComments, form));
+    this.ws.send(this.client.getComments(form));
   }
 
   public likePost(form: CreatePostLikeForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.CreatePostLike, form));
+    this.ws.send(this.client.likePost(form));
   }
 
   public editPost(form: PostForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.EditPost, form));
+    this.ws.send(this.client.editPost(form));
   }
 
   public deletePost(form: DeletePostForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.DeletePost, form));
+    this.ws.send(this.client.deletePost(form));
   }
 
   public removePost(form: RemovePostForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.RemovePost, form));
+    this.ws.send(this.client.removePost(form));
   }
 
   public lockPost(form: LockPostForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.LockPost, form));
+    this.ws.send(this.client.lockPost(form));
   }
 
   public stickyPost(form: StickyPostForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.StickyPost, form));
+    this.ws.send(this.client.stickyPost(form));
   }
 
   public savePost(form: SavePostForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.SavePost, form));
+    this.ws.send(this.client.savePost(form));
   }
 
   public banFromCommunity(form: BanFromCommunityForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.BanFromCommunity, form));
+    this.ws.send(this.client.banFromCommunity(form));
   }
 
   public addModToCommunity(form: AddModToCommunityForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.AddModToCommunity, form));
+    this.ws.send(this.client.addModToCommunity(form));
   }
 
   public transferCommunity(form: TransferCommunityForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.TransferCommunity, form));
+    this.ws.send(this.client.transferCommunity(form));
   }
 
   public transferSite(form: TransferSiteForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.TransferSite, form));
+    this.ws.send(this.client.transferSite(form));
   }
 
   public banUser(form: BanUserForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.BanUser, form));
+    this.ws.send(this.client.banUser(form));
   }
 
   public addAdmin(form: AddAdminForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.AddAdmin, form));
+    this.ws.send(this.client.addAdmin(form));
   }
 
   public getUserDetails(form: GetUserDetailsForm) {
     this.setAuth(form, false);
-    this.ws.send(this.wsSendWrapper(UserOperation.GetUserDetails, form));
+    this.ws.send(this.client.getUserDetails(form));
   }
 
   public getReplies(form: GetRepliesForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.GetReplies, form));
+    this.ws.send(this.client.getReplies(form));
   }
 
   public getUserMentions(form: GetUserMentionsForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.GetUserMentions, form));
+    this.ws.send(this.client.getUserMentions(form));
   }
 
   public markUserMentionAsRead(form: MarkUserMentionAsReadForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.MarkUserMentionAsRead, form));
+    this.ws.send(this.client.markUserMentionAsRead(form));
   }
 
   public getModlog(form: GetModlogForm) {
-    this.ws.send(this.wsSendWrapper(UserOperation.GetModlog, form));
+    this.ws.send(this.client.getModlog(form));
   }
 
-  public createSite(siteForm: SiteForm) {
+  public createSite(form: SiteForm) {
-    this.setAuth(siteForm);
+    this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.CreateSite, siteForm));
+    this.ws.send(this.client.createSite(form));
   }
 
-  public editSite(siteForm: SiteForm) {
+  public editSite(form: SiteForm) {
-    this.setAuth(siteForm);
+    this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.EditSite, siteForm));
+    this.ws.send(this.client.editSite(form));
   }
 
   public getSite(form: GetSiteForm = {}) {
     this.setAuth(form, false);
-    this.ws.send(this.wsSendWrapper(UserOperation.GetSite, form));
+    this.ws.send(this.client.getSite(form));
   }
 
   public getSiteConfig() {
-    let siteConfig: GetSiteConfig = {};
+    let form: GetSiteConfig = {};
-    this.setAuth(siteConfig);
+    this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.GetSiteConfig, siteConfig));
+    this.ws.send(this.client.getSiteConfig(form));
   }
 
   public search(form: SearchForm) {
     this.setAuth(form, false);
-    this.ws.send(this.wsSendWrapper(UserOperation.Search, form));
+    this.ws.send(this.client.search(form));
   }
 
   public markAllAsRead() {
-    let form = {};
+    let form: MarkAllAsReadForm;
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.MarkAllAsRead, form));
+    this.ws.send(this.client.markAllAsRead(form));
   }
 
-  public saveUserSettings(userSettingsForm: UserSettingsForm) {
+  public saveUserSettings(form: UserSettingsForm) {
-    this.setAuth(userSettingsForm);
+    this.setAuth(form);
-    this.ws.send(
+    this.ws.send(this.client.saveUserSettings(form));
-      this.wsSendWrapper(UserOperation.SaveUserSettings, userSettingsForm)
-    );
   }
 
   public deleteAccount(form: DeleteAccountForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.DeleteAccount, form));
+    this.ws.send(this.client.deleteAccount(form));
   }
 
   public passwordReset(form: PasswordResetForm) {
-    this.ws.send(this.wsSendWrapper(UserOperation.PasswordReset, form));
+    this.ws.send(this.client.passwordReset(form));
   }
 
   public passwordChange(form: PasswordChangeForm) {
-    this.ws.send(this.wsSendWrapper(UserOperation.PasswordChange, form));
+    this.ws.send(this.client.passwordChange(form));
   }
 
   public createPrivateMessage(form: PrivateMessageForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.CreatePrivateMessage, form));
+    this.ws.send(this.client.createPrivateMessage(form));
   }
 
   public editPrivateMessage(form: EditPrivateMessageForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.EditPrivateMessage, form));
+    this.ws.send(this.client.editPrivateMessage(form));
   }
 
   public deletePrivateMessage(form: DeletePrivateMessageForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.DeletePrivateMessage, form));
+    this.ws.send(this.client.deletePrivateMessage(form));
   }
 
   public markPrivateMessageAsRead(form: MarkPrivateMessageAsReadForm) {
     this.setAuth(form);
-    this.ws.send(
+    this.ws.send(this.client.markPrivateMessageAsRead(form));
-      this.wsSendWrapper(UserOperation.MarkPrivateMessageAsRead, form)
-    );
   }
 
   public getPrivateMessages(form: GetPrivateMessagesForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.GetPrivateMessages, form));
+    this.ws.send(this.client.getPrivateMessages(form));
   }
 
   public saveSiteConfig(form: SiteConfigForm) {
     this.setAuth(form);
-    this.ws.send(this.wsSendWrapper(UserOperation.SaveSiteConfig, form));
+    this.ws.send(this.client.saveSiteConfig(form));
-  }
-
-  private wsSendWrapper(op: UserOperation, data: MessageType) {
-    let send = { op: UserOperation[op], data: data };
-    console.log(send);
-    return JSON.stringify(send);
   }
 
   private setAuth(obj: any, throwErr: boolean = true) {

ui/src/utils.ts

@@ -34,9 +34,7 @@ import {
   PrivateMessage,
   User,
   SortType,
-  CommentSortType,
   ListingType,
-  DataType,
   SearchType,
   WebSocketResponse,
   WebSocketJsonResponse,
@@ -44,7 +42,9 @@ import {
   SearchResponse,
   CommentResponse,
   PostResponse,
-} from './interfaces';
+} from 'lemmy-js-client';
+
+import { CommentSortType, DataType } from './interfaces';
 import { UserService, WebSocketService } from './services';
 
 import Tribute from 'tributejs/src/Tribute.js';
@@ -273,27 +273,11 @@ export function capitalizeFirstLetter(str: string): string {
 }
 
 export function routeSortTypeToEnum(sort: string): SortType {
-  if (sort == 'new') {
+  return SortType[sort];
-    return SortType.New;
-  } else if (sort == 'hot') {
-    return SortType.Hot;
-  } else if (sort == 'active') {
-    return SortType.Active;
-  } else if (sort == 'topday') {
-    return SortType.TopDay;
-  } else if (sort == 'topweek') {
-    return SortType.TopWeek;
-  } else if (sort == 'topmonth') {
-    return SortType.TopMonth;
-  } else if (sort == 'topyear') {
-    return SortType.TopYear;
-  } else if (sort == 'topall') {
-    return SortType.TopAll;
-  }
 }
 
 export function routeListingTypeToEnum(type: string): ListingType {
-  return ListingType[capitalizeFirstLetter(type)];
+  return ListingType[type];
 }
 
 export function routeDataTypeToEnum(type: string): DataType {
@@ -730,8 +714,8 @@ function userSearch(text: string, cb: any) {
   if (text) {
     let form: SearchForm = {
       q: text,
-      type_: SearchType[SearchType.Users],
+      type_: SearchType.Users,
-      sort: SortType[SortType.TopAll],
+      sort: SortType.TopAll,
       page: 1,
       limit: mentionDropdownFetchLimit,
     };
@@ -767,8 +751,8 @@ function communitySearch(text: string, cb: any) {
   if (text) {
     let form: SearchForm = {
       q: text,
-      type_: SearchType[SearchType.Communities],
+      type_: SearchType.Communities,
-      sort: SortType[SortType.TopAll],
+      sort: SortType.TopAll,
       page: 1,
       limit: mentionDropdownFetchLimit,
     };
@@ -804,7 +788,7 @@ export function getListingTypeFromProps(props: any): ListingType {
   return props.match.params.listing_type
     ? routeListingTypeToEnum(props.match.params.listing_type)
     : UserService.Instance.user
-    ? UserService.Instance.user.default_listing_type
+    ? Object.values(ListingType)[UserService.Instance.user.default_listing_type]
     : ListingType.All;
 }
 
@@ -819,7 +803,7 @@ export function getSortTypeFromProps(props: any): SortType {
   return props.match.params.sort
     ? routeSortTypeToEnum(props.match.params.sort)
     : UserService.Instance.user
-    ? UserService.Instance.user.default_sort_type
+    ? Object.values(SortType)[UserService.Instance.user.default_sort_type]
     : SortType.Active;
 }
 

ui/yarn.lock

@@ -4938,6 +4938,11 @@ lego-api@^1.0.7:
   dependencies:
     chain-able "^3.0.0"
 
+lemmy-js-client@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-1.0.8.tgz#98e34c8e3cd07427f883f60fad376dc4d6f46e7f"
+  integrity sha512-YZxD3+8RGz7cRKdI8EIe5iQqQIMm5WzdNz6zZ7/CdkMtXUv6YuMOEv8HLTvBoGuaWIJwlMJ+23NIarxlT26IEw==
+
 leven@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"