Fixed rutracker after changing stucture of the atom file of theirs own

pkg/repository/rutracker.go

@@ -42,22 +42,19 @@ func (s *Rutracker) GetTopic(topics []string) ([]model.ExternalSources, error) {
 
 		for _, e := range topic.Entry {
 			var es model.ExternalSources
-			u, _ := url.Parse(e.Link.Href)
-
 			es.Type = constant.ScopeRuTracker
-			es.TypeId, _ = strconv.Atoi(u.Query().Get("t"))
+			es.TypeId = topicId(e)
 			es.Title = e.Title
 
 			es.TypeSubsectionId, _ = strconv.Atoi(t)
 			es.Releaser = e.Author.Name
 			es.Created = carbon.Parse(e.Updated, "Europe/Kyiv")
 			esModel := table.ExternalSources{Columns: columns}
+
+			fmt.Printf("%+v\n\n\n", es)
+
 			entry := esModel.InsertOnDuplicate(es, s.db)
 			entries = append(entries, entry)
-
-			///fmt.Println(entries)
-
-			fmt.Printf("%+v\n\n\n", entry)
 		}
 	}
 
@@ -67,22 +64,44 @@ func (s *Rutracker) GetTopic(topics []string) ([]model.ExternalSources, error) {
 func fetch(endpoint string) (*resource.RutrackerAtomTopic, error) {
 	resp, err := http.Get(endpoint)
 	if err != nil {
-		slog.Error("couldn't fetch data", endpoint, err.Error())
+		slog.Error("couldn't fetch data", "endpoint", endpoint, "err", err.Error())
 		return nil, err
 	}
 
 	defer func(Body io.ReadCloser) {
-		err = Body.Close()
-		if err != nil {
-			fmt.Println("Body.Close")
+		if cerr := Body.Close(); cerr != nil {
+			slog.Error("couldn't close response body", "endpoint", endpoint, "err", cerr.Error())
 		}
 	}(resp.Body)
 
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("unexpected status code %d from %s", resp.StatusCode, endpoint)
+	}
+
 	topic := &resource.RutrackerAtomTopic{}
 
 	if err = xml.NewDecoder(resp.Body).Decode(topic); err != nil {
+		slog.Error("couldn't decode feed", "endpoint", endpoint, "err", err.Error())
 		return nil, err
 	}
 
 	return topic, nil
 }
+
+// topicId resolves the rutracker topic id preferring the page link query (?t=...),
+// falling back to the entry id tag (tag:rto.feed,...:/t/5702203).
+func topicId(e resource.RutrackerAtomEntry) int {
+	if link, ok := e.PageLink(); ok {
+		if u, err := url.Parse(link.Href); err == nil {
+			if id, err := strconv.Atoi(u.Query().Get("t")); err == nil {
+				return id
+			}
+		}
+	}
+	id, err := e.TopicId()
+	if err != nil {
+		slog.Error("couldn't resolve topic id", "entry_id", e.ID, "err", err.Error())
+		return 0
+	}
+	return id
+}