Keep recovery advice out of log events

The WhatsApp logout log records the event without a command for the
user. The existing user-facing notice still explains how to pair again,
so recovery advice reaches the user without becoming part of the event
name.

Issue: 3cdc678

diff --git a/whatsapp.go b/whatsapp.go
index 1e6bfa85444e6233985b4c79f703ce24b2b85ac9..91ee675553951e8c80755b279d7f3a76100811c4 100644 (file)
--- a/whatsapp.go
+++ b/whatsapp.go
@@ -456,7 +456,7 @@ func (w *WhatsApp) loggedOut(ctx context.Context, l *TurnLoop) error {
                return nil
        }
 
                return nil
        }
 

-       w.logger.Error("logged out by the phone, run /whatsapp pair PHONE")
+       w.logger.Error("logged out by the phone")

 
        err := w.inbox.deliver(ctx, l, w.link(), true)
        if err != nil {
 
        err := w.inbox.deliver(ctx, l, w.link(), true)
        if err != nil {

diff --git a/whatsapp_test.go b/whatsapp_test.go
index 6475805f0aac2ae17674d98343f032cf51c090b1..d200a91fbed394873356f46fb9b863e85b85f104 100644 (file)
--- a/whatsapp_test.go
+++ b/whatsapp_test.go
@@ -601,7 +601,7 @@ func TestWhatsAppLogoutFromThePhone(t *testing.T) {
        notice := "WhatsApp was unlinked from the phone. Run /whatsapp pair PHONE to link it again."
        client.WaitFor(t, notice)
        telegramWaitForSent(t, telegram, notice)
        notice := "WhatsApp was unlinked from the phone. Run /whatsapp pair PHONE to link it again."
        client.WaitFor(t, notice)
        telegramWaitForSent(t, telegram, notice)

-       require.Equal(t, "<3>logged out by the phone, run /whatsapp pair PHONE\n", logs.String())
+       require.Equal(t, "<3>logged out by the phone\n", logs.String())

        require.NoFileExists(t, filepath.Join(dir, whatsappDirName, whatsappSessionFileName))
        require.Equal(t, "WhatsApp is not linked. Run /whatsapp pair PHONE to link it.", whatsapp.Status())
        require.Equal(t, []string{"WhatsApp was unlinked from the phone."}, whatsappTestLogTexts(t, memory))
        require.NoFileExists(t, filepath.Join(dir, whatsappDirName, whatsappSessionFileName))
        require.Equal(t, "WhatsApp is not linked. Run /whatsapp pair PHONE to link it.", whatsapp.Status())
        require.Equal(t, []string{"WhatsApp was unlinked from the phone."}, whatsappTestLogTexts(t, memory))