tileradotorg/mautrix-whatsapp
1
0
Fork 0
forked from MirrorHub/mautrix-whatsapp
Code Pull requests Activity

Suggest delete-session when trying to logout without connection. Fixes #98

Browse source
This commit is contained in:
Tulir Asokan 2020-05-21 20:50:54 +03:00
parent e4bc254a65
commit 64af0209b7
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
commands.go
View file

@ -121,7 +121,9 @@ func (handler *CommandHandler) CommandMux(ce *CommandEvent) {
handler.CommandDevTest(ce) handler.CommandDevTest(ce)
case "set-pl": case "set-pl":
handler.CommandSetPowerLevel(ce) handler.CommandSetPowerLevel(ce)
case "login-matrix", "logout", "sync", "list", "open", "pm": case "logout":
handler.CommandLogout(ce)
case "login-matrix", "sync", "list", "open", "pm":
if !ce.User.HasSession() { if !ce.User.HasSession() {
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.")
return return
@ -133,8 +135,6 @@ func (handler *CommandHandler) CommandMux(ce *CommandEvent) {
switch ce.Command { switch ce.Command {
case "login-matrix": case "login-matrix":
handler.CommandLoginMatrix(ce) handler.CommandLoginMatrix(ce)
case "logout":
handler.CommandLogout(ce)
case "sync": case "sync":
handler.CommandSync(ce) handler.CommandSync(ce)
case "list": case "list":
@ -229,6 +229,9 @@ func (handler *CommandHandler) CommandLogout(ce *CommandEvent) {
if ce.User.Session == nil { if ce.User.Session == nil {
ce.Reply("You're not logged in.") ce.Reply("You're not logged in.")
return return
} else if !ce.User.IsConnected() {
ce.Reply("You are not connected to WhatsApp. Use the `reconnect` command to reconnect, or `delete-session` to forget all login information.")
return
} }
puppet := handler.bridge.GetPuppetByJID(ce.User.JID) puppet := handler.bridge.GetPuppetByJID(ce.User.JID)
if puppet.CustomMXID != "" { if puppet.CustomMXID != "" {