Merge pull request #85 from djcruz93/fix-direct-room-names

[FIX] Username as display names for direct messages

Author: murtaza98

client/src/components/CommunityListItem/index.js

@@ -1,14 +1,16 @@
-import "./index.css"
+import "./index.css";
 import RoomItem from "./../RoomItem/";
 
 export default function CommunityListItem(props) {
-    const { community, community_name } = props;
-    return (
-      <div className="community-wrapper">
-        <div className="community-title">{community_name}</div>
-        {community.map((room) => {
-            return <RoomItem room={room} key={room.rid}></RoomItem>
-        })}
-      </div>
-    );
+  const { community, community_name } = props;
+  return (
+    <div className="community-wrapper">
+      <div className="community-title">{community_name}</div>
+      {community.map((room) => {
+        // Here the second condition holds when new room is created as the response from server doesn't return open field on creation
+        if (room.open || room.open === undefined)
+          return <RoomItem room={room} key={room._id}></RoomItem>;
+      })}
+    </div>
+  );
 }

client/src/components/RoomItem/index.js

@@ -30,10 +30,8 @@ export default function RoomItem({room}) {
           <FiUser className="room-item-type-icon"></FiUser>
         )}
         <span className="room-name">
-          {room.name.split(/_(.+)/)[1] && room["t"] !== "d"
-            ? room.name.split(/_(.+)/)[1]
-            : room.name}
-          {room.username ? ` (${room.username})` : null}
+          {(room.fname && (room.fname.split(/_(.+)/)[1] || room.fname)) ||
+            room.name || room.username}
         </span>
       </NavLink>
     );

client/src/components/SignedLeftSidebar/index.js

@@ -88,9 +88,7 @@ export default function SignedLeftSidebar(props) {
   };
 
   useEffect(() => {
-    const url = `${rcApiDomain}/api/v1/users.info?userId=${Cookies.get(
-      "rc_uid"
-    )}&fields={"userRooms": 1}`;
+    const url = `${rcApiDomain}/api/v1/subscriptions.get`;
     fetch(url, {
       headers: {
         "X-Auth-Token": Cookies.get("rc_token"),
@@ -101,7 +99,7 @@ export default function SignedLeftSidebar(props) {
     })
       .then((response) => response.json())
       .then((data) => {
-        setChatRooms(data.user.rooms);
+        setChatRooms(data.update);
       })
       .catch((err) => {
         console.log("Error Fetching Rooms from server --->", err);