From da4abacf69142bf6aa5986ebf185a136a55888c7 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Sun, 31 May 2020 23:18:22 +0200
Subject: [PATCH] Use Ruleset type from ruma_events in get_pushrules endpoints

---
 CHANGELOG.md                              | 2 ++
 src/r0/push/get_pushrules_all.rs          | 7 ++-----
 src/r0/push/get_pushrules_global_scope.rs | 7 ++-----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20961308..cd472a62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ Breaking changes:
 * Update `r0::room::create_room::CreationContent`
   * Change `federated`s type from `Option<bool>` to `bool`
   * Add `predecessor` field
+* Update `r0::push::get_pushrules_all` and `r0::push::get_pushrules_global_scope` to use the
+  `Ruleset` type from `ruma_events`
 
 Improvements:
 
diff --git a/src/r0/push/get_pushrules_all.rs b/src/r0/push/get_pushrules_all.rs
index ac08ddfe..cb6feaa4 100644
--- a/src/r0/push/get_pushrules_all.rs
+++ b/src/r0/push/get_pushrules_all.rs
@@ -1,10 +1,7 @@
 //! [GET /_matrix/client/r0/pushrules/](https://matrix.org/docs/spec/client_server/r0.6.0#get-matrix-client-r0-pushrules)
 
-use std::collections::BTreeMap;
-
 use ruma_api::ruma_api;
-
-use super::{PushRule, RuleKind};
+use ruma_events::push_rules::Ruleset;
 
 ruma_api! {
     metadata {
@@ -20,7 +17,7 @@ ruma_api! {
 
     response {
         /// The global ruleset
-        pub global: BTreeMap<RuleKind, Vec<PushRule>>
+        pub global: Ruleset,
     }
 
     error: crate::Error
diff --git a/src/r0/push/get_pushrules_global_scope.rs b/src/r0/push/get_pushrules_global_scope.rs
index 5857e64e..eedcce43 100644
--- a/src/r0/push/get_pushrules_global_scope.rs
+++ b/src/r0/push/get_pushrules_global_scope.rs
@@ -1,10 +1,7 @@
 //! [GET /_matrix/client/r0/pushrules/global/](https://matrix.org/docs/spec/client_server/r0.6.0#get-matrix-client-r0-pushrules)
 
-use std::collections::BTreeMap;
-
 use ruma_api::ruma_api;
-
-use super::{PushRule, RuleKind};
+use ruma_events::push_rules::Ruleset;
 
 ruma_api! {
     metadata {
@@ -21,7 +18,7 @@ ruma_api! {
     response {
         /// The global ruleset.
         #[ruma_api(body)]
-        pub global: BTreeMap<RuleKind, Vec<PushRule>>,
+        pub global: Ruleset,
     }
 
     error: crate::Error