IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Thread autoresponse posts with the post they are autoresponding to (#15625)

Browse Source 
* Thread autoresponse posts with the post they are autoresponding to

* Remove unneeded if

* Remove ParentID references

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
This commit is contained in:
Daniel Espino García
2020-10-23 16:21:21 +02:00
committed by GitHub
parent 8c63eb7232
commit 910de96a33
5 changed files with 112 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/app_iface.go
View File

@@ -884,8 +884,8 @@ type AppIface interface {
SearchUsersNotInTeam(notInTeamId string, term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError)
SearchUsersWithoutTeam(term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError)
SendAckToPushProxy(ack *model.PushNotificationAck) error
SendAutoResponse(channel *model.Channel, receiver *model.User) (bool, *model.AppError)
SendAutoResponseIfNecessary(channel *model.Channel, sender *model.User) (bool, *model.AppError)
SendAutoResponse(channel *model.Channel, receiver *model.User, post *model.Post) (bool, *model.AppError)
SendAutoResponseIfNecessary(channel *model.Channel, sender *model.User, post *model.Post) (bool, *model.AppError)
SendEmailVerification(user *model.User, newEmail, redirect string) *model.AppError
SendEphemeralPost(userId string, post *model.Post) *model.Post
SendNotifications(post *model.Post, team *model.Team, channel *model.Channel, sender *model.User, parentPostList *model.PostList, setOnline bool) ([]string, error)

14
app/auto_responder.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/mattermost/mattermost-server/v5/model"
)
func (a *App) SendAutoResponseIfNecessary(channel *model.Channel, sender *model.User) (bool, *model.AppError) {
func (a *App) SendAutoResponseIfNecessary(channel *model.Channel, sender *model.User, post *model.Post) (bool, *model.AppError) {
if channel.Type != model.CHANNEL_DIRECT {
return false, nil
}
@@ -28,10 +28,10 @@ func (a *App) SendAutoResponseIfNecessary(channel *model.Channel, sender *model.
return false, err
}
return a.SendAutoResponse(channel, receiver)
return a.SendAutoResponse(channel, receiver, post)
}
func (a *App) SendAutoResponse(channel *model.Channel, receiver *model.User) (bool, *model.AppError) {
func (a *App) SendAutoResponse(channel *model.Channel, receiver *model.User, post *model.Post) (bool, *model.AppError) {
if receiver == nil || receiver.NotifyProps == nil {
return false, nil
}
@@ -43,11 +43,15 @@ func (a *App) SendAutoResponse(channel *model.Channel, receiver *model.User) (bo
return false, nil
}
rootID := post.Id
if post.RootId != "" {
rootID = post.RootId
}
autoResponderPost := &model.Post{
ChannelId: channel.Id,
Message: message,
RootId: "",
ParentId: "",
RootId: rootID,
Type: model.POST_AUTO_RESPONDER,
UserId: receiver.Id,
}

113
app/auto_responder_test.go
View File

@@ -97,7 +97,14 @@ func TestSendAutoResponseIfNecessary(t *testing.T) {
channel := th.CreateDmChannel(receiver)
sent, err := th.App.SendAutoResponseIfNecessary(channel, th.BasicUser)
savedPost, _ := th.App.CreatePost(&model.Post{
ChannelId: channel.Id,
Message: "zz" + model.NewId() + "a",
UserId: th.BasicUser.Id},
th.BasicChannel,
false, true)
sent, err := th.App.SendAutoResponseIfNecessary(channel, th.BasicUser, savedPost)
assert.Nil(t, err)
assert.True(t, sent)
@@ -120,7 +127,14 @@ func TestSendAutoResponseIfNecessary(t *testing.T) {
channel := th.CreateDmChannel(receiver)
sent, err := th.App.SendAutoResponseIfNecessary(channel, th.BasicUser)
savedPost, _ := th.App.CreatePost(&model.Post{
ChannelId: channel.Id,
Message: "zz" + model.NewId() + "a",
UserId: th.BasicUser.Id},
th.BasicChannel,
false, true)
sent, err := th.App.SendAutoResponseIfNecessary(channel, th.BasicUser, savedPost)
assert.Nil(t, err)
assert.False(t, sent)
@@ -130,7 +144,14 @@ func TestSendAutoResponseIfNecessary(t *testing.T) {
th := Setup(t).InitBasic()
defer th.TearDown()
sent, err := th.App.SendAutoResponseIfNecessary(th.BasicChannel, th.BasicUser)
savedPost, _ := th.App.CreatePost(&model.Post{
ChannelId: th.BasicChannel.Id,
Message: "zz" + model.NewId() + "a",
UserId: th.BasicUser.Id},
th.BasicChannel,
false, true)
sent, err := th.App.SendAutoResponseIfNecessary(th.BasicChannel, th.BasicUser, savedPost)
assert.Nil(t, err)
assert.False(t, sent)
@@ -163,7 +184,14 @@ func TestSendAutoResponseIfNecessary(t *testing.T) {
botUser, err := th.App.GetUser(bot.UserId)
assert.Nil(t, err)
sent, err := th.App.SendAutoResponseIfNecessary(channel, botUser)
savedPost, _ := th.App.CreatePost(&model.Post{
ChannelId: channel.Id,
Message: "zz" + model.NewId() + "a",
UserId: botUser.Id},
th.BasicChannel,
false, true)
sent, err := th.App.SendAutoResponseIfNecessary(channel, botUser, savedPost)
assert.Nil(t, err)
assert.False(t, sent)
@@ -185,29 +213,80 @@ func TestSendAutoResponseSuccess(t *testing.T) {
userUpdated1, err := th.App.PatchUser(user.Id, patch, true)
require.Nil(t, err)
th.App.CreatePost(&model.Post{
savedPost, _ := th.App.CreatePost(&model.Post{
ChannelId: th.BasicChannel.Id,
Message: "zz" + model.NewId() + "a",
UserId: th.BasicUser.Id},
th.BasicChannel,
false, true)
sent, err := th.App.SendAutoResponse(th.BasicChannel, userUpdated1)
sent, err := th.App.SendAutoResponse(th.BasicChannel, userUpdated1, savedPost)
assert.Nil(t, err)
assert.True(t, sent)
if list, err := th.App.GetPosts(th.BasicChannel.Id, 0, 1); err != nil {
require.Nil(t, err)
} else {
autoResponderPostFound := false
for _, post := range list.Posts {
if post.Type == model.POST_AUTO_RESPONDER {
autoResponderPostFound = true
}
list, err := th.App.GetPosts(th.BasicChannel.Id, 0, 1)
require.Nil(t, err)
autoResponderPostFound := false
for _, post := range list.Posts {
if post.Type == model.POST_AUTO_RESPONDER {
autoResponderPostFound = true
assert.Equal(t, savedPost.Id, post.RootId)
assert.Equal(t, savedPost.Id, post.ParentId)
}
assert.True(t, autoResponderPostFound)
}
assert.True(t, autoResponderPostFound)
}
func TestSendAutoResponseSuccessOnThread(t *testing.T) {
th := Setup(t).InitBasic()
defer th.TearDown()
user := th.CreateUser()
defer th.App.PermanentDeleteUser(user)
patch := &model.UserPatch{}
patch.NotifyProps = make(map[string]string)
patch.NotifyProps["auto_responder_active"] = "true"
patch.NotifyProps["auto_responder_message"] = "Hello, I'm unavailable today."
userUpdated1, err := th.App.PatchUser(user.Id, patch, true)
require.Nil(t, err)
parentPost, _ := th.App.CreatePost(&model.Post{
ChannelId: th.BasicChannel.Id,
Message: "zz" + model.NewId() + "a",
UserId: th.BasicUser.Id},
th.BasicChannel,
false, true)
savedPost, _ := th.App.CreatePost(&model.Post{
ChannelId: th.BasicChannel.Id,
Message: "zz" + model.NewId() + "a",
UserId: th.BasicUser.Id,
RootId: parentPost.Id,
ParentId: parentPost.Id},
th.BasicChannel,
false, true)
sent, err := th.App.SendAutoResponse(th.BasicChannel, userUpdated1, savedPost)
assert.Nil(t, err)
assert.True(t, sent)
list, err := th.App.GetPosts(th.BasicChannel.Id, 0, 1)
require.Nil(t, err)
autoResponderPostFound := false
for _, post := range list.Posts {
if post.Type == model.POST_AUTO_RESPONDER {
autoResponderPostFound = true
assert.Equal(t, savedPost.RootId, post.RootId)
assert.Equal(t, savedPost.ParentId, post.ParentId)
}
}
assert.True(t, autoResponderPostFound)
}
func TestSendAutoResponseFailure(t *testing.T) {
@@ -225,14 +304,14 @@ func TestSendAutoResponseFailure(t *testing.T) {
userUpdated1, err := th.App.PatchUser(user.Id, patch, true)
require.Nil(t, err)
th.App.CreatePost(&model.Post{
savedPost, _ := th.App.CreatePost(&model.Post{
ChannelId: th.BasicChannel.Id,
Message: "zz" + model.NewId() + "a",
UserId: th.BasicUser.Id},
th.BasicChannel,
false, true)
sent, err := th.App.SendAutoResponse(th.BasicChannel, userUpdated1)
sent, err := th.App.SendAutoResponse(th.BasicChannel, userUpdated1, savedPost)
assert.Nil(t, err)
assert.False(t, sent)

8
app/opentracing/opentracing_layer.go
View File

@@ -12895,7 +12895,7 @@ func (a *OpenTracingAppLayer) SendAckToPushProxy(ack *model.PushNotificationAck)
return resultVar0
}
func (a *OpenTracingAppLayer) SendAutoResponse(channel *model.Channel, receiver *model.User) (bool, *model.AppError) {
func (a *OpenTracingAppLayer) SendAutoResponse(channel *model.Channel, receiver *model.User, post *model.Post) (bool, *model.AppError) {
origCtx := a.ctx
span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.SendAutoResponse")
@@ -12907,7 +12907,7 @@ func (a *OpenTracingAppLayer) SendAutoResponse(channel *model.Channel, receiver
}()
defer span.Finish()
resultVar0, resultVar1 := a.app.SendAutoResponse(channel, receiver)
resultVar0, resultVar1 := a.app.SendAutoResponse(channel, receiver, post)
if resultVar1 != nil {
span.LogFields(spanlog.Error(resultVar1))
@@ -12917,7 +12917,7 @@ func (a *OpenTracingAppLayer) SendAutoResponse(channel *model.Channel, receiver
return resultVar0, resultVar1
}
func (a *OpenTracingAppLayer) SendAutoResponseIfNecessary(channel *model.Channel, sender *model.User) (bool, *model.AppError) {
func (a *OpenTracingAppLayer) SendAutoResponseIfNecessary(channel *model.Channel, sender *model.User, post *model.Post) (bool, *model.AppError) {
origCtx := a.ctx
span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.SendAutoResponseIfNecessary")
@@ -12929,7 +12929,7 @@ func (a *OpenTracingAppLayer) SendAutoResponseIfNecessary(channel *model.Channel
}()
defer span.Finish()
resultVar0, resultVar1 := a.app.SendAutoResponseIfNecessary(channel, sender)
resultVar0, resultVar1 := a.app.SendAutoResponseIfNecessary(channel, sender, post)
if resultVar1 != nil {
span.LogFields(spanlog.Error(resultVar1))

2
app/post.go
View File

@@ -451,7 +451,7 @@ func (a *App) handlePostEvents(post *model.Post, user *model.User, channel *mode
if post.Type != model.POST_AUTO_RESPONDER { // don't respond to an auto-responder
a.Srv().Go(func() {
_, err := a.SendAutoResponseIfNecessary(channel, user)
_, err := a.SendAutoResponseIfNecessary(channel, user, post)
if err != nil {
mlog.Error("Failed to send auto response", mlog.String("user_id", user.Id), mlog.String("post_id", post.Id), mlog.Err(err))
}