lx/easybridge
0
0
Fork 0
Code Issues 1.6k Pull requests Releases Activity

Fixes

Browse source
This commit is contained in:
Alex 2020-02-28 22:08:18 +01:00
parent 2444302510
commit 708bd14e99
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
account.go
View file

@ -159,7 +159,7 @@ func LoadDbAccounts(mxid string, key *[32]byte) {
err = SetAccount(mxid, acct.Name, acct.Protocol, config) err = SetAccount(mxid, acct.Name, acct.Protocol, config)
if err != nil { if err != nil {
ezbrSystemSendf("Could not setup account %s: %s", acct.Name, err.Error()) ezbrSystemSendf(mxid, "Could not setup account %s: %s", acct.Name, err.Error())
} }
} }
} }

27
server.go
View file

@ -4,6 +4,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"net/http" "net/http"
"os"
"strings" "strings"
"github.com/gorilla/mux" "github.com/gorilla/mux"
@ -23,22 +24,28 @@ func StartAppService(errch chan error) error {
return err return err
} }
err = mx.RegisterUser(registration.SenderLocalpart) if dbKvGet("ezbr_initialized") != "yes" {
if mxe, ok := err.(*mxlib.MxError); !ok || mxe.ErrCode != "M_USER_IN_USE" { err = mx.RegisterUser(registration.SenderLocalpart)
return err if mxe, ok := err.(*mxlib.MxError); !ok || mxe.ErrCode != "M_USER_IN_USE" {
}
if err == nil {
// If Easybridge account was created, update avatar and display name
err = mx.ProfileAvatar(ezbrMxId(), &connector.FileMediaObject{
Path: config.AvatarFile,
})
if err != nil {
return err return err
} }
_, st := os.Stat(config.AvatarFile)
if !os.IsNotExist(st) {
err = mx.ProfileAvatar(ezbrMxId(), &connector.FileMediaObject{
Path: config.AvatarFile,
})
if err != nil {
return err
}
}
err = mx.ProfileDisplayname(ezbrMxId(), fmt.Sprintf("Easybridge (%s)", EASYBRIDGE_SYSTEM_PROTOCOL)) err = mx.ProfileDisplayname(ezbrMxId(), fmt.Sprintf("Easybridge (%s)", EASYBRIDGE_SYSTEM_PROTOCOL))
if err != nil { if err != nil {
return err return err
} }
dbKvPut("ezbr_initialized", "yes")
} }
router := mux.NewRouter() router := mux.NewRouter()