aboutsummaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'pkg')
-rw-r--r--pkg/config/body.go5
-rw-r--r--pkg/config/config.go6
-rw-r--r--pkg/util/util.go11
3 files changed, 5 insertions, 17 deletions
diff --git a/pkg/config/body.go b/pkg/config/body.go
index 17cf924..68c06da 100644
--- a/pkg/config/body.go
+++ b/pkg/config/body.go
@@ -2,10 +2,9 @@ package config
import (
"fmt"
+ "slices"
"gopkg.in/yaml.v3"
-
- "github.com/Necoro/feed2imap-go/pkg/util"
)
type Body string
@@ -22,7 +21,7 @@ func (b *Body) UnmarshalYAML(node *yaml.Node) error {
val = "default"
}
- if !util.Contains(validBody, val) {
+ if !slices.Contains(validBody, val) {
return TypeError("line %d: Invalid value for 'body': %q", node.Line, val)
}
diff --git a/pkg/config/config.go b/pkg/config/config.go
index aaf6701..db320c9 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -5,10 +5,10 @@ import (
"os"
"os/user"
"runtime"
+ "slices"
"strings"
"github.com/Necoro/feed2imap-go/pkg/log"
- "github.com/Necoro/feed2imap-go/pkg/util"
)
// Map is a convenience type for the non-mapped configuration options
@@ -114,12 +114,12 @@ func (cfg *Config) Validate() error {
// WithPartText marks whether 'text' part should be included in mails
func (opt GlobalOptions) WithPartText() bool {
- return util.Contains(opt.Parts, "text")
+ return slices.Contains(opt.Parts, "text")
}
// WithPartHtml marks whether 'html' part should be included in mails
func (opt GlobalOptions) WithPartHtml() bool {
- return util.Contains(opt.Parts, "html")
+ return slices.Contains(opt.Parts, "html")
}
// Load configuration from file and validate it
diff --git a/pkg/util/util.go b/pkg/util/util.go
index cbc6014..c0b5a17 100644
--- a/pkg/util/util.go
+++ b/pkg/util/util.go
@@ -2,17 +2,6 @@ package util
import "time"
-// Contains searches for `needle` in `haystack` and returns `true` if found.
-func Contains[T comparable](haystack []T, needle T) bool {
- for _, s := range haystack {
- if s == needle {
- return true
- }
- }
-
- return false
-}
-
// TimeFormat formats the given time, where an empty time is formatted as "not set".
func TimeFormat(t time.Time) string {
if t.IsZero() {