better
This commit is contained in:
parent
5dcee4ba03
commit
cd537636e8
|
@ -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 {
|
||||||
|
|
|
@ -625,6 +625,7 @@ 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)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if portal.IsPrivateChat() {
|
||||||
preUserIds,_ := portal.GetMatrixUsers()
|
preUserIds,_ := portal.GetMatrixUsers()
|
||||||
for _,userId := range preUserIds {
|
for _,userId := range preUserIds {
|
||||||
if user.MXID != userId {
|
if user.MXID != userId {
|
||||||
|
@ -635,6 +636,7 @@ func (portal *Portal) SyncSkype(user *User, chat skype.Conversation) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if portal.IsPrivateChat() {
|
if portal.IsPrivateChat() {
|
||||||
return
|
return
|
||||||
|
|
Loading…
Reference in New Issue