Merge pull request #110 from nickago/MM-1430

MM-1430 Added the ability to have hashtags with dashes in them

1 files changed, 16 insertions, 0 deletions

diff --git a/store/sql_post_store.go b/store/sql_post_store.go
index 0ceebc02f..01900023f 100644
--- a/store/sql_post_store.go
+++ b/store/sql_post_store.go
@@ -356,9 +356,14 @@ func (s SqlPostStore) Search(teamId string, userId string, terms string, isHasht
 
 	go func() {
 		result := StoreResult{}
+		termMap := map[string]bool{}
+
 		searchType := "Message"
 		if isHashtagSearch {
 			searchType = "Hashtags"
+			for _,term := range strings.Split(terms, " ") {
+				termMap[term] = true;
+			}
 		}
 
 		// @ has a speical meaning in INNODB FULLTEXT indexes and
@@ -394,6 +399,17 @@ func (s SqlPostStore) Search(teamId string, userId string, terms string, isHasht
 			list := &model.PostList{Order: make([]string, 0, len(posts))}
 
 			for _, p := range posts {
+				if searchType == "Hashtags" {
+					exactMatch := false
+					for _, tag := range strings.Split(p.Hashtags, " ") {
+						if termMap[tag] {
+							exactMatch = true
+						}
+					}
+					if !exactMatch {
+						continue
+					}
+				}
 				list.AddPost(p)
 				list.AddOrder(p.Id)
 			}