Browse Source

feat: add diff, fix: configurable url

Shashank S 1 year ago
parent
commit
aa04904a72

+ 2 - 1
internal/assets/templates/changes.html

@@ -4,9 +4,10 @@
 <ul class="list list-gap-14 list-collapsible">
     {{ range $i, $watch := .ChangeDetections }}
     <li {{ if shouldCollapse $i $.CollapseAfter }}class="list-collapsible-item" style="--animation-delay: {{ itemAnimationDelay $i $.CollapseAfter }};"{{ end }}>
-        <a class="size-h4 block text-truncate color-primary-if-not-visited" href="{{ $watch.Url }}" target="_blank" rel="noreferrer">{{ .Name }}</a>
+        <a class="size-h4 block text-truncate color-primary-if-not-visited" href="{{ $watch.URL }}" target="_blank" rel="noreferrer">{{ .Name }}</a>
         <ul class="list-horizontal-text">
             <li title="{{ $watch.LastChanged | formatTime }}" {{ dynamicRelativeTimeAttrs $watch.LastChanged }}>{{ $watch.LastChanged | relativeTime }}</li>
+            <li class="shrink min-width-0"><a class="visited-indicator text-truncate block" href="{{ $watch.DiffURL }}" target="_blank" rel="noreferrer">diff: {{ $watch.DiffDisplay |  }}</a></li>
         </ul>
     </li>
     {{ end }}

+ 12 - 6
internal/feed/changedetection.go

@@ -4,25 +4,29 @@ import (
 	"fmt"
 	"log/slog"
 	"net/http"
+	"strings"
 	"time"
 )
 
 type changeDetectionResponseJson struct {
 	Name        string `json:"title"`
-	Url         string `json:"url"`
+	URL         string `json:"url"`
 	LastChanged int    `json:"last_changed"`
+	UUID        string `json:"uuid"`
 }
 
-	
 func parseLastChangeTime(t int) time.Time {
 	parsedTime := time.Unix(int64(t), 0)
 	return parsedTime
 }
 
-
-func FetchLatestDetectedChanges(watches []string, token string) (ChangeWatches, error) {
+func FetchLatestDetectedChanges(request_url string, watches []string, token string) (ChangeWatches, error) {
 	changeWatches := make(ChangeWatches, 0, len(watches))
 
+	if request_url == "" {
+		request_url = "https://www.changedetection.io"
+	}
+
 	if len(watches) == 0 {
 		return changeWatches, nil
 	}
@@ -30,7 +34,7 @@ func FetchLatestDetectedChanges(watches []string, token string) (ChangeWatches,
 	requests := make([]*http.Request, len(watches))
 
 	for i, repository := range watches {
-		request, _ := http.NewRequest("GET", fmt.Sprintf("https://changedetection.knhash.in/api/v1/watch/%s", repository), nil)
+		request, _ := http.NewRequest("GET", fmt.Sprintf("%s/api/v1/watch/%s", request_url, repository), nil)
 
 		if token != "" {
 			request.Header.Add("x-api-key", token)
@@ -60,8 +64,10 @@ func FetchLatestDetectedChanges(watches []string, token string) (ChangeWatches,
 
 		changeWatches = append(changeWatches, ChangeWatch{
 			Name:        watch.Name,
-			Url:         watch.Url,
+			URL:         watch.URL,
 			LastChanged: parseLastChangeTime(watch.LastChanged),
+			DiffURL:     request_url + "/diff/" + watch.UUID,
+			DiffDisplay: strings.Split(watch.UUID, "-")[len(strings.Split(watch.UUID, "-"))-1],
 		})
 	}
 

+ 3 - 1
internal/feed/primitives.go

@@ -50,8 +50,10 @@ type AppReleases []AppRelease
 
 type ChangeWatch struct {
 	Name        string
-	Url         string
+	URL         string
 	LastChanged time.Time
+	DiffURL     string
+	DiffDisplay string
 }
 
 type ChangeWatches []ChangeWatch

+ 7 - 6
internal/widget/changedetection.go

@@ -11,11 +11,12 @@ import (
 
 type ChangeDetections struct {
 	widgetBase       `yaml:",inline"`
-	ChangeDetections feed.ChangeWatches  `yaml:"-"`
-	Watches          []string          `yaml:"watches"`
-	Token            OptionalEnvString `yaml:"token"`
-	Limit            int               `yaml:"limit"`
-	CollapseAfter    int               `yaml:"collapse-after"`
+	ChangeDetections feed.ChangeWatches `yaml:"-"`
+	RequestURL       string             `yaml:"request_url"`
+	Watches          []string           `yaml:"watches"`
+	Token            OptionalEnvString  `yaml:"token"`
+	Limit            int                `yaml:"limit"`
+	CollapseAfter    int                `yaml:"collapse-after"`
 }
 
 func (widget *ChangeDetections) Initialize() error {
@@ -33,7 +34,7 @@ func (widget *ChangeDetections) Initialize() error {
 }
 
 func (widget *ChangeDetections) Update(ctx context.Context) {
-	watches, err := feed.FetchLatestDetectedChanges(widget.Watches, string(widget.Token))
+	watches, err := feed.FetchLatestDetectedChanges(widget.RequestURL, widget.Watches, string(widget.Token))
 
 	if !widget.canContinueUpdateAfterHandlingErr(err) {
 		return