X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/48d7bce28b18ecef4c52c98821675605464cecb9..12bd9e96f3b3e67290484e3829461e054110db27:/whatsapp.go

diff --git a/whatsapp.go b/whatsapp.go
index 9365173..4950d28 100644
--- a/whatsapp.go
+++ b/whatsapp.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"crypto/sha256"
 	"database/sql"
 	"errors"
 	"fmt"
@@ -54,17 +55,17 @@ const (
 	// whatsappTimeLayout is the layout of the times in the answers.
 	whatsappTimeLayout = "2006-01-02 15:04"
 
-	// whatsappPairTime is the longest time of a pairing. The library closes
-	// the pairing connection after about 160 seconds.
-	whatsappPairTime = 3 * time.Minute
+	// whatsappPairTimeout is the longest time of a pairing. The library
+	// closes the pairing connection after about 160 seconds.
+	whatsappPairTimeout = 3 * time.Minute
 
-	// whatsappLogoutTime is the longest time of the logout call of an
+	// whatsappLogoutTimeout is the longest time of the logout call of an
 	// unlink.
-	whatsappLogoutTime = 30 * time.Second
+	whatsappLogoutTimeout = 30 * time.Second
 
-	// whatsappNoticeDelay is how long a disconnection lasts before the user
-	// gets a notice.
-	whatsappNoticeDelay = 10 * time.Minute
+	// whatsappOutageNoticeDelay is the delay from a disconnection to its
+	// notice to the user.
+	whatsappOutageNoticeDelay = 10 * time.Minute
 
 	// whatsappRetryDelay is the first wait after a failed starting
 	// connection.
@@ -92,6 +93,7 @@ type WhatsAppClient interface {
 	Logout(ctx context.Context) error
 	GetJoinedGroups(ctx context.Context) ([]*types.GroupInfo, error)
 	Download(ctx context.Context, message whatsmeow.DownloadableMessage) ([]byte, error)
+	Upload(ctx context.Context, data []byte, mediaType whatsmeow.MediaType) (whatsmeow.UploadResponse, error)
 	GenerateMessageID() types.MessageID
 	SendMessage(ctx context.Context, to types.JID, message *waE2E.Message, extra ...whatsmeow.SendRequestExtra) (whatsmeow.SendResponse, error)
 }
@@ -309,7 +311,7 @@ func (w *WhatsApp) Run(ctx context.Context, l *TurnLoop, notify func(Event)) err
 			case w.isLinked():
 				request.answer("WhatsApp is linked already. Run /whatsapp unlink first.")
 			default:
-				pairCtx, cancelPair := context.WithTimeout(ctx, whatsappPairTime)
+				pairCtx, cancelPair := context.WithTimeout(ctx, whatsappPairTimeout)
 				cancel = cancelPair
 				pairing.Go(func() {
 					defer cancelPair()
@@ -462,10 +464,10 @@ func (w *WhatsApp) Find(ctx context.Context, name string) (string, error) {
 	return whatsappFind(ctx, w.link(), w.groups, name)
 }
 
-// Send returns the answer of whatsapp_send for the send id of text to chat, as
-// whatsappSend says.
-func (w *WhatsApp) Send(ctx context.Context, id, chat, text string) (string, error) {
-	return whatsappSend(ctx, w.link(), w.groups, w.state, w.clock, id, chat, text)
+// Send returns the answer of whatsapp_send for text and an optional stored
+// image to chat, with the durable send id that whatsappSend describes.
+func (w *WhatsApp) Send(ctx context.Context, id, chat, text, image string) (string, error) {
+	return whatsappSend(ctx, w.link(), w.groups, w.state, w.inbox.images, w.logger, w.clock, id, chat, text, image)
 }
 
 func (w *WhatsApp) sessionPath() string {
@@ -569,7 +571,7 @@ func (w *WhatsApp) startOutage() bool {
 		w.disconnectedAt = w.clock()
 		w.disconnections++
 		disconnections := w.disconnections
-		w.timer = time.AfterFunc(whatsappNoticeDelay, func() {
+		w.timer = time.AfterFunc(whatsappOutageNoticeDelay, func() {
 			w.disconnectedLong(disconnections)
 		})
 	}
@@ -654,7 +656,7 @@ func (w *WhatsApp) unlink(ctx context.Context, l *TurnLoop, answer func(text str
 	var logoutErr error
 
 	if client != nil {
-		ctx, cancel := context.WithTimeout(ctx, whatsappLogoutTime)
+		ctx, cancel := context.WithTimeout(ctx, whatsappLogoutTimeout)
 		defer cancel()
 
 		logoutErr = client.Logout(ctx)
@@ -890,8 +892,8 @@ func (w *WhatsApp) linkedBy(client WhatsAppClient) {
 // handle takes one event of the library and tells if it was handled. A message
 // goes to the inbox. The names of the groups follow the events of the groups. A
 // connection starts a catch-up of the inbox, which ends at OfflineSyncCompleted
-// or after whatsappCatchupLimit. A disconnection keeps the time of its start
-// while Run or the library tries again. After whatsappNoticeDelay of a
+// or after whatsappCatchupTimeout. A disconnection keeps the time of its start
+// while Run or the library tries again. After whatsappOutageNoticeDelay of a
 // disconnection, all clients get one notice, and they get one more when the
 // connection comes back. A disconnection that the library does not try again
 // gives a notice at once.
@@ -1143,6 +1145,14 @@ func whatsappOwnIDs(ids ...string) []string {
 	return own
 }
 
+// whatsappChatHash returns a short hash of chat for the daemon log, so that a
+// log line can tell chats apart without a phone number.
+func whatsappChatHash(chat types.JID) string {
+	digest := sha256.Sum256([]byte(chat.ToNonAD().String()))
+
+	return fmt.Sprintf("%x", digest[:6])
+}
+
 // whatsappRedact replaces each of the own IDs own in text with OWN.
 func whatsappRedact(own []string, text string) string {
 	for _, id := range own {