diff --git a/server/template/views.go b/server/template/views.go
index 2f36c002..514c78eb 100644
--- a/server/template/views.go
+++ b/server/template/views.go
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
-// 2017-12-02 19:31:37.027317932 -0800 PST m=+0.012259058
+// 2017-12-02 21:11:24.019569008 -0800 PST m=+0.010742856
package template
@@ -812,19 +812,34 @@ var templateViewsMap = map[string]string{
{{ end }}
Pinboard
-
+
+
-
-
+
+
-
-
+
+
-
+
+
+
+
Instapaper
+
+
+
+
+
+
+
+
+
@@ -1145,7 +1160,7 @@ var templateViewsMapChecksums = map[string]string{
"feeds": "c22af39b42ba9ca69ea0914ca789303ec2c5b484abcd4eaa49016e365381257c",
"history": "9a67599a5d8d67ef958e3f07da339b749f42892667547c9e60a54477e8d32a56",
"import": "73b5112e20bfd232bf73334544186ea419505936bc237d481517a8622901878f",
- "integrations": "e3cb653bf3d45fada18b64c53860fcae18a9a3f18162d42c56b290cd1aaa4e18",
+ "integrations": "4e51fabe73b4ee2c2268f77dbbf7987c2a176c5a5714ea29ac31986928f22b8a",
"login": "04f3ce79bfa5753f69e0d956c2a8999c0da549c7925634a3e8134975da0b0e0f",
"sessions": "878dbe8f8ea783b44130c495814179519fa5c3aa2666ac87508f94d58dd008bf",
"settings": "ea2505b9d0a6d6bb594dba87a92079de19baa6d494f0651693a7685489fb7de9",
diff --git a/server/ui/controller/integrations.go b/server/ui/controller/integrations.go
index 12a7964d..a3e545e0 100644
--- a/server/ui/controller/integrations.go
+++ b/server/ui/controller/integrations.go
@@ -6,9 +6,8 @@ package controller
import (
"errors"
- "log"
- "github.com/miniflux/miniflux2/integration/pinboard"
+ "github.com/miniflux/miniflux2/integration"
"github.com/miniflux/miniflux2/model"
"github.com/miniflux/miniflux2/server/core"
"github.com/miniflux/miniflux2/server/ui/form"
@@ -36,6 +35,9 @@ func (c *Controller) ShowIntegrations(ctx *core.Context, request *core.Request,
PinboardToken: integration.PinboardToken,
PinboardTags: integration.PinboardTags,
PinboardMarkAsUnread: integration.PinboardMarkAsUnread,
+ InstapaperEnabled: integration.InstapaperEnabled,
+ InstapaperUsername: integration.InstapaperUsername,
+ InstapaperPassword: integration.InstapaperPassword,
},
}))
}
@@ -85,20 +87,14 @@ func (c *Controller) SaveEntry(ctx *core.Context, request *core.Request, respons
return
}
- integration, err := c.store.Integration(user.ID)
+ settings, err := c.store.Integration(user.ID)
if err != nil {
response.JSON().ServerError(err)
return
}
go func() {
- if integration.PinboardEnabled {
- client := pinboard.NewClient(integration.PinboardToken)
- err := client.AddBookmark(entry.URL, entry.Title, integration.PinboardTags, integration.PinboardMarkAsUnread)
- if err != nil {
- log.Println("[Pinboard]", err)
- }
- }
+ integration.SendEntry(entry, settings)
}()
response.JSON().Created(map[string]string{"message": "saved"})
diff --git a/server/ui/form/integration.go b/server/ui/form/integration.go
index 566adaec..be54e23a 100644
--- a/server/ui/form/integration.go
+++ b/server/ui/form/integration.go
@@ -16,6 +16,9 @@ type IntegrationForm struct {
PinboardToken string
PinboardTags string
PinboardMarkAsUnread bool
+ InstapaperEnabled bool
+ InstapaperUsername string
+ InstapaperPassword string
}
// Merge copy form values to the model.
@@ -24,6 +27,9 @@ func (i IntegrationForm) Merge(integration *model.Integration) {
integration.PinboardToken = i.PinboardToken
integration.PinboardTags = i.PinboardTags
integration.PinboardMarkAsUnread = i.PinboardMarkAsUnread
+ integration.InstapaperEnabled = i.InstapaperEnabled
+ integration.InstapaperUsername = i.InstapaperUsername
+ integration.InstapaperPassword = i.InstapaperPassword
}
// NewIntegrationForm returns a new AuthForm.
@@ -33,5 +39,8 @@ func NewIntegrationForm(r *http.Request) *IntegrationForm {
PinboardToken: r.FormValue("pinboard_token"),
PinboardTags: r.FormValue("pinboard_tags"),
PinboardMarkAsUnread: r.FormValue("pinboard_mark_as_unread") == "1",
+ InstapaperEnabled: r.FormValue("instapaper_enabled") == "1",
+ InstapaperUsername: r.FormValue("instapaper_username"),
+ InstapaperPassword: r.FormValue("instapaper_password"),
}
}
diff --git a/sql/schema_version_5.sql b/sql/schema_version_5.sql
index e4c597f2..326562f9 100644
--- a/sql/schema_version_5.sql
+++ b/sql/schema_version_5.sql
@@ -4,5 +4,8 @@ create table integrations (
pinboard_token text default '',
pinboard_tags text default 'miniflux',
pinboard_mark_as_unread bool default 'f',
+ instapaper_enabled bool default 'f',
+ instapaper_username text default '',
+ instapaper_password text default '',
primary key(user_id)
)
diff --git a/sql/sql.go b/sql/sql.go
index 7ec60a57..e1881310 100644
--- a/sql/sql.go
+++ b/sql/sql.go
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
-// 2017-12-02 19:31:37.017577269 -0800 PST m=+0.002518395
+// 2017-12-02 21:11:24.01125036 -0800 PST m=+0.002424208
package sql
@@ -127,6 +127,9 @@ alter table users add column entry_direction entry_sorting_direction default 'as
pinboard_token text default '',
pinboard_tags text default 'miniflux',
pinboard_mark_as_unread bool default 'f',
+ instapaper_enabled bool default 'f',
+ instapaper_username text default '',
+ instapaper_password text default '',
primary key(user_id)
)
`,
@@ -137,5 +140,5 @@ var SqlMapChecksums = map[string]string{
"schema_version_2": "e8e9ff32478df04fcddad10a34cba2e8bb1e67e7977b5bd6cdc4c31ec94282b4",
"schema_version_3": "a54745dbc1c51c000f74d4e5068f1e2f43e83309f023415b1749a47d5c1e0f12",
"schema_version_4": "216ea3a7d3e1704e40c797b5dc47456517c27dbb6ca98bf88812f4f63d74b5d9",
- "schema_version_5": "69c0aff4d72f86a3f3c3cac33674a943d4f293dd88a8552706144814a85b5629",
+ "schema_version_5": "4e7958c01f15def3f8619fc5bee6f0d99e773353aeea08188f77ef089fc9d3e7",
}
diff --git a/storage/integration.go b/storage/integration.go
index d21b618a..07b67a89 100644
--- a/storage/integration.go
+++ b/storage/integration.go
@@ -18,7 +18,10 @@ func (s *Storage) Integration(userID int64) (*model.Integration, error) {
pinboard_enabled,
pinboard_token,
pinboard_tags,
- pinboard_mark_as_unread
+ pinboard_mark_as_unread,
+ instapaper_enabled,
+ instapaper_username,
+ instapaper_password
FROM integrations
WHERE user_id=$1
`
@@ -29,6 +32,9 @@ func (s *Storage) Integration(userID int64) (*model.Integration, error) {
&integration.PinboardToken,
&integration.PinboardTags,
&integration.PinboardMarkAsUnread,
+ &integration.InstapaperEnabled,
+ &integration.InstapaperUsername,
+ &integration.InstapaperPassword,
)
switch {
case err == sql.ErrNoRows:
@@ -47,8 +53,11 @@ func (s *Storage) UpdateIntegration(integration *model.Integration) error {
pinboard_enabled=$1,
pinboard_token=$2,
pinboard_tags=$3,
- pinboard_mark_as_unread=$4
- WHERE user_id=$5
+ pinboard_mark_as_unread=$4,
+ instapaper_enabled=$5,
+ instapaper_username=$6,
+ instapaper_password=$7
+ WHERE user_id=$8
`
_, err := s.db.Exec(
query,
@@ -56,6 +65,9 @@ func (s *Storage) UpdateIntegration(integration *model.Integration) error {
integration.PinboardToken,
integration.PinboardTags,
integration.PinboardMarkAsUnread,
+ integration.InstapaperEnabled,
+ integration.InstapaperUsername,
+ integration.InstapaperPassword,
integration.UserID,
)