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

Try to fix stuff

Browse source
This commit is contained in:
Alex 2020-02-26 17:03:49 +01:00
parent d97a76fcc3
commit 4270202972
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
account.go
View file

@ -227,7 +227,9 @@ func (a *Account) roomInfoUpdatedInternal(roomId RoomID, author UserID, info *Ro
} }
as_mxid := ezbrMxId() as_mxid := ezbrMxId()
if len(author) > 0 { if author == a.Conn.User() {
as_mxid = a.MatrixUser
} else if len(author) > 0 {
mx_user_id, err2 := dbGetMxUser(a.Protocol, author) mx_user_id, err2 := dbGetMxUser(a.Protocol, author)
if err2 == nil { if err2 == nil {
as_mxid = mx_user_id as_mxid = mx_user_id

6
connector/xmpp/xmpp.go
View file

@ -200,7 +200,11 @@ func (xm *XMPP) handleXMPP() error {
if v.Subject != "" && v.Type == "groupchat" { if v.Subject != "" && v.Type == "groupchat" {
author := UserID("") author := UserID("")
if len(remote_sp) == 2 { if len(remote_sp) == 2 {
author = UserID(remote_sp[1] + "@" + remote_sp[0]) if remote_sp[1] == xm.nickname {
author = xm.User()
} else {
author = UserID(remote_sp[1] + "@" + remote_sp[0])
}
} }
xm.handler.RoomInfoUpdated(RoomID(remote_sp[0]), author, &RoomInfo{ xm.handler.RoomInfoUpdated(RoomID(remote_sp[0]), author, &RoomInfo{
Topic: v.Subject, Topic: v.Subject,

2
util.go
View file

@ -50,7 +50,7 @@ func safeStringForId(in string) string {
id2 += "__" id2 += "__"
} else if c == ':' { } else if c == ':' {
id2 += "_" id2 += "_"
} else if unicode.IsDigit(c) || unicode.IsLetter(c) { } else if unicode.IsDigit(c) || unicode.IsLetter(c) || c == '.' || c == '-' || c == '_' {
id2 += string(c) id2 += string(c)
} }
} }