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

better

This commit is contained in:
zhaoYangguang 2020-11-04 19:46:46 +08:00
parent 5dcee4ba03
commit cd537636e8
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
matrix.go
View File

@ -153,7 +153,7 @@ func (mx *MatrixHandler) handlePrivatePortal(roomID id.RoomID, inviter *User, pu
return return
} }
intent := puppet.DefaultIntent() intent := puppet.DefaultIntent()
_, _ = intent.SendNotice(roomID, "You already have a private chat portal with me at %s") _, _ = intent.SendNotice(roomID, fmt.Sprintf("You already have a private chat portal with me at %s", roomID))
mx.log.Debugln("Leaving private chat room", roomID, "as", puppet.MXID, "after accepting invite from", inviter.MXID, "as we already have chat with the user") mx.log.Debugln("Leaving private chat room", roomID, "as", puppet.MXID, "after accepting invite from", inviter.MXID, "as we already have chat with the user")
_, _ = intent.LeaveRoom(roomID) _, _ = intent.LeaveRoom(roomID)
} }
@ -263,6 +263,9 @@ func (mx *MatrixHandler) HandleMembership(evt *event.Event) {
return return
} }
isSelf := id.UserID(evt.GetStateKey()) == evt.Sender isSelf := id.UserID(evt.GetStateKey()) == evt.Sender
fmt.Println("HandleMembership isSelf:", isSelf)
fmt.Println("HandleMembership id.UserID(evt.GetStateKey()):", id.UserID(evt.GetStateKey()))
fmt.Println("HandleMembership evt.Sender:", evt.Sender)
if content.Membership == event.MembershipLeave { if content.Membership == event.MembershipLeave {
if id.UserID(evt.GetStateKey()) == evt.Sender { if id.UserID(evt.GetStateKey()) == evt.Sender {
if evt.Unsigned.PrevContent != nil { if evt.Unsigned.PrevContent != nil {

14
portal.go
View File

@ -625,12 +625,14 @@ func (portal *Portal) SyncSkype(user *User, chat skype.Conversation) {
portal.log.Warnfln("SyncSkype: SetPowerLevel err: ", err, rep) portal.log.Warnfln("SyncSkype: SetPowerLevel err: ", err, rep)
} }
preUserIds,_ := portal.GetMatrixUsers() if portal.IsPrivateChat() {
for _,userId := range preUserIds { preUserIds,_ := portal.GetMatrixUsers()
if user.MXID != userId { for _,userId := range preUserIds {
err := portal.tryKickUser(userId, portal.MainIntent()) if user.MXID != userId {
if err != nil { err := portal.tryKickUser(userId, portal.MainIntent())
portal.log.Errorln("Failed to try kick user:", err) if err != nil {
portal.log.Errorln("Failed to try kick user:", err)
}
} }
} }
} }