diff options
author | Frédéric Guillot <fred@miniflux.net> | 2018-05-21 12:19:56 -0700 |
---|---|---|
committer | Frédéric Guillot <fred@miniflux.net> | 2018-05-21 19:58:36 -0400 |
commit | b270159aae97359afe02f3c4843fa0f4e9a1a1b6 (patch) | |
tree | 290eef118ce6ccab49471d3673bb7d51b24bb4c2 /integration | |
parent | 44decae557a6f78eda57b8f407d35b10233538e4 (diff) |
Offer the possibility to set Pocket Consumer Key as environment variable
Diffstat (limited to 'integration')
-rw-r--r-- | integration/integration.go | 6 | ||||
-rw-r--r-- | integration/pocket/pocket.go | 6 |
2 files changed, 6 insertions, 6 deletions
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} } |