From b270159aae97359afe02f3c4843fa0f4e9a1a1b6 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@miniflux.net>
Date: Mon, 21 May 2018 12:19:56 -0700
Subject: Offer the possibility to set Pocket Consumer Key as environment
 variable

---
 integration/integration.go   | 6 +++---
 integration/pocket/pocket.go | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'integration')

diff --git a/integration/integration.go b/integration/integration.go
index d853773..af19939 100644
--- a/integration/integration.go
+++ b/integration/integration.go
@@ -5,6 +5,7 @@
 package integration
 
 import (
+	"github.com/miniflux/miniflux/config"
 	"github.com/miniflux/miniflux/integration/instapaper"
 	"github.com/miniflux/miniflux/integration/nunuxkeeper"
 	"github.com/miniflux/miniflux/integration/pinboard"
@@ -15,7 +16,7 @@ import (
 )
 
 // SendEntry send the entry to the activated providers.
-func SendEntry(entry *model.Entry, integration *model.Integration) {
+func SendEntry(cfg *config.Config, entry *model.Entry, integration *model.Integration) {
 	if integration.PinboardEnabled {
 		client := pinboard.NewClient(integration.PinboardToken)
 		err := client.AddBookmark(
@@ -63,10 +64,9 @@ func SendEntry(entry *model.Entry, integration *model.Integration) {
 	}
 
 	if integration.PocketEnabled {
-		client := pocket.NewClient(integration.PocketAccessToken, integration.PocketConsumerKey)
+		client := pocket.NewClient(cfg.PocketConsumerKey(integration.PocketConsumerKey), integration.PocketAccessToken)
 		if err := client.AddURL(entry.URL, entry.Title); err != nil {
 			logger.Error("[Integration] UserID #%d: %v", integration.UserID, err)
 		}
 	}
-
 }
diff --git a/integration/pocket/pocket.go b/integration/pocket/pocket.go
index 16a826c..77f77d4 100644
--- a/integration/pocket/pocket.go
+++ b/integration/pocket/pocket.go
@@ -12,8 +12,8 @@ import (
 
 // Client represents a Pocket client.
 type Client struct {
-	accessToken string
 	consumerKey string
+	accessToken string
 }
 
 // AddURL sends a single link to Pocket.
@@ -50,6 +50,6 @@ func (c *Client) AddURL(link, title string) error {
 }
 
 // NewClient returns a new Pocket client.
-func NewClient(accessToken, consumerKey string) *Client {
-	return &Client{accessToken: accessToken, consumerKey: consumerKey}
+func NewClient(consumerKey, accessToken string) *Client {
+	return &Client{consumerKey, accessToken}
 }
-- 
cgit v1.2.3