forks/miniflux
1
0
Fork 0
Code Releases Activity

client.New(): accept endpoint URLs with /v1/

Browse source
This commit is contained in:
jtagcat 2022-10-03 17:23:12 +03:00 • committed by Frédéric Guillot
parent 159abf7b7d
commit cd7f01f573
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
client/client.go
View file

@ -10,6 +10,7 @@ import (
"io" "io"
"net/url" "net/url"
"strconv" "strconv"
"strings"
) )
// Client holds API procedure calls. // Client holds API procedure calls.
@ -19,6 +20,11 @@ type Client struct {
// New returns a new Miniflux client. // New returns a new Miniflux client.
func New(endpoint string, credentials ...string) *Client { func New(endpoint string, credentials ...string) *Client {
// Web gives "API Endpoint = https://miniflux.app/v1/", it doesn't work (/v1/v1/me)
endpoint = strings.TrimSuffix(endpoint, "/")
endpoint = strings.TrimSuffix(endpoint, "/v1")
// trim to https://miniflux.app
if len(credentials) == 2 { if len(credentials) == 2 {
return &Client{request: &request{endpoint: endpoint, username: credentials[0], password: credentials[1]}} return &Client{request: &request{endpoint: endpoint, username: credentials[0], password: credentials[1]}}
} }
@ -181,7 +187,6 @@ func (c *Client) CreateCategory(title string) (*Category, error) {
body, err := c.request.Post("/v1/categories", map[string]interface{}{ body, err := c.request.Post("/v1/categories", map[string]interface{}{
"title": title, "title": title,
}) })
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -201,7 +206,6 @@ func (c *Client) UpdateCategory(categoryID int64, title string) (*Category, erro
body, err := c.request.Put(fmt.Sprintf("/v1/categories/%d", categoryID), map[string]interface{}{ body, err := c.request.Put(fmt.Sprintf("/v1/categories/%d", categoryID), map[string]interface{}{
"title": title, "title": title,
}) })
if err != nil { if err != nil {
return nil, err return nil, err
} }