From 5872bf9c2f9b81c7aad761d40a6970f6267f1424 Mon Sep 17 00:00:00 2001 From: Martin Kraft Date: Mon, 30 Jul 2018 15:06:08 -0400 Subject: Pr 9039 (#9187) * MM-11065: Allow to search and get archived channels from the API * Fixing more tests * Add some unit tests * Add includeDeleted parameter to session permissions check function * More test fixing * Adding archive channels list in channels search * Add restriction for archived channel edition * Reverting permissions checks modification * Changed the query parameter to include_deleted * Enable search archive channels as true by default * Adding tests for verify search on deleted channels * Allowing to override archive channels during the imports * Fixed test * Search in archive channels from the API must be explicitly requested * Removing includeDeleted parameter from GetChannelByName and GetChannelByNameForTeam * Back to ViewArchivedChannels config * Fixing tests * Reverting GetChannelByName parameter * Add include deleted parameter on GetChannel functions in plugins api * Fixing tests --- api4/post.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'api4/post.go') diff --git a/api4/post.go b/api4/post.go index b76e89964..12664cc24 100644 --- a/api4/post.go +++ b/api4/post.go @@ -330,6 +330,8 @@ func searchPosts(c *Context, w http.ResponseWriter, r *http.Request) { return } + includeDeletedChannels := r.URL.Query().Get("include_deleted_channels") == "true" + props := model.StringInterfaceFromJson(r.Body) terms, ok := props["terms"].(string) if !ok || len(terms) == 0 { @@ -341,7 +343,7 @@ func searchPosts(c *Context, w http.ResponseWriter, r *http.Request) { startTime := time.Now() - results, err := c.App.SearchPostsInTeam(terms, c.Session.UserId, c.Params.TeamId, isOrSearch) + results, err := c.App.SearchPostsInTeam(terms, c.Session.UserId, c.Params.TeamId, isOrSearch, includeDeletedChannels) elapsedTime := float64(time.Since(startTime)) / float64(time.Second) metrics := c.App.Metrics -- cgit v1.2.3-1-g7c22