frontend-next/src/app/login/page.js

@@ -31,7 +31,6 @@ function Login() {
           }
         }
       ).catch((error) => {
-        console.log(error)
         if (error = "auth/invalid-credential") {
           const formError = {
             type: "server",

frontend-next/src/components/app/friends/dm.js

@@ -6,24 +6,26 @@ import ChatIcon from '@mui/icons-material/Chat';
 
 
 export function openDM(user, uid) {
-    get(ref(database, `dms/`)).then((snapshot) => {
-        var dmsList = snapshot.val();
-        for (var dmRoom in dmsList) {
-            if (user.uid in dmsList[dmRoom].UIDs && uid in dmsList[dmRoom].UIDs) {
-                window.location.href = `/dm?dm=${dmRoom}`
-            }
+    var uid1 = user.uid < uid? user.uid : uid
+    var uid2 = user.uid > uid? user.uid : uid
+    get(ref(database, `dms/${uid1}-${uid2}`)).then((snapshot) => {
+        if (snapshot.exists()) {
+            window.location.href = `/dm?dm=${uid1}-${uid2}`
+        } else {
+            createDM(user, uid)
+            window.location.href = `/dm?dm=${uid1}-${uid2}`
         }
-        createDM(user, uid)
-        window.location.href = `/dm?dm=${user.uid}-${uid}`
     });
 }
 
 
 export function createDM(user, uid) {
-    set(ref(database, `dms/${user.uid}-${uid}`), {
+    var uid1 = user.uid < uid? user.uid : uid
+    var uid2 = user.uid > uid? user.uid : uid
+    set(ref(database, `dms/${uid1}-${uid2}`), {
         initUID: user.uid,
         targetUID: uid,
-        room: user.uid + "-" + uid,
+        room: uid1 + '-' + uid2,
         UIDs: [user.uid, uid]
     })
 }

frontend-next/src/components/app/sidebar/home.js

@@ -162,11 +162,13 @@ export function Sidebar({user,location,loadingLoc}) {
       for(var dmRoom in dmsList) {
         if (user.uid == dmsList[dmRoom].UIDs[0]) {
           get(ref(database, `/users/${dmsList[dmRoom].UIDs[1]}`)).then((snapshot) => {
-            dmArr.push(<DM user={user} friendObj={snapshot.val()} key={dmRoom}/>);
+            var friendObj = snapshot.val()
+            dmArr.push(<DM user={user} friendObj={friendObj} key={dmRoom}/>);
           })
         } else if (user.uid == dmsList[dmRoom].UIDs[1]) {
-          get(ref(database, `/users/${dmsList[dmRoom].UIDs[1]}`)).then((snapshot) => {
-            dmArr.push(<DM user={user} friendObj={snapshot.val()} key={dmRoom}/>);
+          get(ref(database, `/users/${dmsList[dmRoom].UIDs[0]}`)).then((snapshot) => {
+            var friendObj = snapshot.val()
+            dmArr.push(<DM user={user} friendObj={friendObj} key={dmRoom}/>);
           })
         }  
       }