Fix 1:1 message to/from in search results

[hiqua]

Fixes #5158.

Contributor checklist:

• My contribution is not related to translations. Please submit translation changes via our Signal Desktop Transifex project.
• My commits are in nice logical chunks with good commit messages
• My changes are rebased on the latest development branch
• A yarn ready run passes successfully (more about tests here)
• My changes are ready to be shipped to users

Description

See issue.

I don't think that's the proper way to address this issue, but it seems to work in practice. Feel free to close this PR in favor of a better fix.

If I note:

M(e)
G(roup)
O(ther)

I have tested these cases and the header seems correct (message sent from - to):
O - G
O - M
M - G
M - O
M - M (notes to self)

[scottnonnenberg-signal]

@hiqua Can you show some screenshots of the before and after? The change looks pretty simple, I just want to be sure that we get the proper 'Jon to You' kind of text.

[hiqua]

These would be the screenshots covering various cases, including the faulty one. Let me know if there's something missing.

Ideally there'd be tests for this, I don't know if there are some in place already. I'll have a look and see how feasible that would be.

Before:

After:

[EvanHahn-Signal]

Looks good! Thanks for doing this.

[hiqua]

I think the test "returns incoming message" could be modified to test this change, but it's not clear to me how exactly. If you have a hint I can easily follow I could try to implement it. Otherwise I'll leave it like this.

[EvanHahn-Signal]

I think the test "returns incoming message" could be modified to test this change, but it's not clear to me how exactly. If you have a hint I can easily follow I could try to implement it. Otherwise I'll leave it like this.

That's a good point. I think it's worth adding a new test that's very similar to the "returns incoming message" test, with two changes:

1. fromId and toId should be the same
2. The expected result should be updated

Let me know if I can answer more questions.

[hiqua]

Thanks for your help! I think I managed to come up with something reasonable, let me know if something is still missing.

The test does fail without the changes.

I guess you'll squash the commits, so I was not very descriptive with the second one.

[EvanHahn-Signal]

LGTM, other than some small comments in tests.

[hiqua]

@EvanHahn-Signal let me know if I should try to rebase.

[scottnonnenberg-signal]

@hiqua No, please don't make any further changes. We've merged this internally, and when we release a beta including these changes, this PR should be automatically set as 'merged.'