From 1e656d836ead371bb395a768e35173a6cf41f5ea Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 15 Apr 2018 22:35:44 +0100
Subject: [PATCH 1/5] spec notifications key on power level event and provide
 @room in example

---
 event-schemas/examples/m.room.power_levels | 5 ++++-
 event-schemas/schema/m.room.power_levels   | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/event-schemas/examples/m.room.power_levels b/event-schemas/examples/m.room.power_levels
index 0c8f8bc5..2b0aaca5 100644
--- a/event-schemas/examples/m.room.power_levels
+++ b/event-schemas/examples/m.room.power_levels
@@ -14,7 +14,10 @@
     "users": {
       "@example:localhost": 100
     },
-    "users_default": 0
+    "users_default": 0,
+    "notifications": {
+      "room": 20
+    }
   },
   "state_key": "",
   "origin_server_ts": 1431961217939,
diff --git a/event-schemas/schema/m.room.power_levels b/event-schemas/schema/m.room.power_levels
index 13a44c70..f348b52d 100644
--- a/event-schemas/schema/m.room.power_levels
+++ b/event-schemas/schema/m.room.power_levels
@@ -85,6 +85,14 @@ properties:
             ``user_id`` is mentioned in the ``users`` key. Defaults to 0 if
             unspecified.
         type: number
+      notifications:
+        additionalProperties:
+          type: number
+        description: |-
+            The power level requirements for specific notification types.
+            This is a mapping from ``key`` to power level for that notifications key.
+        title: Notification power level requirements
+        type: object
     type: object
   state_key:
     description: A zero-length string.

From 60ae73b179c53213ce952251c7e9f4d14c323fef Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 15 Apr 2018 22:37:23 +0100
Subject: [PATCH 2/5] specify default

---
 event-schemas/schema/m.room.power_levels | 1 +
 1 file changed, 1 insertion(+)

diff --git a/event-schemas/schema/m.room.power_levels b/event-schemas/schema/m.room.power_levels
index f348b52d..a00746f0 100644
--- a/event-schemas/schema/m.room.power_levels
+++ b/event-schemas/schema/m.room.power_levels
@@ -91,6 +91,7 @@ properties:
         description: |-
             The power level requirements for specific notification types.
             This is a mapping from ``key`` to power level for that notifications key.
+            Defaults to 50 for unspecified keys.
         title: Notification power level requirements
         type: object
     type: object

From c305317fa57b918d68731f69a0ab21367debde0b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 15 Apr 2018 22:41:24 +0100
Subject: [PATCH 3/5] explicitly specify @room

---
 event-schemas/schema/m.room.power_levels | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/event-schemas/schema/m.room.power_levels b/event-schemas/schema/m.room.power_levels
index a00746f0..25d33f08 100644
--- a/event-schemas/schema/m.room.power_levels
+++ b/event-schemas/schema/m.room.power_levels
@@ -86,13 +86,16 @@ properties:
             unspecified.
         type: number
       notifications:
+        properties:
+          room:
+            type: number
+            description: The level required to trigger an ``@room`` notification. Defaults to 50 if unspecified.
         additionalProperties:
           type: number
         description: |-
             The power level requirements for specific notification types.
             This is a mapping from ``key`` to power level for that notifications key.
-            Defaults to 50 for unspecified keys.
-        title: Notification power level requirements
+        title: Notifications
         type: object
     type: object
   state_key:

From 17a0dcc7d396a1ce9ca55141a5491e47b62c1f62 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Aug 2018 23:11:07 +0100
Subject: [PATCH 4/5] add newsfragment for #1176

---
 changelogs/client_server/newsfragments/1176.new | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelogs/client_server/newsfragments/1176.new

diff --git a/changelogs/client_server/newsfragments/1176.new b/changelogs/client_server/newsfragments/1176.new
new file mode 100644
index 00000000..41e30799
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1176.new
@@ -0,0 +1 @@
+Specify how to control the power level required for ``@room``
\ No newline at end of file

From c83da453b565a6f1c7c5a4a8c0e4459d5aa19795 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 29 Aug 2018 14:18:41 -0600
Subject: [PATCH 5/5] s/number/integer

---
 event-schemas/schema/m.room.power_levels | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/event-schemas/schema/m.room.power_levels b/event-schemas/schema/m.room.power_levels
index ae4e5589..9bb12993 100644
--- a/event-schemas/schema/m.room.power_levels
+++ b/event-schemas/schema/m.room.power_levels
@@ -88,10 +88,10 @@ properties:
       notifications:
         properties:
           room:
-            type: number
+            type: integer
             description: The level required to trigger an ``@room`` notification. Defaults to 50 if unspecified.
         additionalProperties:
-          type: number
+          type: integer
         description: |-
             The power level requirements for specific notification types.
             This is a mapping from ``key`` to power level for that notifications key.