Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Examples/SlackClone/AppView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -33,7 +35,7 @@ final class AppViewModel {
}

Task {
for await status in supabase.realtimeV2.statusChange {
for await status in supabase.realtime.statusChange {
realtimeConnectionStatus = status
}
}
Expand Down
8 changes: 4 additions & 4 deletions Examples/SlackClone/AuthView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion Examples/SlackClone/ChannelListView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ struct ChannelListView: View {
}
}
#if os(macOS)
.padding()
.padding()
#endif
}
}
5 changes: 3 additions & 2 deletions Examples/SlackClone/ChannelStore.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions Examples/SlackClone/MessageStore.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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,
Expand Down
6 changes: 4 additions & 2 deletions Examples/SlackClone/MessagesView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
}
}
Expand Down
3 changes: 2 additions & 1 deletion Examples/SlackClone/Supabase.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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")),
Expand Down
9 changes: 4 additions & 5 deletions Examples/SlackClone/UserStore.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
108 changes: 0 additions & 108 deletions Sources/Realtime/Defaults.swift

This file was deleted.

102 changes: 0 additions & 102 deletions Sources/Realtime/Delegated.swift

This file was deleted.

Loading
Loading