summaryrefslogtreecommitdiffstats
path: root/model/reaction.go
diff options
context:
space:
mode:
authorSaturnino Abril <saturnino.abril@gmail.com>2017-04-26 23:11:32 +0900
committerHarrison Healey <harrisonmhealey@gmail.com>2017-04-26 10:11:32 -0400
commit6fa7082833812c734aeef8ad24477823ee766f1b (patch)
treebc70138ff3a71cfffcdf9fe20794735a87e478e7 /model/reaction.go
parentf9502ff14bbb31aa835540c14725bbebdf0c340d (diff)
downloadchat-6fa7082833812c734aeef8ad24477823ee766f1b.tar.gz
chat-6fa7082833812c734aeef8ad24477823ee766f1b.tar.bz2
chat-6fa7082833812c734aeef8ad24477823ee766f1b.zip
fix reaction's name validation with + sign in it (#6221)
Diffstat (limited to 'model/reaction.go')
-rw-r--r--model/reaction.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/model/reaction.go b/model/reaction.go
index 5dbf07152..3d334c214 100644
--- a/model/reaction.go
+++ b/model/reaction.go
@@ -6,6 +6,7 @@ package model
import (
"encoding/json"
"io"
+ "regexp"
)
type Reaction struct {
@@ -60,7 +61,9 @@ func (o *Reaction) IsValid() *AppError {
return NewLocAppError("Reaction.IsValid", "model.reaction.is_valid.post_id.app_error", nil, "post_id="+o.PostId)
}
- if len(o.EmojiName) == 0 || len(o.EmojiName) > 64 || !IsValidAlphaNumHyphenUnderscore(o.EmojiName, false) {
+ validName := regexp.MustCompile(`^[a-zA-Z0-9\-\+_]+$`)
+
+ if len(o.EmojiName) == 0 || len(o.EmojiName) > 64 || !validName.MatchString(o.EmojiName) {
return NewLocAppError("Reaction.IsValid", "model.reaction.is_valid.emoji_name.app_error", nil, "emoji_name="+o.EmojiName)
}