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

cleaning up things

Browse Source
This commit is contained in:
talksik
2022-01-01 22:06:00 -08:00
parent 03d6ec4bf2
commit 454601a13c
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nirvana-ios/Models/Convo.swift
+1 -1
View File
@@ -30,7 +30,7 @@ struct Convo: Identifiable, Codable {
@ServerTimestamp var startedTimestamp: Date? @ServerTimestamp var startedTimestamp: Date?
var endedTimestamp: Date? var endedTimestamp: Date?
var receiverEndedTimestamp: Date? var secondToLastUserEndedTimestamp: Date?
} }
//struct DetailConvo: Convo { //struct DetailConvo: Convo {
nirvana-ios/Views/Convos/ConvoViewModel.swift
+7 -8
View File
@@ -95,12 +95,12 @@ class ConvoViewModel: NSObject, ObservableObject {
// if convo receiver is me and I'm not in a call or this call already, then join in // if convo receiver is me and I'm not in a call or this call already, then join in
if convo!.receiverUserId == userId && !(self?.isInCall())! if convo!.receiverUserId == userId && !(self?.isInCall())!
&& convo!.receiverEndedTimestamp == nil { && convo!.secondToLastUserEndedTimestamp == nil {
print("I am the direct receiver...joining convo") print("I am the direct receiver...joining convo")
self?.joinConvo(convo: convo!) self?.joinConvo(convo: convo!)
} }
// if I am in a convo in which the last/loner has left, I need to leave the convo // if I am in a convo in which the last/loner has left, I need to leave the convo
else if convo!.receiverEndedTimestamp != nil && (self?.isInCall())! && convo!.users.contains(userId!) { 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 } //also if I am added after a receiver was added and I am not already in a convo, then join the call
@@ -305,7 +305,7 @@ class ConvoViewModel: NSObject, ObservableObject {
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
else if updatedConvo!.users.count == 2 && updatedConvo!.users.contains(userId!) { else if updatedConvo!.users.count == 2 && updatedConvo!.users.contains(userId!) {
updatedConvo!.receiverEndedTimestamp = Date() updatedConvo!.secondToLastUserEndedTimestamp = Date()
} }
let updatedUsers: [String] = updatedConvo!.users.filter{ arrUserId in let updatedUsers: [String] = updatedConvo!.users.filter{ arrUserId in
@@ -325,10 +325,6 @@ class ConvoViewModel: NSObject, ObservableObject {
func destroyInstance() { func destroyInstance() {
AgoraRtcEngineKit.destroy() AgoraRtcEngineKit.destroy()
} }
func joinedConvoCallback() {
}
} }
extension ConvoViewModel { extension ConvoViewModel {
@@ -417,7 +413,10 @@ extension ConvoViewModel: AgoraRtcEngineDelegate {
case .success: case .success:
// update convo in database users array to let them know I am in now // update convo in database users array to let them know I am in now
updatedConvo!.users.append(userId!) // only add if I am not already in the users arr...if I was a third party, I should be in there already
if !updatedConvo!.users.contains(userId!) {
updatedConvo!.users.append(userId!)
}
updatedConvo!.state = .active updatedConvo!.state = .active
self?.firestoreService.updateConvo(convo: updatedConvo!) {[weak self] res in self?.firestoreService.updateConvo(convo: updatedConvo!) {[weak self] res in