Merge pull request #1075 from LemmyNet/fix_online_counts

Fixing online counts. Fixes #664

server/src/api/community.rs

@@ -4,7 +4,7 @@ use crate::{
   apub::ActorType,
   blocking,
   websocket::{
-    server::{JoinCommunityRoom, SendCommunityRoomMessage},
+    server::{GetCommunityUsersOnline, JoinCommunityRoom, SendCommunityRoomMessage},
     UserOperation,
     WebsocketInfo,
   },
@@ -205,13 +205,10 @@ impl Perform for GetCommunity {
           id,
         });
       }
-
+      ws.chatserver
-      // TODO
+        .send(GetCommunityUsersOnline { community_id })
-      1
+        .await
-    // let fut = async {
+        .unwrap_or(1)
-    //   ws.chatserver.send(GetCommunityUsersOnline {community_id}).await.unwrap()
-    // };
-    // Runtime::new().unwrap().block_on(fut)
     } else {
       0
     };

server/src/api/post.rs

@@ -13,7 +13,7 @@ use crate::{
   blocking,
   fetch_iframely_and_pictrs_data,
   websocket::{
-    server::{JoinCommunityRoom, JoinPostRoom, SendPost},
+    server::{GetPostUsersOnline, JoinCommunityRoom, JoinPostRoom, SendPost},
     UserOperation,
     WebsocketInfo,
   },
@@ -308,13 +308,10 @@ impl Perform for GetPost {
           id,
         });
       }
-
+      ws.chatserver
-      // TODO
+        .send(GetPostUsersOnline { post_id: data.id })
-      1
+        .await
-    // let fut = async {
+        .unwrap_or(1)
-    //   ws.chatserver.send(GetPostUsersOnline {post_id: data.id}).await.unwrap()
-    // };
-    // Runtime::new().unwrap().block_on(fut)
     } else {
       0
     };

server/src/api/site.rs

@@ -12,7 +12,11 @@ use crate::{
   apub::fetcher::search_by_apub_id,
   blocking,
   version,
-  websocket::{server::SendAllMessage, UserOperation, WebsocketInfo},
+  websocket::{
+    server::{GetUsersOnline, SendAllMessage},
+    UserOperation,
+    WebsocketInfo,
+  },
   DbPool,
   LemmyError,
 };
@@ -414,13 +418,8 @@ impl Perform for GetSite {
 
     let banned = blocking(pool, move |conn| UserView::banned(conn)).await??;
 
-    let online = if let Some(_ws) = websocket_info {
+    let online = if let Some(ws) = websocket_info {
-      // TODO
+      ws.chatserver.send(GetUsersOnline).await.unwrap_or(1)
-      1
-    // let fut = async {
-    //   ws.chatserver.send(GetUsersOnline).await.unwrap()
-    // };
-    // Runtime::new().unwrap().block_on(fut)
     } else {
       0
     };

ui/src/components/main.tsx

@@ -385,11 +385,9 @@ export class Main extends Component<any, MainState> {
   badges() {
     return (
       <ul class="my-2 list-inline">
-        {/*
+        <li className="list-inline-item badge badge-light">
-              <li className="list-inline-item badge badge-light">
+          {i18n.t('number_online', { count: this.state.siteRes.online })}
-                {i18n.t('number_online', { count: this.state.siteRes.online })}
+        </li>
-              </li>
-              */}
         <li className="list-inline-item badge badge-light">
           {i18n.t('number_of_users', {
             count: this.state.siteRes.site.number_of_users,

ui/src/components/sidebar.tsx

@@ -125,11 +125,9 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
     let community = this.props.community;
     return (
       <ul class="my-1 list-inline">
-        {/*
+        <li className="list-inline-item badge badge-light">
-              <li className="list-inline-item badge badge-light">
+          {i18n.t('number_online', { count: this.props.online })}
-                {i18n.t('number_online', { count: this.props.online })}
+        </li>
-              </li>
-              */}
         <li className="list-inline-item badge badge-light">
           {i18n.t('number_of_subscribers', {
             count: community.number_of_subscribers,