Update sockets for new server (#132)

* Remove user status global client side handling

* Update for new server changes

* Revert URLs

src/components/DropyMap.js

@@ -20,7 +20,7 @@ import MapLoadingOverlay from './overlays/MapLoadingOverlay';
 import Sonar from './Sonar';
 import DropyMapMarker from './DropyMapMarker';
 
-const DropyMap = ({ dropiesAround, retreiveDropy }) => {
+const DropyMap = ({ dropiesAround, retrieveDropy }) => {
 
   const navigation = useNavigation();
 
@@ -34,7 +34,7 @@ const DropyMap = ({ dropiesAround, retreiveDropy }) => {
       if (userCoordinates == null) return;
       if (dropy?.isUserDropy) return;
 
-      const response = await retreiveDropy(dropy.id);
+      const response = await retrieveDropy(dropy.id);
       if(response.error != null) {
         throw response.error;
       }

src/hooks/useChatSocket.js

@@ -57,7 +57,10 @@ const useChatSocket = (conversationId) => {
     });
 
     return () => {
-      Socket.chatSocket.emit('leave_conversation', conversationId);
+      Socket.chatSocket.emit('leave_conversation', conversationId, (response) => {
+        if(response.error != null)
+          console.error('Error leaving conversation', response.error);
+      });
 
       Socket.chatSocket.off('connect');
       Socket.chatSocket.off('message_sent');

src/hooks/useDropiesAroundSocket.js

@@ -10,6 +10,7 @@ const useDropiesAroundSocket = () => {
 
   useEffect(() => {
     if (Socket.dropySocket == null) return;
+
     updateAllDropiesAround();
     Socket.dropySocket.on('connect', updateAllDropiesAround);
 
@@ -26,9 +27,9 @@ const useDropiesAroundSocket = () => {
       setDropiesAround(olds => [...olds, response.data]);
     });
 
-    Socket.dropySocket.on('dropy_retreived', (response) => {
+    Socket.dropySocket.on('dropy_retrieved', (response) => {
       if (response.error != null) {
-        console.error('Error getting retreived dropy', response.error);
+        console.error('Error getting retrieved dropy', response.error);
         return;
       }
 
@@ -38,13 +39,14 @@ const useDropiesAroundSocket = () => {
     return () => {
       Socket.dropySocket.off('connect');
       Socket.dropySocket.off('dropy_created');
-      Socket.dropySocket.off('dropy_retreived');
+      Socket.dropySocket.off('dropy_retrieved');
     };
   }, []);
 
   const updateAllDropiesAround = () => {
     if (Socket.dropySocket == null) return;
     if (Socket.dropySocket.connected === false) return;
+
     Socket.dropySocket.emit('all_dropies_around', (response) => {
       if(response.error != null) {
         console.error('Error getting dropies around', response.error);
@@ -64,13 +66,13 @@ const useDropiesAroundSocket = () => {
     });
   };
 
-  const retreiveDropy = (dropyId) => {
+  const retrieveDropy = (dropyId) => {
     return new Promise((resolve) => {
-      Socket.dropySocket.emit('dropy_retreived', { dropyId }, resolve);
+      Socket.dropySocket.emit('dropy_retrieved', { dropyId }, resolve);
     });
   };
 
-  return { dropiesAround, createDropy, retreiveDropy };
+  return { dropiesAround, createDropy, retrieveDropy };
 };
 
 export default useDropiesAroundSocket;

src/screens/HomeScreen.js

@@ -15,7 +15,7 @@ const HomeScreen = ({ navigation, route }) => {
   const { dropyCreateParams = null } = route.params || {};
 
   const [confirmDropOverlayVisible, setConfirmDropOverlayVisible] = useState(false);
-  const { dropiesAround, createDropy, retreiveDropy } = useDropiesAroundSocket();
+  const { dropiesAround, createDropy, retrieveDropy } = useDropiesAroundSocket();
 
   useEffect(() => {
     if(dropyCreateParams != null) {
@@ -30,7 +30,7 @@ const HomeScreen = ({ navigation, route }) => {
   return (
     <View style={styles.container}>
       <StatusBar barStyle='dark-content' />
-      <DropyMap dropiesAround={dropiesAround} retreiveDropy={retreiveDropy} />
+      <DropyMap dropiesAround={dropiesAround} retrieveDropy={retrieveDropy} />
       <SafeAreaView style={styles.avatarContainer}>
         <TouchableOpacity onPress={() => navigation.navigate('Profile')}>
           <ProfileAvatar

src/states/SocketContextProvider.js

@@ -24,28 +24,14 @@ const SocketProvider = ({ children }) => {
 
     Socket.initSockets();
 
-    handleUserStatus();
-
     log('Sockets initilized');
 
     return () => {
-      Socket.chatSocket?.emit('user_status', false);
-
       Socket.destroySockets();
       log('Sockets destroyed');
     };
   }, [user]);
 
-  const handleUserStatus = () => {
-    if(Socket.chatSocket == null) return;
-
-    Socket.chatSocket.emit('user_status', true);
-
-    Socket.chatSocket.on('request_status', () => {
-      Socket.chatSocket.emit('user_status', true);
-    });
-  };
-
   useEffect(() => {
     const appStateListener = AppState.addEventListener('change', (nextAppState) => {
       if (nextAppState === 'active') {