oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-09-15 18:57:04 +00:00
Code Wiki Activity

Rename internal url package to avoid overlap with net/url

Browse source
This commit is contained in:
Frédéric Guillot 2023-08-13 19:09:01 -07:00
parent 9f465fd70d
commit e5d9f2f5a0
23 changed files with 74 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/integration/apprise/apprise.go
View file

@ -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)
}

4
internal/integration/espial/espial.go
View file

@ -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)
}

4
internal/integration/linkding/linkding.go
View file

@ -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)
}

4
internal/integration/nunuxkeeper/nunuxkeeper.go
View file

@ -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)
}

4
internal/integration/shaarli/shaarli.go
View file

@ -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)
}

6
internal/integration/shiori/shiori.go
View file

@ -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)
}

6
internal/integration/wallabag/wallabag.go
View file

@ -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)
}