Removed Pill Avatar + @room is not displayed among suggestions for DM (#1968)

* removed pill avatar

* completion suggestion service shows @room as first and only if not a DM

* code improvement

UnitTests/Sources/CompletionSuggestionServiceTests.swift

@@ -102,9 +102,9 @@ final class CompletionSuggestionServiceTests: XCTestCase {
         try await deferred.fulfill()
         
         deferred = deferFulfillment(service.suggestionsPublisher) { suggestions in
-            suggestions == [.user(item: .init(id: alice.userID, displayName: alice.displayName, avatarURL: alice.avatarURL)),
-                            .user(item: .init(id: bob.userID, displayName: bob.displayName, avatarURL: bob.avatarURL)),
-                            .allUsers(item: .allUsersMention(roomAvatar: nil))]
+            suggestions == [.allUsers(item: .allUsersMention(roomAvatar: nil)),
+                            .user(item: .init(id: alice.userID, displayName: alice.displayName, avatarURL: alice.avatarURL)),
+                            .user(item: .init(id: bob.userID, displayName: bob.displayName, avatarURL: bob.avatarURL))]
         }
         service.setSuggestionTrigger(.init(type: .user, text: ""))
         try await deferred.fulfill()

UnitTests/Sources/PillContextTests.swift

@@ -37,9 +37,6 @@ class PillContextTests: XCTestCase {
         let context = PillContext(roomContext: mock.context, data: PillTextAttachmentData(type: .user(userID: id), font: .preferredFont(forTextStyle: .body)))
         
         XCTAssertFalse(context.viewState.isOwnMention)
-        XCTAssertNil(context.viewState.avatarURL)
-        XCTAssertNil(context.viewState.name)
-        XCTAssertEqual(context.viewState.contentID, id)
         XCTAssertEqual(context.viewState.displayText, id)
         
         let name = "Mr. Test"
@@ -48,10 +45,7 @@ class PillContextTests: XCTestCase {
         await Task.yield()
         
         XCTAssertFalse(context.viewState.isOwnMention)
-        XCTAssertEqual(context.viewState.avatarURL, avatarURL)
-        XCTAssertEqual(context.viewState.name, name)
-        XCTAssertEqual(context.viewState.contentID, id)
-        XCTAssertEqual(context.viewState.displayText, name)
+        XCTAssertEqual(context.viewState.displayText, "@\(name)")
     }
     
     func testOwnUser() async throws {
@@ -90,9 +84,6 @@ class PillContextTests: XCTestCase {
         let context = PillContext(roomContext: mock.context, data: PillTextAttachmentData(type: .allUsers, font: .preferredFont(forTextStyle: .body)))
         
         XCTAssertTrue(context.viewState.isOwnMention)
-        XCTAssertEqual(context.viewState.avatarURL, avatarURL)
-        XCTAssertEqual(context.viewState.name, displayName)
-        XCTAssertEqual(context.viewState.contentID, id)
-        XCTAssertEqual(context.viewState.displayText, "@room")
+        XCTAssertEqual(context.viewState.displayText, PillConstants.atRoom)
     }
 }

UnitTests/__Snapshots__/PreviewTests/test_messageText.Custom-Attachment.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a15ca8e95ef692687c5b1eede5d0bd6f7fff14b544100928dd409cd6a48d66d
-size 62925
+oid sha256:b832b8fc74a6a05083c6d493bb10ea1e50698523511918fefb4f09749276b9a0
+size 62612

UnitTests/__Snapshots__/PreviewTests/test_pillView.All-Users.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e28c9283ff63ad76753b6ad671d996034c07e453e44345cbac176dcf4b433c73
-size 61442
+oid sha256:cb1c8657a870af18a771b7a6b1be6c732ff2e9dfb4b69a558f453ce16d8711e7
+size 60309

UnitTests/__Snapshots__/PreviewTests/test_pillView.Loaded-Long-Own.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b78e02b2c47f049fa5e9c5802d76572696d497cd9a09cdb4a05edcb60b1da2df
-size 66669
+oid sha256:838977457413677c95b62440aba60f39767b5c57c2dc8bc04db17604836961bf
+size 66094

UnitTests/__Snapshots__/PreviewTests/test_pillView.Loaded-Long.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd550435f2618862e8338704605a98f0471aa49a23425ccfbfc1487ad339279c
-size 66822
+oid sha256:b0a781a2db50c0e6b675fe4253421517bdb7c39584b0d810356e976a0dbf7e0e
+size 66299

UnitTests/__Snapshots__/PreviewTests/test_pillView.Loading-Own.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9fd608f61a0055a49ad6b93a2db812c9a6fb60444a12699bffd78b05d61f3ee5
-size 63623
+oid sha256:dc295464d789704bef51b0613c6d62a6f4b2273d2468a8c985db64065317b42e
+size 62830

UnitTests/__Snapshots__/PreviewTests/test_pillView.Loading.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ffe228e557bf1c029f5b07c6e187db1413cedae314747241c7c03cbcb291b240
-size 63702
+oid sha256:dd328f4947f5550ac584574b69eec3c2de4f06d90c9fefabe19a36b039ef0ec0
+size 62922