Fix deprecated usage from examples

Guilherme Souza · Guilherme Souza · commit f54387c2336a · 2024-10-23T17:41:40.000-03:00
diff --git a/Examples/SlackClone/AppView.swift b/Examples/SlackClone/AppView.swift
@@ -15,13 +15,15 @@ final class AppViewModel {
   var session: Session?
   var selectedChannel: Channel?
 
-  var realtimeConnectionStatus: RealtimeClientV2.Status?
+  var realtimeConnectionStatus: RealtimeClientStatus?
 
   init() {
     Task {
       for await (event, session) in supabase.auth.authStateChanges {
         Logger.main.debug("AuthStateChange: \(event.rawValue)")
-        guard [.signedIn, .signedOut, .initialSession, .tokenRefreshed].contains(event) else { return }
+        guard [.signedIn, .signedOut, .initialSession, .tokenRefreshed].contains(event) else {
+          return
+        }
         self.session = session
 
         if session == nil {
@@ -33,7 +35,7 @@ final class AppViewModel {
     }
 
     Task {
-      for await status in supabase.realtimeV2.statusChange {
+      for await status in supabase.realtime.statusChange {
         realtimeConnectionStatus = status
       }
     }
diff --git a/Examples/SlackClone/AuthView.swift b/Examples/SlackClone/AuthView.swift
@@ -38,10 +38,10 @@ struct AuthView: View {
     VStack {
       VStack {
         TextField("Email", text: $model.email)
-        #if os(iOS)
-          .textInputAutocapitalization(.never)
-          .keyboardType(.emailAddress)
-        #endif
+          #if os(iOS)
+            .textInputAutocapitalization(.never)
+            .keyboardType(.emailAddress)
+          #endif
           .textContentType(.emailAddress)
           .autocorrectionDisabled()
       }
diff --git a/Examples/SlackClone/ChannelListView.swift b/Examples/SlackClone/ChannelListView.swift
@@ -54,7 +54,7 @@ struct ChannelListView: View {
       }
     }
     #if os(macOS)
-    .padding()
+      .padding()
     #endif
   }
 }
diff --git a/Examples/SlackClone/ChannelStore.swift b/Examples/SlackClone/ChannelStore.swift
@@ -62,7 +62,8 @@ final class ChannelStore {
       return channel
     }
 
-    let channel: Channel = try await supabase
+    let channel: Channel =
+      try await supabase
       .from("channels")
       .select()
       .eq("id", value: id)
@@ -74,7 +75,7 @@ final class ChannelStore {
 
   private func handleInsertedChannel(_ action: InsertAction) {
     do {
-      let channel = try action.decodeRecord(decoder: decoder) as Channel
+      let channel = try action.decodeRecord() as Channel
       channels.append(channel)
     } catch {
       dump(error)
diff --git a/Examples/SlackClone/MessageStore.swift b/Examples/SlackClone/MessageStore.swift
@@ -33,8 +33,8 @@ struct Messages {
 
   mutating func appendOrUpdate(_ message: Message) {
     if let sectionIndex = messageToSectionLookupTable[message.id],
-       let messageIndex = sections[sectionIndex].messages
-       .firstIndex(where: { $0.id == message.id })
+      let messageIndex = sections[sectionIndex].messages
+        .firstIndex(where: { $0.id == message.id })
     {
       sections[sectionIndex].messages[messageIndex] = message
     } else {
@@ -146,7 +146,7 @@ final class MessageStore {
 
   private func handleInsertedOrUpdatedMessage(_ action: HasRecord) async {
     do {
-      let decodedMessage = try action.decodeRecord(decoder: decoder) as MessagePayload
+      let decodedMessage = try action.decodeRecord() as MessagePayload
       let message = try await Message(
         id: decodedMessage.id,
         insertedAt: decodedMessage.insertedAt,
diff --git a/Examples/SlackClone/MessagesView.swift b/Examples/SlackClone/MessagesView.swift
@@ -42,8 +42,10 @@ struct MessagesView: View {
 
             Image(systemName: "circle.fill")
               .foregroundStyle(
-                userStore.presences[section.author.id] != nil ? Color.green : Color
-                  .red
+                userStore.presences[section.author.id] != nil
+                  ? Color.green
+                  : Color
+                    .red
               )
           }
         }
diff --git a/Examples/SlackClone/Supabase.swift b/Examples/SlackClone/Supabase.swift
@@ -22,7 +22,8 @@ let decoder: JSONDecoder = {
 
 let supabase = SupabaseClient(
   supabaseURL: URL(string: "http://localhost:54321")!,
-  supabaseKey: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0",
+  supabaseKey:
+    "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0",
   options: SupabaseClientOptions(
     db: .init(encoder: encoder, decoder: decoder),
     auth: .init(redirectToURL: URL(string: "com.supabase.slack-clone://login-callback")),
diff --git a/Examples/SlackClone/UserStore.swift b/Examples/SlackClone/UserStore.swift
@@ -64,7 +64,8 @@ final class UserStore {
       return user
     }
 
-    let user: User = try await supabase
+    let user: User =
+      try await supabase
       .from("users")
       .select()
       .eq("id", value: id)
@@ -79,16 +80,14 @@ final class UserStore {
     do {
       switch action {
       case let .insert(action):
-        let user = try action.decodeRecord(decoder: decoder) as User
+        let user = try action.decodeRecord() as User
         users[user.id] = user
       case let .update(action):
-        let user = try action.decodeRecord(decoder: decoder) as User
+        let user = try action.decodeRecord() as User
         users[user.id] = user
       case let .delete(action):
         guard let id = action.oldRecord["id"]?.stringValue else { return }
         users[UUID(uuidString: id)!] = nil
-      default:
-        break
       }
     } catch {
       dump(error)
diff --git a/Sources/Realtime/Internal/CallbackManager.swift b/Sources/Realtime/Internal/CallbackManager.swift
@@ -124,8 +124,8 @@ final class CallbackManager: Sendable {
   }
 
   func triggerPresenceDiffs(
-    joins: [String: PresenceV2],
-    leaves: [String: PresenceV2],
+    joins: [String: Presence],
+    leaves: [String: Presence],
     rawMessage: RealtimeMessage
   ) {
     let presenceCallbacks = mutableState.callbacks.compactMap {
diff --git a/Sources/Realtime/PostgresAction.swift b/Sources/Realtime/PostgresAction.swift
@@ -77,16 +77,13 @@ public enum AnyAction: PostgresAction, HasRawMessage {
 }
 
 extension HasRecord {
-  public func decodeRecord<T: Decodable>(as _: T.Type = T.self, decoder: JSONDecoder) throws -> T {
-    try record.decode(as: T.self, decoder: decoder)
+  public func decodeRecord<T: Decodable>(as _: T.Type = T.self) throws -> T {
+    try record.decode(as: T.self)
   }
 }
 
 extension HasOldRecord {
-  public func decodeOldRecord<T: Decodable>(
-    as _: T.Type = T.self,
-    decoder: JSONDecoder
-  ) throws -> T {
-    try oldRecord.decode(as: T.self, decoder: decoder)
+  public func decodeOldRecord<T: Decodable>(as _: T.Type = T.self) throws -> T {
+    try oldRecord.decode(as: T.self)
   }
 }
diff --git a/Sources/Realtime/PresenceAction.swift b/Sources/Realtime/PresenceAction.swift
@@ -83,10 +83,9 @@ extension Presence: Codable {
   /// - Note: You can also receive your own presence, but without your state so be aware of
   /// exceptions.
   public func decodeState<T: Decodable>(
-    as _: T.Type = T.self,
-    decoder: JSONDecoder = AnyJSON.decoder
+    as _: T.Type = T.self
   ) throws -> T {
-    try state.decode(as: T.self, decoder: decoder)
+    try state.decode(as: T.self)
   }
 }
 
@@ -110,14 +109,13 @@ extension PresenceAction {
   /// presence.
   public func decodeJoins<T: Decodable>(
     as _: T.Type = T.self,
-    ignoreOtherTypes: Bool = true,
-    decoder: JSONDecoder = AnyJSON.decoder
+    ignoreOtherTypes: Bool = true
   ) throws -> [T] {
     if ignoreOtherTypes {
-      return joins.values.compactMap { try? $0.decodeState(as: T.self, decoder: decoder) }
+      return joins.values.compactMap { try? $0.decodeState(as: T.self) }
     }
 
-    return try joins.values.map { try $0.decodeState(as: T.self, decoder: decoder) }
+    return try joins.values.map { try $0.decodeState(as: T.self) }
   }
 
   /// Decode all ``PresenceAction/leaves`` values.
@@ -126,14 +124,13 @@ extension PresenceAction {
   /// presence.
   public func decodeLeaves<T: Decodable>(
     as _: T.Type = T.self,
-    ignoreOtherTypes: Bool = true,
-    decoder: JSONDecoder = AnyJSON.decoder
+    ignoreOtherTypes: Bool = true
   ) throws -> [T] {
     if ignoreOtherTypes {
-      return leaves.values.compactMap { try? $0.decodeState(as: T.self, decoder: decoder) }
+      return leaves.values.compactMap { try? $0.decodeState(as: T.self) }
     }
 
-    return try leaves.values.map { try $0.decodeState(as: T.self, decoder: decoder) }
+    return try leaves.values.map { try $0.decodeState(as: T.self) }
   }
 }
 
diff --git a/Sources/Realtime/RealtimeChannel.swift b/Sources/Realtime/RealtimeChannel.swift
@@ -407,12 +407,12 @@ public final class RealtimeChannel: Sendable {
         )
 
       case .presenceDiff:
-        let joins = try message.payload["joins"]?.decode(as: [String: PresenceV2].self) ?? [:]
-        let leaves = try message.payload["leaves"]?.decode(as: [String: PresenceV2].self) ?? [:]
+        let joins = try message.payload["joins"]?.decode(as: [String: Presence].self) ?? [:]
+        let leaves = try message.payload["leaves"]?.decode(as: [String: Presence].self) ?? [:]
         callbackManager.triggerPresenceDiffs(joins: joins, leaves: leaves, rawMessage: message)
 
       case .presenceState:
-        let joins = try message.payload.decode(as: [String: PresenceV2].self)
+        let joins = try message.payload.decode(as: [String: Presence].self)
         callbackManager.triggerPresenceDiffs(joins: joins, leaves: [:], rawMessage: message)
       }
     } catch {
diff --git a/Tests/RealtimeTests/CallbackManagerTests.swift b/Tests/RealtimeTests/CallbackManagerTests.swift
@@ -201,8 +201,8 @@ final class CallbackManagerTests: XCTestCase {
   func testTriggerPresenceDiffs() {
     let callbackManager = CallbackManager()
 
-    let joins = ["user1": PresenceV2(ref: "ref", state: [:])]
-    let leaves = ["user2": PresenceV2(ref: "ref", state: [:])]
+    let joins = ["user1": Presence(ref: "ref", state: [:])]
+    let leaves = ["user2": Presence(ref: "ref", state: [:])]
 
     let receivedAction = LockIsolated(PresenceAction?.none)
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ struct ChannelListView: View {`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`#if os(macOS)`
`57`		`- .padding()`
	`57`	`+ .padding()`
`58`	`58`	`#endif`
`59`	`59`	`}`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,10 @@ struct MessagesView: View {`
`42`	`42`
`43`	`43`	`Image(systemName: "circle.fill")`
`44`	`44`	`.foregroundStyle(`
`45`		`- userStore.presences[section.author.id] != nil ? Color.green : Color`
`46`		`- .red`
	`45`	`+ userStore.presences[section.author.id] != nil`
	`46`	`+ ? Color.green`
	`47`	`+ : Color`
	`48`	`+ .red`
`47`	`49`	`)`
`48`	`50`	`}`
`49`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,16 +77,13 @@ public enum AnyAction: PostgresAction, HasRawMessage {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`extension HasRecord {`
`80`		`- public func decodeRecord<T: Decodable>(as _: T.Type = T.self, decoder: JSONDecoder) throws -> T {`
`81`		`- try record.decode(as: T.self, decoder: decoder)`
	`80`	`+ public func decodeRecord<T: Decodable>(as _: T.Type = T.self) throws -> T {`
	`81`	`+ try record.decode(as: T.self)`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`extension HasOldRecord {`
`86`		`- public func decodeOldRecord<T: Decodable>(`
`87`		`- as _: T.Type = T.self,`
`88`		`- decoder: JSONDecoder`
`89`		`- ) throws -> T {`
`90`		`- try oldRecord.decode(as: T.self, decoder: decoder)`
	`86`	`+ public func decodeOldRecord<T: Decodable>(as _: T.Type = T.self) throws -> T {`
	`87`	`+ try oldRecord.decode(as: T.self)`
`91`	`88`	`}`
`92`	`89`	`}`