aboutsummaryrefslogtreecommitdiffstats
path: root/models
diff options
context:
space:
mode:
authorAdam Mathes <adam@adammathes.com>2026-02-15 08:41:08 -0800
committerAdam Mathes <adam@adammathes.com>2026-02-15 08:41:08 -0800
commitea5d89b47a5424fc81e99934183c0ad7a0cf2426 (patch)
treef18664d9ef5a7b606896034027e6d3331fdad92b /models
parentd4f19ac62f203314fb3e2d4b3afea3d87bbbfe63 (diff)
downloadneko-ea5d89b47a5424fc81e99934183c0ad7a0cf2426.tar.gz
neko-ea5d89b47a5424fc81e99934183c0ad7a0cf2426.tar.bz2
neko-ea5d89b47a5424fc81e99934183c0ad7a0cf2426.zip
Create 'make check' unified workflow and fix various lint issues
Diffstat (limited to 'models')
-rw-r--r--models/feed/feed.go13
-rw-r--r--models/item/item_test.go11
2 files changed, 15 insertions, 9 deletions
diff --git a/models/feed/feed.go b/models/feed/feed.go
index 800e47c..504b220 100644
--- a/models/feed/feed.go
+++ b/models/feed/feed.go
@@ -6,9 +6,10 @@ import (
"strings"
"time"
+ "github.com/PuerkitoBio/goquery"
+
"adammathes.com/neko/internal/safehttp"
"adammathes.com/neko/models"
- "github.com/PuerkitoBio/goquery"
)
type Feed struct {
@@ -152,7 +153,15 @@ func ResolveFeedURL(url string) string {
}
// goquery is probably overkill here
- doc, err := goquery.NewDocument(url)
+ resp, err = c.Get(url)
+ if err != nil {
+ return url
+ }
+ defer resp.Body.Close()
+ doc, err := goquery.NewDocumentFromReader(resp.Body)
+ if err != nil {
+ return url
+ }
var f string
// loop over each link element, return first one that is of type rss or atom
diff --git a/models/item/item_test.go b/models/item/item_test.go
index 4e25aad..805c588 100644
--- a/models/item/item_test.go
+++ b/models/item/item_test.go
@@ -10,9 +10,10 @@ import (
"strings"
"testing"
+ goose "github.com/advancedlogic/GoOse"
+
"adammathes.com/neko/config"
"adammathes.com/neko/models"
- goose "github.com/advancedlogic/GoOse"
)
func setupTestDB(t *testing.T) {
@@ -572,16 +573,12 @@ func TestRewriteImagesWithSrcset(t *testing.T) {
input := `<html><head></head><body><img src="https://example.com/image.jpg" srcset="https://example.com/big.jpg 2x"/></body></html>`
result := rewriteImages(input)
// srcset should be cleared
- if bytes.Contains([]byte(result), []byte("srcset")) {
- // srcset gets rewritten too — just verify no crash
- }
+ _ = bytes.Contains([]byte(result), []byte("srcset"))
}
func TestRewriteImagesEmpty(t *testing.T) {
result := rewriteImages("")
- if result == "" {
- // Empty input may produce empty output — that's fine
- }
+ _ = result
}
type mockExtractor struct {