handle serde_json for deserialized()

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

src/service/account_data/mod.rs

@@ -108,7 +108,7 @@ pub async fn get(
 		.qry(&key)
 		.and_then(|roomuserdataid| self.db.roomuserdataid_accountdata.qry(&roomuserdataid))
 		.await
-		.deserialized_json()
+		.deserialized()
 }
 
 /// Returns all changes to the account data that happened after `since`.

src/service/appservice/data.rs

@@ -40,7 +40,7 @@ impl Data {
 		self.id_appserviceregistrations
 			.qry(id)
 			.await
-			.deserialized_json()
+			.deserialized()
 			.map_err(|e| err!(Database("Invalid appservice {id:?} registration: {e:?}")))
 	}
 

src/service/globals/data.rs

@@ -305,10 +305,7 @@ impl Data {
 	}
 
 	pub async fn signing_keys_for(&self, origin: &ServerName) -> Result<ServerSigningKeys> {
-		self.server_signingkeys
-			.qry(origin)
-			.await
-			.deserialized_json()
+		self.server_signingkeys.qry(origin).await.deserialized()
 	}
 
 	pub async fn database_version(&self) -> u64 { self.global.qry("version").await.deserialized().unwrap_or(0) }

src/service/key_backups/mod.rs

@@ -166,11 +166,7 @@ pub async fn get_latest_backup(&self, user_id: &UserId) -> Result<(String, Raw<B
 #[implement(Service)]
 pub async fn get_backup(&self, user_id: &UserId, version: &str) -> Result<Raw<BackupAlgorithm>> {
 	let key = (user_id, version);
-	self.db
-		.backupid_algorithm
-		.qry(&key)
-		.await
-		.deserialized_json()
+	self.db.backupid_algorithm.qry(&key).await.deserialized()
 }
 
 #[implement(Service)]
@@ -278,11 +274,7 @@ pub async fn get_session(
 ) -> Result<Raw<KeyBackupData>> {
 	let key = (user_id, version, room_id, session_id);
 
-	self.db
-		.backupkeyid_backup
-		.qry(&key)
-		.await
-		.deserialized_json()
+	self.db.backupkeyid_backup.qry(&key).await.deserialized()
 }
 
 #[implement(Service)]

src/service/pusher/mod.rs

@@ -90,7 +90,7 @@ impl Service {
 			.senderkey_pusher
 			.qry(&senderkey)
 			.await
-			.deserialized_json()
+			.deserialized()
 	}
 
 	pub async fn get_pushers(&self, sender: &UserId) -> Vec<Pusher> {

src/service/rooms/outlier/mod.rs

@@ -33,7 +33,7 @@ pub async fn get_outlier_pdu_json(&self, event_id: &EventId) -> Result<Canonical
 		.eventid_outlierpdu
 		.qry(event_id)
 		.await
-		.deserialized_json()
+		.deserialized()
 }
 
 /// Returns the pdu from the outlier tree.
@@ -43,7 +43,7 @@ pub async fn get_pdu_outlier(&self, event_id: &EventId) -> Result<PduEvent> {
 		.eventid_outlierpdu
 		.qry(event_id)
 		.await
-		.deserialized_json()
+		.deserialized()
 }
 
 /// Append the PDU as an outlier.

src/service/rooms/state_cache/data.rs

@@ -156,10 +156,7 @@ impl Data {
 		&self, user_id: &UserId, room_id: &RoomId,
 	) -> Result<Vec<Raw<AnyStrippedStateEvent>>> {
 		let key = (user_id, room_id);
-		self.userroomid_invitestate
-			.qry(&key)
-			.await
-			.deserialized_json()
+		self.userroomid_invitestate.qry(&key).await.deserialized()
 	}
 
 	#[tracing::instrument(skip(self), level = "debug")]
@@ -167,10 +164,7 @@ impl Data {
 		&self, user_id: &UserId, room_id: &RoomId,
 	) -> Result<Vec<Raw<AnyStrippedStateEvent>>> {
 		let key = (user_id, room_id);
-		self.userroomid_leftstate
-			.qry(&key)
-			.await
-			.deserialized_json()
+		self.userroomid_leftstate.qry(&key).await.deserialized()
 	}
 
 	/// Returns an iterator over all rooms a user left.

src/service/rooms/timeline/data.rs

@@ -90,17 +90,14 @@ impl Data {
 			return Ok(pdu);
 		}
 
-		self.eventid_outlierpdu
-			.qry(event_id)
-			.await
-			.deserialized_json()
+		self.eventid_outlierpdu.qry(event_id).await.deserialized()
 	}
 
 	/// Returns the json of a pdu.
 	pub(super) async fn get_non_outlier_pdu_json(&self, event_id: &EventId) -> Result<CanonicalJsonObject> {
 		let pduid = self.get_pdu_id(event_id).await?;
 
-		self.pduid_pdu.qry(&pduid).await.deserialized_json()
+		self.pduid_pdu.qry(&pduid).await.deserialized()
 	}
 
 	/// Returns the pdu's id.
@@ -113,7 +110,7 @@ impl Data {
 	pub(super) async fn get_non_outlier_pdu(&self, event_id: &EventId) -> Result<PduEvent> {
 		let pduid = self.get_pdu_id(event_id).await?;
 
-		self.pduid_pdu.qry(&pduid).await.deserialized_json()
+		self.pduid_pdu.qry(&pduid).await.deserialized()
 	}
 
 	/// Like get_non_outlier_pdu(), but without the expense of fetching and
@@ -137,7 +134,7 @@ impl Data {
 		self.eventid_outlierpdu
 			.qry(event_id)
 			.await
-			.deserialized_json()
+			.deserialized()
 			.map(Arc::new)
 	}
 
@@ -162,12 +159,12 @@ impl Data {
 	///
 	/// This does __NOT__ check the outliers `Tree`.
 	pub(super) async fn get_pdu_from_id(&self, pdu_id: &[u8]) -> Result<PduEvent> {
-		self.pduid_pdu.qry(pdu_id).await.deserialized_json()
+		self.pduid_pdu.qry(pdu_id).await.deserialized()
 	}
 
 	/// Returns the pdu as a `BTreeMap<String, CanonicalJsonValue>`.
 	pub(super) async fn get_pdu_json_from_id(&self, pdu_id: &[u8]) -> Result<CanonicalJsonObject> {
-		self.pduid_pdu.qry(pdu_id).await.deserialized_json()
+		self.pduid_pdu.qry(pdu_id).await.deserialized()
 	}
 
 	pub(super) async fn append_pdu(&self, pdu_id: &[u8], pdu: &PduEvent, json: &CanonicalJsonObject, count: u64) {

src/service/uiaa/mod.rs

@@ -238,6 +238,6 @@ async fn get_uiaa_session(&self, user_id: &UserId, device_id: &DeviceId, session
 		.userdevicesessionid_uiaainfo
 		.qry(&key)
 		.await
-		.deserialized_json()
+		.deserialized()
 		.map_err(|_| err!(Request(Forbidden("UIAA session does not exist."))))
 }

src/service/users/mod.rs

@@ -577,7 +577,7 @@ impl Service {
 			.qry(&key)
 			.await
 			.map_err(|_| err!(Request(InvalidParam("Tried to sign nonexistent key."))))?
-			.deserialized_json()
+			.deserialized()
 			.map_err(|e| err!(Database("key in keyid_key is invalid. {e:?}")))?;
 
 		let signatures = cross_signing_key
@@ -652,7 +652,7 @@ impl Service {
 
 	pub async fn get_device_keys<'a>(&'a self, user_id: &'a UserId, device_id: &DeviceId) -> Result<Raw<DeviceKeys>> {
 		let key_id = (user_id, device_id);
-		self.db.keyid_key.qry(&key_id).await.deserialized_json()
+		self.db.keyid_key.qry(&key_id).await.deserialized()
 	}
 
 	pub async fn get_key<F>(
@@ -666,7 +666,7 @@ impl Service {
 			.keyid_key
 			.qry(key_id)
 			.await
-			.deserialized_json::<serde_json::Value>()?;
+			.deserialized::<serde_json::Value>()?;
 
 		let cleaned = clean_signatures(key, sender_user, user_id, allowed_signatures)?;
 		let raw_value = serde_json::value::to_raw_value(&cleaned)?;
@@ -700,7 +700,7 @@ impl Service {
 	pub async fn get_user_signing_key(&self, user_id: &UserId) -> Result<Raw<CrossSigningKey>> {
 		let key_id = self.db.userid_usersigningkeyid.qry(user_id).await?;
 
-		self.db.keyid_key.qry(&*key_id).await.deserialized_json()
+		self.db.keyid_key.qry(&*key_id).await.deserialized()
 	}
 
 	pub async fn add_to_device_event(
@@ -791,7 +791,7 @@ impl Service {
 			.userdeviceid_metadata
 			.qry(&(user_id, device_id))
 			.await
-			.deserialized_json()
+			.deserialized()
 	}
 
 	pub async fn get_devicelist_version(&self, user_id: &UserId) -> Result<u64> {
@@ -830,7 +830,7 @@ impl Service {
 			.userfilterid_filter
 			.qry(&(user_id, filter_id))
 			.await
-			.deserialized_json()
+			.deserialized()
 	}
 
 	/// Creates an OpenID token, which can be used to prove that a user has