multi_feed #6
2 changed files with 22 additions and 18 deletions
|
|
@ -10,8 +10,10 @@ import (
|
||||||
|
|
||||||
type KikiSettings struct {
|
type KikiSettings struct {
|
||||||
Instance string `yaml:"instance,omitempty"`
|
Instance string `yaml:"instance,omitempty"`
|
||||||
RSSUri string `yaml:"rss_url,omitempty"`
|
RSSURLs []struct {
|
||||||
|
Url string `yaml:"url,omitempty"`
|
||||||
Sensitive bool `yaml:"sensitive,omitempty"`
|
Sensitive bool `yaml:"sensitive,omitempty"`
|
||||||
|
} `yaml:"rss_urls,omitempty"`
|
||||||
Redis struct {
|
Redis struct {
|
||||||
Address string `yaml:"address"`
|
Address string `yaml:"address"`
|
||||||
} `yaml:"redis"`
|
} `yaml:"redis"`
|
||||||
|
|
|
||||||
|
|
@ -74,12 +74,13 @@ func main() {
|
||||||
if file_watcher.IsFileChange(&lastFileMod, confFile) {
|
if file_watcher.IsFileChange(&lastFileMod, confFile) {
|
||||||
log.Println(lastFileMod)
|
log.Println(lastFileMod)
|
||||||
log.Println("RSS ленты перечитаны")
|
log.Println("RSS ленты перечитаны")
|
||||||
kikiConfig.RSSUri = config.GetKikiConfig(confFile).RSSUri
|
kikiConfig.RSSURLs = config.GetKikiConfig(confFile).RSSURLs
|
||||||
}
|
}
|
||||||
|
|
||||||
newPosts := tooter.NewsText(kikiConfig.RSSUri)
|
for _, rssUrl := range kikiConfig.RSSURLs {
|
||||||
|
newPost := tooter.NewsText(rssUrl.Url)
|
||||||
|
|
||||||
for _, post := range newPosts {
|
for _, post := range newPost {
|
||||||
inStack, err := stacker.CheckInRedis(rdb, post.GUID)
|
inStack, err := stacker.CheckInRedis(rdb, post.GUID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Println(err)
|
log.Println(err)
|
||||||
|
|
@ -88,7 +89,7 @@ func main() {
|
||||||
if !inStack {
|
if !inStack {
|
||||||
log.Println(post.Description)
|
log.Println(post.Description)
|
||||||
|
|
||||||
toot, err := tooter.CreateToot(*mastoClient, post, kikiConfig.Sensitive)
|
toot, err := tooter.CreateToot(*mastoClient, post, rssUrl.Sensitive)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Println(err)
|
log.Println(err)
|
||||||
}
|
}
|
||||||
|
|
@ -99,6 +100,7 @@ func main() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue