Skip to content

Commit 3d17ba0

Browse files
committed
2 spaces for all classes
1 parent 9493cde commit 3d17ba0

File tree

8 files changed

+1597
-1597
lines changed

8 files changed

+1597
-1597
lines changed

Sources/client/Channel.swift

Lines changed: 532 additions & 532 deletions
Large diffs are not rendered by default.

Sources/client/Message.swift

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -21,56 +21,56 @@
2121

2222
/// Data that is received from the Server.
2323
public class Message {
24+
25+
/// Reference number. Empty if missing
26+
public let ref: String
27+
28+
/// Join Reference number
29+
internal let joinRef: String?
30+
31+
/// Message topic
32+
public let topic: String
33+
34+
/// Message event
35+
public let event: String
36+
37+
/// Message payload
38+
public var payload: Payload
39+
40+
/// Convenience accessor. Equivalent to getting the status as such:
41+
/// ```swift
42+
/// message.payload["status"]
43+
/// ```
44+
public var status: String? {
45+
return payload["status"] as? String
46+
}
47+
48+
init(ref: String = "",
49+
topic: String = "",
50+
event: String = "",
51+
payload: Payload = [:],
52+
joinRef: String? = nil) {
53+
self.ref = ref
54+
self.topic = topic
55+
self.event = event
56+
self.payload = payload
57+
self.joinRef = joinRef
58+
}
59+
60+
init?(json: [String: Any]) {
61+
self.ref = json["ref"] as? String ?? ""
62+
self.joinRef = json["join_ref"] as? String
2463

25-
/// Reference number. Empty if missing
26-
public let ref: String
27-
28-
/// Join Reference number
29-
internal let joinRef: String?
30-
31-
/// Message topic
32-
public let topic: String
33-
34-
/// Message event
35-
public let event: String
36-
37-
/// Message payload
38-
public var payload: Payload
39-
40-
/// Convenience accessor. Equivalent to getting the status as such:
41-
/// ```swift
42-
/// message.payload["status"]
43-
/// ```
44-
public var status: String? {
45-
return payload["status"] as? String
46-
}
47-
48-
init(ref: String = "",
49-
topic: String = "",
50-
event: String = "",
51-
payload: Payload = [:],
52-
joinRef: String? = nil) {
53-
self.ref = ref
54-
self.topic = topic
55-
self.event = event
56-
self.payload = payload
57-
self.joinRef = joinRef
58-
}
59-
60-
init?(json: [String: Any]) {
61-
self.ref = json["ref"] as? String ?? ""
62-
self.joinRef = json["join_ref"] as? String
63-
64-
if
65-
let topic = json["topic"] as? String,
66-
let event = json["event"] as? String,
67-
let payload = json["payload"] as? Payload {
68-
69-
self.topic = topic
70-
self.event = event
71-
self.payload = payload
72-
} else {
73-
return nil
74-
}
64+
if
65+
let topic = json["topic"] as? String,
66+
let event = json["event"] as? String,
67+
let payload = json["payload"] as? Payload {
68+
69+
self.topic = topic
70+
self.event = event
71+
self.payload = payload
72+
} else {
73+
return nil
7574
}
75+
}
7676
}

Sources/client/Presence.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public final class Presence {
134134
// Diff has keys "joins" and "leaves", pointing to a Presence.State each
135135
// containing the users that joined and left.
136136
public typealias Diff = [String: State]
137-
137+
138138
/// Closure signature of OnJoin callbacks
139139
public typealias OnJoin = (_ key: String, _ current: Map?, _ new: Map) -> Void
140140

@@ -240,7 +240,7 @@ public final class Presence {
240240
self.pendingDiffs = []
241241
self.caller.onSync()
242242
}
243-
243+
244244
self.channel?.delegateOn(diffEvent, to: self) { (self, message) in
245245
guard let diff = message.payload as? Diff else { return }
246246
if self.isPendingSyncState {
@@ -269,7 +269,7 @@ public final class Presence {
269269
public func filter(by filter: ((String, Map) -> Bool)?) -> State {
270270
return Presence.filter(self.state, by: filter)
271271
}
272-
272+
273273

274274
//----------------------------------------------------------------------
275275
// MARK: - Static
@@ -289,13 +289,13 @@ public final class Presence {
289289
let state = currentState
290290
var leaves: Presence.State = [:]
291291
var joins: Presence.State = [:]
292-
292+
293293
state.forEach { (key, presence) in
294294
if newState[key] == nil {
295295
leaves[key] = presence
296296
}
297297
}
298-
298+
299299
newState.forEach { (key, newPresence) in
300300
if let currentPresence = state[key] {
301301
let newRefs = newPresence["metas"]!.map({ $0["phx_ref"] as! String })
@@ -307,7 +307,7 @@ public final class Presence {
307307
let leftMetas = currentPresence["metas"]!.filter({ (meta: Meta) -> Bool in
308308
!newRefs.contains { $0 == meta["phx_ref"] as! String }
309309
})
310-
310+
311311

312312
if joinedMetas.count > 0 {
313313
joins[key] = newPresence
@@ -322,7 +322,7 @@ public final class Presence {
322322
joins[key] = newPresence
323323
}
324324
}
325-
325+
326326
return Presence.syncDiff(state,
327327
diff: ["joins": joins, "leaves": leaves],
328328
onJoin: onJoin,
@@ -366,7 +366,7 @@ public final class Presence {
366366

367367
curPresence["metas"] = keepMetas
368368
onLeave(key, curPresence, leftPresence)
369-
369+
370370
if keepMetas.count > 0 {
371371
state[key]!["metas"] = keepMetas
372372
} else {

0 commit comments

Comments
 (0)