fix: Wireless users should not appear in a search (#512)

fixes AN-6074

Author: makingthematrix

zmessaging/src/main/scala/com/waz/service/UserSearchService.scala

@@ -242,7 +242,7 @@ class UserSearchService(selfUserId:           UserId,
         dir <-
           if (shouldShowDirectorySearch)
             searchUserData(query)
-              .map(_.filter(!_.isWireBot))
+              .map(_.filter(u => !u.isWireBot && u.expiresAt.isEmpty))
               .map(sortUsers(_, filter, isHandle, symbolStripped))
           else Signal.const(IndexedSeq.empty)
         exact <- exactMatchUser

zmessaging/src/test/scala/com/waz/service/UserSearchServiceSpec.scala

@@ -79,6 +79,8 @@ class UserSearchServiceSpec extends AndroidFreeSpec {
     id('r) -> UserData(id('r), "Liv Boeree").copy(handle = Some(Handle("testjohntest"))),
     id('s) -> UserData(id('s), "blah").copy(handle = Some(Handle("mores"))),
     id('t) -> UserData(id('t), "test handle").copy(handle = Some(Handle("smoresare"))),
+    id('u) -> UserData(id('u), "Wireless").copy(expiresAt = Some(RemoteInstant.ofEpochMilli(12345L))),
+    id('v) -> UserData(id('v), "Wireful"),
     id('pp1) -> UserData(id('pp1), "Partner 1").copy(
       permissions = (partnerPermissions, partnerPermissions),
       teamId = teamId,
@@ -674,6 +676,21 @@ class UserSearchServiceSpec extends AndroidFreeSpec {
       res shouldBe ids('aa2)
 
     }
+
+    scenario("do not return wireless guests as results") {
+      // GIVEN
+      val preparedSearch = prepareTestSearch(
+        query = "Wire",
+        selfId = id('aa1),
+        connectedUsers = ids('u, 'v)
+      )
+
+      // WHEN
+      val res = result(preparedSearch.perform())
+
+      // THEN
+      res shouldBe ids('v) // the user 'u also has the username starting with Wire, but is wireless
+    }
   }
 
   def getService(inTeam: Boolean, selfId: UserId) = {