fixed merge

yale-swe · Nov 28, 2023 · 20730c1 · 20730c1
1 parent 6f886a9
commit 20730c1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/newHere1/newHere.xcodeproj/project.pbxproj b/app/newHere1/newHere.xcodeproj/project.pbxproj
@@ -632,7 +632,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"newHere/Preview Content\"";
-				DEVELOPMENT_TEAM = W23Y365YR7;
+				DEVELOPMENT_TEAM = A7X36A78B2;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;

diff --git a/app/newHere1/newHere/Models/Message.swift b/app/newHere1/newHere/Models/Message.swift
@@ -22,12 +22,14 @@ class Message {
 //    var username: String
     var location: CLLocation
     var messageStr: String
+    var visibility: String
 
     /// Initialize Message object with provided parameters
-    init(id:String, user_id: String, location:CLLocation, messageStr: String) {
+    init(id:String, user_id: String, location:CLLocation, messageStr: String, visibility: String) {
         self.id = id
         self.user_id = user_id
         self.location = location
         self.messageStr = messageStr
+        self.visibility = visibility
     }
 }
diff --git a/app/newHere1/newHere/Utils/api_call.swift b/app/newHere1/newHere/Utils/api_call.swift
@@ -189,8 +189,6 @@ func postMessage(user_id: String, text: String, visibility: String, locationData
 
 // Function to get all friends of a user
 func getAllUserFriends(userId: String, completion: @escaping (Result<[String: String], Error>) -> Void) {
-/// Function to get all friends of a user
-func getAllUserFriends(userId: String, completion: @escaping (Result<[String], Error>) -> Void) {
     // API URL
     let urlString = "https://here-swe.vercel.app/user/\(userId)/friends"