jarno
/
go-skype-bridge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix mention user bug

This commit is contained in:
zhaoYangguang 2021-01-15 20:29:17 +08:00
parent 977b8996c7
commit 43b937d645
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
formatting.go
View File

@ -159,14 +159,26 @@ func (formatter *Formatter) ParseSkype(content *event.MessageEventContent, RoomM
// parse mention user message // parse mention user message
r := regexp.MustCompile(`<at[^>]+\bid="([^"]+)"(.*?)</at>*`) r := regexp.MustCompile(`<at[^>]+\bid="([^"]+)"(.*?)</at>*`)
matches := r.FindAllStringSubmatch(backStr, -1) var originStr string
if len(backStr) == 0 {
originStr = content.Body
} else {
originStr = backStr
}
matches := r.FindAllStringSubmatch(originStr, -1)
if len(matches) > 0 { if len(matches) > 0 {
for _, match := range matches { for _, match := range matches {
mxid, displayname := formatter.getMatrixInfoByJID(match[1] + skypeExt.NewUserSuffix) mxid, displayname := formatter.getMatrixInfoByJID(match[1] + skypeExt.NewUserSuffix)
number := "@" + strings.Replace(match[1], skypeExt.NewUserSuffix, "", 1) number := "@" + strings.Replace(match[1], skypeExt.NewUserSuffix, "", 1)
output = strings.ReplaceAll(backStr, match[0], fmt.Sprintf(`<a href="https://%s/#/%s">%s</a>:`, formatter.bridge.Config.Homeserver.Domain, mxid, displayname)) output = strings.ReplaceAll(originStr, match[0], fmt.Sprintf(`<a href="https://%s/#/%s">%s</a>:`, formatter.bridge.Config.Homeserver.Domain, mxid, displayname))
content.FormattedBody = content.FormattedBody + output if len(backStr) == 0 {
content.Body = content.Body + strings.Replace(backStr, number, displayname, -1) content.Format = event.FormatHTML
content.Body = strings.Replace(originStr, number, displayname, -1)
content.FormattedBody = output
} else {
content.FormattedBody = content.FormattedBody + output
content.Body = content.Body + strings.Replace(backStr, number, displayname, -1)
}
} }
} else { } else {
content.Body = content.Body + backStr content.Body = content.Body + backStr