Merge branch 'master' into local-relay-model

Logical merge errors fixed manually

Changelog-None
Signed-off-by: Daniel D’Aquino <daniel@daquino.me>

damusTests/Mocking/MockDamusState.swift

@@ -31,7 +31,9 @@ func generate_test_damus_state(
     let damus = DamusState(keypair: test_keypair,
                            likes: .init(our_pubkey: our_pubkey),
                            boosts: .init(our_pubkey: our_pubkey),
-                           contacts: .init(our_pubkey: our_pubkey), mutelist_manager: mutelist_manager,
+                           contacts: .init(our_pubkey: our_pubkey),
+                           contactCards: ContactCardManagerMock(),
+                           mutelist_manager: mutelist_manager,
                            profiles: profiles,
                            dms: home?.dms ?? .init(our_pubkey: our_pubkey),
                            previews: .init(),