Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions app/chat.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,19 @@ package app

import (
"context"
"regexp"

"github.com/webitel/engine/model"
"github.com/webitel/engine/pkg/wbt/chat_manager"
"regexp"
"github.com/webitel/engine/utils"

"net/url"
)

var publicStorage *url.URL
var reErrDetail = regexp.MustCompile(`"detail":"(.*?)"`)
var (
publicStorage *url.URL
reErrDetail = regexp.MustCompile(`"detail":"(.*?)"`)
)

func (a *App) DeclineChat(authUserId int64, inviteId string, cause string) model.AppError {
chat, err := a.chatManager.Client()
Expand Down Expand Up @@ -63,6 +67,10 @@ func (a *App) SendTextMessage(authUserId int64, channelId, conversationId, text

err = chat.SendText(authUserId, channelId, conversationId, text)
if err != nil {
if weer := utils.DomainErorrFromGRPC(err); weer != nil {
return weer
}

return model.NewInternalError("chat.send.text.app_err", extractErrDetail(err))
}

Expand Down Expand Up @@ -103,6 +111,10 @@ func (a *App) SendFileMessage(authUserId int64, channelId, conversationId string

err = chat.SendFile(authUserId, channelId, conversationId, file)
if err != nil {
if weer := utils.DomainErorrFromGRPC(err); weer != nil {
return weer
}

return model.NewInternalError("chat.send.file.app_err", extractErrDetail(err))
}

Expand Down
20 changes: 20 additions & 0 deletions utils/error.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package utils

import (
"github.com/webitel/engine/model"
"google.golang.org/grpc/status"
)

func DomainErorrFromGRPC(err error) model.AppError {
st, ok := status.FromError(err)
if !ok {
return nil
}

jsonString := st.Message()
if werr := model.AppErrorFromJson(jsonString); werr != nil {
return werr
}

return nil
}
Loading