rdelaage
/
miniflux-v2
mirror of https://github.com/miniflux/v2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add sub-folder support for Wallabag integration

This commit is contained in:
Gabriel Augendre 2023-06-24 19:14:46 +02:00 committed by GitHub
parent df472254d3
commit 765b4c6424
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
integration/wallabag/wallabag.go
View File

@ -43,7 +43,7 @@ func (c *Client) AddEntry(link, title, content string) error {
}
func (c *Client) createEntry(accessToken, link, title, content string) error {
endpoint, err := getAPIEndpoint(c.baseURL, "/api/entries.json")
endpoint, err := url.JoinPath(c.baseURL, "/api/entries.json")
if err != nil {
return fmt.Errorf("wallbag: unable to get entries endpoint: %v", err)
}
@ -75,7 +75,7 @@ func (c *Client) getAccessToken() (string, error) {
values.Add("username", c.username)
values.Add("password", c.password)
endpoint, err := getAPIEndpoint(c.baseURL, "/oauth/v2/token")
endpoint, err := url.JoinPath(c.baseURL, "/oauth/v2/token")
if err != nil {
return "", fmt.Errorf("wallbag: unable to get token endpoint: %v", err)
}
@ -98,15 +98,6 @@ func (c *Client) getAccessToken() (string, error) {
return token.AccessToken, nil
}
func getAPIEndpoint(baseURL, path string) (string, error) {
u, err := url.Parse(baseURL)
if err != nil {
return "", fmt.Errorf("wallabag: invalid API endpoint: %v", err)
}
u.Path = path
return u.String(), nil
}
type tokenResponse struct {
AccessToken string `json:"access_token"`
Expires int `json:"expires_in"`