Skip to content

chore: make GetFeeds method on backends #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guyfedwards merged 1 commit into from
Dec 21, 2025
Merged

chore: make GetFeeds method on backends #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 26 additions & 7 deletions internal/config/backends.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,33 @@ package config
import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"net/http"
"strings"

miniflux "miniflux.app/client"
)

func getMinifluxFeeds(config *MinifluxBackend) ([]Feed, error) {
mf := miniflux.New(config.Host, config.APIKey)
type MinifluxBackend struct {
Host string `yaml:"host"`
APIKey string `yaml:"api_key"`
}

type FreshRSSBackend struct {
Host string `yaml:"host"`
User string `yaml:"user"`
Password string `yaml:"password"`
PrefixCats bool `yaml:"prefixCats"`
}

type Backends struct {
Miniflux *MinifluxBackend `yaml:"miniflux,omitempty"`
FreshRSS *FreshRSSBackend `yaml:"freshrss,omitempty"`
}

func (mfb *MinifluxBackend) GetFeeds() ([]Feed, error) {
mf := miniflux.New(mfb.Host, mfb.APIKey)

// Fetch all feeds.
feeds, err := mf.Feeds()
Expand Down Expand Up @@ -52,8 +70,8 @@ func (frss FreshRSSFeed) GetCats() string {
return ret
}

func getFreshRSSFeeds(config *FreshRSSBackend) ([]Feed, error) {
resp, err := http.Get(fmt.Sprintf("%v/api/greader.php/accounts/ClientLogin?Email=%v&Passwd=%v", config.Host, config.User, config.Password))
func (frp *FreshRSSBackend) GetFeeds() ([]Feed, error) {
resp, err := http.Get(fmt.Sprintf("%v/api/greader.php/accounts/ClientLogin?Email=%v&Passwd=%v", frp.Host, frp.User, frp.Password))
if err != nil {
return []Feed{}, err
}
Expand All @@ -71,7 +89,7 @@ func getFreshRSSFeeds(config *FreshRSSBackend) ([]Feed, error) {
lines := strings.Split(string(body), "\n")
kv := strings.Split(lines[0], "=")

url := fmt.Sprintf("%v/api/greader.php/reader/api/0/subscription/list?output=json", config.Host)
url := fmt.Sprintf("%v/api/greader.php/reader/api/0/subscription/list?output=json", frp.Host)
req, err := http.NewRequest("GET", url, nil)
if err != nil {
return []Feed{}, err
Expand All @@ -84,7 +102,7 @@ func getFreshRSSFeeds(config *FreshRSSBackend) ([]Feed, error) {
return []Feed{}, err
}

body, err = ioutil.ReadAll(resp.Body)
body, err = io.ReadAll(resp.Body)
if err != nil {
return []Feed{}, err
}
Expand All @@ -99,9 +117,10 @@ func getFreshRSSFeeds(config *FreshRSSBackend) ([]Feed, error) {

for _, f := range b.Subscriptions {
name := ""
if config.PrefixCats {
if frp.PrefixCats {
name = f.GetCats()
}

ret = append(ret, Feed{URL: f.URL, Name: name})
}

Expand Down
21 changes: 2 additions & 19 deletions internal/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,6 @@ type Feed struct {
Tags []string `yaml:"tags,omitempty"`
}

type MinifluxBackend struct {
Host string `yaml:"host"`
APIKey string `yaml:"api_key"`
}

type FreshRSSBackend struct {
Host string `yaml:"host"`
User string `yaml:"user"`
Password string `yaml:"password"`
PrefixCats bool `yaml:"prefixCats"`
}

type Backends struct {
Miniflux *MinifluxBackend `yaml:"miniflux,omitempty"`
FreshRSS *FreshRSSBackend `yaml:"freshrss,omitempty"`
}

type Opener struct {
Regex string `yaml:"regex"`
Cmd string `yaml:"cmd"`
Expand Down Expand Up @@ -235,7 +218,7 @@ func (c *Config) Load() error {

if fileConfig.Backends != nil {
if fileConfig.Backends.Miniflux != nil {
mffeeds, err := getMinifluxFeeds(fileConfig.Backends.Miniflux)
mffeeds, err := fileConfig.Backends.Miniflux.GetFeeds()
if err != nil {
return err
}
Expand All @@ -244,7 +227,7 @@ func (c *Config) Load() error {
}

if fileConfig.Backends.FreshRSS != nil {
freshfeeds, err := getFreshRSSFeeds(fileConfig.Backends.FreshRSS)
freshfeeds, err := fileConfig.Backends.FreshRSS.GetFeeds()
if err != nil {
return err
}
Expand Down