From 13ef6dcbcf17e04f28ad8beaab64920e63c2aa31 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Thu, 7 Nov 2024 03:59:08 +0000
Subject: [PATCH] add standalone getters for shortid service

Signed-off-by: Jason Volk <jason@zemos.net>
---
 src/service/rooms/short/mod.rs | 35 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/service/rooms/short/mod.rs b/src/service/rooms/short/mod.rs
index 9fddf099..e8b00d9b 100644
--- a/src/service/rooms/short/mod.rs
+++ b/src/service/rooms/short/mod.rs
@@ -52,13 +52,7 @@ impl crate::Service for Service {
 pub async fn get_or_create_shorteventid(&self, event_id: &EventId) -> ShortEventId {
 	const BUFSIZE: usize = size_of::<ShortEventId>();
 
-	if let Ok(shorteventid) = self
-		.db
-		.eventid_shorteventid
-		.get(event_id)
-		.await
-		.deserialized()
-	{
+	if let Ok(shorteventid) = self.get_shorteventid(event_id).await {
 		return shorteventid;
 	}
 
@@ -105,11 +99,10 @@ pub async fn multi_get_or_create_shorteventid(&self, event_ids: &[&EventId]) ->
 }
 
 #[implement(Service)]
-pub async fn get_shortstatekey(&self, event_type: &StateEventType, state_key: &str) -> Result<ShortStateKey> {
-	let key = (event_type, state_key);
+pub async fn get_shorteventid(&self, event_id: &EventId) -> Result<ShortEventId> {
 	self.db
-		.statekey_shortstatekey
-		.qry(&key)
+		.eventid_shorteventid
+		.get(event_id)
 		.await
 		.deserialized()
 }
@@ -118,17 +111,11 @@ pub async fn get_shortstatekey(&self, event_type: &StateEventType, state_key: &s
 pub async fn get_or_create_shortstatekey(&self, event_type: &StateEventType, state_key: &str) -> ShortStateKey {
 	const BUFSIZE: usize = size_of::<ShortStateKey>();
 
-	let key = (event_type, state_key);
-	if let Ok(shortstatekey) = self
-		.db
-		.statekey_shortstatekey
-		.qry(&key)
-		.await
-		.deserialized()
-	{
+	if let Ok(shortstatekey) = self.get_shortstatekey(event_type, state_key).await {
 		return shortstatekey;
 	}
 
+	let key = (event_type, state_key);
 	let shortstatekey = self.services.globals.next_count().unwrap();
 	debug_assert!(size_of_val(&shortstatekey) == BUFSIZE, "buffer requirement changed");
 
@@ -143,6 +130,16 @@ pub async fn get_or_create_shortstatekey(&self, event_type: &StateEventType, sta
 	shortstatekey
 }
 
+#[implement(Service)]
+pub async fn get_shortstatekey(&self, event_type: &StateEventType, state_key: &str) -> Result<ShortStateKey> {
+	let key = (event_type, state_key);
+	self.db
+		.statekey_shortstatekey
+		.qry(&key)
+		.await
+		.deserialized()
+}
+
 #[implement(Service)]
 pub async fn get_eventid_from_short(&self, shorteventid: ShortEventId) -> Result<Arc<EventId>> {
 	const BUFSIZE: usize = size_of::<ShortEventId>();