From 1f74b636d31e816907ff6adbf1472f9e0fb37ab7 Mon Sep 17 00:00:00 2001
From: Ophestra <cat@gensokyo.uk>
Date: Fri, 14 Feb 2025 14:11:02 +0900
Subject: state/join: use Join method when available

Signed-off-by: Ophestra <cat@gensokyo.uk>
---
 internal/state/join.go | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++
 internal/state/util.go | 49 -----------------------------------------
 2 files changed, 60 insertions(+), 49 deletions(-)
 create mode 100644 internal/state/join.go
 delete mode 100644 internal/state/util.go

diff --git a/internal/state/join.go b/internal/state/join.go
new file mode 100644
index 00000000..2b4011fe
--- /dev/null
+++ b/internal/state/join.go
@@ -0,0 +1,60 @@
+package state
+
+import (
+	"errors"
+	"maps"
+)
+
+var (
+	ErrDuplicate = errors.New("store contains duplicates")
+)
+
+/*
+Joiner is the interface that wraps the Join method.
+
+The Join function uses Joiner if available.
+*/
+type Joiner interface{ Join() (Entries, error) }
+
+// Join returns joined state entries of all active aids.
+func Join(s Store) (Entries, error) {
+	if j, ok := s.(Joiner); ok {
+		return j.Join()
+	}
+
+	var (
+		aids    []int
+		entries = make(Entries)
+
+		el      int
+		res     Entries
+		loadErr error
+	)
+
+	if ln, err := s.List(); err != nil {
+		return nil, err
+	} else {
+		aids = ln
+	}
+
+	for _, aid := range aids {
+		if _, err := s.Do(aid, func(c Cursor) {
+			res, loadErr = c.Load()
+		}); err != nil {
+			return nil, err
+		}
+
+		if loadErr != nil {
+			return nil, loadErr
+		}
+
+		// save expected length
+		el = len(entries) + len(res)
+		maps.Copy(entries, res)
+		if len(entries) != el {
+			return nil, ErrDuplicate
+		}
+	}
+
+	return entries, nil
+}
diff --git a/internal/state/util.go b/internal/state/util.go
deleted file mode 100644
index 473ae51d..00000000
--- a/internal/state/util.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package state
-
-import (
-	"errors"
-	"maps"
-)
-
-var (
-	ErrDuplicate = errors.New("store contains duplicates")
-)
-
-// Join returns joined state entries of all active aids.
-func Join(s Store) (Entries, error) {
-	var (
-		aids    []int
-		entries = make(Entries)
-
-		el      int
-		res     Entries
-		loadErr error
-	)
-
-	if ln, err := s.List(); err != nil {
-		return nil, err
-	} else {
-		aids = ln
-	}
-
-	for _, aid := range aids {
-		if _, err := s.Do(aid, func(c Cursor) {
-			res, loadErr = c.Load()
-		}); err != nil {
-			return nil, err
-		}
-
-		if loadErr != nil {
-			return nil, loadErr
-		}
-
-		// save expected length
-		el = len(entries) + len(res)
-		maps.Copy(entries, res)
-		if len(entries) != el {
-			return nil, ErrDuplicate
-		}
-	}
-
-	return entries, nil
-}
-- 
cgit v1.3.1