integration/raindrop: initial draft implementation
This commit is contained in:
parent
7d6a4243c1
commit
ca62b0b36b
26 changed files with 243 additions and 4 deletions
|
@ -888,4 +888,14 @@ var migrations = []func(tx *sql.Tx) error{
|
||||||
_, err = tx.Exec(`DROP INDEX entries_feed_url_idx`)
|
_, err = tx.Exec(`DROP INDEX entries_feed_url_idx`)
|
||||||
return err
|
return err
|
||||||
},
|
},
|
||||||
|
func(tx *sql.Tx) (err error) {
|
||||||
|
sql := `
|
||||||
|
ALTER TABLE integrations ADD COLUMN raindrop_enabled bool default 'f';
|
||||||
|
ALTER TABLE integrations ADD COLUMN raindrop_token text default '';
|
||||||
|
ALTER TABLE integrations ADD COLUMN raindrop_collection_id text default '';
|
||||||
|
ALTER TABLE integrations ADD COLUMN raindrop_tags text default '';
|
||||||
|
`
|
||||||
|
_, err = tx.Exec(sql)
|
||||||
|
return err
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,6 +19,7 @@ import (
|
||||||
"miniflux.app/v2/internal/integration/omnivore"
|
"miniflux.app/v2/internal/integration/omnivore"
|
||||||
"miniflux.app/v2/internal/integration/pinboard"
|
"miniflux.app/v2/internal/integration/pinboard"
|
||||||
"miniflux.app/v2/internal/integration/pocket"
|
"miniflux.app/v2/internal/integration/pocket"
|
||||||
|
"miniflux.app/v2/internal/integration/raindrop"
|
||||||
"miniflux.app/v2/internal/integration/readeck"
|
"miniflux.app/v2/internal/integration/readeck"
|
||||||
"miniflux.app/v2/internal/integration/readwise"
|
"miniflux.app/v2/internal/integration/readwise"
|
||||||
"miniflux.app/v2/internal/integration/shaarli"
|
"miniflux.app/v2/internal/integration/shaarli"
|
||||||
|
@ -359,6 +360,7 @@ func SendEntry(entry *model.Entry, userIntegrations *model.Integration) {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if userIntegrations.OmnivoreEnabled {
|
if userIntegrations.OmnivoreEnabled {
|
||||||
slog.Debug("Sending entry to Omnivore",
|
slog.Debug("Sending entry to Omnivore",
|
||||||
slog.Int64("user_id", userIntegrations.UserID),
|
slog.Int64("user_id", userIntegrations.UserID),
|
||||||
|
@ -376,6 +378,24 @@ func SendEntry(entry *model.Entry, userIntegrations *model.Integration) {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if userIntegrations.RaindropEnabled {
|
||||||
|
slog.Debug("Sending entry to Raindrop",
|
||||||
|
slog.Int64("user_id", userIntegrations.UserID),
|
||||||
|
slog.Int64("entry_id", entry.ID),
|
||||||
|
slog.String("entry_url", entry.URL),
|
||||||
|
)
|
||||||
|
|
||||||
|
client := raindrop.NewClient(userIntegrations.RaindropToken, userIntegrations.RaindropCollectionID, userIntegrations.RaindropTags)
|
||||||
|
if err := client.CreateRaindrop(entry.URL, entry.Title); err != nil {
|
||||||
|
slog.Error("Unable to send entry to Raindrop",
|
||||||
|
slog.Int64("user_id", userIntegrations.UserID),
|
||||||
|
slog.Int64("entry_id", entry.ID),
|
||||||
|
slog.String("entry_url", entry.URL),
|
||||||
|
slog.Any("error", err),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// PushEntries pushes a list of entries to activated third-party providers during feed refreshes.
|
// PushEntries pushes a list of entries to activated third-party providers during feed refreshes.
|
||||||
|
|
78
internal/integration/raindrop/raindrop.go
Normal file
78
internal/integration/raindrop/raindrop.go
Normal file
|
@ -0,0 +1,78 @@
|
||||||
|
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
|
package raindrop // import "miniflux.app/v2/internal/integration/raindrop"
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"miniflux.app/v2/internal/version"
|
||||||
|
)
|
||||||
|
|
||||||
|
const defaultClientTimeout = 10 * time.Second
|
||||||
|
|
||||||
|
type Client struct {
|
||||||
|
token string
|
||||||
|
collectionID string
|
||||||
|
tags []string
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewClient(token, collectionID, tags string) *Client {
|
||||||
|
return &Client{token: token, collectionID: collectionID, tags: strings.Split(tags, ",")}
|
||||||
|
}
|
||||||
|
|
||||||
|
// https://developer.raindrop.io/v1/raindrops/single#create-raindrop
|
||||||
|
func (c *Client) CreateRaindrop(entryURL, entryTitle string) error {
|
||||||
|
if c.token == "" {
|
||||||
|
return fmt.Errorf("raindrop: missing token")
|
||||||
|
}
|
||||||
|
|
||||||
|
var request *http.Request
|
||||||
|
requestBodyJson, err := json.Marshal(&raindrop{
|
||||||
|
Link: entryURL,
|
||||||
|
Title: entryTitle,
|
||||||
|
Collection: collection{Id: c.collectionID},
|
||||||
|
Tags: c.tags,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("raindrop: unable to encode request body: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
request, err = http.NewRequest(http.MethodPost, "https://api.raindrop.io/rest/v1/raindrop", bytes.NewReader(requestBodyJson))
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("raindrop: unable to create request: %v", err)
|
||||||
|
}
|
||||||
|
request.Header.Set("Content-Type", "application/json")
|
||||||
|
|
||||||
|
request.Header.Set("User-Agent", "Miniflux/"+version.Version)
|
||||||
|
request.Header.Set("Authorization", "Bearer "+c.token)
|
||||||
|
|
||||||
|
httpClient := &http.Client{Timeout: defaultClientTimeout}
|
||||||
|
response, err := httpClient.Do(request)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("raindrop: unable to send request: %v", err)
|
||||||
|
}
|
||||||
|
defer response.Body.Close()
|
||||||
|
|
||||||
|
if response.StatusCode >= 400 {
|
||||||
|
return fmt.Errorf("raindrop: unable to create bookmark: status=%d", response.StatusCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type raindrop struct {
|
||||||
|
Link string `json:"link"`
|
||||||
|
Title string `json:"title"`
|
||||||
|
Collection collection `json:"collection,omitempty"`
|
||||||
|
Tags []string `json:"tags"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type collection struct {
|
||||||
|
Id string `json:"$id"`
|
||||||
|
}
|
|
@ -452,6 +452,10 @@
|
||||||
"form.integration.matrix_bot_password": "Passwort für Matrix-Benutzer",
|
"form.integration.matrix_bot_password": "Passwort für Matrix-Benutzer",
|
||||||
"form.integration.matrix_bot_url": "URL des Matrix-Servers",
|
"form.integration.matrix_bot_url": "URL des Matrix-Servers",
|
||||||
"form.integration.matrix_bot_chat_id": "ID des Matrix-Raums",
|
"form.integration.matrix_bot_chat_id": "ID des Matrix-Raums",
|
||||||
|
"form.integration.raindrop_activate": "Save entries to Raindrop",
|
||||||
|
"form.integration.raindrop_token": "(Test) Token",
|
||||||
|
"form.integration.raindrop_collection_id": "Collection ID",
|
||||||
|
"form.integration.raindrop_tags": "Tags (comma-separated)",
|
||||||
"form.integration.readeck_activate": "Artikel in Readeck speichern",
|
"form.integration.readeck_activate": "Artikel in Readeck speichern",
|
||||||
"form.integration.readeck_endpoint": "Readeck API-Endpunkt",
|
"form.integration.readeck_endpoint": "Readeck API-Endpunkt",
|
||||||
"form.integration.readeck_api_key": "Readeck API-Schlüssel",
|
"form.integration.readeck_api_key": "Readeck API-Schlüssel",
|
||||||
|
|
|
@ -452,6 +452,10 @@
|
||||||
"form.integration.matrix_bot_password": "Κωδικός πρόσβασης για τον χρήστη Matrix",
|
"form.integration.matrix_bot_password": "Κωδικός πρόσβασης για τον χρήστη Matrix",
|
||||||
"form.integration.matrix_bot_url": "URL διακομιστή Matrix",
|
"form.integration.matrix_bot_url": "URL διακομιστή Matrix",
|
||||||
"form.integration.matrix_bot_chat_id": "Αναγνωριστικό της αίθουσας Matrix",
|
"form.integration.matrix_bot_chat_id": "Αναγνωριστικό της αίθουσας Matrix",
|
||||||
|
"form.integration.raindrop_activate": "Save entries to Raindrop",
|
||||||
|
"form.integration.raindrop_token": "(Test) Token",
|
||||||
|
"form.integration.raindrop_collection_id": "Collection ID",
|
||||||
|
"form.integration.raindrop_tags": "Tags (comma-separated)",
|
||||||
"form.integration.readeck_activate": "Αποθήκευση άρθρων στο Readeck",
|
"form.integration.readeck_activate": "Αποθήκευση άρθρων στο Readeck",
|
||||||
"form.integration.readeck_endpoint": "Τελικό σημείο Readeck API",
|
"form.integration.readeck_endpoint": "Τελικό σημείο Readeck API",
|
||||||
"form.integration.readeck_api_key": "Κλειδί API Readeck",
|
"form.integration.readeck_api_key": "Κλειδί API Readeck",
|
||||||
|
|
|
@ -452,6 +452,10 @@
|
||||||
"form.integration.matrix_bot_password": "Password for Matrix user",
|
"form.integration.matrix_bot_password": "Password for Matrix user",
|
||||||
"form.integration.matrix_bot_url": "Matrix server URL",
|
"form.integration.matrix_bot_url": "Matrix server URL",
|
||||||
"form.integration.matrix_bot_chat_id": "ID of Matrix Room",
|
"form.integration.matrix_bot_chat_id": "ID of Matrix Room",
|
||||||
|
"form.integration.raindrop_activate": "Save entries to Raindrop",
|
||||||
|
"form.integration.raindrop_token": "(Test) Token",
|
||||||
|
"form.integration.raindrop_collection_id": "Collection ID",
|
||||||
|
"form.integration.raindrop_tags": "Tags (comma-separated)",
|
||||||
"form.integration.readeck_activate": "Save entries to readeck",
|
"form.integration.readeck_activate": "Save entries to readeck",
|
||||||
"form.integration.readeck_endpoint": "Readeck API Endpoint",
|
"form.integration.readeck_endpoint": "Readeck API Endpoint",
|
||||||
"form.integration.readeck_api_key": "Readeck API key",
|
"form.integration.readeck_api_key": "Readeck API key",
|
||||||
|
|
|
@ -452,6 +452,10 @@
|
||||||
"form.integration.matrix_bot_password": "Contraseña para el usuario de Matrix",
|
"form.integration.matrix_bot_password": "Contraseña para el usuario de Matrix",
|
||||||
"form.integration.matrix_bot_url": "URL del servidor de Matrix",
|
"form.integration.matrix_bot_url": "URL del servidor de Matrix",
|
||||||
"form.integration.matrix_bot_chat_id": "ID de la sala de Matrix",
|
"form.integration.matrix_bot_chat_id": "ID de la sala de Matrix",
|
||||||
|
"form.integration.raindrop_activate": "Save entries to Raindrop",
|
||||||
|
"form.integration.raindrop_token": "(Test) Token",
|
||||||
|
"form.integration.raindrop_collection_id": "Collection ID",
|
||||||
|
"form.integration.raindrop_tags": "Tags (comma-separated)",
|
||||||
"form.integration.readeck_activate": "Enviar artículos a Readeck",
|
"form.integration.readeck_activate": "Enviar artículos a Readeck",
|
||||||
"form.integration.readeck_endpoint": "Acceso API de Readeck",
|
"form.integration.readeck_endpoint": "Acceso API de Readeck",
|
||||||
"form.integration.readeck_api_key": "Clave de API de Readeck",
|
"form.integration.readeck_api_key": "Clave de API de Readeck",
|
||||||
|
|
|
@ -452,6 +452,10 @@
|
||||||
"form.integration.matrix_bot_password": "Matrix-käyttäjän salasana",
|
"form.integration.matrix_bot_password": "Matrix-käyttäjän salasana",
|
||||||
"form.integration.matrix_bot_url": "Matrix-palvelimen URL-osoite",
|
"form.integration.matrix_bot_url": "Matrix-palvelimen URL-osoite",
|
||||||
"form.integration.matrix_bot_chat_id": "Matrix-huoneen tunnus",
|
"form.integration.matrix_bot_chat_id": "Matrix-huoneen tunnus",
|
||||||
|
"form.integration.raindrop_activate": "Save entries to Raindrop",
|
||||||
|
"form.integration.raindrop_token": "(Test) Token",
|
||||||
|
"form.integration.raindrop_collection_id": "Collection ID",
|
||||||
|
"form.integration.raindrop_tags": "Tags (comma-separated)",
|
||||||
"form.integration.readeck_activate": "Tallenna artikkelit Readeckiin",
|
"form.integration.readeck_activate": "Tallenna artikkelit Readeckiin",
|
||||||
"form.integration.readeck_endpoint": "Readeck API-päätepiste",
|
"form.integration.readeck_endpoint": "Readeck API-päätepiste",
|
||||||
"form.integration.readeck_api_key": "Readeck API-avain",
|
"form.integration.readeck_api_key": "Readeck API-avain",
|
||||||
|
|
|
@ -452,6 +452,10 @@
|
||||||
"form.integration.matrix_bot_password": "Mot de passe de l'utilisateur Matrix",
|
"form.integration.matrix_bot_password": "Mot de passe de l'utilisateur Matrix",
|
||||||
"form.integration.matrix_bot_url": "URL du serveur Matrix",
|
"form.integration.matrix_bot_url": "URL du serveur Matrix",
|
||||||
"form.integration.matrix_bot_chat_id": "Identifiant de la salle Matrix",
|
"form.integration.matrix_bot_chat_id": "Identifiant de la salle Matrix",
|
||||||
|
"form.integration.raindrop_activate": "Save entries to Raindrop",
|
||||||
|
"form.integration.raindrop_token": "(Test) Token",
|
||||||
|
"form.integration.raindrop_collection_id": "Collection ID",
|
||||||
|
"form.integration.raindrop_tags": "Tags (comma-separated)",
|
||||||
"form.integration.readeck_activate": "Sauvegarder les articles vers Readeck",
|
"form.integration.readeck_activate": "Sauvegarder les articles vers Readeck",
|
||||||
"form.integration.readeck_endpoint": "URL de l'API de Readeck",
|
"form.integration.readeck_endpoint": "URL de l'API de Readeck",
|
||||||
"form.integration.readeck_api_key": "Clé d'API de Readeck",
|
"form.integration.readeck_api_key": "Clé d'API de Readeck",
|
||||||
|
|
|
@ -452,6 +452,10 @@
|
||||||
"form.integration.matrix_bot_password": "मैट्रिक्स उपयोगकर्ता के लिए पासवर्ड",
|
"form.integration.matrix_bot_password": "मैट्रिक्स उपयोगकर्ता के लिए पासवर्ड",
|
||||||
"form.integration.matrix_bot_url": "मैट्रिक्स सर्वर URL",
|
"form.integration.matrix_bot_url": "मैट्रिक्स सर्वर URL",
|
||||||
"form.integration.matrix_bot_chat_id": "मैट्रिक्स रूम की आईडी",
|
"form.integration.matrix_bot_chat_id": "मैट्रिक्स रूम की आईडी",
|
||||||
|
"form.integration.raindrop_activate": "Save entries to Raindrop",
|
||||||
|
"form.integration.raindrop_token": "(Test) Token",
|
||||||
|
"form.integration.raindrop_collection_id": "Collection ID",
|
||||||
|
"form.integration.raindrop_tags": "Tags (comma-separated)",
|
||||||
"form.integration.readeck_activate": "Readeck में विषयवस्तु सहेजें",
|
"form.integration.readeck_activate": "Readeck में विषयवस्तु सहेजें",
|
||||||
"form.integration.readeck_endpoint": "Readeck·एपीआई·समापन·बिंदु",
|
"form.integration.readeck_endpoint": "Readeck·एपीआई·समापन·बिंदु",
|
||||||
"form.integration.readeck_api_key": "Readeck एपीआई कुंजी",
|
"form.integration.readeck_api_key": "Readeck एपीआई कुंजी",
|
||||||
|
|
|
@ -442,6 +442,10 @@
|
||||||
"form.integration.matrix_bot_password": "Kata Sandi Matrix",
|
"form.integration.matrix_bot_password": "Kata Sandi Matrix",
|
||||||
"form.integration.matrix_bot_url": "URL Peladen Matrix",
|
"form.integration.matrix_bot_url": "URL Peladen Matrix",
|
||||||
"form.integration.matrix_bot_chat_id": "ID Ruang Matrix",
|
"form.integration.matrix_bot_chat_id": "ID Ruang Matrix",
|
||||||
|
"form.integration.raindrop_activate": "Save entries to Raindrop",
|
||||||
|
"form.integration.raindrop_token": "(Test) Token",
|
||||||
|
"form.integration.raindrop_collection_id": "Collection ID",
|
||||||
|
"form.integration.raindrop_tags": "Tags (comma-separated)",
|
||||||
"form.integration.readeck_activate": "Simpan artikel ke Readeck",
|
"form.integration.readeck_activate": "Simpan artikel ke Readeck",
|
||||||
"form.integration.readeck_endpoint": "Titik URL API Readeck",
|
"form.integration.readeck_endpoint": "Titik URL API Readeck",
|
||||||
"form.integration.readeck_api_key": "Kunci API Readeck",
|
"form.integration.readeck_api_key": "Kunci API Readeck",
|
||||||
|
|
|
@ -452,6 +452,10 @@
|
||||||
"form.integration.matrix_bot_password": "Password per l'utente Matrix",
|
"form.integration.matrix_bot_password": "Password per l'utente Matrix",
|
||||||
"form.integration.matrix_bot_url": "URL del server Matrix",
|
"form.integration.matrix_bot_url": "URL del server Matrix",
|
||||||
"form.integration.matrix_bot_chat_id": "ID della stanza Matrix",
|
"form.integration.matrix_bot_chat_id": "ID della stanza Matrix",
|
||||||
|
"form.integration.raindrop_activate": "Save entries to Raindrop",
|
||||||
|
"form.integration.raindrop_token": "(Test) Token",
|
||||||
|
"form.integration.raindrop_collection_id": "Collection ID",
|
||||||
|
"form.integration.raindrop_tags": "Tags (comma-separated)",
|
||||||
"form.integration.readeck_activate": "Salva gli articoli su Readeck",
|
"form.integration.readeck_activate": "Salva gli articoli su Readeck",
|
||||||
"form.integration.readeck_endpoint": "Endpoint dell'API di Readeck",
|
"form.integration.readeck_endpoint": "Endpoint dell'API di Readeck",
|
||||||
"form.integration.readeck_api_key": "API key dell'account Readeck",
|
"form.integration.readeck_api_key": "API key dell'account Readeck",
|
||||||
|
|
|
@ -442,6 +442,10 @@
|
||||||
"form.integration.matrix_bot_password": "Matrixユーザ用パスワード",
|
"form.integration.matrix_bot_password": "Matrixユーザ用パスワード",
|
||||||
"form.integration.matrix_bot_url": "MatrixサーバーのURL",
|
"form.integration.matrix_bot_url": "MatrixサーバーのURL",
|
||||||
"form.integration.matrix_bot_chat_id": "MatrixルームのID",
|
"form.integration.matrix_bot_chat_id": "MatrixルームのID",
|
||||||
|
"form.integration.raindrop_activate": "Save entries to Raindrop",
|
||||||
|
"form.integration.raindrop_token": "(Test) Token",
|
||||||
|
"form.integration.raindrop_collection_id": "Collection ID",
|
||||||
|
"form.integration.raindrop_tags": "Tags (comma-separated)",
|
||||||
"form.integration.readeck_activate": "Readeck に記事を保存する",
|
"form.integration.readeck_activate": "Readeck に記事を保存する",
|
||||||
"form.integration.readeck_endpoint": "Readeck の API Endpoint",
|
"form.integration.readeck_endpoint": "Readeck の API Endpoint",
|
||||||
"form.integration.readeck_api_key": "Readeck の API key",
|
"form.integration.readeck_api_key": "Readeck の API key",
|
||||||
|
|
|
@ -452,6 +452,10 @@
|
||||||
"form.integration.matrix_bot_password": "Wachtwoord voor Matrix-gebruiker",
|
"form.integration.matrix_bot_password": "Wachtwoord voor Matrix-gebruiker",
|
||||||
"form.integration.matrix_bot_url": "URL van de Matrix-server",
|
"form.integration.matrix_bot_url": "URL van de Matrix-server",
|
||||||
"form.integration.matrix_bot_chat_id": "ID van Matrix-kamer",
|
"form.integration.matrix_bot_chat_id": "ID van Matrix-kamer",
|
||||||
|
"form.integration.raindrop_activate": "Save entries to Raindrop",
|
||||||
|
"form.integration.raindrop_token": "(Test) Token",
|
||||||
|
"form.integration.raindrop_collection_id": "Collection ID",
|
||||||
|
"form.integration.raindrop_tags": "Tags (comma-separated)",
|
||||||
"form.integration.readeck_activate": "Opslaan naar Readeck",
|
"form.integration.readeck_activate": "Opslaan naar Readeck",
|
||||||
"form.integration.readeck_endpoint": "Readeck URL",
|
"form.integration.readeck_endpoint": "Readeck URL",
|
||||||
"form.integration.readeck_api_key": "Readeck API-sleutel",
|
"form.integration.readeck_api_key": "Readeck API-sleutel",
|
||||||
|
|
|
@ -462,6 +462,10 @@
|
||||||
"form.integration.matrix_bot_password": "Hasło dla użytkownika Matrix",
|
"form.integration.matrix_bot_password": "Hasło dla użytkownika Matrix",
|
||||||
"form.integration.matrix_bot_url": "URL serwera Matrix",
|
"form.integration.matrix_bot_url": "URL serwera Matrix",
|
||||||
"form.integration.matrix_bot_chat_id": "Identyfikator pokoju Matrix",
|
"form.integration.matrix_bot_chat_id": "Identyfikator pokoju Matrix",
|
||||||
|
"form.integration.raindrop_activate": "Save entries to Raindrop",
|
||||||
|
"form.integration.raindrop_token": "(Test) Token",
|
||||||
|
"form.integration.raindrop_collection_id": "Collection ID",
|
||||||
|
"form.integration.raindrop_tags": "Tags (comma-separated)",
|
||||||
"form.integration.readeck_activate": "Zapisz artykuły do Readeck",
|
"form.integration.readeck_activate": "Zapisz artykuły do Readeck",
|
||||||
"form.integration.readeck_endpoint": "Readeck URL",
|
"form.integration.readeck_endpoint": "Readeck URL",
|
||||||
"form.integration.readeck_api_key": "Readeck API key",
|
"form.integration.readeck_api_key": "Readeck API key",
|
||||||
|
|
|
@ -452,6 +452,10 @@
|
||||||
"form.integration.matrix_bot_password": "Palavra-passe para utilizador da Matrix",
|
"form.integration.matrix_bot_password": "Palavra-passe para utilizador da Matrix",
|
||||||
"form.integration.matrix_bot_url": "URL do servidor Matrix",
|
"form.integration.matrix_bot_url": "URL do servidor Matrix",
|
||||||
"form.integration.matrix_bot_chat_id": "Identificação da sala Matrix",
|
"form.integration.matrix_bot_chat_id": "Identificação da sala Matrix",
|
||||||
|
"form.integration.raindrop_activate": "Save entries to Raindrop",
|
||||||
|
"form.integration.raindrop_token": "(Test) Token",
|
||||||
|
"form.integration.raindrop_collection_id": "Collection ID",
|
||||||
|
"form.integration.raindrop_tags": "Tags (comma-separated)",
|
||||||
"form.integration.readeck_activate": "Salvar itens no Readeck",
|
"form.integration.readeck_activate": "Salvar itens no Readeck",
|
||||||
"form.integration.readeck_endpoint": "Endpoint de API do Readeck",
|
"form.integration.readeck_endpoint": "Endpoint de API do Readeck",
|
||||||
"form.integration.readeck_api_key": "Chave de API do Readeck",
|
"form.integration.readeck_api_key": "Chave de API do Readeck",
|
||||||
|
|
|
@ -462,6 +462,10 @@
|
||||||
"form.integration.matrix_bot_password": "Пароль пользователя Matrix",
|
"form.integration.matrix_bot_password": "Пароль пользователя Matrix",
|
||||||
"form.integration.matrix_bot_url": "Ссылка на сервер Matrix",
|
"form.integration.matrix_bot_url": "Ссылка на сервер Matrix",
|
||||||
"form.integration.matrix_bot_chat_id": "ID комнаты Matrix",
|
"form.integration.matrix_bot_chat_id": "ID комнаты Matrix",
|
||||||
|
"form.integration.raindrop_activate": "Save entries to Raindrop",
|
||||||
|
"form.integration.raindrop_token": "(Test) Token",
|
||||||
|
"form.integration.raindrop_collection_id": "Collection ID",
|
||||||
|
"form.integration.raindrop_tags": "Tags (comma-separated)",
|
||||||
"form.integration.readeck_activate": "Сохранять статьи в Readeck",
|
"form.integration.readeck_activate": "Сохранять статьи в Readeck",
|
||||||
"form.integration.readeck_endpoint": "Конечная точка Readeck API",
|
"form.integration.readeck_endpoint": "Конечная точка Readeck API",
|
||||||
"form.integration.readeck_api_key": "API-ключ Readeck",
|
"form.integration.readeck_api_key": "API-ключ Readeck",
|
||||||
|
|
|
@ -222,6 +222,10 @@
|
||||||
"form.integration.pocket_activate": "Makaleleri Pocket'a kaydet",
|
"form.integration.pocket_activate": "Makaleleri Pocket'a kaydet",
|
||||||
"form.integration.pocket_connect_link": "Pocket hesabını bağla",
|
"form.integration.pocket_connect_link": "Pocket hesabını bağla",
|
||||||
"form.integration.pocket_consumer_key": "Pocket Consumer Anahtarı",
|
"form.integration.pocket_consumer_key": "Pocket Consumer Anahtarı",
|
||||||
|
"form.integration.raindrop_activate": "Save entries to Raindrop",
|
||||||
|
"form.integration.raindrop_token": "(Test) Token",
|
||||||
|
"form.integration.raindrop_collection_id": "Collection ID",
|
||||||
|
"form.integration.raindrop_tags": "Tags (comma-separated)",
|
||||||
"form.integration.readeck_activate": "Makaleleri Readeck'e kaydet",
|
"form.integration.readeck_activate": "Makaleleri Readeck'e kaydet",
|
||||||
"form.integration.readeck_api_key": "Readeck API Anahtarı",
|
"form.integration.readeck_api_key": "Readeck API Anahtarı",
|
||||||
"form.integration.readeck_endpoint": "Readeck API Uç Noktası",
|
"form.integration.readeck_endpoint": "Readeck API Uç Noktası",
|
||||||
|
|
|
@ -462,6 +462,10 @@
|
||||||
"form.integration.matrix_bot_password": "Пароль для користувача Matrix",
|
"form.integration.matrix_bot_password": "Пароль для користувача Matrix",
|
||||||
"form.integration.matrix_bot_url": "URL-адреса сервера Матриці",
|
"form.integration.matrix_bot_url": "URL-адреса сервера Матриці",
|
||||||
"form.integration.matrix_bot_chat_id": "Ідентифікатор кімнати Матриці",
|
"form.integration.matrix_bot_chat_id": "Ідентифікатор кімнати Матриці",
|
||||||
|
"form.integration.raindrop_activate": "Save entries to Raindrop",
|
||||||
|
"form.integration.raindrop_token": "(Test) Token",
|
||||||
|
"form.integration.raindrop_collection_id": "Collection ID",
|
||||||
|
"form.integration.raindrop_tags": "Tags (comma-separated)",
|
||||||
"form.integration.readeck_activate": "Зберігати статті до Readeck",
|
"form.integration.readeck_activate": "Зберігати статті до Readeck",
|
||||||
"form.integration.readeck_endpoint": "Readeck API Endpoint",
|
"form.integration.readeck_endpoint": "Readeck API Endpoint",
|
||||||
"form.integration.readeck_api_key": "Ключ API Readeck",
|
"form.integration.readeck_api_key": "Ключ API Readeck",
|
||||||
|
|
|
@ -442,6 +442,10 @@
|
||||||
"form.integration.matrix_bot_password": "Matrix Bot 密码",
|
"form.integration.matrix_bot_password": "Matrix Bot 密码",
|
||||||
"form.integration.matrix_bot_url": "Matrix 服务器 URL",
|
"form.integration.matrix_bot_url": "Matrix 服务器 URL",
|
||||||
"form.integration.matrix_bot_chat_id": "Matrix 聊天 ID",
|
"form.integration.matrix_bot_chat_id": "Matrix 聊天 ID",
|
||||||
|
"form.integration.raindrop_activate": "Save entries to Raindrop",
|
||||||
|
"form.integration.raindrop_token": "(Test) Token",
|
||||||
|
"form.integration.raindrop_collection_id": "Collection ID",
|
||||||
|
"form.integration.raindrop_tags": "Tags (comma-separated)",
|
||||||
"form.integration.readeck_activate": "保存文章到 Readeck",
|
"form.integration.readeck_activate": "保存文章到 Readeck",
|
||||||
"form.integration.readeck_endpoint": "Readeck API 端点",
|
"form.integration.readeck_endpoint": "Readeck API 端点",
|
||||||
"form.integration.readeck_api_key": "Readeck API 密钥",
|
"form.integration.readeck_api_key": "Readeck API 密钥",
|
||||||
|
|
|
@ -442,6 +442,10 @@
|
||||||
"form.integration.matrix_bot_password": "Matrix 的密碼",
|
"form.integration.matrix_bot_password": "Matrix 的密碼",
|
||||||
"form.integration.matrix_bot_url": "Matrix 伺服器的 URL",
|
"form.integration.matrix_bot_url": "Matrix 伺服器的 URL",
|
||||||
"form.integration.matrix_bot_chat_id": "Matrix 房間 ID",
|
"form.integration.matrix_bot_chat_id": "Matrix 房間 ID",
|
||||||
|
"form.integration.raindrop_activate": "Save entries to Raindrop",
|
||||||
|
"form.integration.raindrop_token": "(Test) Token",
|
||||||
|
"form.integration.raindrop_collection_id": "Collection ID",
|
||||||
|
"form.integration.raindrop_tags": "Tags (comma-separated)",
|
||||||
"form.integration.readeck_activate": "儲存文章到 Readeck",
|
"form.integration.readeck_activate": "儲存文章到 Readeck",
|
||||||
"form.integration.readeck_endpoint": "Readeck API 端點",
|
"form.integration.readeck_endpoint": "Readeck API 端點",
|
||||||
"form.integration.readeck_api_key": "Readeck API 金鑰",
|
"form.integration.readeck_api_key": "Readeck API 金鑰",
|
||||||
|
|
|
@ -90,4 +90,8 @@ type Integration struct {
|
||||||
OmnivoreEnabled bool
|
OmnivoreEnabled bool
|
||||||
OmnivoreAPIKey string
|
OmnivoreAPIKey string
|
||||||
OmnivoreURL string
|
OmnivoreURL string
|
||||||
|
RaindropEnabled bool
|
||||||
|
RaindropToken string
|
||||||
|
RaindropCollectionID string
|
||||||
|
RaindropTags string
|
||||||
}
|
}
|
||||||
|
|
|
@ -193,7 +193,11 @@ func (s *Storage) Integration(userID int64) (*model.Integration, error) {
|
||||||
rssbridge_url,
|
rssbridge_url,
|
||||||
omnivore_enabled,
|
omnivore_enabled,
|
||||||
omnivore_api_key,
|
omnivore_api_key,
|
||||||
omnivore_url
|
omnivore_url,
|
||||||
|
raindrop_enabled,
|
||||||
|
raindrop_token,
|
||||||
|
raindrop_collection_id,
|
||||||
|
raindrop_tags
|
||||||
FROM
|
FROM
|
||||||
integrations
|
integrations
|
||||||
WHERE
|
WHERE
|
||||||
|
@ -286,6 +290,10 @@ func (s *Storage) Integration(userID int64) (*model.Integration, error) {
|
||||||
&integration.OmnivoreEnabled,
|
&integration.OmnivoreEnabled,
|
||||||
&integration.OmnivoreAPIKey,
|
&integration.OmnivoreAPIKey,
|
||||||
&integration.OmnivoreURL,
|
&integration.OmnivoreURL,
|
||||||
|
&integration.RaindropEnabled,
|
||||||
|
&integration.RaindropToken,
|
||||||
|
&integration.RaindropCollectionID,
|
||||||
|
&integration.RaindropTags,
|
||||||
)
|
)
|
||||||
switch {
|
switch {
|
||||||
case err == sql.ErrNoRows:
|
case err == sql.ErrNoRows:
|
||||||
|
@ -386,9 +394,13 @@ func (s *Storage) UpdateIntegration(integration *model.Integration) error {
|
||||||
omnivore_url=$81,
|
omnivore_url=$81,
|
||||||
linkwarden_enabled=$82,
|
linkwarden_enabled=$82,
|
||||||
linkwarden_url=$83,
|
linkwarden_url=$83,
|
||||||
linkwarden_api_key=$84
|
linkwarden_api_key=$84,
|
||||||
|
raindrop_enabled=$85,
|
||||||
|
raindrop_token=$86,
|
||||||
|
raindrop_collection_id=$87,
|
||||||
|
raindrop_tags=$88
|
||||||
WHERE
|
WHERE
|
||||||
user_id=$85
|
user_id=$89
|
||||||
`
|
`
|
||||||
_, err := s.db.Exec(
|
_, err := s.db.Exec(
|
||||||
query,
|
query,
|
||||||
|
@ -476,6 +488,10 @@ func (s *Storage) UpdateIntegration(integration *model.Integration) error {
|
||||||
integration.LinkwardenEnabled,
|
integration.LinkwardenEnabled,
|
||||||
integration.LinkwardenURL,
|
integration.LinkwardenURL,
|
||||||
integration.LinkwardenAPIKey,
|
integration.LinkwardenAPIKey,
|
||||||
|
integration.RaindropEnabled,
|
||||||
|
integration.RaindropToken,
|
||||||
|
integration.RaindropCollectionID,
|
||||||
|
integration.RaindropTags,
|
||||||
integration.UserID,
|
integration.UserID,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -513,7 +529,8 @@ func (s *Storage) HasSaveEntry(userID int64) (result bool) {
|
||||||
readeck_enabled='t' OR
|
readeck_enabled='t' OR
|
||||||
shaarli_enabled='t' OR
|
shaarli_enabled='t' OR
|
||||||
webhook_enabled='t' OR
|
webhook_enabled='t' OR
|
||||||
omnivore_enabled='t'
|
omnivore_enabled='t' OR
|
||||||
|
raindrop_enabled='t'
|
||||||
)
|
)
|
||||||
`
|
`
|
||||||
if err := s.db.QueryRow(query, userID).Scan(&result); err != nil {
|
if err := s.db.QueryRow(query, userID).Scan(&result); err != nil {
|
||||||
|
|
|
@ -326,6 +326,28 @@
|
||||||
</div>
|
</div>
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
|
<details {{ if .form.RaindropEnabled }}open{{ end }}>
|
||||||
|
<summary>Raindrop</summary>
|
||||||
|
<div class="form-section">
|
||||||
|
<label>
|
||||||
|
<input type="checkbox" name="raindrop_enabled" value="1" {{ if .form.RaindropEnabled }}checked{{ end }}> {{ t "form.integration.raindrop_activate" }}
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<label for="form-raindrop-token">{{ t "form.integration.raindrop_token" }}</label>
|
||||||
|
<input type="text" name="raindrop_token" id="form-raindrop-token" value="{{ .form.RaindropToken }}" spellcheck="false">
|
||||||
|
|
||||||
|
<label for="form-raindrop-collection-id">{{ t "form.integration.raindrop_collection_id" }}</label>
|
||||||
|
<input type="text" name="raindrop_collection_id" id="form-raindrop-collection-id" value="{{ .form.RaindropCollectionID }}" spellcheck="false">
|
||||||
|
|
||||||
|
<label for="form-raindrop-tags">{{ t "form.integration.raindrop_tags" }}</label>
|
||||||
|
<input type="text" name="raindrop_tags" id="form-raindrop-tags" value="{{ .form.RaindropTags }}" spellcheck="false">
|
||||||
|
|
||||||
|
<div class="buttons">
|
||||||
|
<button type="submit" class="button button-primary" data-label-loading="{{ t "form.submit.saving" }}">{{ t "action.update" }}</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</details>
|
||||||
|
|
||||||
<details {{ if .form.ReadeckEnabled }}open{{ end }}>
|
<details {{ if .form.ReadeckEnabled }}open{{ end }}>
|
||||||
<summary>Readeck</summary>
|
<summary>Readeck</summary>
|
||||||
<div class="form-section">
|
<div class="form-section">
|
||||||
|
|
|
@ -96,6 +96,10 @@ type IntegrationForm struct {
|
||||||
OmnivoreEnabled bool
|
OmnivoreEnabled bool
|
||||||
OmnivoreAPIKey string
|
OmnivoreAPIKey string
|
||||||
OmnivoreURL string
|
OmnivoreURL string
|
||||||
|
RaindropEnabled bool
|
||||||
|
RaindropToken string
|
||||||
|
RaindropCollectionID string
|
||||||
|
RaindropTags string
|
||||||
}
|
}
|
||||||
|
|
||||||
// Merge copy form values to the model.
|
// Merge copy form values to the model.
|
||||||
|
@ -181,6 +185,10 @@ func (i IntegrationForm) Merge(integration *model.Integration) {
|
||||||
integration.OmnivoreEnabled = i.OmnivoreEnabled
|
integration.OmnivoreEnabled = i.OmnivoreEnabled
|
||||||
integration.OmnivoreAPIKey = i.OmnivoreAPIKey
|
integration.OmnivoreAPIKey = i.OmnivoreAPIKey
|
||||||
integration.OmnivoreURL = i.OmnivoreURL
|
integration.OmnivoreURL = i.OmnivoreURL
|
||||||
|
integration.RaindropEnabled = i.RaindropEnabled
|
||||||
|
integration.RaindropToken = i.RaindropToken
|
||||||
|
integration.RaindropCollectionID = i.RaindropCollectionID
|
||||||
|
integration.RaindropTags = i.RaindropTags
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewIntegrationForm returns a new IntegrationForm.
|
// NewIntegrationForm returns a new IntegrationForm.
|
||||||
|
@ -269,6 +277,10 @@ func NewIntegrationForm(r *http.Request) *IntegrationForm {
|
||||||
OmnivoreEnabled: r.FormValue("omnivore_enabled") == "1",
|
OmnivoreEnabled: r.FormValue("omnivore_enabled") == "1",
|
||||||
OmnivoreAPIKey: r.FormValue("omnivore_api_key"),
|
OmnivoreAPIKey: r.FormValue("omnivore_api_key"),
|
||||||
OmnivoreURL: r.FormValue("omnivore_url"),
|
OmnivoreURL: r.FormValue("omnivore_url"),
|
||||||
|
RaindropEnabled: r.FormValue("raindrop_enabled") == "1",
|
||||||
|
RaindropToken: r.FormValue("raindrop_token"),
|
||||||
|
RaindropCollectionID: r.FormValue("raindrop_collection_id"),
|
||||||
|
RaindropTags: r.FormValue("raindrop_tags"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -110,6 +110,10 @@ func (h *handler) showIntegrationPage(w http.ResponseWriter, r *http.Request) {
|
||||||
OmnivoreEnabled: integration.OmnivoreEnabled,
|
OmnivoreEnabled: integration.OmnivoreEnabled,
|
||||||
OmnivoreAPIKey: integration.OmnivoreAPIKey,
|
OmnivoreAPIKey: integration.OmnivoreAPIKey,
|
||||||
OmnivoreURL: integration.OmnivoreURL,
|
OmnivoreURL: integration.OmnivoreURL,
|
||||||
|
RaindropEnabled: integration.RaindropEnabled,
|
||||||
|
RaindropToken: integration.RaindropToken,
|
||||||
|
RaindropCollectionID: integration.RaindropCollectionID,
|
||||||
|
RaindropTags: integration.RaindropTags,
|
||||||
}
|
}
|
||||||
|
|
||||||
sess := session.New(h.store, request.SessionID(r))
|
sess := session.New(h.store, request.SessionID(r))
|
||||||
|
|
Loading…
Reference in a new issue