mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

PLT-5745 Cleaning up duplicate calls (#7298)

Просмотр исходного кода 
* PLT-5745 Cleaning up duplicate calls

* Fixing missing calls

* Fixing broken test
Этот коммит содержится в:
Corey Hulen
2017-08-28 07:08:37 -07:00
коммит произвёл Harrison Healey
родитель a12cf549cf
Коммит 1709b94227
16 изменённых файлов: 79 добавлений и 79 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
api/channel.go
Просмотреть файл

@@ -207,7 +207,7 @@ func updateChannel(c *Context, w http.ResponseWriter, r *http.Request) {
return return
} else { } else {
if oldChannelDisplayName != channel.DisplayName { if oldChannelDisplayName != channel.DisplayName {
if err := app.PostUpdateChannelDisplayNameMessage(c.Session.UserId, channel.Id, c.TeamId, oldChannelDisplayName, channel.DisplayName); err != nil { if err := app.PostUpdateChannelDisplayNameMessage(c.Session.UserId, channel, oldChannelDisplayName, channel.DisplayName); err != nil {
l4g.Error(err.Error()) l4g.Error(err.Error())
} }
} }
@@ -255,7 +255,7 @@ func updateChannelHeader(c *Context, w http.ResponseWriter, r *http.Request) {
c.Err = err c.Err = err
return return
} else { } else {
if err := app.PostUpdateChannelHeaderMessage(c.Session.UserId, channel.Id, c.TeamId, oldChannelHeader, channelHeader); err != nil { if err := app.PostUpdateChannelHeaderMessage(c.Session.UserId, channel, oldChannelHeader, channelHeader); err != nil {
l4g.Error(err.Error()) l4g.Error(err.Error())
} }
c.LogAudit("name=" + channel.Name) c.LogAudit("name=" + channel.Name)
@@ -301,7 +301,7 @@ func updateChannelPurpose(c *Context, w http.ResponseWriter, r *http.Request) {
c.Err = err c.Err = err
return return
} else { } else {
if err := app.PostUpdateChannelPurposeMessage(c.Session.UserId, channel.Id, c.TeamId, oldChannelPurpose, channelPurpose); err != nil { if err := app.PostUpdateChannelPurposeMessage(c.Session.UserId, channel, oldChannelPurpose, channelPurpose); err != nil {
l4g.Error(err.Error()) l4g.Error(err.Error())
} }
c.LogAudit("name=" + channel.Name) c.LogAudit("name=" + channel.Name)

2
api4/channel.go
Просмотреть файл

@@ -141,7 +141,7 @@ func updateChannel(c *Context, w http.ResponseWriter, r *http.Request) {
return return
} else { } else {
if oldChannelDisplayName != channel.DisplayName { if oldChannelDisplayName != channel.DisplayName {
if err := app.PostUpdateChannelDisplayNameMessage(c.Session.UserId, channel.Id, c.Params.TeamId, oldChannelDisplayName, channel.DisplayName); err != nil { if err := app.PostUpdateChannelDisplayNameMessage(c.Session.UserId, channel, oldChannelDisplayName, channel.DisplayName); err != nil {
l4g.Error(err.Error()) l4g.Error(err.Error())
} }
} }

2
app/apptestlib.go
Просмотреть файл

@@ -169,7 +169,7 @@ func (me *TestHelper) CreatePost(channel *model.Channel) *model.Post {
utils.DisableDebugLogForTest() utils.DisableDebugLogForTest()
var err *model.AppError var err *model.AppError
if post, err = CreatePost(post, channel.TeamId, false); err != nil { if post, err = CreatePost(post, channel, false); err != nil {
l4g.Error(err.Error()) l4g.Error(err.Error())
l4g.Close() l4g.Close()
time.Sleep(time.Second) time.Sleep(time.Second)

34
app/channel.go
Просмотреть файл

@@ -335,19 +335,19 @@ func PatchChannel(channel *model.Channel, patch *model.ChannelPatch, userId stri
} }
if oldChannelDisplayName != channel.DisplayName { if oldChannelDisplayName != channel.DisplayName {
if err := PostUpdateChannelDisplayNameMessage(userId, channel.Id, channel.TeamId, oldChannelDisplayName, channel.DisplayName); err != nil { if err := PostUpdateChannelDisplayNameMessage(userId, channel, oldChannelDisplayName, channel.DisplayName); err != nil {
l4g.Error(err.Error()) l4g.Error(err.Error())
} }
} }
if channel.Header != oldChannelHeader { if channel.Header != oldChannelHeader {
if err := PostUpdateChannelHeaderMessage(userId, channel.Id, channel.TeamId, oldChannelHeader, channel.Header); err != nil { if err := PostUpdateChannelHeaderMessage(userId, channel, oldChannelHeader, channel.Header); err != nil {
l4g.Error(err.Error()) l4g.Error(err.Error())
} }
} }
if channel.Purpose != oldChannelPurpose { if channel.Purpose != oldChannelPurpose {
if err := PostUpdateChannelPurposeMessage(userId, channel.Id, channel.TeamId, oldChannelPurpose, channel.Purpose); err != nil { if err := PostUpdateChannelPurposeMessage(userId, channel, oldChannelPurpose, channel.Purpose); err != nil {
l4g.Error(err.Error()) l4g.Error(err.Error())
} }
} }
@@ -445,7 +445,7 @@ func DeleteChannel(channel *model.Channel, userId string) *model.AppError {
}, },
} }
if _, err := CreatePost(post, channel.TeamId, false); err != nil { if _, err := CreatePost(post, channel, false); err != nil {
l4g.Error(utils.T("api.channel.delete_channel.failed_post.error"), err) l4g.Error(utils.T("api.channel.delete_channel.failed_post.error"), err)
} }
@@ -615,7 +615,7 @@ func AddDirectChannels(teamId string, user *model.User) *model.AppError {
return nil return nil
} }
func PostUpdateChannelHeaderMessage(userId string, channelId string, teamId string, oldChannelHeader, newChannelHeader string) *model.AppError { func PostUpdateChannelHeaderMessage(userId string, channel *model.Channel, oldChannelHeader, newChannelHeader string) *model.AppError {
uc := Srv.Store.User().Get(userId) uc := Srv.Store.User().Get(userId)
if uresult := <-uc; uresult.Err != nil { if uresult := <-uc; uresult.Err != nil {
@@ -633,7 +633,7 @@ func PostUpdateChannelHeaderMessage(userId string, channelId string, teamId stri
} }
post := &model.Post{ post := &model.Post{
ChannelId: channelId, ChannelId: channel.Id,
Message: message, Message: message,
Type: model.POST_HEADER_CHANGE, Type: model.POST_HEADER_CHANGE,
UserId: userId, UserId: userId,
@@ -644,7 +644,7 @@ func PostUpdateChannelHeaderMessage(userId string, channelId string, teamId stri
}, },
} }
if _, err := CreatePost(post, teamId, false); err != nil { if _, err := CreatePost(post, channel, false); err != nil {
return model.NewLocAppError("", "api.channel.post_update_channel_header_message_and_forget.post.error", nil, err.Error()) return model.NewLocAppError("", "api.channel.post_update_channel_header_message_and_forget.post.error", nil, err.Error())
} }
} }
@@ -652,7 +652,7 @@ func PostUpdateChannelHeaderMessage(userId string, channelId string, teamId stri
return nil return nil
} }
func PostUpdateChannelPurposeMessage(userId string, channelId string, teamId string, oldChannelPurpose string, newChannelPurpose string) *model.AppError { func PostUpdateChannelPurposeMessage(userId string, channel *model.Channel, oldChannelPurpose string, newChannelPurpose string) *model.AppError {
uc := Srv.Store.User().Get(userId) uc := Srv.Store.User().Get(userId)
if uresult := <-uc; uresult.Err != nil { if uresult := <-uc; uresult.Err != nil {
@@ -670,7 +670,7 @@ func PostUpdateChannelPurposeMessage(userId string, channelId string, teamId str
} }
post := &model.Post{ post := &model.Post{
ChannelId: channelId, ChannelId: channel.Id,
Message: message, Message: message,
Type: model.POST_PURPOSE_CHANGE, Type: model.POST_PURPOSE_CHANGE,
UserId: userId, UserId: userId,
@@ -680,7 +680,7 @@ func PostUpdateChannelPurposeMessage(userId string, channelId string, teamId str
"new_purpose": newChannelPurpose, "new_purpose": newChannelPurpose,
}, },
} }
if _, err := CreatePost(post, teamId, false); err != nil { if _, err := CreatePost(post, channel, false); err != nil {
return model.NewLocAppError("", "app.channel.post_update_channel_purpose_message.post.error", nil, err.Error()) return model.NewLocAppError("", "app.channel.post_update_channel_purpose_message.post.error", nil, err.Error())
} }
} }
@@ -688,7 +688,7 @@ func PostUpdateChannelPurposeMessage(userId string, channelId string, teamId str
return nil return nil
} }
func PostUpdateChannelDisplayNameMessage(userId string, channelId string, teamId string, oldChannelDisplayName, newChannelDisplayName string) *model.AppError { func PostUpdateChannelDisplayNameMessage(userId string, channel *model.Channel, oldChannelDisplayName, newChannelDisplayName string) *model.AppError {
uc := Srv.Store.User().Get(userId) uc := Srv.Store.User().Get(userId)
if uresult := <-uc; uresult.Err != nil { if uresult := <-uc; uresult.Err != nil {
@@ -699,7 +699,7 @@ func PostUpdateChannelDisplayNameMessage(userId string, channelId string, teamId
message := fmt.Sprintf(utils.T("api.channel.post_update_channel_displayname_message_and_forget.updated_from"), user.Username, oldChannelDisplayName, newChannelDisplayName) message := fmt.Sprintf(utils.T("api.channel.post_update_channel_displayname_message_and_forget.updated_from"), user.Username, oldChannelDisplayName, newChannelDisplayName)
post := &model.Post{ post := &model.Post{
ChannelId: channelId, ChannelId: channel.Id,
Message: message, Message: message,
Type: model.POST_DISPLAYNAME_CHANGE, Type: model.POST_DISPLAYNAME_CHANGE,
UserId: userId, UserId: userId,
@@ -710,7 +710,7 @@ func PostUpdateChannelDisplayNameMessage(userId string, channelId string, teamId
}, },
} }
if _, err := CreatePost(post, teamId, false); err != nil { if _, err := CreatePost(post, channel, false); err != nil {
return model.NewLocAppError("PostUpdateChannelDisplayNameMessage", "api.channel.post_update_channel_displayname_message_and_forget.create_post.error", nil, err.Error()) return model.NewLocAppError("PostUpdateChannelDisplayNameMessage", "api.channel.post_update_channel_displayname_message_and_forget.create_post.error", nil, err.Error())
} }
} }
@@ -908,7 +908,7 @@ func postJoinChannelMessage(user *model.User, channel *model.Channel) *model.App
}, },
} }
if _, err := CreatePost(post, channel.TeamId, false); err != nil { if _, err := CreatePost(post, channel, false); err != nil {
return model.NewLocAppError("postJoinChannelMessage", "api.channel.post_user_add_remove_message_and_forget.error", nil, err.Error()) return model.NewLocAppError("postJoinChannelMessage", "api.channel.post_user_add_remove_message_and_forget.error", nil, err.Error())
} }
@@ -964,7 +964,7 @@ func postLeaveChannelMessage(user *model.User, channel *model.Channel) *model.Ap
}, },
} }
if _, err := CreatePost(post, channel.TeamId, false); err != nil { if _, err := CreatePost(post, channel, false); err != nil {
return model.NewLocAppError("postLeaveChannelMessage", "api.channel.post_user_add_remove_message_and_forget.error", nil, err.Error()) return model.NewLocAppError("postLeaveChannelMessage", "api.channel.post_user_add_remove_message_and_forget.error", nil, err.Error())
} }
@@ -983,7 +983,7 @@ func PostAddToChannelMessage(user *model.User, addedUser *model.User, channel *m
}, },
} }
if _, err := CreatePost(post, channel.TeamId, false); err != nil { if _, err := CreatePost(post, channel, false); err != nil {
return model.NewLocAppError("postAddToChannelMessage", "api.channel.post_user_add_remove_message_and_forget.error", nil, err.Error()) return model.NewLocAppError("postAddToChannelMessage", "api.channel.post_user_add_remove_message_and_forget.error", nil, err.Error())
} }
@@ -1001,7 +1001,7 @@ func PostRemoveFromChannelMessage(removerUserId string, removedUser *model.User,
}, },
} }
if _, err := CreatePost(post, channel.TeamId, false); err != nil { if _, err := CreatePost(post, channel, false); err != nil {
return model.NewLocAppError("postRemoveFromChannelMessage", "api.channel.post_user_add_remove_message_and_forget.error", nil, err.Error()) return model.NewLocAppError("postRemoveFromChannelMessage", "api.channel.post_user_add_remove_message_and_forget.error", nil, err.Error())
} }

2
app/command.go
Просмотреть файл

@@ -46,7 +46,7 @@ func CreateCommandPost(post *model.Post, teamId string, response *model.CommandR
} }
if response.ResponseType == model.COMMAND_RESPONSE_TYPE_IN_CHANNEL { if response.ResponseType == model.COMMAND_RESPONSE_TYPE_IN_CHANNEL {
return CreatePost(post, teamId, true) return CreatePostMissingChannel(post, true)
} else if response.ResponseType == "" || response.ResponseType == model.COMMAND_RESPONSE_TYPE_EPHEMERAL { } else if response.ResponseType == "" || response.ResponseType == model.COMMAND_RESPONSE_TYPE_EPHEMERAL {
if response.Text == "" { if response.Text == "" {
return post, nil return post, nil

2
app/command_echo.go
Просмотреть файл

@@ -88,7 +88,7 @@ func (me *EchoProvider) DoCommand(args *model.CommandArgs, message string) *mode
time.Sleep(time.Duration(delay) * time.Second) time.Sleep(time.Duration(delay) * time.Second)
if _, err := CreatePost(post, args.TeamId, true); err != nil { if _, err := CreatePostMissingChannel(post, true); err != nil {
l4g.Error(args.T("api.command_echo.create.app_error"), err) l4g.Error(args.T("api.command_echo.create.app_error"), err)
} }
}() }()

4
app/command_loadtest.go
Просмотреть файл

@@ -357,7 +357,7 @@ func (me *LoadTestProvider) UrlCommand(args *model.CommandArgs, message string)
post.ChannelId = args.ChannelId post.ChannelId = args.ChannelId
post.UserId = args.UserId post.UserId = args.UserId
if _, err := CreatePost(post, args.TeamId, false); err != nil { if _, err := CreatePostMissingChannel(post, false); err != nil {
return &model.CommandResponse{Text: "Unable to create post", ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} return &model.CommandResponse{Text: "Unable to create post", ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}
} }
} }
@@ -396,7 +396,7 @@ func (me *LoadTestProvider) JsonCommand(args *model.CommandArgs, message string)
post.Message = message post.Message = message
} }
if _, err := CreatePost(post, args.TeamId, false); err != nil { if _, err := CreatePostMissingChannel(post, false); err != nil {
return &model.CommandResponse{Text: "Unable to create post", ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} return &model.CommandResponse{Text: "Unable to create post", ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}
} }
return &model.CommandResponse{Text: "Loaded data", ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} return &model.CommandResponse{Text: "Loaded data", ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}

2
app/command_msg.go
Просмотреть файл

@@ -89,7 +89,7 @@ func (me *msgProvider) DoCommand(args *model.CommandArgs, message string) *model
post.Message = parsedMessage post.Message = parsedMessage
post.ChannelId = targetChannelId post.ChannelId = targetChannelId
post.UserId = args.UserId post.UserId = args.UserId
if _, err := CreatePost(post, args.TeamId, true); err != nil { if _, err := CreatePostMissingChannel(post, true); err != nil {
return &model.CommandResponse{Text: args.T("api.command_msg.fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} return &model.CommandResponse{Text: args.T("api.command_msg.fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}
} }
} }

14
app/notification.go
Просмотреть файл

@@ -25,7 +25,7 @@ import (
"github.com/nicksnyder/go-i18n/i18n" "github.com/nicksnyder/go-i18n/i18n"
) )
func SendNotifications(post *model.Post, team *model.Team, channel *model.Channel, sender *model.User) ([]string, *model.AppError) { func SendNotifications(post *model.Post, team *model.Team, channel *model.Channel, sender *model.User, parentPostList *model.PostList) ([]string, *model.AppError) {
pchan := Srv.Store.User().GetAllProfilesInChannel(channel.Id, true) pchan := Srv.Store.User().GetAllProfilesInChannel(channel.Id, true)
cmnchan := Srv.Store.Channel().GetAllChannelMembersNotifyPropsForChannel(channel.Id, true) cmnchan := Srv.Store.Channel().GetAllChannelMembersNotifyPropsForChannel(channel.Id, true)
var fchan store.StoreChannel var fchan store.StoreChannel
@@ -77,20 +77,14 @@ func SendNotifications(post *model.Post, team *model.Team, channel *model.Channe
mentionedUserIds, potentialOtherMentions, hereNotification, channelNotification, allNotification = GetExplicitMentions(post.Message, keywords) mentionedUserIds, potentialOtherMentions, hereNotification, channelNotification, allNotification = GetExplicitMentions(post.Message, keywords)
// get users that have comment thread mentions enabled // get users that have comment thread mentions enabled
if len(post.RootId) > 0 { if len(post.RootId) > 0 && parentPostList != nil {
if result := <-Srv.Store.Post().Get(post.RootId); result.Err != nil { for _, threadPost := range parentPostList.Posts {
return nil, result.Err
} else {
list := result.Data.(*model.PostList)
for _, threadPost := range list.Posts {
profile := profileMap[threadPost.UserId] profile := profileMap[threadPost.UserId]
if profile != nil && (profile.NotifyProps["comments"] == "any" || (profile.NotifyProps["comments"] == "root" && threadPost.Id == list.Order[0])) { if profile != nil && (profile.NotifyProps["comments"] == "any" || (profile.NotifyProps["comments"] == "root" && threadPost.Id == parentPostList.Order[0])) {
mentionedUserIds[threadPost.UserId] = true mentionedUserIds[threadPost.UserId] = true
} }
} }
} }
}
// prevent the user from mentioning themselves // prevent the user from mentioning themselves
if post.Props["from_webhook"] != "true" { if post.Props["from_webhook"] != "true" {

18
app/notification_test.go
Просмотреть файл

@@ -16,17 +16,17 @@ func TestSendNotifications(t *testing.T) {
AddUserToChannel(th.BasicUser2, th.BasicChannel) AddUserToChannel(th.BasicUser2, th.BasicChannel)
post1, err := CreatePost(&model.Post{ post1, err := CreatePostMissingChannel(&model.Post{
UserId: th.BasicUser.Id, UserId: th.BasicUser.Id,
ChannelId: th.BasicChannel.Id, ChannelId: th.BasicChannel.Id,
Message: "@" + th.BasicUser2.Username, Message: "@" + th.BasicUser2.Username,
}, th.BasicTeam.Id, true) }, true)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
mentions, err := SendNotifications(post1, th.BasicTeam, th.BasicChannel, th.BasicUser) mentions, err := SendNotifications(post1, th.BasicTeam, th.BasicChannel, th.BasicUser, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} else if mentions == nil { } else if mentions == nil {
@@ -42,17 +42,17 @@ func TestSendNotifications(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
post2, err := CreatePost(&model.Post{ post2, err := CreatePostMissingChannel(&model.Post{
UserId: th.BasicUser.Id, UserId: th.BasicUser.Id,
ChannelId: dm.Id, ChannelId: dm.Id,
Message: "dm message", Message: "dm message",
}, th.BasicTeam.Id, true) }, true)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
_, err = SendNotifications(post2, th.BasicTeam, dm, th.BasicUser) _, err = SendNotifications(post2, th.BasicTeam, dm, th.BasicUser, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@@ -60,17 +60,17 @@ func TestSendNotifications(t *testing.T) {
UpdateActive(th.BasicUser2, false) UpdateActive(th.BasicUser2, false)
InvalidateAllCaches() InvalidateAllCaches()
post3, err := CreatePost(&model.Post{ post3, err := CreatePostMissingChannel(&model.Post{
UserId: th.BasicUser.Id, UserId: th.BasicUser.Id,
ChannelId: dm.Id, ChannelId: dm.Id,
Message: "dm message", Message: "dm message",
}, th.BasicTeam.Id, true) }, true)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
_, err = SendNotifications(post3, th.BasicTeam, dm, th.BasicUser) _, err = SendNotifications(post3, th.BasicTeam, dm, th.BasicUser, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

2
app/plugin/api.go
Просмотреть файл

@@ -30,7 +30,7 @@ type API interface {
GetDirectChannel(userId1, userId2 string) (*model.Channel, *model.AppError) GetDirectChannel(userId1, userId2 string) (*model.Channel, *model.AppError)
// Creates a post // Creates a post
CreatePost(post *model.Post, teamId string) (*model.Post, *model.AppError) CreatePost(post *model.Post) (*model.Post, *model.AppError)
// Returns a localized string. If a request is given, its headers will be used to pick a locale. // Returns a localized string. If a request is given, its headers will be used to pick a locale.
I18n(id string, r *http.Request) string I18n(id string, r *http.Request) string

2
app/plugin/jira/plugin.go
Просмотреть файл

@@ -72,7 +72,7 @@ func (p *Plugin) handleWebhook(w http.ResponseWriter, r *http.Request) {
"from_webhook": "true", "from_webhook": "true",
"attachments": []*model.SlackAttachment{attachment}, "attachments": []*model.SlackAttachment{attachment},
}, },
}, channel.TeamId); err != nil { }); err != nil {
http.Error(w, p.api.I18n(err.Message, r), err.StatusCode) http.Error(w, p.api.I18n(err.Message, r), err.StatusCode)
} }
} }

4
app/plugins.go
Просмотреть файл

@@ -50,8 +50,8 @@ func (api *PluginAPI) GetDirectChannel(userId1, userId2 string) (*model.Channel,
return GetDirectChannel(userId1, userId2) return GetDirectChannel(userId1, userId2)
} }
func (api *PluginAPI) CreatePost(post *model.Post, teamId string) (*model.Post, *model.AppError) { func (api *PluginAPI) CreatePost(post *model.Post) (*model.Post, *model.AppError) {
return CreatePost(post, teamId, true) return CreatePostMissingChannel(post, true)
} }
func (api *PluginAPI) I18n(id string, r *http.Request) string { func (api *PluginAPI) I18n(id string, r *http.Request) string {

44
app/post.go
Просмотреть файл

@@ -34,7 +34,7 @@ func CreatePostAsUser(post *model.Post) (*model.Post, *model.AppError) {
return nil, err return nil, err
} }
if rp, err := CreatePost(post, channel.TeamId, true); err != nil { if rp, err := CreatePost(post, channel, true); err != nil {
if err.Id == "api.post.create_post.root_id.app_error" || if err.Id == "api.post.create_post.root_id.app_error" ||
err.Id == "api.post.create_post.channel_root_id.app_error" || err.Id == "api.post.create_post.channel_root_id.app_error" ||
err.Id == "api.post.create_post.parent_id.app_error" { err.Id == "api.post.create_post.parent_id.app_error" {
@@ -61,19 +61,32 @@ func CreatePostAsUser(post *model.Post) (*model.Post, *model.AppError) {
} }
func CreatePost(post *model.Post, teamId string, triggerWebhooks bool) (*model.Post, *model.AppError) { func CreatePostMissingChannel(post *model.Post, triggerWebhooks bool) (*model.Post, *model.AppError) {
var channel *model.Channel
cchan := Srv.Store.Channel().Get(post.ChannelId, true)
if result := <-cchan; result.Err != nil {
return nil, result.Err
} else {
channel = result.Data.(*model.Channel)
}
return CreatePost(post, channel, triggerWebhooks)
}
func CreatePost(post *model.Post, channel *model.Channel, triggerWebhooks bool) (*model.Post, *model.AppError) {
var pchan store.StoreChannel var pchan store.StoreChannel
if len(post.RootId) > 0 { if len(post.RootId) > 0 {
pchan = Srv.Store.Post().Get(post.RootId) pchan = Srv.Store.Post().Get(post.RootId)
} }
// Verify the parent/child relationships are correct // Verify the parent/child relationships are correct
var parentPostList *model.PostList
if pchan != nil { if pchan != nil {
if presult := <-pchan; presult.Err != nil { if presult := <-pchan; presult.Err != nil {
return nil, model.NewLocAppError("createPost", "api.post.create_post.root_id.app_error", nil, "") return nil, model.NewLocAppError("createPost", "api.post.create_post.root_id.app_error", nil, "")
} else { } else {
list := presult.Data.(*model.PostList) parentPostList = presult.Data.(*model.PostList)
if len(list.Posts) == 0 || !list.IsChannelId(post.ChannelId) { if len(parentPostList.Posts) == 0 || !parentPostList.IsChannelId(post.ChannelId) {
return nil, model.NewLocAppError("createPost", "api.post.create_post.channel_root_id.app_error", nil, "") return nil, model.NewLocAppError("createPost", "api.post.create_post.channel_root_id.app_error", nil, "")
} }
@@ -82,7 +95,7 @@ func CreatePost(post *model.Post, teamId string, triggerWebhooks bool) (*model.P
} }
if post.RootId != post.ParentId { if post.RootId != post.ParentId {
parent := list.Posts[post.ParentId] parent := parentPostList.Posts[post.ParentId]
if parent == nil { if parent == nil {
return nil, model.NewLocAppError("createPost", "api.post.create_post.parent_id.app_error", nil, "") return nil, model.NewLocAppError("createPost", "api.post.create_post.parent_id.app_error", nil, "")
} }
@@ -101,7 +114,7 @@ func CreatePost(post *model.Post, teamId string, triggerWebhooks bool) (*model.P
esInterface := einterfaces.GetElasticsearchInterface() esInterface := einterfaces.GetElasticsearchInterface()
if esInterface != nil && *utils.Cfg.ElasticsearchSettings.EnableIndexing { if esInterface != nil && *utils.Cfg.ElasticsearchSettings.EnableIndexing {
go esInterface.IndexPost(rpost, teamId) go esInterface.IndexPost(rpost, channel.TeamId)
} }
if einterfaces.GetMetricsInterface() != nil { if einterfaces.GetMetricsInterface() != nil {
@@ -123,19 +136,19 @@ func CreatePost(post *model.Post, teamId string, triggerWebhooks bool) (*model.P
} }
} }
if err := handlePostEvents(rpost, teamId, triggerWebhooks); err != nil { if err := handlePostEvents(rpost, channel, triggerWebhooks, parentPostList); err != nil {
return nil, err return nil, err
} }
return rpost, nil return rpost, nil
} }
func handlePostEvents(post *model.Post, teamId string, triggerWebhooks bool) *model.AppError { func handlePostEvents(post *model.Post, channel *model.Channel, triggerWebhooks bool, parentPostList *model.PostList) *model.AppError {
var tchan store.StoreChannel var tchan store.StoreChannel
if len(teamId) > 0 { if len(channel.TeamId) > 0 {
tchan = Srv.Store.Team().Get(teamId) tchan = Srv.Store.Team().Get(channel.TeamId)
} }
cchan := Srv.Store.Channel().Get(post.ChannelId, true)
uchan := Srv.Store.User().Get(post.UserId) uchan := Srv.Store.User().Get(post.UserId)
var team *model.Team var team *model.Team
@@ -150,13 +163,6 @@ func handlePostEvents(post *model.Post, teamId string, triggerWebhooks bool) *mo
team = &model.Team{} team = &model.Team{}
} }
var channel *model.Channel
if result := <-cchan; result.Err != nil {
return result.Err
} else {
channel = result.Data.(*model.Channel)
}
InvalidateCacheForChannel(channel) InvalidateCacheForChannel(channel)
InvalidateCacheForChannelPosts(channel.Id) InvalidateCacheForChannelPosts(channel.Id)
@@ -167,7 +173,7 @@ func handlePostEvents(post *model.Post, teamId string, triggerWebhooks bool) *mo
user = result.Data.(*model.User) user = result.Data.(*model.User)
} }
if _, err := SendNotifications(post, team, channel, user); err != nil { if _, err := SendNotifications(post, team, channel, user, parentPostList); err != nil {
return err return err
} }

14
app/webhook.go
Просмотреть файл

@@ -80,13 +80,13 @@ func handleWebhookEvents(post *model.Post, team *model.Team, channel *model.Chan
TriggerWord: triggerWord, TriggerWord: triggerWord,
FileIds: strings.Join(post.FileIds, ","), FileIds: strings.Join(post.FileIds, ","),
} }
go TriggerWebhook(payload, hook, post) go TriggerWebhook(payload, hook, post, channel)
} }
return nil return nil
} }
func TriggerWebhook(payload *model.OutgoingWebhookPayload, hook *model.OutgoingWebhook, post *model.Post) { func TriggerWebhook(payload *model.OutgoingWebhookPayload, hook *model.OutgoingWebhook, post *model.Post, channel *model.Channel) {
var body io.Reader var body io.Reader
var contentType string var contentType string
if hook.ContentType == "application/json" { if hook.ContentType == "application/json" {
@@ -109,7 +109,7 @@ func TriggerWebhook(payload *model.OutgoingWebhookPayload, hook *model.OutgoingW
respProps := model.MapFromJson(resp.Body) respProps := model.MapFromJson(resp.Body)
if text, ok := respProps["text"]; ok { if text, ok := respProps["text"]; ok {
if _, err := CreateWebhookPost(hook.CreatorId, hook.TeamId, post.ChannelId, text, respProps["username"], respProps["icon_url"], post.Props, post.Type); err != nil { if _, err := CreateWebhookPost(hook.CreatorId, channel, text, respProps["username"], respProps["icon_url"], post.Props, post.Type); err != nil {
l4g.Error(utils.T("api.post.handle_webhook_events_and_forget.create_post.error"), err) l4g.Error(utils.T("api.post.handle_webhook_events_and_forget.create_post.error"), err)
} }
} }
@@ -118,12 +118,12 @@ func TriggerWebhook(payload *model.OutgoingWebhookPayload, hook *model.OutgoingW
} }
} }
func CreateWebhookPost(userId, teamId, channelId, text, overrideUsername, overrideIconUrl string, props model.StringInterface, postType string) (*model.Post, *model.AppError) { func CreateWebhookPost(userId string, channel *model.Channel, text, overrideUsername, overrideIconUrl string, props model.StringInterface, postType string) (*model.Post, *model.AppError) {
// parse links into Markdown format // parse links into Markdown format
linkWithTextRegex := regexp.MustCompile(`<([^<\|]+)\|([^>]+)>`) linkWithTextRegex := regexp.MustCompile(`<([^<\|]+)\|([^>]+)>`)
text = linkWithTextRegex.ReplaceAllString(text, "[${2}](${1})") text = linkWithTextRegex.ReplaceAllString(text, "[${2}](${1})")
post := &model.Post{UserId: userId, ChannelId: channelId, Message: text, Type: postType} post := &model.Post{UserId: userId, ChannelId: channel.Id, Message: text, Type: postType}
post.AddProp("from_webhook", "true") post.AddProp("from_webhook", "true")
if metrics := einterfaces.GetMetricsInterface(); metrics != nil { if metrics := einterfaces.GetMetricsInterface(); metrics != nil {
@@ -173,7 +173,7 @@ func CreateWebhookPost(userId, teamId, channelId, text, overrideUsername, overri
post.UpdateAt = 0 post.UpdateAt = 0
post.CreateAt = 0 post.CreateAt = 0
post.Message = txt post.Message = txt
if _, err := CreatePost(post, teamId, false); err != nil { if _, err := CreatePostMissingChannel(post, false); err != nil {
return nil, model.NewLocAppError("CreateWebhookPost", "api.post.create_webhook_post.creating.app_error", nil, "err="+err.Message) return nil, model.NewLocAppError("CreateWebhookPost", "api.post.create_webhook_post.creating.app_error", nil, "err="+err.Message)
} }
@@ -527,7 +527,7 @@ func HandleIncomingWebhook(hookId string, req *model.IncomingWebhookRequest) *mo
overrideUsername := req.Username overrideUsername := req.Username
overrideIconUrl := req.IconURL overrideIconUrl := req.IconURL
if _, err := CreateWebhookPost(hook.UserId, hook.TeamId, channel.Id, text, overrideUsername, overrideIconUrl, req.Props, webhookType); err != nil { if _, err := CreateWebhookPost(hook.UserId, channel, text, overrideUsername, overrideIconUrl, req.Props, webhookType); err != nil {
return err return err
} }

2
app/webhook_test.go
Просмотреть файл

@@ -28,7 +28,7 @@ func TestCreateWebhookPost(t *testing.T) {
} }
defer DeleteIncomingWebhook(hook.Id) defer DeleteIncomingWebhook(hook.Id)
post, err := CreateWebhookPost(hook.UserId, hook.TeamId, th.BasicChannel.Id, "foo", "user", "http://iconurl", model.StringInterface{ post, err := CreateWebhookPost(hook.UserId, th.BasicChannel, "foo", "user", "http://iconurl", model.StringInterface{
"attachments": []*model.SlackAttachment{ "attachments": []*model.SlackAttachment{
&model.SlackAttachment{ &model.SlackAttachment{
Text: "text", Text: "text",