From 0184d6059bb1943fb74bf33d1d200a423c5bf5e6 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Thu, 4 Aug 2016 11:38:09 -0400
Subject: PLT-3506 Added flagged posts functionality (#3679)

* Added flagged posts functionality

* UI Improvements to flags (#3697)

* Added flag functionality for mobile

* Updating flagged text (#3699)

* Add back button to RHS thread when coming from flagged posts

* Updating position of flags (#3708)

* Plt 3506 - Reverting flag position (#3724)

* Revert "Updating position of flags (#3708)"

This reverts commit aaa05632c5d9eda35a048300a5bd7e99584c5b58.

* Fixing the icon in search

* Help text and white space improvements (#3730)

* Updatng help text and some white spacing.

* Updating help text
---
 api/post.go      | 28 ++++++++++++++++++++++++++++
 api/post_test.go | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)

(limited to 'api')

diff --git a/api/post.go b/api/post.go
index 223e8ee15..46c0284d0 100644
--- a/api/post.go
+++ b/api/post.go
@@ -34,6 +34,7 @@ func InitPost() {
 	l4g.Debug(utils.T("api.post.init.debug"))
 
 	BaseRoutes.NeedTeam.Handle("/posts/search", ApiUserRequired(searchPosts)).Methods("POST")
+	BaseRoutes.NeedTeam.Handle("/posts/flagged/{offset:[0-9]+}/{limit:[0-9]+}", ApiUserRequiredActivity(getFlaggedPosts, false)).Methods("GET")
 	BaseRoutes.NeedTeam.Handle("/posts/{post_id}", ApiUserRequired(getPostById)).Methods("GET")
 	BaseRoutes.NeedTeam.Handle("/pltmp/{post_id}", ApiUserRequired(getPermalinkTmp)).Methods("GET")
 
@@ -1034,6 +1035,33 @@ func updatePost(c *Context, w http.ResponseWriter, r *http.Request) {
 	}
 }
 
+func getFlaggedPosts(c *Context, w http.ResponseWriter, r *http.Request) {
+	params := mux.Vars(r)
+
+	offset, err := strconv.Atoi(params["offset"])
+	if err != nil {
+		c.SetInvalidParam("getFlaggedPosts", "offset")
+		return
+	}
+
+	limit, err := strconv.Atoi(params["limit"])
+	if err != nil {
+		c.SetInvalidParam("getFlaggedPosts", "limit")
+		return
+	}
+
+	posts := &model.PostList{}
+
+	if result := <-Srv.Store.Post().GetFlaggedPosts(c.Session.UserId, offset, limit); result.Err != nil {
+		c.Err = result.Err
+		return
+	} else {
+		posts = result.Data.(*model.PostList)
+	}
+
+	w.Write([]byte(posts.ToJson()))
+}
+
 func getPosts(c *Context, w http.ResponseWriter, r *http.Request) {
 	params := mux.Vars(r)
 
diff --git a/api/post_test.go b/api/post_test.go
index 29fe63ddc..2a2a9f41b 100644
--- a/api/post_test.go
+++ b/api/post_test.go
@@ -924,3 +924,38 @@ func TestGetOutOfChannelMentions(t *testing.T) {
 		t.Fatalf("getOutOfChannelMentions returned %v when two users on a different team were mentioned", mentioned)
 	}
 }
+
+func TestGetFlaggedPosts(t *testing.T) {
+	th := Setup().InitBasic()
+	Client := th.BasicClient
+	user1 := th.BasicUser
+	post1 := th.BasicPost
+
+	preferences := &model.Preferences{
+		{
+			UserId:   user1.Id,
+			Category: model.PREFERENCE_CATEGORY_FLAGGED_POST,
+			Name:     post1.Id,
+			Value:    "true",
+		},
+	}
+	Client.Must(Client.SetPreferences(preferences))
+
+	r1 := Client.Must(Client.GetFlaggedPosts(0, 2)).Data.(*model.PostList)
+
+	if len(r1.Order) == 0 {
+		t.Fatal("should have gotten a flagged post")
+	}
+
+	if _, ok := r1.Posts[post1.Id]; !ok {
+		t.Fatal("missing flagged post")
+	}
+
+	Client.DeletePreferences(preferences)
+
+	r2 := Client.Must(Client.GetFlaggedPosts(0, 2)).Data.(*model.PostList)
+
+	if len(r2.Order) != 0 {
+		t.Fatal("should not have gotten a flagged post")
+	}
+}
-- 
cgit v1.2.3-1-g7c22