Recent mention searches now OR terms instead of AND (#2931)

4 files changed, 43 insertions, 30 deletions

diff --git a/api/command_msg_test.go b/api/command_msg_test.go
index db8c3216c..f11fce091 100644
--- a/api/command_msg_test.go
+++ b/api/command_msg_test.go
@@ -30,7 +30,7 @@ func TestMsgCommands(t *testing.T) {
 	if !strings.HasSuffix(rs2.GotoLocation, "/"+team.Name+"/channels/"+user1.Id+"__"+user3.Id) && !strings.HasSuffix(rs2.GotoLocation, "/"+team.Name+"/channels/"+user3.Id+"__"+user1.Id) {
 		t.Fatal("failed to create second direct channel")
 	}
-	if result := Client.Must(Client.SearchPosts("foobar")).Data.(*model.PostList); len(result.Order) == 0 {
+	if result := Client.Must(Client.SearchPosts("foobar", false)).Data.(*model.PostList); len(result.Order) == 0 {
 		t.Fatalf("post did not get sent to direct message")
 	}
 
diff --git a/api/post.go b/api/post.go
index a33b6ebf0..ac499e615 100644
--- a/api/post.go
+++ b/api/post.go
@@ -25,7 +25,7 @@ import (
 func InitPost() {
 	l4g.Debug(utils.T("api.post.init.debug"))
 
-	BaseRoutes.NeedTeam.Handle("/posts/search", ApiUserRequired(searchPosts)).Methods("GET")
+	BaseRoutes.NeedTeam.Handle("/posts/search", ApiUserRequired(searchPosts)).Methods("POST")
 	BaseRoutes.NeedTeam.Handle("/posts/{post_id}", ApiUserRequired(getPostById)).Methods("GET")
 	BaseRoutes.NeedTeam.Handle("/pltmp/{post_id}", ApiUserRequired(getPermalinkTmp)).Methods("GET")
 
@@ -1289,17 +1289,24 @@ func getPostsBeforeOrAfter(c *Context, w http.ResponseWriter, r *http.Request, b
 }
 
 func searchPosts(c *Context, w http.ResponseWriter, r *http.Request) {
-	terms := r.FormValue("terms")
+	props := model.StringInterfaceFromJson(r.Body)
 
+	terms := props["terms"].(string)
 	if len(terms) == 0 {
 		c.SetInvalidParam("search", "terms")
 		return
 	}
 
+	isOrSearch := false
+	if val, ok := props["is_or_search"]; ok && val != nil {
+		isOrSearch = val.(bool)
+	}
+
 	paramsList := model.ParseSearchParams(terms)
 	channels := []store.StoreChannel{}
 
 	for _, params := range paramsList {
+		params.OrTerms = isOrSearch
 		// don't allow users to search for everything
 		if params.Terms != "*" {
 			channels = append(channels, Srv.Store.Post().Search(c.TeamId, c.Session.UserId, params))
diff --git a/api/post_benchmark_test.go b/api/post_benchmark_test.go
index 4e5f6668f..5424bc1dd 100644
--- a/api/post_benchmark_test.go
+++ b/api/post_benchmark_test.go
@@ -95,9 +95,9 @@ func BenchmarkSearchPosts(b *testing.B) {
 	// Benchmark Start
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		Client.Must(Client.SearchPosts("nothere"))
-		Client.Must(Client.SearchPosts("n"))
-		Client.Must(Client.SearchPosts("#tag"))
+		Client.Must(Client.SearchPosts("nothere", false))
+		Client.Must(Client.SearchPosts("n", false))
+		Client.Must(Client.SearchPosts("#tag", false))
 	}
 }
 
diff --git a/api/post_test.go b/api/post_test.go
index 529cc6e4d..bb11a5439 100644
--- a/api/post_test.go
+++ b/api/post_test.go
@@ -357,27 +357,33 @@ func TestSearchPosts(t *testing.T) {
 	post4 := &model.Post{ChannelId: channel1.Id, Message: "hashtag for post4"}
 	post4 = Client.Must(Client.CreatePost(post4)).Data.(*model.Post)
 
-	r1 := Client.Must(Client.SearchPosts("search")).Data.(*model.PostList)
+	r1 := Client.Must(Client.SearchPosts("search", false)).Data.(*model.PostList)
 
 	if len(r1.Order) != 3 {
 		t.Fatal("wrong search")
 	}
 
-	r2 := Client.Must(Client.SearchPosts("post2")).Data.(*model.PostList)
+	r2 := Client.Must(Client.SearchPosts("post2", false)).Data.(*model.PostList)
 
 	if len(r2.Order) != 1 && r2.Order[0] == post2.Id {
 		t.Fatal("wrong search")
 	}
 
-	r3 := Client.Must(Client.SearchPosts("#hashtag")).Data.(*model.PostList)
+	r3 := Client.Must(Client.SearchPosts("#hashtag", false)).Data.(*model.PostList)
 
 	if len(r3.Order) != 1 && r3.Order[0] == post3.Id {
 		t.Fatal("wrong search")
 	}
 
-	if r4 := Client.Must(Client.SearchPosts("*")).Data.(*model.PostList); len(r4.Order) != 0 {
+	if r4 := Client.Must(Client.SearchPosts("*", false)).Data.(*model.PostList); len(r4.Order) != 0 {
 		t.Fatal("searching for just * shouldn't return any results")
 	}
+
+	r5 := Client.Must(Client.SearchPosts("post1 post2", true)).Data.(*model.PostList)
+
+	if len(r5.Order) != 2 {
+		t.Fatal("wrong search results")
+	}
 }
 
 func TestSearchHashtagPosts(t *testing.T) {
@@ -394,7 +400,7 @@ func TestSearchHashtagPosts(t *testing.T) {
 	post3 := &model.Post{ChannelId: channel1.Id, Message: "no hashtag"}
 	post3 = Client.Must(Client.CreatePost(post3)).Data.(*model.Post)
 
-	r1 := Client.Must(Client.SearchPosts("#sgtitlereview")).Data.(*model.PostList)
+	r1 := Client.Must(Client.SearchPosts("#sgtitlereview", false)).Data.(*model.PostList)
 
 	if len(r1.Order) != 2 {
 		t.Fatal("wrong search")
@@ -425,47 +431,47 @@ func TestSearchPostsInChannel(t *testing.T) {
 	post4 := &model.Post{ChannelId: channel3.Id, Message: "other message with no return"}
 	post4 = Client.Must(Client.CreatePost(post4)).Data.(*model.Post)
 
-	if result := Client.Must(Client.SearchPosts("channel:")).Data.(*model.PostList); len(result.Order) != 0 {
+	if result := Client.Must(Client.SearchPosts("channel:", false)).Data.(*model.PostList); len(result.Order) != 0 {
 		t.Fatalf("wrong number of posts returned %v", len(result.Order))
 	}
 
-	if result := Client.Must(Client.SearchPosts("in:")).Data.(*model.PostList); len(result.Order) != 0 {
+	if result := Client.Must(Client.SearchPosts("in:", false)).Data.(*model.PostList); len(result.Order) != 0 {
 		t.Fatalf("wrong number of posts returned %v", len(result.Order))
 	}
 
-	if result := Client.Must(Client.SearchPosts("channel:" + channel1.Name)).Data.(*model.PostList); len(result.Order) != 2 {
+	if result := Client.Must(Client.SearchPosts("channel:"+channel1.Name, false)).Data.(*model.PostList); len(result.Order) != 2 {
 		t.Fatalf("wrong number of posts returned %v", len(result.Order))
 	}
 
-	if result := Client.Must(Client.SearchPosts("in: " + channel2.Name)).Data.(*model.PostList); len(result.Order) != 2 {
+	if result := Client.Must(Client.SearchPosts("in: "+channel2.Name, false)).Data.(*model.PostList); len(result.Order) != 2 {
 		t.Fatalf("wrong number of posts returned %v", len(result.Order))
 	}
 
-	if result := Client.Must(Client.SearchPosts("channel: " + channel2.Name)).Data.(*model.PostList); len(result.Order) != 2 {
+	if result := Client.Must(Client.SearchPosts("channel: "+channel2.Name, false)).Data.(*model.PostList); len(result.Order) != 2 {
 		t.Fatalf("wrong number of posts returned %v", len(result.Order))
 	}
 
-	if result := Client.Must(Client.SearchPosts("ChAnNeL: " + channel2.Name)).Data.(*model.PostList); len(result.Order) != 2 {
+	if result := Client.Must(Client.SearchPosts("ChAnNeL: "+channel2.Name, false)).Data.(*model.PostList); len(result.Order) != 2 {
 		t.Fatalf("wrong number of posts returned %v", len(result.Order))
 	}
 
-	if result := Client.Must(Client.SearchPosts("sgtitlereview")).Data.(*model.PostList); len(result.Order) != 2 {
+	if result := Client.Must(Client.SearchPosts("sgtitlereview", false)).Data.(*model.PostList); len(result.Order) != 2 {
 		t.Fatalf("wrong number of posts returned %v", len(result.Order))
 	}
 
-	if result := Client.Must(Client.SearchPosts("sgtitlereview channel:" + channel1.Name)).Data.(*model.PostList); len(result.Order) != 1 {
+	if result := Client.Must(Client.SearchPosts("sgtitlereview channel:"+channel1.Name, false)).Data.(*model.PostList); len(result.Order) != 1 {
 		t.Fatalf("wrong number of posts returned %v", len(result.Order))
 	}
 
-	if result := Client.Must(Client.SearchPosts("sgtitlereview in: " + channel2.Name)).Data.(*model.PostList); len(result.Order) != 1 {
+	if result := Client.Must(Client.SearchPosts("sgtitlereview in: "+channel2.Name, false)).Data.(*model.PostList); len(result.Order) != 1 {
 		t.Fatalf("wrong number of posts returned %v", len(result.Order))
 	}
 
-	if result := Client.Must(Client.SearchPosts("sgtitlereview channel: " + channel2.Name)).Data.(*model.PostList); len(result.Order) != 1 {
+	if result := Client.Must(Client.SearchPosts("sgtitlereview channel: "+channel2.Name, false)).Data.(*model.PostList); len(result.Order) != 1 {
 		t.Fatalf("wrong number of posts returned %v", len(result.Order))
 	}
 
-	if result := Client.Must(Client.SearchPosts("channel: " + channel2.Name + " channel: " + channel3.Name)).Data.(*model.PostList); len(result.Order) != 3 {
+	if result := Client.Must(Client.SearchPosts("channel: "+channel2.Name+" channel: "+channel3.Name, false)).Data.(*model.PostList); len(result.Order) != 3 {
 		t.Fatalf("wrong number of posts returned :) %v :) %v", result.Posts, result.Order)
 	}
 }
@@ -493,22 +499,22 @@ func TestSearchPostsFromUser(t *testing.T) {
 	post2 := &model.Post{ChannelId: channel2.Id, Message: "sgtitlereview\n with return"}
 	post2 = Client.Must(Client.CreatePost(post2)).Data.(*model.Post)
 
-	if result := Client.Must(Client.SearchPosts("from: " + user1.Username)).Data.(*model.PostList); len(result.Order) != 2 {
+	if result := Client.Must(Client.SearchPosts("from: "+user1.Username, false)).Data.(*model.PostList); len(result.Order) != 2 {
 		t.Fatalf("wrong number of posts returned %v", len(result.Order))
 	}
 
-	if result := Client.Must(Client.SearchPosts("from: " + user2.Username)).Data.(*model.PostList); len(result.Order) != 1 {
+	if result := Client.Must(Client.SearchPosts("from: "+user2.Username, false)).Data.(*model.PostList); len(result.Order) != 1 {
 		t.Fatalf("wrong number of posts returned %v", len(result.Order))
 	}
 
-	if result := Client.Must(Client.SearchPosts("from: " + user2.Username + " sgtitlereview")).Data.(*model.PostList); len(result.Order) != 1 {
+	if result := Client.Must(Client.SearchPosts("from: "+user2.Username+" sgtitlereview", false)).Data.(*model.PostList); len(result.Order) != 1 {
 		t.Fatalf("wrong number of posts returned %v", len(result.Order))
 	}
 
 	post3 := &model.Post{ChannelId: channel1.Id, Message: "hullo"}
 	post3 = Client.Must(Client.CreatePost(post3)).Data.(*model.Post)
 
-	if result := Client.Must(Client.SearchPosts("from: " + user2.Username + " in:" + channel1.Name)).Data.(*model.PostList); len(result.Order) != 1 {
+	if result := Client.Must(Client.SearchPosts("from: "+user2.Username+" in:"+channel1.Name, false)).Data.(*model.PostList); len(result.Order) != 1 {
 		t.Fatalf("wrong number of posts returned %v", len(result.Order))
 	}
 
@@ -517,22 +523,22 @@ func TestSearchPostsFromUser(t *testing.T) {
 	// wait for the join/leave messages to be created for user3 since they're done asynchronously
 	time.Sleep(100 * time.Millisecond)
 
-	if result := Client.Must(Client.SearchPosts("from: " + user2.Username)).Data.(*model.PostList); len(result.Order) != 2 {
+	if result := Client.Must(Client.SearchPosts("from: "+user2.Username, false)).Data.(*model.PostList); len(result.Order) != 2 {
 		t.Fatalf("wrong number of posts returned %v", len(result.Order))
 	}
 
-	if result := Client.Must(Client.SearchPosts("from: " + user2.Username + " from: " + user3.Username)).Data.(*model.PostList); len(result.Order) != 2 {
+	if result := Client.Must(Client.SearchPosts("from: "+user2.Username+" from: "+user3.Username, false)).Data.(*model.PostList); len(result.Order) != 2 {
 		t.Fatalf("wrong number of posts returned %v", len(result.Order))
 	}
 
-	if result := Client.Must(Client.SearchPosts("from: " + user2.Username + " from: " + user3.Username + " in:" + channel2.Name)).Data.(*model.PostList); len(result.Order) != 1 {
+	if result := Client.Must(Client.SearchPosts("from: "+user2.Username+" from: "+user3.Username+" in:"+channel2.Name, false)).Data.(*model.PostList); len(result.Order) != 1 {
 		t.Fatalf("wrong number of posts returned %v", len(result.Order))
 	}
 
 	post4 := &model.Post{ChannelId: channel2.Id, Message: "coconut"}
 	post4 = Client.Must(Client.CreatePost(post4)).Data.(*model.Post)
 
-	if result := Client.Must(Client.SearchPosts("from: " + user2.Username + " from: " + user3.Username + " in:" + channel2.Name + " coconut")).Data.(*model.PostList); len(result.Order) != 1 {
+	if result := Client.Must(Client.SearchPosts("from: "+user2.Username+" from: "+user3.Username+" in:"+channel2.Name+" coconut", false)).Data.(*model.PostList); len(result.Order) != 1 {
 		t.Fatalf("wrong number of posts returned %v", len(result.Order))
 	}
 }