diff options
Diffstat (limited to 'internal/integration')
| -rw-r--r-- | internal/integration/apprise/apprise.go | 4 | ||||
| -rw-r--r-- | internal/integration/espial/espial.go | 4 | ||||
| -rw-r--r-- | internal/integration/linkding/linkding.go | 4 | ||||
| -rw-r--r-- | internal/integration/nunuxkeeper/nunuxkeeper.go | 4 | ||||
| -rw-r--r-- | internal/integration/shaarli/shaarli.go | 4 | ||||
| -rw-r--r-- | internal/integration/shiori/shiori.go | 6 | ||||
| -rw-r--r-- | internal/integration/wallabag/wallabag.go | 6 |
7 files changed, 16 insertions, 16 deletions
diff --git a/internal/integration/apprise/apprise.go b/internal/integration/apprise/apprise.go index 89ea3b6e..3d1c40a2 100644 --- a/internal/integration/apprise/apprise.go +++ b/internal/integration/apprise/apprise.go @@ -11,7 +11,7 @@ import ( "miniflux.app/v2/internal/http/client" "miniflux.app/v2/internal/model" - "miniflux.app/v2/internal/url" + "miniflux.app/v2/internal/urllib" ) const defaultClientTimeout = 1 * time.Second @@ -34,7 +34,7 @@ func (c *Client) PushEntry(entry *model.Entry) error { } _, err := net.DialTimeout("tcp", c.baseURL, defaultClientTimeout) if err != nil { - apiEndpoint, err := url.JoinBaseURLAndPath(c.baseURL, "/notify") + apiEndpoint, err := urllib.JoinBaseURLAndPath(c.baseURL, "/notify") if err != nil { return fmt.Errorf(`apprise: invalid API endpoint: %v`, err) } diff --git a/internal/integration/espial/espial.go b/internal/integration/espial/espial.go index 4751a880..b7a9cc70 100644 --- a/internal/integration/espial/espial.go +++ b/internal/integration/espial/espial.go @@ -7,7 +7,7 @@ import ( "fmt" "miniflux.app/v2/internal/http/client" - "miniflux.app/v2/internal/url" + "miniflux.app/v2/internal/urllib" ) // Document structure of an Espial document @@ -42,7 +42,7 @@ func (c *Client) AddEntry(link, title, content, tags string) error { Tags: tags, } - apiEndpoint, err := url.JoinBaseURLAndPath(c.baseURL, "/api/add") + apiEndpoint, err := urllib.JoinBaseURLAndPath(c.baseURL, "/api/add") if err != nil { return fmt.Errorf(`espial: invalid API endpoint: %v`, err) } diff --git a/internal/integration/linkding/linkding.go b/internal/integration/linkding/linkding.go index 8fa98602..9cbd3cc5 100644 --- a/internal/integration/linkding/linkding.go +++ b/internal/integration/linkding/linkding.go @@ -8,7 +8,7 @@ import ( "strings" "miniflux.app/v2/internal/http/client" - "miniflux.app/v2/internal/url" + "miniflux.app/v2/internal/urllib" ) // Document structure of a Linkding document @@ -49,7 +49,7 @@ func (c *Client) AddEntry(title, entryURL string) error { Unread: c.unread, } - apiEndpoint, err := url.JoinBaseURLAndPath(c.baseURL, "/api/bookmarks/") + apiEndpoint, err := urllib.JoinBaseURLAndPath(c.baseURL, "/api/bookmarks/") if err != nil { return fmt.Errorf(`linkding: invalid API endpoint: %v`, err) } diff --git a/internal/integration/nunuxkeeper/nunuxkeeper.go b/internal/integration/nunuxkeeper/nunuxkeeper.go index b734cc98..7c8d4d78 100644 --- a/internal/integration/nunuxkeeper/nunuxkeeper.go +++ b/internal/integration/nunuxkeeper/nunuxkeeper.go @@ -7,7 +7,7 @@ import ( "fmt" "miniflux.app/v2/internal/http/client" - "miniflux.app/v2/internal/url" + "miniflux.app/v2/internal/urllib" ) // Document structure of a Nununx Keeper document @@ -42,7 +42,7 @@ func (c *Client) AddEntry(link, title, content string) error { ContentType: "text/html", } - apiEndpoint, err := url.JoinBaseURLAndPath(c.baseURL, "/v2/documents") + apiEndpoint, err := urllib.JoinBaseURLAndPath(c.baseURL, "/v2/documents") if err != nil { return fmt.Errorf(`nunux-keeper: invalid API endpoint: %v`, err) } diff --git a/internal/integration/shaarli/shaarli.go b/internal/integration/shaarli/shaarli.go index d88e3cf4..e5d49fd0 100644 --- a/internal/integration/shaarli/shaarli.go +++ b/internal/integration/shaarli/shaarli.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "miniflux.app/v2/internal/url" + "miniflux.app/v2/internal/urllib" "miniflux.app/v2/internal/version" ) @@ -34,7 +34,7 @@ func (c *Client) AddLink(entryURL, entryTitle string) error { return fmt.Errorf("shaarli: missing base URL or API secret") } - apiEndpoint, err := url.JoinBaseURLAndPath(c.baseURL, "/api/v1/links") + apiEndpoint, err := urllib.JoinBaseURLAndPath(c.baseURL, "/api/v1/links") if err != nil { return fmt.Errorf("shaarli: invalid API endpoint: %v", err) } diff --git a/internal/integration/shiori/shiori.go b/internal/integration/shiori/shiori.go index c55a530d..455aaebe 100644 --- a/internal/integration/shiori/shiori.go +++ b/internal/integration/shiori/shiori.go @@ -10,7 +10,7 @@ import ( "net/http" "time" - "miniflux.app/v2/internal/url" + "miniflux.app/v2/internal/urllib" "miniflux.app/v2/internal/version" ) @@ -36,7 +36,7 @@ func (c *Client) AddBookmark(entryURL, entryTitle string) error { return fmt.Errorf("shiori: unable to authenticate: %v", err) } - apiEndpoint, err := url.JoinBaseURLAndPath(c.baseURL, "/api/bookmarks") + apiEndpoint, err := urllib.JoinBaseURLAndPath(c.baseURL, "/api/bookmarks") if err != nil { return fmt.Errorf("shiori: invalid API endpoint: %v", err) } @@ -77,7 +77,7 @@ func (c *Client) AddBookmark(entryURL, entryTitle string) error { } func (c *Client) authenticate() (sessionID string, err error) { - apiEndpoint, err := url.JoinBaseURLAndPath(c.baseURL, "/api/login") + apiEndpoint, err := urllib.JoinBaseURLAndPath(c.baseURL, "/api/login") if err != nil { return "", fmt.Errorf("shiori: invalid API endpoint: %v", err) } diff --git a/internal/integration/wallabag/wallabag.go b/internal/integration/wallabag/wallabag.go index b8044445..e5788185 100644 --- a/internal/integration/wallabag/wallabag.go +++ b/internal/integration/wallabag/wallabag.go @@ -10,7 +10,7 @@ import ( "net/url" "miniflux.app/v2/internal/http/client" - internal_url "miniflux.app/v2/internal/url" + "miniflux.app/v2/internal/urllib" ) // Client represents a Wallabag client. @@ -44,7 +44,7 @@ func (c *Client) AddEntry(link, title, content string) error { } func (c *Client) createEntry(accessToken, link, title, content string) error { - endpoint, err := internal_url.JoinBaseURLAndPath(c.baseURL, "/api/entries.json") + endpoint, err := urllib.JoinBaseURLAndPath(c.baseURL, "/api/entries.json") if err != nil { return fmt.Errorf("wallbag: unable to generate entries endpoint: %v", err) } @@ -76,7 +76,7 @@ func (c *Client) getAccessToken() (string, error) { values.Add("username", c.username) values.Add("password", c.password) - endpoint, err := internal_url.JoinBaseURLAndPath(c.baseURL, "/oauth/v2/token") + endpoint, err := urllib.JoinBaseURLAndPath(c.baseURL, "/oauth/v2/token") if err != nil { return "", fmt.Errorf("wallbag: unable to generate token endpoint: %v", err) } |