From 3039081161d39c1a76fdb7130b0ad365423a6877 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Tue, 15 Oct 2019 12:10:40 -0400 Subject: [PATCH] Fix merge conflicts --- app/channel_test.go | 15 --------------- app/post.go | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/app/channel_test.go b/app/channel_test.go index 49a0f15fa8..362497d786 100644 --- a/app/channel_test.go +++ b/app/channel_test.go @@ -1001,21 +1001,6 @@ func TestSearchChannelsForUser(t *testing.T) { }) } -func TestGetNumberOfChannelsOnTeam(t *testing.T) { - th := Setup(t).InitBasic() - defer th.TearDown() - - th.App.DeleteChannel(th.BasicChannel, th.BasicUser.Id) - - count, err := th.App.GetNumberOfChannelsOnTeam(th.BasicTeam.Id, true) - require.Nil(t, err) - assert.Equal(t, 3, count) - - count, err = th.App.GetNumberOfChannelsOnTeam(th.BasicTeam.Id, false) - require.Nil(t, err) - assert.Equal(t, 2, count) -} - func TestMarkChannelAsUnreadFromPost(t *testing.T) { th := Setup(t).InitBasic() defer th.TearDown() diff --git a/app/post.go b/app/post.go index 121d99bd46..ca59f188c2 100644 --- a/app/post.go +++ b/app/post.go @@ -1209,7 +1209,7 @@ func (a *App) countMentionsFromPost(user *model.User, post *model.Post) (int, *m // A mapping of thread root IDs to whether or not a post in that thread mentions the user mentionedByThread := make(map[string]bool) - thread, err := a.GetPostThread(post.Id) + thread, err := a.GetPostThread(post.Id, false) if err != nil { return 0, err }