From 0b621f02fad55a25b34c8cf382792a536dc22c8e Mon Sep 17 00:00:00 2001
From: julwrites <mail@tehj.io>
Date: Tue, 15 Jul 2025 00:20:05 +0800
Subject: [PATCH] Fixing links in articles

---
 pkg/app/devo_articles.go | 89 ++++++++++++++++++----------------------
 pkg/app/devo_test.go     | 21 ----------
 2 files changed, 40 insertions(+), 70 deletions(-)

diff --git a/pkg/app/devo_articles.go b/pkg/app/devo_articles.go
index b2111e6..8b69e33 100644
--- a/pkg/app/devo_articles.go
+++ b/pkg/app/devo_articles.go
@@ -2,7 +2,6 @@ package app
 
 import (
 	"bytes"
-	"fmt"
 	"log"
 	"net/http"
 
@@ -11,24 +10,36 @@ import (
 	"golang.org/x/net/html"
 )
 
-func GetDesiringGodHtml() *html.Node {
-	query := "http://rss.desiringgod.org"
+// getTextFromNode extracts the text content from an HTML node.
+// fetchHTMLPage fetches an HTML page from the given URL and parses it into an *html.Node.
+func fetchHTMLPage(url string) *html.Node {
+	res, err := http.Get(url)
+	if err != nil {
+		log.Printf("Error fetching HTML from %s: %v", url, err)
+		return nil
+	}
+	defer res.Body.Close()
 
-	res, _ := http.Get(query)
 	buf := new(bytes.Buffer)
-	buf.ReadFrom(res.Body)
-	newStr := buf.String()
-
-	fmt.Printf(newStr)
+	_, err = buf.ReadFrom(res.Body)
+	if err != nil {
+		log.Printf("Error reading response body from %s: %v", url, err)
+		return nil
+	}
+	// fmt.Printf(buf.String()) // Removed debug print
 
-	return utils.QueryHtml(query)
+	doc, err := html.Parse(buf)
+	if err != nil {
+		log.Printf("Error parsing HTML from %s: %v", url, err)
+		return nil
+	}
+	return doc
 }
 
-func GetDesiringGodArticles() []def.Option {
+// parseArticlesFromHTML parses an HTML document and extracts articles based on common patterns.
+func parseArticlesFromHTML(doc *html.Node) []def.Option {
 	var options []def.Option
 
-	doc := GetDesiringGodHtml()
-
 	itemNodes := utils.FilterTree(doc, func(node *html.Node) bool {
 		return node.Data == "item"
 	})
@@ -43,6 +54,13 @@ func GetDesiringGodArticles() []def.Option {
 
 		label := titleNode.FirstChild.Data
 		link := linkNode.Data
+		if linkNode.FirstChild != nil {
+			link = linkNode.FirstChild.Data
+		} else if linkNode.NextSibling != nil {
+			link = linkNode.NextSibling.Data
+		}
+
+		log.Printf("Label: %s, Link: %s", label, link)
 
 		if len(label) > 0 && len(link) > 0 {
 			options = append(options, def.Option{Text: label, Link: link})
@@ -52,45 +70,18 @@ func GetDesiringGodArticles() []def.Option {
 	return options
 }
 
-func GetUtmostForHisHighestHtml() *html.Node {
-	query := "http://utmost.org/feed/?post_type=modern-classic"
-
-	res, _ := http.Get(query)
-	buf := new(bytes.Buffer)
-	buf.ReadFrom(res.Body)
-	newStr := buf.String()
-
-	fmt.Printf(newStr)
-
-	return utils.QueryHtml(query)
+func GetDesiringGodArticles() []def.Option {
+	doc := fetchHTMLPage("http://rss.desiringgod.org")
+	if doc == nil {
+		return []def.Option{}
+	}
+	return parseArticlesFromHTML(doc)
 }
 
 func GetUtmostForHisHighestArticles() []def.Option {
-	var options []def.Option
-
-	doc := GetUtmostForHisHighestHtml()
-
-	itemNodes := utils.FilterTree(doc, func(node *html.Node) bool {
-		return node.Data == "item"
-	})
-
-	for _, node := range itemNodes {
-		titleNode := utils.FindNode(node, func(node *html.Node) bool {
-			return node.Data == "title"
-		})
-		linkNode := utils.FindNode(node, func(node *html.Node) bool {
-			return node.Data == "link"
-		})
-
-		label := titleNode.FirstChild.Data
-		link := linkNode.Data
-
-		log.Printf("Label: %s, Link: %s", label, link)
-
-		if len(label) > 0 && len(link) > 0 {
-			options = append(options, def.Option{Text: label, Link: link})
-		}
+	doc := fetchHTMLPage("http://utmost.org/feed/?post_type=modern-classic")
+	if doc == nil {
+		return []def.Option{}
 	}
-
-	return options
+	return parseArticlesFromHTML(doc)
 }
diff --git a/pkg/app/devo_test.go b/pkg/app/devo_test.go
index 2476094..bf698b5 100644
--- a/pkg/app/devo_test.go
+++ b/pkg/app/devo_test.go
@@ -54,31 +54,12 @@ func TestGetDiscipleshipJournalReferences(t *testing.T) {
 	}
 }
 
-func TestGetDesiringGodHtml(t *testing.T) {
-	doc := GetDesiringGodHtml()
-
-	if doc == nil {
-		t.Errorf("Failed TestGetDesiringGodHtml, no RSS retrieved")
-	}
-}
-
 func TestGetDesiringGodArticles(t *testing.T) {
 	articles := GetDesiringGodArticles()
 
 	if len(articles) == 0 {
 		t.Errorf("Failed TestGetDesiringGodArticles, no articles found")
 	}
-
-	
-
-}
-
-func TestGetUtmostForHisHighestHtml(t *testing.T) {
-	doc := GetUtmostForHisHighestHtml()
-
-	if doc == nil {
-		t.Errorf("Failed TestGetUtmostForHisHighestHtml, no RSS retrieved")
-	}
 }
 
 func TestGetUtmostForHisHighestArticles(t *testing.T) {
@@ -94,8 +75,6 @@ func TestGetUtmostForHisHighestArticles(t *testing.T) {
 	}
 }
 
-
-
 func TestGetDevotionalData(t *testing.T) {
 	var env def.SessionData