damus : Merge pull request #2307 from damus-io/review_highlights_2024-06-19_rebased

Highlights (rebased to solve merge conflicts + minor tweaks)

https://github.com/damus-io/damus/commit/a88e80a34618ba27c06f21fb3218e137246464fb