push

main.go

@@ -431,18 +431,14 @@ func simplifyClubQuery(name string) string {
 func getLogoFromLogoAPI(teamName string, teamID string) string {
 	base := strings.TrimSpace(os.Getenv("LOGOAPI_BASE_URL"))
 	if base == "" {
-		return ""
+		base = "https://logoapi.sportcreative.eu"
 	}
 	base = strings.TrimRight(base, "/")
 	name := strings.TrimSpace(teamName)
-	id := strings.TrimSpace(teamID)
-	if name == "" && id == "" {
+	if name == "" {
 		return ""
 	}
 	cacheKey := "logoapi|" + strings.ToLower(name)
-	if id != "" {
-		cacheKey += "|" + strings.ToLower(id)
-	}
 	if v, ok := logoCache[cacheKey]; ok {
 		return v
 	}
@@ -464,31 +460,47 @@ func getLogoFromLogoAPI(teamName string, teamID string) string {
 		}
 		var payload []logoAPISearchResult
 		if err := json.NewDecoder(resp.Body).Decode(&payload); err != nil {
+			// Non-JSON or invalid response – treat as no result
 			return nil, false
 		}
 		return payload, true
 	}
-	var candidates []logoAPISearchResult
-	if id != "" {
-		if payload, ok := doSearch(id); ok && len(payload) > 0 {
-			candidates = payload
-		}
-	}
-	if len(candidates) == 0 && name != "" {
-		q := simplifyClubQuery(name)
-		if q == "" {
-			q = name
-		}
-		if payload, ok := doSearch(q); ok && len(payload) > 0 {
-			candidates = payload
-		}
-	}
-	if len(candidates) == 0 {
+	// Search strictly by full club name; if it yields nothing usable, let caller fall back to FACR.
+	payload, ok := doSearch(name)
+	if !ok || len(payload) == 0 {
 		logoCache[cacheKey] = ""
 		return ""
 	}
+	// Normalize names for comparison (case-insensitive, strip common legal/sport suffixes).
+	normalize := func(s string) string {
+		s = strings.ToLower(strings.TrimSpace(s))
+		if s == "" {
+			return s
+		}
+		parts := strings.Fields(s)
+		stop := map[string]struct{}{
+			"fotbal": {}, "futsal": {},
+			"z.s.": {}, "z.s": {}, "zs": {},
+			"o.s.": {}, "o.s": {}, "os": {},
+			"a.s.": {}, "a.s": {}, "as": {},
+			"s.r.o.": {}, "s.r.o": {}, "sro": {},
+		}
+		end := len(parts)
+		for end > 0 {
+			if _, banned := stop[parts[end-1]]; banned {
+				end--
+				continue
+			}
+			break
+		}
+		if end != len(parts) {
+			parts = parts[:end]
+		}
+		return strings.Join(parts, " ")
+	}
+	want := normalize(name)
 	var withLogo []logoAPISearchResult
-	for _, r := range candidates {
+	for _, r := range payload {
 		if r.HasLocalLogo {
 			withLogo = append(withLogo, r)
 		}
@@ -497,28 +509,16 @@ func getLogoFromLogoAPI(teamName string, teamID string) string {
 		logoCache[cacheKey] = ""
 		return ""
 	}
-	var best string
-	if id != "" {
-		for _, r := range withLogo {
-			if strings.EqualFold(strings.TrimSpace(r.ID), id) {
-				best = r.LogoURL
-				break
-			}
+	// Only accept a logo when the normalized club name matches; avoid arbitrary first-result picks.
+	for _, r := range withLogo {
+		if normalize(r.Name) == want {
+			logoCache[cacheKey] = r.LogoURL
+			return r.LogoURL
 		}
 	}
-	if best == "" && name != "" {
-		for _, r := range withLogo {
-			if strings.EqualFold(strings.TrimSpace(r.Name), name) {
-				best = r.LogoURL
-				break
-			}
-		}
-	}
-	if best == "" {
-		best = withLogo[0].LogoURL
-	}
-	logoCache[cacheKey] = best
-	return best
+	// No strong match – treat as "no logo" so upstream can fall back to FACR and send notification.
+	logoCache[cacheKey] = ""
+	return ""
 }
 
 func getLogoBySearch(name string) string {
@@ -836,6 +836,11 @@ func getClubSearch(w http.ResponseWriter, r *http.Request) {
 			href = "https://www.fotbal.cz" + href
 		}
 
+		// Prefer logoapi / local logo when available
+		if l := strings.TrimSpace(getLogo(name, clubID)); l != "" {
+			logoURL = l
+		}
+
 		results = append(results, SearchResult{
 			Name:     name,
 			ClubID:   clubID,
@@ -1017,6 +1022,9 @@ func getClubTables(w http.ResponseWriter, r *http.Request) {
 	clubName := strings.TrimSpace(doc.Find("h1.H4 span").First().Text())
 	clubURL := strings.TrimSpace(doc.Find("h1.H4 a").First().AttrOr("href", ""))
 	logoURL := strings.TrimSpace(doc.Find("img.Logo").First().AttrOr("src", ""))
+	if l := strings.TrimSpace(getLogo(clubName, clubID)); l != "" {
+		logoURL = l
+	}
 	category := strings.TrimSpace(doc.Find("section").First().Find("h3 span").First().Text())
 	address := strings.TrimSpace(doc.Find("section").First().Find("ul li").First().Text())
 
@@ -1078,7 +1086,10 @@ func getClubInfo(w http.ResponseWriter, r *http.Request) {
 	clubName := strings.TrimSpace(doc.Find("h1.H4 span").First().Text())
 	// Basic club metadata
 	clubURL := fmt.Sprintf("%s/%s", baseURL, clubID)
-	logoURL := fmt.Sprintf("https://is1.fotbal.cz/media/kluby/%s/%s_crop.jpg", clubID, clubID)
+	logoURL := getLogo(clubName, clubID)
+	if logoURL == "" {
+		logoURL = fmt.Sprintf("https://is1.fotbal.cz/media/kluby/%s/%s_crop.jpg", clubID, clubID)
+	}
 	category := "Fotbal"
 	if strings.EqualFold(clubType, "futsal") {
 		category = "Futsal"