alqindiirsyam 2 жил өмнө
parent
commit
6ab42e9794

+ 2 - 2
appbuilder-ios/AppBuilder/AppBuilder/FourthTabViewController.swift

@@ -150,14 +150,14 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
                     position = cursorIsAdmin.string(forColumnIndex: 0) ?? ""
                     position = cursorIsAdmin.string(forColumnIndex: 0) ?? ""
                     cursorIsAdmin.close()
                     cursorIsAdmin.close()
                 }
                 }
-                if (cursorUser.string(forColumnIndex: 0) == "23" && position == "1") || User.isOfficial(official_account: cursorUser.string(forColumnIndex: 2) ?? "") || User.isOfficial(official_account: cursorUser.string(forColumnIndex: 2) ?? "") {
+                if ( User.isInternal(userType: cursorUser.string(forColumnIndex: 0) ?? "") && position == "1") || User.isOfficial(official_account: cursorUser.string(forColumnIndex: 2) ?? "") || User.isOfficial(official_account: cursorUser.string(forColumnIndex: 2) ?? "") {
                     Item.menus["Personal"] = [
                     Item.menus["Personal"] = [
                         Item(icon: UIImage(systemName: "person.fill"), title: "Personal Information".localized()),
                         Item(icon: UIImage(systemName: "person.fill"), title: "Personal Information".localized()),
                         Item(icon: UIImage(systemName: "textformat.abc"), title: "Change Language".localized()),
                         Item(icon: UIImage(systemName: "textformat.abc"), title: "Change Language".localized()),
                         Item(icon: UIImage(systemName: "person.crop.rectangle"), title: "Change Admin / Internal Password".localized()),
                         Item(icon: UIImage(systemName: "person.crop.rectangle"), title: "Change Admin / Internal Password".localized()),
                         Item(icon: UIImage(systemName: "laptopcomputer.and.iphone"), title: "Sign-In to Web".localized()),
                         Item(icon: UIImage(systemName: "laptopcomputer.and.iphone"), title: "Sign-In to Web".localized()),
                     ]
                     ]
-                } else if User.isInternal(userType: cursorUser.string(forColumnIndex: 0)!) || User.isCallCenter(userType: cursorUser.string(forColumnIndex: 0)!) || User.isVerified(official_account: cursorUser.string(forColumnIndex: 2)!) {
+                } else if User.isInternal(userType: cursorUser.string(forColumnIndex: 0) ?? "") || User.isCallCenter(userType: cursorUser.string(forColumnIndex: 0) ?? "") || User.isVerified(official_account: cursorUser.string(forColumnIndex: 2) ?? "") {
                     Item.menus["Personal"] = [
                     Item.menus["Personal"] = [
                         Item(icon: UIImage(systemName: "person.fill"), title: "Personal Information".localized()),
                         Item(icon: UIImage(systemName: "person.fill"), title: "Personal Information".localized()),
                         Item(icon: UIImage(systemName: "textformat.abc"), title: "Change Language".localized()),
                         Item(icon: UIImage(systemName: "textformat.abc"), title: "Change Language".localized()),

+ 1 - 1
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Chat/EditorGroup.swift

@@ -1023,7 +1023,7 @@ public class EditorGroup: UIViewController {
             controller.flag = .me
             controller.flag = .me
             navigationController?.show(controller, sender: nil)
             navigationController?.show(controller, sender: nil)
         } else {
         } else {
-            let data = User.getData(pin: sender.message_id)
+            let data = User.getDataCanNil(pin: sender.message_id)
             if data != nil {
             if data != nil {
                 let controller = AppStoryBoard.Palio.instance.instantiateViewController(withIdentifier: "profileView") as! ProfileViewController
                 let controller = AppStoryBoard.Palio.instance.instantiateViewController(withIdentifier: "profileView") as! ProfileViewController
                 controller.flag = .friend
                 controller.flag = .friend

+ 1 - 1
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Chat/EditorPersonal.swift

@@ -289,7 +289,7 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
                 }
                 }
             })
             })
         ])
         ])
-        let exblock = User.getData(pin: self.dataPerson["f_pin"]!!)?.ex_block
+        let exblock = User.getDataCanNil(pin: self.dataPerson["f_pin"]!!)?.ex_block
         blocking = exblock == nil ? "0" : exblock!.isEmpty ? "0" : exblock!
         blocking = exblock == nil ? "0" : exblock!.isEmpty ? "0" : exblock!
         if blocking == "1" && self.dataPerson["f_pin"]!! != "-999" {
         if blocking == "1" && self.dataPerson["f_pin"]!! != "-999" {
             menu = UIMenu(title: "", children: [
             menu = UIMenu(title: "", children: [

+ 2 - 2
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/ContactChatViewController.swift

@@ -452,7 +452,7 @@ extension ContactChatViewController {
                 data = chats[indexPath.row]
                 data = chats[indexPath.row]
             }
             }
             if let chooser = isChooser {
             if let chooser = isChooser {
-                var exblock = User.getData(pin: data.pin)?.ex_block
+                var exblock = User.getDataCanNil(pin: data.pin)?.ex_block
                 exblock = exblock == nil ? "0" : exblock!.isEmpty ? "0" : exblock!
                 exblock = exblock == nil ? "0" : exblock!.isEmpty ? "0" : exblock!
                 if exblock != "0" {
                 if exblock != "0" {
                     if exblock == "1" {
                     if exblock == "1" {
@@ -489,7 +489,7 @@ extension ContactChatViewController {
                 data = contacts[indexPath.row]
                 data = contacts[indexPath.row]
             }
             }
             if let chooser = isChooser {
             if let chooser = isChooser {
-                var exblock = User.getData(pin: data.pin)?.ex_block
+                var exblock = User.getDataCanNil(pin: data.pin)?.ex_block
                 exblock = exblock == nil ? "0" : exblock!.isEmpty ? "0" : exblock!
                 exblock = exblock == nil ? "0" : exblock!.isEmpty ? "0" : exblock!
                 if exblock != "0" {
                 if exblock != "0" {
                     if exblock == "1" {
                     if exblock == "1" {

+ 4 - 4
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/GroupDetailViewController.swift

@@ -481,7 +481,7 @@ class GroupDetailViewController: UITableViewController {
             if let g = group, isAdmin, indexPath.row == 0 {
             if let g = group, isAdmin, indexPath.row == 0 {
                 let controller = AppStoryBoard.Palio.instance.instantiateViewController(identifier: "groupMemberView") as! GroupMemberViewController
                 let controller = AppStoryBoard.Palio.instance.instantiateViewController(identifier: "groupMemberView") as! GroupMemberViewController
                 controller.group = g
                 controller.group = g
-                if g.official == "1" && g.name == "Customer Service" {
+                if g.official == "1" && g.level == "3" {
                     controller.isContactCenterInvite = true
                     controller.isContactCenterInvite = true
                 }
                 }
                 controller.isDismiss = {
                 controller.isDismiss = {
@@ -493,7 +493,7 @@ class GroupDetailViewController: UITableViewController {
                 let member = g.members[indexPath.row - 1]
                 let member = g.members[indexPath.row - 1]
                 if member.pin != UserDefaults.standard.string(forKey: "me")! {
                 if member.pin != UserDefaults.standard.string(forKey: "me")! {
                     if member.pin == g.by {
                     if member.pin == g.by {
-                        let data = User.getData(pin: member.pin)
+                        let data = User.getDataCanNil(pin: member.pin)
                         let controller = AppStoryBoard.Palio.instance.instantiateViewController(withIdentifier: "profileView") as! ProfileViewController
                         let controller = AppStoryBoard.Palio.instance.instantiateViewController(withIdentifier: "profileView") as! ProfileViewController
                         controller.flag = data == nil ? .invite : .friend
                         controller.flag = data == nil ? .invite : .friend
                         controller.user = member
                         controller.user = member
@@ -505,7 +505,7 @@ class GroupDetailViewController: UITableViewController {
                     }
                     }
                     let alert = UIAlertController(title: nil, message: "\(member.firstName) \(member.lastName)", preferredStyle: .actionSheet)
                     let alert = UIAlertController(title: nil, message: "\(member.firstName) \(member.lastName)", preferredStyle: .actionSheet)
                     alert.addAction(UIAlertAction(title: "Info".localized(), style: .default, handler: { action in
                     alert.addAction(UIAlertAction(title: "Info".localized(), style: .default, handler: { action in
-                        let data = User.getData(pin: member.pin)
+                        let data = User.getDataCanNil(pin: member.pin)
                         let controller = AppStoryBoard.Palio.instance.instantiateViewController(withIdentifier: "profileView") as! ProfileViewController
                         let controller = AppStoryBoard.Palio.instance.instantiateViewController(withIdentifier: "profileView") as! ProfileViewController
                         controller.flag = data == nil ? .invite : .friend
                         controller.flag = data == nil ? .invite : .friend
                         controller.user = member
                         controller.user = member
@@ -568,7 +568,7 @@ class GroupDetailViewController: UITableViewController {
                     // skip self profile
                     // skip self profile
                     return
                     return
                 }
                 }
-                let data = User.getData(pin: member.pin)
+                let data = User.getDataCanNil(pin: member.pin)
                 let controller = AppStoryBoard.Palio.instance.instantiateViewController(withIdentifier: "profileView") as! ProfileViewController
                 let controller = AppStoryBoard.Palio.instance.instantiateViewController(withIdentifier: "profileView") as! ProfileViewController
                 controller.flag = data == nil ? .invite : .friend
                 controller.flag = data == nil ? .invite : .friend
                 controller.user = member
                 controller.user = member

+ 2 - 2
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/HistoryBroadcastViewController.swift

@@ -68,7 +68,7 @@ class HistoryBroadcastViewController: UIViewController, UITableViewDelegate, UIT
         guard let dataMessage = data["message"] as? TMessage else {
         guard let dataMessage = data["message"] as? TMessage else {
             return
             return
         }
         }
-        let isUser = User.getData(pin: dataMessage.getBody(key: CoreMessage_TMessageKey.L_PIN)) != nil
+        let isUser = User.getDataCanNil(pin: dataMessage.getBody(key: CoreMessage_TMessageKey.L_PIN)) != nil
         let chatId = dataMessage.getBody(key: CoreMessage_TMessageKey.CHAT_ID, default_value: "").isEmpty ? dataMessage.getBody(key: CoreMessage_TMessageKey.L_PIN) : dataMessage.getBody(key: CoreMessage_TMessageKey.CHAT_ID, default_value: "")
         let chatId = dataMessage.getBody(key: CoreMessage_TMessageKey.CHAT_ID, default_value: "").isEmpty ? dataMessage.getBody(key: CoreMessage_TMessageKey.L_PIN) : dataMessage.getBody(key: CoreMessage_TMessageKey.CHAT_ID, default_value: "")
         let pin = isUser ? dataMessage.getBody(key: CoreMessage_TMessageKey.F_PIN) : chatId
         let pin = isUser ? dataMessage.getBody(key: CoreMessage_TMessageKey.F_PIN) : chatId
         if let _ = chats.firstIndex(of: Chat(pin: pin)) {
         if let _ = chats.firstIndex(of: Chat(pin: pin)) {
@@ -134,7 +134,7 @@ class HistoryBroadcastViewController: UIViewController, UITableViewDelegate, UIT
                 imageView.heightAnchor.constraint(equalToConstant: 40.0)
                 imageView.heightAnchor.constraint(equalToConstant: 40.0)
             ])
             ])
             if data.profile.isEmpty && data.pin != "-999" {
             if data.profile.isEmpty && data.pin != "-999" {
-                let user = User.getData(pin: data.pin)
+                let user = User.getDataCanNil(pin: data.pin)
                 if user != nil {
                 if user != nil {
                     imageView.image = UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
                     imageView.image = UIImage(named: "Profile---Purple", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)
                 } else {
                 } else {

+ 2 - 2
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Streaming/QmeraStreamingViewController.swift

@@ -305,7 +305,7 @@ class QmeraStreamingViewController: UIViewController {
     }
     }
     
     
     @objc func liked(sender: Any?) {
     @objc func liked(sender: Any?) {
-        guard let me = User.getData(pin: UserDefaults.standard.string(forKey: "me")) else {
+        guard let me = User.getDataCanNil(pin: UserDefaults.standard.string(forKey: "me")) else {
             return
             return
         }
         }
         if liked {
         if liked {
@@ -325,7 +325,7 @@ class QmeraStreamingViewController: UIViewController {
         guard let text = textView.text, !text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
         guard let text = textView.text, !text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
             return
             return
         }
         }
-        guard let me = User.getData(pin: UserDefaults.standard.string(forKey: "me")) else {
+        guard let me = User.getDataCanNil(pin: UserDefaults.standard.string(forKey: "me")) else {
             return
             return
         }
         }
         chats.append(StreamingChat(name: "You".localized(), thumb: me.thumb, messageText: text.trimmingCharacters(in: .whitespacesAndNewlines)))
         chats.append(StreamingChat(name: "You".localized(), thumb: me.thumb, messageText: text.trimmingCharacters(in: .whitespacesAndNewlines)))