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

Merge branch 'release-3.7' into master.

Просмотр исходного кода
Этот коммит содержится в:
George Goldberg
2017-03-17 16:29:26 +00:00
родитель bfae88e60c 8568afe5b4
Коммит 7f266c1951
91 изменённых файлов: 941 добавлений и 801 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@@ -32,7 +32,7 @@ func CreateDefaultChannels(teamId string) ([]*model.Channel, *model.AppError) {
return channels, nil
}
func JoinDefaultChannels(teamId string, user *model.User, channelRole string) *model.AppError {
func JoinDefaultChannels(teamId string, user *model.User, channelRole string, siteURL string) *model.AppError {
var err *model.AppError = nil
if result := <-Srv.Store.Channel().GetByName(teamId, "town-square", true); result.Err != nil {
@@ -47,7 +47,7 @@ func JoinDefaultChannels(teamId string, user *model.User, channelRole string) *m
err = cmResult.Err
}
if err := postJoinChannelMessage(user, townSquare); err != nil {
if err := postJoinChannelMessage(user, townSquare, siteURL); err != nil {
l4g.Error(utils.T("api.channel.post_user_add_remove_message_and_forget.error"), err)
}
@@ -66,7 +66,7 @@ func JoinDefaultChannels(teamId string, user *model.User, channelRole string) *m
err = cmResult.Err
}
if err := postJoinChannelMessage(user, offTopic); err != nil {
if err := postJoinChannelMessage(user, offTopic, siteURL); err != nil {
l4g.Error(utils.T("api.channel.post_user_add_remove_message_and_forget.error"), err)
}
@@ -310,7 +310,7 @@ func UpdateChannelMemberNotifyProps(data map[string]string, channelId string, us
}
}
func DeleteChannel(channel *model.Channel, userId string) *model.AppError {
func DeleteChannel(channel *model.Channel, userId string, siteURL string) *model.AppError {
uc := Srv.Store.User().Get(userId)
ihc := Srv.Store.Webhook().GetIncomingByChannel(channel.Id)
ohc := Srv.Store.Webhook().GetOutgoingByChannel(channel.Id, -1, -1)
@@ -350,7 +350,7 @@ func DeleteChannel(channel *model.Channel, userId string) *model.AppError {
},
}
if _, err := CreatePost(post, channel.TeamId, false); err != nil {
if _, err := CreatePost(post, channel.TeamId, false, siteURL); err != nil {
l4g.Error(utils.T("api.channel.delete_channel.failed_post.error"), err)
}
@@ -482,7 +482,7 @@ func AddDirectChannels(teamId string, user *model.User) *model.AppError {
return nil
}
func PostUpdateChannelHeaderMessage(userId string, channelId string, teamId string, oldChannelHeader, newChannelHeader string) *model.AppError {
func PostUpdateChannelHeaderMessage(userId string, channelId string, teamId string, oldChannelHeader, newChannelHeader string, siteURL string) *model.AppError {
uc := Srv.Store.User().Get(userId)
if uresult := <-uc; uresult.Err != nil {
@@ -511,7 +511,7 @@ func PostUpdateChannelHeaderMessage(userId string, channelId string, teamId stri
},
}
if _, err := CreatePost(post, teamId, false); err != nil {
if _, err := CreatePost(post, teamId, false, siteURL); err != nil {
return model.NewLocAppError("", "api.channel.post_update_channel_header_message_and_forget.post.error", nil, err.Error())
}
}
@@ -519,7 +519,7 @@ func PostUpdateChannelHeaderMessage(userId string, channelId string, teamId stri
return nil
}
func PostUpdateChannelPurposeMessage(userId string, channelId string, teamId string, oldChannelPurpose string, newChannelPurpose string) *model.AppError {
func PostUpdateChannelPurposeMessage(userId string, channelId string, teamId string, oldChannelPurpose string, newChannelPurpose string, siteURL string) *model.AppError {
uc := Srv.Store.User().Get(userId)
if uresult := <-uc; uresult.Err != nil {
@@ -547,7 +547,7 @@ func PostUpdateChannelPurposeMessage(userId string, channelId string, teamId str
"new_purpose": newChannelPurpose,
},
}
if _, err := CreatePost(post, teamId, false); err != nil {
if _, err := CreatePost(post, teamId, false, siteURL); err != nil {
return model.NewLocAppError("", "app.channel.post_update_channel_purpose_message.post.error", nil, err.Error())
}
}
@@ -555,7 +555,7 @@ func PostUpdateChannelPurposeMessage(userId string, channelId string, teamId str
return nil
}
func PostUpdateChannelDisplayNameMessage(userId string, channelId string, teamId string, oldChannelDisplayName, newChannelDisplayName string) *model.AppError {
func PostUpdateChannelDisplayNameMessage(userId string, channelId string, teamId string, oldChannelDisplayName, newChannelDisplayName string, siteURL string) *model.AppError {
uc := Srv.Store.User().Get(userId)
if uresult := <-uc; uresult.Err != nil {
@@ -577,7 +577,7 @@ func PostUpdateChannelDisplayNameMessage(userId string, channelId string, teamId
},
}
if _, err := CreatePost(post, teamId, false); err != nil {
if _, err := CreatePost(post, teamId, false, siteURL); err != nil {
return model.NewLocAppError("PostUpdateChannelDisplayNameMessage", "api.channel.post_update_channel_displayname_message_and_forget.create_post.error", nil, err.Error())
}
}
@@ -716,10 +716,11 @@ func GetChannelUnread(channelId, userId string) (*model.ChannelUnread, *model.Ap
return channelUnread, nil
}
func JoinChannel(channel *model.Channel, userId string) *model.AppError {
func JoinChannel(channel *model.Channel, userId string, siteURL string) *model.AppError {
if channel.DeleteAt > 0 {
return model.NewLocAppError("JoinChannel", "api.channel.join_channel.already_deleted.app_error", nil, "")
}
userChan := Srv.Store.User().Get(userId)
memberChan := Srv.Store.Channel().GetMember(channel.Id, userId)
@@ -736,7 +737,7 @@ func JoinChannel(channel *model.Channel, userId string) *model.AppError {
return err
}
if err := postJoinChannelMessage(user, channel); err != nil {
if err := postJoinChannelMessage(user, channel, siteURL); err != nil {
return err
}
} else {
@@ -747,7 +748,7 @@ func JoinChannel(channel *model.Channel, userId string) *model.AppError {
return nil
}
func postJoinChannelMessage(user *model.User, channel *model.Channel) *model.AppError {
func postJoinChannelMessage(user *model.User, channel *model.Channel, siteURL string) *model.AppError {
post := &model.Post{
ChannelId: channel.Id,
Message: fmt.Sprintf(utils.T("api.channel.join_channel.post_and_forget"), user.Username),
@@ -758,14 +759,14 @@ func postJoinChannelMessage(user *model.User, channel *model.Channel) *model.App
},
}
if _, err := CreatePost(post, channel.TeamId, false); err != nil {
if _, err := CreatePost(post, channel.TeamId, false, siteURL); err != nil {
return model.NewLocAppError("postJoinChannelMessage", "api.channel.post_user_add_remove_message_and_forget.error", nil, err.Error())
}
return nil
}
func LeaveChannel(channelId string, userId string) *model.AppError {
func LeaveChannel(channelId string, userId string, siteURL string) *model.AppError {
sc := Srv.Store.Channel().Get(channelId, true)
uc := Srv.Store.User().Get(userId)
ccm := Srv.Store.Channel().GetMemberCount(channelId, false)
@@ -797,13 +798,13 @@ func LeaveChannel(channelId string, userId string) *model.AppError {
return err
}
go postLeaveChannelMessage(user, channel)
go postLeaveChannelMessage(user, channel, siteURL)
}
return nil
}
func postLeaveChannelMessage(user *model.User, channel *model.Channel) *model.AppError {
func postLeaveChannelMessage(user *model.User, channel *model.Channel, siteURL string) *model.AppError {
post := &model.Post{
ChannelId: channel.Id,
Message: fmt.Sprintf(utils.T("api.channel.leave.left"), user.Username),
@@ -814,14 +815,14 @@ func postLeaveChannelMessage(user *model.User, channel *model.Channel) *model.Ap
},
}
if _, err := CreatePost(post, channel.TeamId, false); err != nil {
if _, err := CreatePost(post, channel.TeamId, false, siteURL); err != nil {
return model.NewLocAppError("postLeaveChannelMessage", "api.channel.post_user_add_remove_message_and_forget.error", nil, err.Error())
}
return nil
}
func PostAddToChannelMessage(user *model.User, addedUser *model.User, channel *model.Channel) *model.AppError {
func PostAddToChannelMessage(user *model.User, addedUser *model.User, channel *model.Channel, siteURL string) *model.AppError {
post := &model.Post{
ChannelId: channel.Id,
Message: fmt.Sprintf(utils.T("api.channel.add_member.added"), addedUser.Username, user.Username),
@@ -833,14 +834,14 @@ func PostAddToChannelMessage(user *model.User, addedUser *model.User, channel *m
},
}
if _, err := CreatePost(post, channel.TeamId, false); err != nil {
if _, err := CreatePost(post, channel.TeamId, false, siteURL); err != nil {
return model.NewLocAppError("postAddToChannelMessage", "api.channel.post_user_add_remove_message_and_forget.error", nil, err.Error())
}
return nil
}
func PostRemoveFromChannelMessage(removerUserId string, removedUser *model.User, channel *model.Channel) *model.AppError {
func PostRemoveFromChannelMessage(removerUserId string, removedUser *model.User, channel *model.Channel, siteURL string) *model.AppError {
post := &model.Post{
ChannelId: channel.Id,
Message: fmt.Sprintf(utils.T("api.channel.remove_member.removed"), removedUser.Username),
@@ -851,7 +852,7 @@ func PostRemoveFromChannelMessage(removerUserId string, removedUser *model.User,
},
}
if _, err := CreatePost(post, channel.TeamId, false); err != nil {
if _, err := CreatePost(post, channel.TeamId, false, siteURL); err != nil {
return model.NewLocAppError("postRemoveFromChannelMessage", "api.channel.post_user_add_remove_message_and_forget.error", nil, err.Error())
}
@@ -890,7 +891,7 @@ func removeUserFromChannel(userIdToRemove string, removerUserId string, channel
return nil
}
func RemoveUserFromChannel(userIdToRemove string, removerUserId string, channel *model.Channel) *model.AppError {
func RemoveUserFromChannel(userIdToRemove string, removerUserId string, channel *model.Channel, siteURL string) *model.AppError {
var err *model.AppError
if err = removeUserFromChannel(userIdToRemove, removerUserId, channel); err != nil {
return err
@@ -901,7 +902,7 @@ func RemoveUserFromChannel(userIdToRemove string, removerUserId string, channel
return err
}
go PostRemoveFromChannelMessage(removerUserId, user, channel)
go PostRemoveFromChannelMessage(removerUserId, user, channel, siteURL)
return nil
}