dissolve key_value/*

Signed-off-by: Jason Volk <jason@zemos.net>

src/service/presence/data.rs

@@ -1,6 +1,12 @@
+use conduit::debug_info;
 use ruma::{events::presence::PresenceEvent, presence::PresenceState, OwnedUserId, UInt, UserId};
 
-use crate::Result;
+use crate::{
+	presence::Presence,
+	services,
+	utils::{self, user_id_from_bytes},
+	Error, KeyValueDatabase, Result,
+};
 
 pub trait Data: Send + Sync {
 	/// Returns the latest presence event for the given user.
@@ -19,3 +25,121 @@ pub trait Data: Send + Sync {
 	/// with id `since`.
 	fn presence_since<'a>(&'a self, since: u64) -> Box<dyn Iterator<Item = (OwnedUserId, u64, Vec<u8>)> + 'a>;
 }
+
+impl Data for KeyValueDatabase {
+	fn get_presence(&self, user_id: &UserId) -> Result<Option<(u64, PresenceEvent)>> {
+		if let Some(count_bytes) = self.userid_presenceid.get(user_id.as_bytes())? {
+			let count = utils::u64_from_bytes(&count_bytes)
+				.map_err(|_e| Error::bad_database("No 'count' bytes in presence key"))?;
+
+			let key = presenceid_key(count, user_id);
+			self.presenceid_presence
+				.get(&key)?
+				.map(|presence_bytes| -> Result<(u64, PresenceEvent)> {
+					Ok((count, Presence::from_json_bytes(&presence_bytes)?.to_presence_event(user_id)?))
+				})
+				.transpose()
+		} else {
+			Ok(None)
+		}
+	}
+
+	fn set_presence(
+		&self, user_id: &UserId, presence_state: &PresenceState, currently_active: Option<bool>,
+		last_active_ago: Option<UInt>, status_msg: Option<String>,
+	) -> Result<()> {
+		let last_presence = self.get_presence(user_id)?;
+		let state_changed = match last_presence {
+			None => true,
+			Some(ref presence) => presence.1.content.presence != *presence_state,
+		};
+
+		let now = utils::millis_since_unix_epoch();
+		let last_last_active_ts = match last_presence {
+			None => 0,
+			Some((_, ref presence)) => now.saturating_sub(presence.content.last_active_ago.unwrap_or_default().into()),
+		};
+
+		let last_active_ts = match last_active_ago {
+			None => now,
+			Some(last_active_ago) => now.saturating_sub(last_active_ago.into()),
+		};
+
+		// tighten for state flicker?
+		if !state_changed && last_active_ts <= last_last_active_ts {
+			debug_info!(
+				"presence spam {:?} last_active_ts:{:?} <= {:?}",
+				user_id,
+				last_active_ts,
+				last_last_active_ts
+			);
+			return Ok(());
+		}
+
+		let status_msg = if status_msg.as_ref().is_some_and(String::is_empty) {
+			None
+		} else {
+			status_msg
+		};
+
+		let presence = Presence::new(
+			presence_state.to_owned(),
+			currently_active.unwrap_or(false),
+			last_active_ts,
+			status_msg,
+		);
+		let count = services().globals.next_count()?;
+		let key = presenceid_key(count, user_id);
+
+		self.presenceid_presence
+			.insert(&key, &presence.to_json_bytes()?)?;
+
+		self.userid_presenceid
+			.insert(user_id.as_bytes(), &count.to_be_bytes())?;
+
+		if let Some((last_count, _)) = last_presence {
+			let key = presenceid_key(last_count, user_id);
+			self.presenceid_presence.remove(&key)?;
+		}
+
+		Ok(())
+	}
+
+	fn remove_presence(&self, user_id: &UserId) -> Result<()> {
+		if let Some(count_bytes) = self.userid_presenceid.get(user_id.as_bytes())? {
+			let count = utils::u64_from_bytes(&count_bytes)
+				.map_err(|_e| Error::bad_database("No 'count' bytes in presence key"))?;
+			let key = presenceid_key(count, user_id);
+			self.presenceid_presence.remove(&key)?;
+			self.userid_presenceid.remove(user_id.as_bytes())?;
+		}
+
+		Ok(())
+	}
+
+	fn presence_since<'a>(&'a self, since: u64) -> Box<dyn Iterator<Item = (OwnedUserId, u64, Vec<u8>)> + 'a> {
+		Box::new(
+			self.presenceid_presence
+				.iter()
+				.flat_map(|(key, presence_bytes)| -> Result<(OwnedUserId, u64, Vec<u8>)> {
+					let (count, user_id) = presenceid_parse(&key)?;
+					Ok((user_id, count, presence_bytes))
+				})
+				.filter(move |(_, count, _)| *count > since),
+		)
+	}
+}
+
+#[inline]
+fn presenceid_key(count: u64, user_id: &UserId) -> Vec<u8> {
+	[count.to_be_bytes().to_vec(), user_id.as_bytes().to_vec()].concat()
+}
+
+#[inline]
+fn presenceid_parse(key: &[u8]) -> Result<(u64, OwnedUserId)> {
+	let (count, user_id) = key.split_at(8);
+	let user_id = user_id_from_bytes(user_id)?;
+	let count = utils::u64_from_bytes(count).unwrap();
+
+	Ok((count, user_id))
+}

src/service/presence/mod.rs

@@ -2,7 +2,7 @@ mod data;
 
 use std::{sync::Arc, time::Duration};
 
-pub use data::Data;
+use data::Data;
 use futures_util::{stream::FuturesUnordered, StreamExt};
 use ruma::{
 	events::presence::{PresenceEvent, PresenceEventContent},