From 76889eab6ef840d2168ce4a1b3ba9b4559aea6db Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Mon, 12 Aug 2019 04:10:28 -0700
Subject: [PATCH] ircd::m::user::highlight: Add for_each() to interface;
 simplify stack (#87).

---
 include/ircd/m/user/highlight.h |  1 +
 modules/m_user_highlight.cc     | 32 ++++++++++++++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/include/ircd/m/user/highlight.h b/include/ircd/m/user/highlight.h
index 63fc8a706..39c4384e9 100644
--- a/include/ircd/m/user/highlight.h
+++ b/include/ircd/m/user/highlight.h
@@ -30,6 +30,7 @@ struct ircd::m::user::highlight
 	bool has(const event &) const;
 	bool has(const event::idx &) const;
 
+	bool for_each(const m::room &, const event::idx_range &, const event::closure_idx_bool &) const;
 	size_t count_between(const m::room &, const event::idx_range &) const;
 	size_t count_to(const m::room &, const event::idx &) const;
 	size_t count(const m::room &) const;
diff --git a/modules/m_user_highlight.cc b/modules/m_user_highlight.cc
index 81acd51db..04dd9db5d 100644
--- a/modules/m_user_highlight.cc
+++ b/modules/m_user_highlight.cc
@@ -117,17 +117,27 @@ ircd::m::user::highlight::count_between(const m::room &room,
                                         const event::idx_range &range)
 const
 {
-	static const event::fetch::opts fopts{[]
+	size_t ret(0);
+	for_each(room, range, [this, &ret]
+	(const m::event::idx &event_idx)
 	{
-		event::fetch::opts ret;
-		ret.keys = event::keys::include {"type", "content"};
-		ret.query_json_force = true;
-		return ret;
-	}()};
+		ret += has(event_idx);
+		return true;
+	});
 
+	return ret;
+}
+
+bool
+IRCD_MODULE_EXPORT
+ircd::m::user::highlight::for_each(const m::room &room,
+                                   const event::idx_range &range,
+                                   const event::closure_idx_bool &closure)
+const
+{
 	m::room::messages it
 	{
-		room, &fopts
+		room
 	};
 
 	assert(range.first <= range.second);
@@ -150,13 +160,11 @@ const
 			string_view{user.user_id},
 		};
 
-	size_t ret{0};
 	for(++it; it && it.event_idx() < range.second; ++it)
-		ret += cached(it.event_idx(), fopts)?
-			has(*it):
-			has(it.event_idx());
+		if(!closure(it.event_idx()))
+			return false;
 
-	return ret;
+	return true;
 }
 
 bool