mirror of
https://github.com/tulir/mautrix-whatsapp
synced 2024-12-14 01:14:29 +01:00
Add command to delete session information to force logout when the bridge gets stuck
This commit is contained in:
parent
c1e1964fc5
commit
5d0edda04a
3 changed files with 25 additions and 3 deletions
22
commands.go
22
commands.go
|
@ -83,6 +83,8 @@ func (handler *CommandHandler) Handle(roomID types.MatrixRoomID, user *User, mes
|
||||||
handler.CommandHelp(ce)
|
handler.CommandHelp(ce)
|
||||||
case "reconnect":
|
case "reconnect":
|
||||||
handler.CommandReconnect(ce)
|
handler.CommandReconnect(ce)
|
||||||
|
case "delete-session":
|
||||||
|
handler.CommandDeleteSession(ce)
|
||||||
case "logout", "disconnect", "sync", "list", "open", "pm":
|
case "logout", "disconnect", "sync", "list", "open", "pm":
|
||||||
if ce.User.Conn == nil {
|
if ce.User.Conn == nil {
|
||||||
ce.Reply("You are not logged in. Use the `login` command to log into WhatsApp.")
|
ce.Reply("You are not logged in. Use the `login` command to log into WhatsApp.")
|
||||||
|
@ -141,11 +143,26 @@ func (handler *CommandHandler) CommandLogout(ce *CommandEvent) {
|
||||||
}
|
}
|
||||||
ce.User.Connected = false
|
ce.User.Connected = false
|
||||||
ce.User.Conn = nil
|
ce.User.Conn = nil
|
||||||
ce.User.Session = nil
|
ce.User.SetSession(nil)
|
||||||
ce.User.Update()
|
|
||||||
ce.Reply("Logged out successfully.")
|
ce.Reply("Logged out successfully.")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const cmdDeleteSessionHelp = `delete-session - Delete session information and disconnect from WhatsApp without sending a logout request`
|
||||||
|
|
||||||
|
func (handler *CommandHandler) CommandDeleteSession(ce *CommandEvent) {
|
||||||
|
if ce.User.Session == nil && !ce.User.Connected && ce.User.Conn == nil {
|
||||||
|
ce.Reply("Nothing to purge: no session information stored and no active connection.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ce.User.SetSession(nil)
|
||||||
|
ce.User.Connected = false
|
||||||
|
if ce.User.Conn != nil {
|
||||||
|
_, _ = ce.User.Conn.Disconnect()
|
||||||
|
ce.User.Conn = nil
|
||||||
|
}
|
||||||
|
ce.Reply("Session information purged")
|
||||||
|
}
|
||||||
|
|
||||||
const cmdReconnectHelp = `reconnect - Reconnect to WhatsApp`
|
const cmdReconnectHelp = `reconnect - Reconnect to WhatsApp`
|
||||||
|
|
||||||
func (handler *CommandHandler) CommandReconnect(ce *CommandEvent) {
|
func (handler *CommandHandler) CommandReconnect(ce *CommandEvent) {
|
||||||
|
@ -213,6 +230,7 @@ func (handler *CommandHandler) CommandHelp(ce *CommandEvent) {
|
||||||
cmdPrefix + cmdHelpHelp,
|
cmdPrefix + cmdHelpHelp,
|
||||||
cmdPrefix + cmdLoginHelp,
|
cmdPrefix + cmdLoginHelp,
|
||||||
cmdPrefix + cmdLogoutHelp,
|
cmdPrefix + cmdLogoutHelp,
|
||||||
|
cmdPrefix + cmdDeleteSessionHelp,
|
||||||
cmdPrefix + cmdReconnectHelp,
|
cmdPrefix + cmdReconnectHelp,
|
||||||
cmdPrefix + cmdDisconnectHelp,
|
cmdPrefix + cmdDisconnectHelp,
|
||||||
cmdPrefix + cmdSyncHelp,
|
cmdPrefix + cmdSyncHelp,
|
||||||
|
|
3
user.go
3
user.go
|
@ -219,7 +219,7 @@ func (user *User) Login(ce *CommandEvent) {
|
||||||
ce.Reply("QR code scan timed out. Please try again.")
|
ce.Reply("QR code scan timed out. Please try again.")
|
||||||
} else {
|
} else {
|
||||||
user.log.Warnln("Failed to log in:", err)
|
user.log.Warnln("Failed to log in:", err)
|
||||||
ce.Reply("Failed to log in: %v", err)
|
ce.Reply("Unknown error while logging in: %v", err)
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -355,6 +355,7 @@ func (user *User) HandleCommand(cmd whatsappExt.Command) {
|
||||||
msg = "\u26a0 Your WhatsApp connection was closed by the server because you opened another WhatsApp Web client.\n\n" +
|
msg = "\u26a0 Your WhatsApp connection was closed by the server because you opened another WhatsApp Web client.\n\n" +
|
||||||
"Use the `reconnect` command to disconnect the other client and resume bridging."
|
"Use the `reconnect` command to disconnect the other client and resume bridging."
|
||||||
} else {
|
} else {
|
||||||
|
user.log.Warnln("Unknown kind of disconnect:", string(cmd.Raw))
|
||||||
msg = fmt.Sprintf("\u26a0 Your WhatsApp connection was closed by the server (reason code: %s).\n\n"+
|
msg = fmt.Sprintf("\u26a0 Your WhatsApp connection was closed by the server (reason code: %s).\n\n"+
|
||||||
"Use the `reconnect` command to reconnect.", cmd.Kind)
|
"Use the `reconnect` command to reconnect.", cmd.Kind)
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,6 +36,8 @@ type Command struct {
|
||||||
|
|
||||||
*ProfilePicInfo
|
*ProfilePicInfo
|
||||||
Kind string `json:"kind"`
|
Kind string `json:"kind"`
|
||||||
|
|
||||||
|
Raw json.RawMessage `json:"-"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type CommandHandler interface {
|
type CommandHandler interface {
|
||||||
|
@ -50,6 +52,7 @@ func (ext *ExtendedConn) handleMessageCommand(message []byte) {
|
||||||
ext.jsonParseError(err)
|
ext.jsonParseError(err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
event.Raw = message
|
||||||
event.JID = strings.Replace(event.JID, OldUserSuffix, NewUserSuffix, 1)
|
event.JID = strings.Replace(event.JID, OldUserSuffix, NewUserSuffix, 1)
|
||||||
for _, handler := range ext.handlers {
|
for _, handler := range ext.handlers {
|
||||||
commandHandler, ok := handler.(CommandHandler)
|
commandHandler, ok := handler.(CommandHandler)
|
||||||
|
|
Loading…
Reference in a new issue