summaryrefslogtreecommitdiffstats
path: root/helpers/emoji.go
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2016-06-11 20:40:56 +0200
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2016-06-11 20:40:56 +0200
commit2564f46a685704c459bec5d0100f5111c138c9b4 (patch)
tree20782477361cc3710a5136e60cd8cd1000c9f59e /helpers/emoji.go
parent683888ebc89049d69042cdc5dc224884cd7903df (diff)
Fix Emojfy for certain text patterns
Fixes #2198
Diffstat (limited to 'helpers/emoji.go')
-rw-r--r--helpers/emoji.go9
1 files changed, 3 insertions, 6 deletions
diff --git a/helpers/emoji.go b/helpers/emoji.go
index 3b0b1605f..725505455 100644
--- a/helpers/emoji.go
+++ b/helpers/emoji.go
@@ -51,14 +51,11 @@ func Emojify(source []byte) []byte {
}
endEmoji := bytes.Index(source[j+1:upper], emojiDelim)
-
- if endEmoji < 0 {
- break
- }
-
nextWordDelim := bytes.Index(source[j:upper], emojiWordDelim)
- if endEmoji == 0 || (nextWordDelim != -1 && nextWordDelim < endEmoji) {
+ if endEmoji < 0 {
+ start += upper + 1
+ } else if endEmoji == 0 || (nextWordDelim != -1 && nextWordDelim < endEmoji) {
start += endEmoji + 1
} else {
endKey := endEmoji + j + 2