New simplified version

This commit is contained in:
2025-10-18 18:03:49 +02:00
parent 227f1d48e1
commit 06ca841919
3 changed files with 263 additions and 279 deletions

View File

@@ -1,7 +1,11 @@
package main
import (
"bytes"
"context"
"encoding/json"
"fmt"
"io"
"math"
"net/http"
"os"
@@ -10,10 +14,243 @@ import (
"strings"
"time"
"github.com/napnap75/multiarch-docker-files/immich-souvenirs/internals/immich"
"github.com/napnap75/multiarch-docker-files/immich-souvenirs/internals/whatsapp"
_ "github.com/mattn/go-sqlite3"
"github.com/mdp/qrterminal/v3"
"go.mau.fi/whatsmeow"
waProto "go.mau.fi/whatsmeow/binary/proto"
"go.mau.fi/whatsmeow/store/sqlstore"
"go.mau.fi/whatsmeow/types"
waLog "go.mau.fi/whatsmeow/util/log"
"google.golang.org/protobuf/proto"
)
type Album struct {
ID string `json:"id"`
Name string `json:"albumName"`
Description string `json:"description"`
Shared bool `json:"shared"`
HasSharedLink bool `json:"hasSharedLink"`
StartDate time.Time `json:"startDate"`
CreatedAt time.Time `json:"createdAt"`
AlbumThumbnailAssetId string `json:"albumThumbnailAssetId"`
}
type Key struct {
ID string `json:"id"`
Key string `json:"key"`
Album *Album `json:"album"`
}
type ImmichClient struct {
BaseURL string
APIKey string
}
// Fonction pour créer une instance d'ImmichClient
func NewImmichClient(baseURL string, apiKey string) *ImmichClient {
return &ImmichClient{
BaseURL: baseURL,
APIKey: apiKey,
}
}
// Récupérer la liste des albums
func (ic *ImmichClient) FetchAlbums() ([]Album, error) {
client := &http.Client{Timeout: 10 * time.Second}
req, err := http.NewRequest(http.MethodGet, ic.BaseURL+"/api/albums", nil)
if err != nil {
return nil, err
}
req.Header.Set("x-api-key", ic.APIKey)
req.Header.Set("Accept", "application/json")
res, err := client.Do(req)
if err != nil {
return nil, err
}
defer res.Body.Close()
if res.StatusCode != 200 {
return nil, fmt.Errorf("status code %d", res.StatusCode)
}
body, err := io.ReadAll(res.Body)
if err != nil {
return nil, err
}
var albums []Album
if err := json.Unmarshal(body, &albums); err != nil {
return nil, err
}
return albums, nil
}
// Obtenir la clé de partage pour un album
func (ic *ImmichClient) GetSharingKey(album Album) (string, error) {
client := &http.Client{Timeout: 10 * time.Second}
if album.HasSharedLink {
// Récupérer la clé existante
req, err := http.NewRequest(http.MethodGet, ic.BaseURL+"/api/shared-links", nil)
if err != nil {
return "", err
}
req.Header.Set("x-api-key", ic.APIKey)
req.Header.Set("Accept", "application/json")
res, err := client.Do(req)
if err != nil {
return "", err
}
defer res.Body.Close()
if res.StatusCode != 200 {
return "", fmt.Errorf("status code %d", res.StatusCode)
}
body, err := io.ReadAll(res.Body)
if err != nil {
return "", err
}
var keys []Key
if err := json.Unmarshal(body, &keys); err != nil {
return "", err
}
for _, key := range keys {
if key.Album != nil && key.Album.ID == album.ID {
return key.Key, nil
}
}
return "", fmt.Errorf("no sharing key found for album '%s'", album.Name)
} else {
// Créer un nouveau lien partagé
jsonData := []byte(`{
"albumId": "` + album.ID + `",
"allowDownload": true,
"allowUpload": false,
"showMetadata": true,
"type": "ALBUM"
}`)
req, err := http.NewRequest(http.MethodPost, ic.BaseURL+"/api/shared-links", bytes.NewBuffer(jsonData))
if err != nil {
return "", err
}
req.Header.Set("x-api-key", ic.APIKey)
req.Header.Set("Content-Type", "application/json")
req.Header.Set("Accept", "application/octet-stream")
res, err := client.Do(req)
if err != nil {
return "", err
}
defer res.Body.Close()
if res.StatusCode != 201 {
return "", fmt.Errorf("status code %d", res.StatusCode)
}
body, err := io.ReadAll(res.Body)
if err != nil {
return "", err
}
var key Key
if err := json.Unmarshal(body, &key); err != nil {
return "", err
}
return key.Key, nil
}
}
// Récupérer la miniature d'un album
func (ic *ImmichClient) GetThumbnail(assetID string) ([]byte, error) {
client := &http.Client{Timeout: 10 * time.Second}
req, err := http.NewRequest(http.MethodGet, ic.BaseURL+"/api/assets/"+assetID+"/thumbnail?size=preview", nil)
if err != nil {
return nil, err
}
req.Header.Set("x-api-key", ic.APIKey)
req.Header.Set("Accept", "application/octet-stream")
res, err := client.Do(req)
if err != nil {
return nil, err
}
defer res.Body.Close()
if res.StatusCode != 200 {
return nil, fmt.Errorf("status code %d", res.StatusCode)
}
return io.ReadAll(res.Body)
}
type WhatsAppClient struct {
Client *whatsmeow.Client
}
// Fonction pour initialiser la connexion et retourner une instance de WhatsAppClient
func NewWhatsAppClient(sessionFile string) (*WhatsAppClient, error) {
dbLog := waLog.Stdout("Database", "ERROR", true)
container, err := sqlstore.New(context.Background(), "sqlite3", "file:"+sessionFile+"?_foreign_keys=on", dbLog)
if err != nil {
return nil, err
}
deviceStore, err := container.GetFirstDevice(context.Background())
if err != nil {
return nil, err
}
clientLog := waLog.Stdout("Client", "ERROR", true)
client := whatsmeow.NewClient(deviceStore, clientLog)
if client.Store.ID == nil {
// No ID stored, nouvelle connexion
qrChan, _ := client.GetQRChannel(context.Background())
err = client.Connect()
if err != nil {
return nil, err
}
for evt := range qrChan {
if evt.Event == "code" {
qrterminal.GenerateHalfBlock(evt.Code, qrterminal.L, os.Stdout)
fmt.Println("QR code:", evt.Code)
} else {
fmt.Println("Event:", evt.Event)
}
}
} else {
// Connexion existante
err = client.Connect()
if err != nil {
return nil, err
}
}
return &WhatsAppClient{Client: client}, nil
}
// Méthode pour envoyer un message
func (wac *WhatsAppClient) SendMessage(group string, title string, description string, message string, url string, thumbnail []byte) error {
jid, err := types.ParseJID(group)
if err != nil {
return fmt.Errorf("incorrect group identifier '%s': %v", group, err)
}
msg := &waProto.Message{
ExtendedTextMessage: &waProto.ExtendedTextMessage{
Title: proto.String(title),
Description: proto.String(description),
Text: proto.String(message),
MatchedText: proto.String(url),
JPEGThumbnail: thumbnail,
},
}
ts, err := wac.Client.SendMessage(context.Background(), jid, msg)
if err != nil {
return fmt.Errorf("error sending message with title '%s': %v", title, err)
}
fmt.Printf("Message with title '%s' sent (timestamp: %s)\n", title, ts)
return nil
}
type Parameters struct {
ImmichURL string
ImmichKey string
@@ -62,35 +299,35 @@ func main() {
}
// Initialize WhatsApp connection
wac, err := whatsapp.New(param.WhatsappSessionFile)
wac, err := NewWhatsAppClient(param.WhatsappSessionFile)
if err != nil {
fmt.Fprintf(os.Stderr, "Error initializing WhatsApp: %v\n", err)
fmt.Fprintf(os.Stderr, "error initializing WhatsApp: %v\n", err)
return
}
// Initialize Immich client
immichClient := immich.New(param.ImmichURL, param.ImmichKey)
immichClient := NewImmichClient(param.ImmichURL, param.ImmichKey)
switch param.DevelopmentMode {
case "run-once", "run-last":
if err := runLoop(wac, immichClient, param); err != nil {
fmt.Fprintf(os.Stderr, "Error in runLoop: %v\n", err)
fmt.Fprintf(os.Stderr, "error in runLoop: %v\n", err)
}
case "listen":
if err := listen(wac); err != nil {
fmt.Fprintf(os.Stderr, "Error in listen: %v\n", err)
fmt.Fprintf(os.Stderr, "error in listen: %v\n", err)
}
default:
// Test connection on startup
if err := testConnections(wac, immichClient, param); err != nil {
fmt.Fprintf(os.Stderr, "Connection test failed: %v\n", err)
fmt.Fprintf(os.Stderr, "connection test failed: %v\n", err)
return
}
// Main scheduled loop
for {
hours, minutes, err := parseTime(param.TimeToRun)
if err != nil {
fmt.Fprintf(os.Stderr, "Invalid time format: %v\n", err)
fmt.Fprintf(os.Stderr, "invalid time format: %v\n", err)
return
}
now := time.Now()
@@ -108,16 +345,16 @@ func main() {
if err == nil {
break
}
fmt.Fprintf(os.Stderr, "Attempt %d failed: %v\n", i+1, err)
fmt.Fprintf(os.Stderr, "attempt %d failed: %v\n", i+1, err)
time.Sleep(time.Duration(math.Pow(2, float64(i))) * 30 * time.Second)
}
if err != nil {
fmt.Fprintf(os.Stderr, "Error after retries: %v\n", err)
fmt.Fprintf(os.Stderr, "error after retries: %v\n", err)
} else if param.HealthchecksURL != "" {
client := &http.Client{Timeout: 10 * time.Second}
_, err := client.Head(param.HealthchecksURL)
if err != nil {
fmt.Fprintf(os.Stderr, "Healthcheck error: %v\n", err)
fmt.Fprintf(os.Stderr, "healthcheck error: %v\n", err)
}
}
}
@@ -125,11 +362,11 @@ func main() {
}
// Fonction pour tester la connexion à WhatsApp et Immich
func testConnections(wac *whatsapp.WhatsAppClient, immichClient *immich.ImmichClient, param *Parameters) error {
func testConnections(wac *WhatsAppClient, immichClient *ImmichClient, param *Parameters) error {
fmt.Println("Testing connections...")
// Test WhatsApp
if err := wac.Client.Connect(); err != nil {
return fmt.Errorf("WhatsApp connection failed: %v", err)
return fmt.Errorf("whatsApp connection failed: %v", err)
}
defer wac.Client.Disconnect()
fmt.Println("WhatsApp connected.")
@@ -137,14 +374,14 @@ func testConnections(wac *whatsapp.WhatsAppClient, immichClient *immich.ImmichCl
// Test Immich
albums, err := immichClient.FetchAlbums()
if err != nil {
return fmt.Errorf("Immich connection failed: %v", err)
return fmt.Errorf("immich connection failed: %v", err)
}
fmt.Printf("Fetched %d albums from Immich.\n", len(albums))
fmt.Printf("fetched %d albums from Immich.\n", len(albums))
return nil
}
// Fonction principale pour exécuter la logique
func runLoop(wac *whatsapp.WhatsAppClient, immichClient *immich.ImmichClient, param *Parameters) error {
func runLoop(wac *WhatsAppClient, immichClient *ImmichClient, param *Parameters) error {
// Connecter WhatsApp si nécessaire
if !wac.Client.IsConnected() {
if err := wac.Client.Connect(); err != nil {
@@ -166,7 +403,7 @@ func runLoop(wac *whatsapp.WhatsAppClient, immichClient *immich.ImmichClient, pa
// Obtenir la clé de partage
sharingKey, err := immichClient.GetSharingKey(album)
if err != nil {
fmt.Fprintf(os.Stderr, "Erreur récupération clé partage: %v\n", err)
fmt.Fprintf(os.Stderr, "erreur récupération clé partage: %v\n", err)
continue
}
link := param.ImmichURL + "/share/" + sharingKey
@@ -174,14 +411,14 @@ func runLoop(wac *whatsapp.WhatsAppClient, immichClient *immich.ImmichClient, pa
// Récupérer la miniature
thumbnail, err := immichClient.GetThumbnail(album.AlbumThumbnailAssetId)
if err != nil {
fmt.Fprintf(os.Stderr, "Erreur miniature: %v\n", err)
fmt.Fprintf(os.Stderr, "erreur miniature: %v\n", err)
continue
}
// Envoyer le message
err = wac.SendMessage(param.WhatsappGroup, album.Name, album.Description, fmt.Sprintf("Il y a %d an(s) : %s", time.Now().Year()-album.StartDate.Year(), link), link, thumbnail)
if err != nil {
fmt.Fprintf(os.Stderr, "Erreur envoi WhatsApp: %v\n", err)
fmt.Fprintf(os.Stderr, "erreur envoi WhatsApp: %v\n", err)
}
}
@@ -194,7 +431,7 @@ func runLoop(wac *whatsapp.WhatsAppClient, immichClient *immich.ImmichClient, pa
// Obtenir la clé de partage
sharingKey, err := immichClient.GetSharingKey(album)
if err != nil {
fmt.Fprintf(os.Stderr, "Erreur récupération clé partage: %v\n", err)
fmt.Fprintf(os.Stderr, "erreur récupération clé partage: %v\n", err)
continue
}
link := param.ImmichURL + "/share/" + sharingKey
@@ -202,14 +439,14 @@ func runLoop(wac *whatsapp.WhatsAppClient, immichClient *immich.ImmichClient, pa
// Récupérer la miniature
thumbnail, err := immichClient.GetThumbnail(album.AlbumThumbnailAssetId)
if err != nil {
fmt.Fprintf(os.Stderr, "Erreur miniature: %v\n", err)
fmt.Fprintf(os.Stderr, "erreur miniature: %v\n", err)
continue
}
// Envoyer le message
err = wac.SendMessage(param.WhatsappGroup, album.Name, album.Description, fmt.Sprintf("Nouvel album : %s", link), link, thumbnail)
if err != nil {
fmt.Fprintf(os.Stderr, "Erreur envoi WhatsApp: %v\n", err)
fmt.Fprintf(os.Stderr, "erreur envoi WhatsApp: %v\n", err)
}
}
}
@@ -218,20 +455,20 @@ func runLoop(wac *whatsapp.WhatsAppClient, immichClient *immich.ImmichClient, pa
}
// Fonction pour écouter les événements WhatsApp
func listen(wac *whatsapp.WhatsAppClient) error {
func listen(wac *WhatsAppClient) error {
if err := wac.Client.Connect(); err != nil {
return err
}
defer wac.Client.Disconnect()
wac.Client.AddEventHandler(func(evt interface{}) {
fmt.Println("Réception d'un message:", evt)
fmt.Println("réception d'un message:", evt)
})
// Attendre une interruption
c := make(chan os.Signal, 1)
signal.Notify(c, os.Interrupt)
<-c
fmt.Println("Arrêt demandé.")
fmt.Println("arrêt demandé.")
return nil
}

View File

@@ -1,169 +0,0 @@
package immich
import (
"bytes"
"encoding/json"
"fmt"
"io/ioutil"
"net/http"
"time"
)
type Album struct {
ID string `json:"id"`
Name string `json:"albumName"`
Description string `json:"description"`
Shared bool `json:"shared"`
HasSharedLink bool `json:"hasSharedLink"`
StartDate time.Time `json:"startDate"`
CreatedAt time.Time `json:"createdAt"`
AlbumThumbnailAssetId string `json:"albumThumbnailAssetId"`
}
type Key struct {
ID string `json:"id"`
Key string `json:"key"`
Album *Album `json:"album"`
}
type ImmichClient struct {
BaseURL string
APIKey string
}
// Fonction pour créer une instance d'ImmichClient
func New(baseURL string, apiKey string) *ImmichClient {
return &ImmichClient{
BaseURL: baseURL,
APIKey: apiKey,
}
}
// Récupérer la liste des albums
func (ic *ImmichClient) FetchAlbums() ([]Album, error) {
client := &http.Client{Timeout: 10 * time.Second}
req, err := http.NewRequest(http.MethodGet, ic.BaseURL+"/api/albums", nil)
if err != nil {
return nil, err
}
req.Header.Set("x-api-key", ic.APIKey)
req.Header.Set("Accept", "application/json")
res, err := client.Do(req)
if err != nil {
return nil, err
}
defer res.Body.Close()
if res.StatusCode != 200 {
return nil, fmt.Errorf("Status code %d", res.StatusCode)
}
body, err := ioutil.ReadAll(res.Body)
if err != nil {
return nil, err
}
var albums []Album
if err := json.Unmarshal(body, &albums); err != nil {
return nil, err
}
return albums, nil
}
// Obtenir la clé de partage pour un album
func (ic *ImmichClient) GetSharingKey(album Album) (string, error) {
client := &http.Client{Timeout: 10 * time.Second}
if album.HasSharedLink {
// Récupérer la clé existante
req, err := http.NewRequest(http.MethodGet, ic.BaseURL+"/api/shared-links", nil)
if err != nil {
return "", err
}
req.Header.Set("x-api-key", ic.APIKey)
req.Header.Set("Accept", "application/json")
res, err := client.Do(req)
if err != nil {
return "", err
}
defer res.Body.Close()
if res.StatusCode != 200 {
return "", fmt.Errorf("Status code %d", res.StatusCode)
}
body, err := ioutil.ReadAll(res.Body)
if err != nil {
return "", err
}
var keys []Key
if err := json.Unmarshal(body, &keys); err != nil {
return "", err
}
for _, key := range keys {
if key.Album != nil && key.Album.ID == album.ID {
return key.Key, nil
}
}
return "", fmt.Errorf("No sharing key found for album '%s'", album.Name)
} else {
// Créer un nouveau lien partagé
jsonData := []byte(`{
"albumId": "` + album.ID + `",
"allowDownload": true,
"allowUpload": false,
"showMetadata": true,
"type": "ALBUM"
}`)
req, err := http.NewRequest(http.MethodPost, ic.BaseURL+"/api/shared-links", bytes.NewBuffer(jsonData))
if err != nil {
return "", err
}
req.Header.Set("x-api-key", ic.APIKey)
req.Header.Set("Content-Type", "application/json")
req.Header.Set("Accept", "application/octet-stream")
res, err := client.Do(req)
if err != nil {
return "", err
}
defer res.Body.Close()
if res.StatusCode != 201 {
return "", fmt.Errorf("Status code %d", res.StatusCode)
}
body, err := ioutil.ReadAll(res.Body)
if err != nil {
return "", err
}
var key Key
if err := json.Unmarshal(body, &key); err != nil {
return "", err
}
return key.Key, nil
}
}
// Récupérer la miniature d'un album
func (ic *ImmichClient) GetThumbnail(assetID string) ([]byte, error) {
client := &http.Client{Timeout: 10 * time.Second}
req, err := http.NewRequest(http.MethodGet, ic.BaseURL+"/api/assets/"+assetID+"/thumbnail?size=preview", nil)
if err != nil {
return nil, err
}
req.Header.Set("x-api-key", ic.APIKey)
req.Header.Set("Accept", "application/octet-stream")
res, err := client.Do(req)
if err != nil {
return nil, err
}
defer res.Body.Close()
if res.StatusCode != 200 {
return nil, fmt.Errorf("Status code %d", res.StatusCode)
}
return ioutil.ReadAll(res.Body)
}

View File

@@ -1,84 +0,0 @@
package whatsapp
import (
"context"
"fmt"
"os"
_ "github.com/mattn/go-sqlite3"
"github.com/mdp/qrterminal/v3"
"go.mau.fi/whatsmeow"
"go.mau.fi/whatsmeow/store/sqlstore"
waLog "go.mau.fi/whatsmeow/util/log"
"go.mau.fi/whatsmeow/types"
waProto "go.mau.fi/whatsmeow/binary/proto"
"google.golang.org/protobuf/proto"
)
type WhatsAppClient struct {
Client *whatsmeow.Client
}
// Fonction pour initialiser la connexion et retourner une instance de WhatsAppClient
func New(sessionFile string) (*WhatsAppClient, error) {
dbLog := waLog.Stdout("Database", "ERROR", true)
container, err := sqlstore.New(context.Background(), "sqlite3", "file:"+sessionFile+"?_foreign_keys=on", dbLog)
if err != nil {
return nil, err
}
deviceStore, err := container.GetFirstDevice(context.Background())
if err != nil {
return nil, err
}
clientLog := waLog.Stdout("Client", "ERROR", true)
client := whatsmeow.NewClient(deviceStore, clientLog)
if client.Store.ID == nil {
// No ID stored, nouvelle connexion
qrChan, _ := client.GetQRChannel(context.Background())
err = client.Connect()
if err != nil {
return nil, err
}
for evt := range qrChan {
if evt.Event == "code" {
qrterminal.GenerateHalfBlock(evt.Code, qrterminal.L, os.Stdout)
fmt.Println("QR code:", evt.Code)
} else {
fmt.Println("Event:", evt.Event)
}
}
} else {
// Connexion existante
err = client.Connect()
if err != nil {
return nil, err
}
}
return &WhatsAppClient{Client: client}, nil
}
// Méthode pour envoyer un message
func (wac *WhatsAppClient) SendMessage(group string, title string, description string, message string, url string, thumbnail []byte) error {
jid, err := types.ParseJID(group)
if err != nil {
return fmt.Errorf("Incorrect group identifier '%s': %v", group, err)
}
msg := &waProto.Message{
ExtendedTextMessage: &waProto.ExtendedTextMessage{
Title: proto.String(title),
Description: proto.String(description),
Text: proto.String(message),
MatchedText: proto.String(url),
JPEGThumbnail: thumbnail,
},
}
ts, err := wac.Client.SendMessage(context.Background(), jid, msg)
if err != nil {
return fmt.Errorf("Error sending message with title '%s': %v", title, err)
}
fmt.Printf("Message with title '%s' sent (timestamp: %s)\n", title, ts)
return nil
}