MirrorHub/forgejo
0
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-10-29 21:59:13 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix emoji detection in certain cases (#12320)

Browse source 
* Fix emoji detection certain cases

Previous tests weren't complicated enough so there were some situations where emojis were't detected properly. Find the earliest occurance in addition to checking for the longest combination.

Fixes #12312

* ok spell bot

Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
mrsdizzie 2020-07-25 09:40:04 -04:00 committed by GitHub
parent 8baf5ca228
commit ea1ed802a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
modules/emoji/emoji.go
View file

@ -130,6 +130,8 @@ func ReplaceAliases(s string) string {
// FindEmojiSubmatchIndex returns index pair of longest emoji in a string // FindEmojiSubmatchIndex returns index pair of longest emoji in a string
func FindEmojiSubmatchIndex(s string) []int { func FindEmojiSubmatchIndex(s string) []int {
loadMap() loadMap()
found := make(map[int]int)
keys := make([]int, 0)
//see if there are any emoji in string before looking for position of specific ones //see if there are any emoji in string before looking for position of specific ones
//no performance difference when there is a match but 10x faster when there are not //no performance difference when there is a match but 10x faster when there are not
@ -137,11 +139,26 @@ func FindEmojiSubmatchIndex(s string) []int {
return nil return nil
} }
// get index of first emoji occurrence while also checking for longest combination
for j := range GemojiData { for j := range GemojiData {
i := strings.Index(s, GemojiData[j].Emoji) i := strings.Index(s, GemojiData[j].Emoji)
if i != -1 { if i != -1 {
return []int{i, i + len(GemojiData[j].Emoji)} if _, ok := found[i]; !ok {
if len(keys) == 0 || i < keys[0] {
found[i] = j
keys = []int{i}
}
if i == 0 {
break
}
}
} }
} }
if len(keys) > 0 {
index := keys[0]
return []int{index, index + len(GemojiData[found[index]].Emoji)}
}
return nil return nil
} }

4
modules/markup/html_test.go
View file

@ -266,6 +266,10 @@ func TestRender_emoji(t *testing.T) {
test( test(
"Some text with 😄😄 2 emoji next to each other", "Some text with 😄😄 2 emoji next to each other",
`<p>Some text with <span class="emoji" aria-label="grinning face with smiling eyes">😄</span><span class="emoji" aria-label="grinning face with smiling eyes">😄</span> 2 emoji next to each other</p>`) `<p>Some text with <span class="emoji" aria-label="grinning face with smiling eyes">😄</span><span class="emoji" aria-label="grinning face with smiling eyes">😄</span> 2 emoji next to each other</p>`)
test(
"😎🤪🔐🤑❓",
`<p><span class="emoji" aria-label="smiling face with sunglasses">😎</span><span class="emoji" aria-label="zany face">🤪</span><span class="emoji" aria-label="locked with key">🔐</span><span class="emoji" aria-label="money-mouth face">🤑</span><span class="emoji" aria-label="question mark">❓</span></p>`)
// should match nothing // should match nothing
test( test(
"2001:0db8:85a3:0000:0000:8a2e:0370:7334", "2001:0db8:85a3:0000:0000:8a2e:0370:7334",