Breaking change to FriendStatus, user cache sync.

src/database/channel.rs

@@ -145,25 +145,17 @@ pub fn process_event(event: &Notification) {
     match event {
         Notification::group_user_join(ev) => {
             let mut cache = CACHE.lock().unwrap();
-            let entry = cache.pop(&ev.id);
-
-            if entry.is_some() {
-                let mut channel = entry.unwrap();
+            if let Some(channel) = cache.peek_mut(&ev.id) {
                 channel.recipients.as_mut().unwrap().push(ev.user.clone());
-                cache.put(ev.id.clone(), channel);
             }
         }
         Notification::group_user_leave(ev) => {
             let mut cache = CACHE.lock().unwrap();
-            let entry = cache.pop(&ev.id);
-
-            if entry.is_some() {
-                let mut channel = entry.unwrap();
+            if let Some(channel) = cache.peek_mut(&ev.id) {
                 let recipients = channel.recipients.as_mut().unwrap();
                 if let Some(pos) = recipients.iter().position(|x| *x == ev.user) {
                     recipients.remove(pos);
                 }
-                cache.put(ev.id.clone(), channel);
             }
         }
         Notification::guild_channel_create(ev) => {

src/database/guild.rs

@@ -206,8 +206,8 @@ use crate::notifications::events::Notification;
 
 pub fn process_event(event: &Notification) {
     match event {
-        Notification::guild_channel_create(ev) => {} // ? for later use
-        Notification::guild_channel_delete(ev) => {} // ? for later use
+        Notification::guild_channel_create(_ev) => {} // ? for later use
+        Notification::guild_channel_delete(_ev) => {} // ? for later use
         Notification::guild_delete(ev) => {
             let mut cache = CACHE.lock().unwrap();
             cache.pop(&ev.id);

src/database/user.rs

@@ -84,7 +84,7 @@ impl<'a, 'r> FromRequest<'a, 'r> for User {
     type Error = AuthError;
 
     fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
-        let u = request.headers().get("x-user").next();
+        let u = request.headers().get("x-user").next(); 
         let t = request.headers().get("x-auth-token").next();
 
         if let Some(uid) = u {
@@ -130,3 +130,34 @@ impl<'r> FromParam<'r> for User {
         }
     }
 }
+
+use crate::notifications::events::Notification;
+
+pub fn process_event(event: &Notification) {
+    match event {
+        Notification::user_friend_status(ev) => {
+            let mut cache = CACHE.lock().unwrap();
+            if let Some(user) = cache.peek_mut(&ev.id) {
+                if let Some(relations) = user.relations.as_mut() {
+                    if ev.status == 0 {
+                        if let Some(pos) = relations.iter().position(|x| x.id == ev.user) {
+                            relations.remove(pos);
+                        }
+                    } else {
+                        if let Some(entry) = relations.iter_mut().find(|x| x.id == ev.user) {
+                            entry.status = ev.status as u8;
+                        } else {
+                            relations.push(
+                                UserRelationship {
+                                    id: ev.id.clone(),
+                                    status: ev.status as u8
+                                }
+                            );
+                        }
+                    }
+                }
+            }
+        }
+        _ => {}
+    }
+}