talksik/nirvana-ios
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more consistent model of managing the data model

Browse Source
This commit is contained in:
talksik
2022-01-02 00:22:42 -08:00
parent a7457b5bdf
commit daee8689c5
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nirvana-ios/Views/Convos/ConvoViewModel.swift
+9 -15
View File
@@ -147,19 +147,13 @@ class ConvoViewModel: NSObject, ObservableObject {
if convo == nil { if convo == nil {
continue continue
} }
// if convo receiver is me and I'm not in a call or this call already, then join in // if I am in a convo in which the second to last person has left, I need to leave the convo
// TODO: this still triggers when I am the receiver but leaving early in a three way call if convo!.secondToLastUserEndedTimestamp != nil && (self?.isInCall())! && convo!.users.contains(userId!) {
if convo!.receiverUserId == userId && !(self?.isInCall())!
&& convo!.secondToLastUserEndedTimestamp == nil {
print("I am the direct receiver...joining convo")
self?.joinConvo(convo: convo!)
}
// if I am in a convo in which the last/loner has left, I need to leave the convo
else if convo!.secondToLastUserEndedTimestamp != nil && (self?.isInCall())! && convo!.users.contains(userId!) {
print("I am the last one now... ending the convo") print("I am the last one now... ending the convo")
self?.leaveConvo() self?.leaveConvo()
} //also if I am added after a receiver was added and I am not already in a convo, then join the call } // if I am added and I am not already in a/the convo, then join the convo
// if convo receiver is me and I'm not in a call or this call already, then join in
else if convo!.users.contains(userId!) && !(self?.isInCall())! { else if convo!.users.contains(userId!) && !(self?.isInCall())! {
// should be free or online and not in another call unless it's a race condition // should be free or online and not in another call unless it's a race condition
print("I was added onto the call because I was free...joining automatically") print("I was added onto the call because I was free...joining automatically")
@@ -222,10 +216,9 @@ class ConvoViewModel: NSObject, ObservableObject {
return return
} }
let _ = [userId] // just one user now, and that's me...but no one has joined yet let firstUsers = [userId, friendId] // adding myself and friend to the call
// only considered joined when I have officially joined the agora channel
let convo = Convo(id: channelName, leaderUserId: userId, receiverUserId: friendId, agoraToken: token!, state: .initialized, users: [], startedTimestamp: nil, endedTimestamp: nil) let convo = Convo(id: channelName, leaderUserId: userId, receiverUserId: friendId, agoraToken: token!, state: .initialized, users: firstUsers, startedTimestamp: nil, endedTimestamp: nil)
// create a convo/channel in db to notify the other user with proper attributes // create a convo/channel in db to notify the other user with proper attributes
self?.firestoreService.createConvo(convo: convo) {[weak self] res in self?.firestoreService.createConvo(convo: convo) {[weak self] res in
@@ -364,11 +357,12 @@ class ConvoViewModel: NSObject, ObservableObject {
if updatedConvo!.users.count == 1 && updatedConvo!.users[0] == userId { if updatedConvo!.users.count == 1 && updatedConvo!.users[0] == userId {
updatedConvo!.state = .complete updatedConvo!.state = .complete
updatedConvo!.endedTimestamp = Date() updatedConvo!.endedTimestamp = Date()
} // if I am second to last, the last guy is a loner } // if I am second to last, the last guy is a loner and activate him to get out
else if updatedConvo!.users.count == 2 && updatedConvo!.users.contains(userId!) { else if updatedConvo!.users.count == 2 && updatedConvo!.users.contains(userId!) {
updatedConvo!.secondToLastUserEndedTimestamp = Date() updatedConvo!.secondToLastUserEndedTimestamp = Date()
} }
// remove me from the users array to omit me from the convo
let updatedUsers: [String] = updatedConvo!.users.filter{ arrUserId in let updatedUsers: [String] = updatedConvo!.users.filter{ arrUserId in
return arrUserId != userId return arrUserId != userId
} }