aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAKP <tom@tdpain.net>2022-06-01 15:36:18 +0100
committerAKP <tom@tdpain.net>2022-06-01 15:36:18 +0100
commit17057d1982e1f049adf55e9abf9826ed32c1df43 (patch)
treee168b5ffeaa92198ce02deab4892417431ac1f85
parentcc77a0fed27b586dff9f0981b1c86d3c920a64bc (diff)
Add appropriate user agent
Signed-off-by: AKP <tom@tdpain.net>
-rw-r--r--walrss/internal/core/version.go2
-rw-r--r--walrss/internal/rss/processor.go16
2 files changed, 16 insertions, 2 deletions
diff --git a/walrss/internal/core/version.go b/walrss/internal/core/version.go
index 0b535ea..9913d5c 100644
--- a/walrss/internal/core/version.go
+++ b/walrss/internal/core/version.go
@@ -1,3 +1,3 @@
package core
-const Version = ""
+const Version = "0.2.3b"
diff --git a/walrss/internal/rss/processor.go b/walrss/internal/rss/processor.go
index e41fc66..6fcca56 100644
--- a/walrss/internal/rss/processor.go
+++ b/walrss/internal/rss/processor.go
@@ -27,6 +27,15 @@ const (
timeFormat = "15:04:05"
)
+var userAgent = func() string {
+ o := "walrss"
+ if core.Version != "" {
+ o += "/" + core.Version
+ }
+ o += " (https://github.com/codemicro/walrss)"
+ return o
+}()
+
type processedFeed struct {
Name string
Items []*feedItem
@@ -151,7 +160,7 @@ func getFeedContent(url string) (*gofeed.Feed, error) {
ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
defer cancel()
- if err := requests.URL(url).ToBytesBuffer(buf).Fetch(ctx); err != nil {
+ if err := requests.URL(url).ToBytesBuffer(buf).UserAgent(userAgent).Fetch(ctx); err != nil {
return nil, err
}
@@ -287,6 +296,11 @@ func generateEmail(st *state.State, processedItems []*processedFeed, interval, t
}
func sendEmail(st *state.State, plain, html []byte, to, subject string) error {
+ if st.Config.Debug {
+ log.Debug().Str("addr", to).Str("subject", subject).Msg("skipping email send due to debug mode")
+ return nil
+ }
+
return (&email.Email{
From: st.Config.Email.From,
To: []string{to},