fix id search returning results for invalid queries.

Defacto2 · Jul 5, 2024 · e11b7ae · e11b7ae
1 parent 21250f8
commit e11b7ae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docs/todo.md b/docs/todo.md
@@ -24,7 +24,7 @@
 
 ### Bug fixes
 
-- [ ] htmx search for id or uuid, incomplete (less than 32 chars) uuid should not trigger a search.
+- [X] htmx search for id or uuid, incomplete (less than 32 chars) uuid should not trigger a search.
 - [ ] Reader is not displaying the textfile. `/f/b62716c`
 - [ ] Change helper.CookieStore behavour when no value is used, the randomized value must be ASCII compatible, as UTF-8 strings break the noice value.
 

diff --git a/model/artifacts.go b/model/artifacts.go
@@ -287,7 +287,7 @@ func (f *Artifacts) ID(
 	if exec == nil {
 		return nil, ErrDB
 	}
-	if ids == nil && uuids == nil {
+	if (ids == nil && uuids == nil) || (len(ids) == 0 && len(uuids) == 0) {
 		return models.FileSlice{}, nil
 	}
 	mods := []qm.QueryMod{}
@@ -298,7 +298,7 @@ func (f *Artifacts) ID(
 		mods = append(mods, qm.Or("id = ?", id))
 	}
 	for _, uuid := range uuids {
-		mods = append(mods, qm.Or("uuid = ?", uuid))
+		mods = append(mods, qm.Or("uuid = ?", uuid.String()))
 	}
 	mods = append(mods, qm.Limit(Maximum), qm.WithDeleted())
 	fs, err := models.Files(mods...).All(ctx, exec)