From a7517a68eafe2cc2295467624a13621f607a1e98 Mon Sep 17 00:00:00 2001
From: Anton Makarov <n80939733040@gmail.com>
Date: Tue, 11 Sep 2018 20:26:02 +0300
Subject: [PATCH] refactoring

---
 .../Message/Interactor/MessageInteractor.swift   |  8 +++-----
 Nynja/Services/NynjaCommunicatorService.swift    | 16 +++++-----------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/Nynja/Modules/Message/Interactor/MessageInteractor.swift b/Nynja/Modules/Message/Interactor/MessageInteractor.swift
index 49fb6950f..4d016832b 100644
--- a/Nynja/Modules/Message/Interactor/MessageInteractor.swift
+++ b/Nynja/Modules/Message/Interactor/MessageInteractor.swift
@@ -338,12 +338,10 @@ final class MessageInteractor: BaseInteractor, MessageInteractorInputProtocol, H
     }
 
     func currentMembersCount() -> UInt {
-        if let r = self.room, let roomId = r.id {
-            return callService.currentMembersCountForCallWithRoom(roomId)
-        }
-        
-        return 0;
+        guard let id = self.room?.id else { return 0 }
+        return callService.currentMembersCountForCallWithRoom(id)
     }
+    
     // MARK: - Fetch Data
     
     private func fetchData() {
diff --git a/Nynja/Services/NynjaCommunicatorService.swift b/Nynja/Services/NynjaCommunicatorService.swift
index 399caa465..e999db6a1 100644
--- a/Nynja/Services/NynjaCommunicatorService.swift
+++ b/Nynja/Services/NynjaCommunicatorService.swift
@@ -304,11 +304,8 @@ class NynjaCommunicatorService: NSObject, NynjaCommunicatorDelegate, NYNCallDele
     }
 
     func currentMembersCountForCallWithRoom(_ roomId: String) -> UInt {
-        if let call = self.nynComm.getCallManager().getCallForRunningCall(withRoom: roomId) {
-            return call.membersCount
-        }
-        
-        return 0
+        guard let call = self.nynComm.getCallManager().getCallForRunningCall(withRoom: roomId) else { return 0 }
+        return call.membersCount
     }
     
     func didChangeConferenceState(_ state: NYNCallState) {
@@ -378,12 +375,9 @@ class NynjaCommunicatorService: NSObject, NynjaCommunicatorDelegate, NYNCallDele
     }
 
     func makeMembers(contacts: [Contact], room: Room?) -> [Member] {
-        var members = [Member]()
-        for i in contacts {
-            members.append(Member(contact: i))
-        }
-
-        if let r = room, let selfMember = r.selfMember {
+        var members = contacts.map() { Member(contact: $0) }
+        
+        if let selfMember = room?.selfMember {
             members.append(selfMember)
         } else if let mySelf = getMySelf() {
             let myMember = Member(contact: mySelf)
-- 
GitLab