mirror of
https://github.com/permissionlesstech/bitchat-android.git
synced 2026-07-24 22:25:19 +00:00
Fix hashtags incorrectly displayed inside URLs (#692)
When a URL contains a # fragment (e.g. https://example.com/page#section), the hashtag regex matches the fragment as a hashtag. The overlap removal logic already removes hashtags overlapping geohashes, and geohashes overlapping URLs, but did not remove hashtags overlapping URLs. Add the missing overlapsUrl check to the hashtag condition.
This commit is contained in:
@@ -398,10 +398,10 @@ private fun appendIOSFormattedContent(
|
||||
val iterator = allMatches.listIterator()
|
||||
while (iterator.hasNext()) {
|
||||
val (range, type) = iterator.next()
|
||||
// Remove generic hashtags that overlap with geohashes, and geohashes that overlap with URLs
|
||||
// Remove generic hashtags that overlap with geohashes or URLs, and geohashes that overlap with URLs
|
||||
val overlapsGeo = geoRanges.any { rangesOverlap(range, it) }
|
||||
val overlapsUrl = urlRanges.any { rangesOverlap(range, it) }
|
||||
if ((type == "hashtag" && overlapsGeo) || (type == "geohash" && overlapsUrl)) iterator.remove()
|
||||
if ((type == "hashtag" && (overlapsGeo || overlapsUrl)) || (type == "geohash" && overlapsUrl)) iterator.remove()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user