diff --git a/Cargo.lock b/Cargo.lock
index b1586ffa..9f1610b7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -364,9 +364,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.90"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
+checksum = "1fd97381a8cc6493395a5afc4c691c1084b3768db713b73aa215217aa245d153"
 dependencies = [
  "jobserver",
  "libc",
@@ -634,6 +634,12 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
 
+[[package]]
+name = "date_header"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c03c416ed1a30fbb027ef484ba6ab6f80e1eada675e1a2b92fd673c045a1f1d"
+
 [[package]]
 name = "debugid"
 version = "0.8.0"
@@ -2244,7 +2250,7 @@ dependencies = [
 [[package]]
 name = "ruma"
 version = "0.9.4"
-source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#5223648e0aa6ff5cca8176b0bdec41b1581b101b"
+source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#580eefe1c6bcf6d86092840fe0b67862374bc806"
 dependencies = [
  "assign",
  "js_int",
@@ -2264,7 +2270,7 @@ dependencies = [
 [[package]]
 name = "ruma-appservice-api"
 version = "0.9.0"
-source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#5223648e0aa6ff5cca8176b0bdec41b1581b101b"
+source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#580eefe1c6bcf6d86092840fe0b67862374bc806"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -2276,11 +2282,12 @@ dependencies = [
 [[package]]
 name = "ruma-client-api"
 version = "0.17.4"
-source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#5223648e0aa6ff5cca8176b0bdec41b1581b101b"
+source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#580eefe1c6bcf6d86092840fe0b67862374bc806"
 dependencies = [
  "as_variant",
  "assign",
  "bytes",
+ "date_header",
  "http 0.2.12",
  "js_int",
  "js_option",
@@ -2290,12 +2297,14 @@ dependencies = [
  "serde",
  "serde_html_form",
  "serde_json",
+ "thiserror",
+ "web-time 1.1.0",
 ]
 
 [[package]]
 name = "ruma-common"
 version = "0.12.1"
-source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#5223648e0aa6ff5cca8176b0bdec41b1581b101b"
+source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#580eefe1c6bcf6d86092840fe0b67862374bc806"
 dependencies = [
  "as_variant",
  "base64 0.21.7",
@@ -2325,7 +2334,7 @@ dependencies = [
 [[package]]
 name = "ruma-events"
 version = "0.27.11"
-source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#5223648e0aa6ff5cca8176b0bdec41b1581b101b"
+source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#580eefe1c6bcf6d86092840fe0b67862374bc806"
 dependencies = [
  "as_variant",
  "indexmap",
@@ -2347,7 +2356,7 @@ dependencies = [
 [[package]]
 name = "ruma-federation-api"
 version = "0.8.0"
-source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#5223648e0aa6ff5cca8176b0bdec41b1581b101b"
+source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#580eefe1c6bcf6d86092840fe0b67862374bc806"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -2359,7 +2368,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-validation"
 version = "0.9.3"
-source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#5223648e0aa6ff5cca8176b0bdec41b1581b101b"
+source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#580eefe1c6bcf6d86092840fe0b67862374bc806"
 dependencies = [
  "js_int",
  "thiserror",
@@ -2368,7 +2377,7 @@ dependencies = [
 [[package]]
 name = "ruma-identity-service-api"
 version = "0.8.0"
-source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#5223648e0aa6ff5cca8176b0bdec41b1581b101b"
+source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#580eefe1c6bcf6d86092840fe0b67862374bc806"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -2378,7 +2387,7 @@ dependencies = [
 [[package]]
 name = "ruma-macros"
 version = "0.12.0"
-source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#5223648e0aa6ff5cca8176b0bdec41b1581b101b"
+source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#580eefe1c6bcf6d86092840fe0b67862374bc806"
 dependencies = [
  "once_cell",
  "proc-macro-crate",
@@ -2393,7 +2402,7 @@ dependencies = [
 [[package]]
 name = "ruma-push-gateway-api"
 version = "0.8.0"
-source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#5223648e0aa6ff5cca8176b0bdec41b1581b101b"
+source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#580eefe1c6bcf6d86092840fe0b67862374bc806"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -2405,7 +2414,7 @@ dependencies = [
 [[package]]
 name = "ruma-signatures"
 version = "0.14.0"
-source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#5223648e0aa6ff5cca8176b0bdec41b1581b101b"
+source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#580eefe1c6bcf6d86092840fe0b67862374bc806"
 dependencies = [
  "base64 0.21.7",
  "ed25519-dalek",
@@ -2421,7 +2430,7 @@ dependencies = [
 [[package]]
 name = "ruma-state-res"
 version = "0.10.0"
-source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#5223648e0aa6ff5cca8176b0bdec41b1581b101b"
+source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#580eefe1c6bcf6d86092840fe0b67862374bc806"
 dependencies = [
  "itertools 0.11.0",
  "js_int",
@@ -2449,7 +2458,7 @@ dependencies = [
 [[package]]
 name = "rust-librocksdb-sys"
 version = "0.19.2+9.0.0"
-source = "git+https://github.com/zaidoon1/rust-rocksdb?branch=master#4a6bb9db41f34cde5ba7356de44135c7a06a2e33"
+source = "git+https://github.com/zaidoon1/rust-rocksdb?branch=master#75b0264ef111014d3a3870607e56fdf527e5ae3b"
 dependencies = [
  "bindgen",
  "bzip2-sys",
@@ -2465,7 +2474,7 @@ dependencies = [
 [[package]]
 name = "rust-rocksdb"
 version = "0.23.2"
-source = "git+https://github.com/zaidoon1/rust-rocksdb?branch=master#4a6bb9db41f34cde5ba7356de44135c7a06a2e33"
+source = "git+https://github.com/zaidoon1/rust-rocksdb?branch=master#75b0264ef111014d3a3870607e56fdf527e5ae3b"
 dependencies = [
  "libc",
  "rust-librocksdb-sys",
@@ -2568,9 +2577,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47"
 
 [[package]]
 name = "ryu"
@@ -3775,9 +3784,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 
 [[package]]
 name = "widestring"
-version = "1.0.2"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
+checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
 
 [[package]]
 name = "wildmatch"
diff --git a/src/api/client_server/media.rs b/src/api/client_server/media.rs
index f03de756..2d1b9d3f 100644
--- a/src/api/client_server/media.rs
+++ b/src/api/client_server/media.rs
@@ -4,7 +4,7 @@ use image::io::Reader as ImgReader;
 use ipaddress::IPAddress;
 use reqwest::Url;
 use ruma::api::client::{
-	error::ErrorKind,
+	error::{ErrorKind, RetryAfter},
 	media::{
 		create_content, get_content, get_content_as_filename, get_content_thumbnail, get_media_config,
 		get_media_preview,
@@ -65,7 +65,7 @@ pub async fn get_media_preview_route(
 				error!("Failed to convert UrlPreviewData into a serde json value: {}", e);
 				Error::BadRequest(
 					ErrorKind::LimitExceeded {
-						retry_after_ms: Some(Duration::from_secs(5)),
+						retry_after: Some(RetryAfter::Delay(Duration::from_secs(5))),
 					},
 					"Failed to generate a URL preview, try again later.",
 				)
@@ -80,7 +80,7 @@ pub async fn get_media_preview_route(
 			// the only response codes in the preview_url spec page are 200 and 429.
 			Err(Error::BadRequest(
 				ErrorKind::LimitExceeded {
-					retry_after_ms: Some(Duration::from_secs(5)),
+					retry_after: Some(RetryAfter::Delay(Duration::from_secs(5))),
 				},
 				"Failed to generate a URL preview, try again later.",
 			))
@@ -109,7 +109,7 @@ pub async fn get_media_preview_v1_route(
 				error!("Failed to convert UrlPreviewData into a serde json value: {}", e);
 				Error::BadRequest(
 					ErrorKind::LimitExceeded {
-						retry_after_ms: Some(Duration::from_secs(5)),
+						retry_after: Some(RetryAfter::Delay(Duration::from_secs(5))),
 					},
 					"Failed to generate a URL preview, try again later.",
 				)
@@ -124,7 +124,7 @@ pub async fn get_media_preview_v1_route(
 			// the only response codes in the preview_url spec page are 200 and 429.
 			Err(Error::BadRequest(
 				ErrorKind::LimitExceeded {
-					retry_after_ms: Some(Duration::from_secs(5)),
+					retry_after: Some(RetryAfter::Delay(Duration::from_secs(5))),
 				},
 				"Failed to generate a URL preview, try again later.",
 			))