Fix crash on set_activity

Azoy · Dec 28, 2017 · b7faa9b · b7faa9b
1 parent fa8ea90
commit b7faa9b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/Sources/SwordRPC/RPC.swift b/Sources/SwordRPC/RPC.swift
@@ -145,7 +145,8 @@ extension SwordRPC {
   }
 
   func handleEvent(_ data: [String: Any]) {
-    guard let event = Event(rawValue: data["evt"] as! String) else {
+    guard let evt = data["evt"] as? String,
+          let event = Event(rawValue: evt) else {
       return
     }
 
@@ -195,15 +196,15 @@ extension SwordRPC {
       self.presence = nil
 
       let json = """
-      {
-        "cmd": "SET_ACTIVITY",
-        "args": {
-          "pid": \(self.pid),
-          "activity": \(String(data: try! self.encoder.encode(presence), encoding: .utf8)!)
-        },
-        "nonce": "\(UUID().uuidString)"
-      }
-      """
+          {
+            "cmd": "SET_ACTIVITY",
+            "args": {
+              "pid": \(self.pid),
+              "activity": \(String(data: try! self.encoder.encode(presence), encoding: .utf8)!)
+            },
+            "nonce": "\(UUID().uuidString)"
+          }
+          """
 
       try? self.send(json, .frame)
     }

diff --git a/Sources/SwordRPC/SwordRPC.swift b/Sources/SwordRPC/SwordRPC.swift
@@ -89,15 +89,15 @@ public class SwordRPC {
 
   public func reply(to request: JoinRequest, with reply: JoinReply) {
     let json = """
-    {
-      "cmd": "\(
-        reply == .yes ? "SEND_ACTIVITY_JOIN_INVITE" : "CLOSE_ACTIVITY_JOIN_REQUEST"
-      )",
-      "args": {
-        "user_id": "\(request.userId)"
-      }
-    }
-    """
+        {
+          "cmd": "\(
+            reply == .yes ? "SEND_ACTIVITY_JOIN_INVITE" : "CLOSE_ACTIVITY_JOIN_REQUEST"
+          )",
+          "args": {
+            "user_id": "\(request.userId)"
+          }
+        }
+        """
 
     try? self.send(json, .frame)
   }