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