* Migrate User.GetByUsername to Sync by default #11453 * fix app errors #11453 * fix app errors #11453 * fix cmd error #11453 * fix shadow var #11453 * fix shadow user var #11453 * fix test error * fix test error #11453
Этот коммит содержится в:
коммит произвёл
Jesús Espino
родитель
678c8f4f84
Коммит
9ce5b28c63
@@ -49,16 +49,15 @@ func (me *InviteProvider) DoCommand(a *App, args *model.CommandArgs, message str
|
||||
targetUsername := splitMessage[0]
|
||||
targetUsername = strings.TrimPrefix(targetUsername, "@")
|
||||
|
||||
result := <-a.Srv.Store.User().GetByUsername(targetUsername)
|
||||
if result.Err != nil {
|
||||
mlog.Error(result.Err.Error())
|
||||
userProfile, err := a.Srv.Store.User().GetByUsername(targetUsername)
|
||||
if err != nil {
|
||||
mlog.Error(err.Error())
|
||||
return &model.CommandResponse{
|
||||
Text: args.T("api.command_invite.missing_user.app_error"),
|
||||
ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL,
|
||||
}
|
||||
}
|
||||
|
||||
userProfile := result.Data.(*model.User)
|
||||
if userProfile.DeleteAt != 0 {
|
||||
return &model.CommandResponse{
|
||||
Text: args.T("api.command_invite.missing_user.app_error"),
|
||||
@@ -67,7 +66,6 @@ func (me *InviteProvider) DoCommand(a *App, args *model.CommandArgs, message str
|
||||
}
|
||||
|
||||
var channelToJoin *model.Channel
|
||||
var err *model.AppError
|
||||
// User set a channel to add the invited user
|
||||
if len(splitMessage) > 1 && splitMessage[1] != "" {
|
||||
targetChannelName := strings.TrimPrefix(strings.TrimSpace(splitMessage[1]), "~")
|
||||
|
||||
Ссылка в новой задаче
Block a user