From 51573238a9b00c32e1210dd38ab4eee50259e300 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Dom=C3=ADnguez?= <adomu@net-c.com>
Date: Fri, 20 Nov 2020 02:01:17 +0100
Subject: [PATCH] Add function to deserialize BTreeMap with values of numbers
 and strings to integers

---
 ruma-serde/src/lib.rs | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/ruma-serde/src/lib.rs b/ruma-serde/src/lib.rs
index 34c7536b..b960f90b 100644
--- a/ruma-serde/src/lib.rs
+++ b/ruma-serde/src/lib.rs
@@ -5,7 +5,10 @@ use serde::{
     de::{Error, IntoDeserializer},
     Deserialize,
 };
-use std::convert::{TryFrom, TryInto};
+use std::{
+    collections::BTreeMap,
+    convert::{TryFrom, TryInto},
+};
 
 pub mod can_be_empty;
 mod canonical_json;
@@ -100,3 +103,19 @@ where
 {
     IntOrString::deserialize(de)?.try_into().map_err(D::Error::custom)
 }
+
+/// Take a BTreeMap with values of either an integer number or a string and deserialize
+/// those to integer numbers.
+///
+/// To be used like this:
+/// `#[serde(deserialize_with = "btreemap_int_or_string_to_int_values")]`
+pub fn btreemap_int_or_string_to_int_values<'de, D, T>(de: D) -> Result<BTreeMap<T, Int>, D::Error>
+where
+    D: serde::Deserializer<'de>,
+    T: serde::Deserialize<'de> + Ord,
+{
+    BTreeMap::<T, IntOrString>::deserialize(de)?
+        .into_iter()
+        .map(|(k, v)| v.try_into().map(|n| (k, n)).map_err(D::Error::custom))
+        .collect()
+}