X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/6844f8c992ec4e276a3a0d93b544de0127eebbd2..refs/heads/master:/whatsapp.go

diff --git a/whatsapp.go b/whatsapp.go
index 0c68a44..f225756 100644
--- a/whatsapp.go
+++ b/whatsapp.go
@@ -95,6 +95,7 @@ type WhatsAppClient interface {
 	PairPhone(ctx context.Context, phone string, showPushNotification bool, clientType whatsmeow.PairClientType, clientDisplayName string) (string, error)
 	Logout(ctx context.Context) error
 	GetJoinedGroups(ctx context.Context) ([]*types.GroupInfo, error)
+	Download(ctx context.Context, message whatsmeow.DownloadableMessage) ([]byte, error)
 	GenerateMessageID() types.MessageID
 	SendMessage(ctx context.Context, to types.JID, message *waE2E.Message, extra ...whatsmeow.SendRequestExtra) (whatsmeow.SendResponse, error)
 }
@@ -123,7 +124,7 @@ func openWhatsApp(ctx context.Context, dir string, clock func() time.Time, logge
 		return nil, err
 	}
 
-	w.inbox = newWhatsAppInbox(w.state, clock, w.groups)
+	w.inbox = newWhatsAppInbox(w.state, clock, w.groups, &ImageStore{dir: filepath.Join(dir, imageDirName)}, logger)
 
 	info, err := os.Stat(w.sessionPath())
 	if errors.Is(err, os.ErrNotExist) {
@@ -168,9 +169,9 @@ func openWhatsApp(ctx context.Context, dir string, clock func() time.Time, logge
 // creation, close, removal, and snapshots. It is held before mutex, and stays
 // held when removal releases mutex for client callbacks.
 //
-// The inbox puts the text messages into batches and logs them, and groups
-// holds the names of the groups. Both get a WhatsAppLink from link for each
-// call, so they use the current device and client.
+// The inbox puts messages into batches and logs them, and groups holds the
+// names of the groups. Both get a WhatsAppLink from link for each call, so they
+// use the current device and client.
 //
 // The library logs nothing, because its log lines hold the ID of the own
 // account, which is the phone number of the user. The own number and the own
@@ -190,6 +191,7 @@ type WhatsApp struct {
 	state       *WhatsAppState
 	groups      *WhatsAppGroups
 	inbox       *WhatsAppInbox
+	routes      *Routes
 
 	sessionMutex   sync.Mutex
 	mutex          sync.Mutex
@@ -358,23 +360,31 @@ func (w *WhatsApp) Command(args string, answer func(text string)) {
 }
 
 // Status returns the state of the link: not linked, linked and connected, or
-// linked and disconnected, with the times of the connection. It never holds the
-// phone number.
+// linked and disconnected, with the times of the connection and the routes.
+// Route source IDs can hold the phone numbers of other chats.
 func (w *WhatsApp) Status() string {
 	w.mutex.Lock()
 	defer w.mutex.Unlock()
 
+	routes := ""
+	if w.routes != nil {
+		listed := w.routes.List()
+		if listed != "No routes." {
+			routes = "\nWhatsApp routes:\n" + listed
+		}
+	}
+
 	switch {
 	case !w.linked:
-		return "WhatsApp is not linked. Run /whatsapp pair PHONE to link it."
+		return "WhatsApp is not linked. Run /whatsapp pair PHONE to link it." + routes
 	case w.connected:
-		return "WhatsApp is linked and connected since " + w.connectedAt.Format(whatsappTimeLayout) + "."
+		return "WhatsApp is linked and connected since " + w.connectedAt.Format(whatsappTimeLayout) + "." + routes
 	case w.disconnectedAt.IsZero():
-		return "WhatsApp is linked and not connected yet."
+		return "WhatsApp is linked and not connected yet." + routes
 	case w.connectedAt.IsZero():
-		return "WhatsApp is linked and disconnected since " + w.disconnectedAt.Format(whatsappTimeLayout) + "."
+		return "WhatsApp is linked and disconnected since " + w.disconnectedAt.Format(whatsappTimeLayout) + "." + routes
 	default:
-		return "WhatsApp is linked and disconnected since " + w.disconnectedAt.Format(whatsappTimeLayout) + ". The last connection started at " + w.connectedAt.Format(whatsappTimeLayout) + "."
+		return "WhatsApp is linked and disconnected since " + w.disconnectedAt.Format(whatsappTimeLayout) + ". The last connection started at " + w.connectedAt.Format(whatsappTimeLayout) + "." + routes
 	}
 }