mirror of
https://github.com/miniflux/v2.git
synced 2025-08-01 17:38:37 +00:00
Consider base path when generating third-party services API endpoint
This commit is contained in:
parent
fb8737e330
commit
13d9d86acd
9 changed files with 87 additions and 60 deletions
|
@ -11,8 +11,11 @@ import (
|
|||
|
||||
"miniflux.app/v2/internal/http/client"
|
||||
"miniflux.app/v2/internal/model"
|
||||
"miniflux.app/v2/internal/url"
|
||||
)
|
||||
|
||||
const defaultClientTimeout = 1 * time.Second
|
||||
|
||||
// Client represents a Apprise client.
|
||||
type Client struct {
|
||||
servicesURL string
|
||||
|
@ -27,12 +30,16 @@ func NewClient(serviceURL, baseURL string) *Client {
|
|||
// PushEntry pushes entry to apprise
|
||||
func (c *Client) PushEntry(entry *model.Entry) error {
|
||||
if c.baseURL == "" || c.servicesURL == "" {
|
||||
return fmt.Errorf("apprise: missing credentials")
|
||||
return fmt.Errorf("apprise: missing base URL or service URL")
|
||||
}
|
||||
timeout := time.Duration(1 * time.Second)
|
||||
_, err := net.DialTimeout("tcp", c.baseURL, timeout)
|
||||
_, err := net.DialTimeout("tcp", c.baseURL, defaultClientTimeout)
|
||||
if err != nil {
|
||||
clt := client.New(c.baseURL + "/notify")
|
||||
apiEndpoint, err := url.JoinBaseURLAndPath(c.baseURL, "/notify")
|
||||
if err != nil {
|
||||
return fmt.Errorf(`apprise: invalid API endpoint: %v`, err)
|
||||
}
|
||||
|
||||
clt := client.New(apiEndpoint)
|
||||
message := "[" + entry.Title + "]" + "(" + entry.URL + ")" + "\n\n"
|
||||
data := &Data{
|
||||
Urls: c.servicesURL,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue