From 90a37cdb3092204dc7a1f5860f764f649818d3e2 Mon Sep 17 00:00:00 2001
From: "Olivier Wilkinson (reivilibre)" <olivier@librepush.net>
Date: Mon, 6 Jul 2020 12:36:08 +0100
Subject: [PATCH] Write MSC2663

---
 ...663-define-nonexistent-push-rule-enable.md |  2 -
 .../2663-errors-nonexistent-push-rules.md     | 44 +++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)
 delete mode 100644 proposals/2663-define-nonexistent-push-rule-enable.md
 create mode 100644 proposals/2663-errors-nonexistent-push-rules.md

diff --git a/proposals/2663-define-nonexistent-push-rule-enable.md b/proposals/2663-define-nonexistent-push-rule-enable.md
deleted file mode 100644
index 5cbb93f4..00000000
--- a/proposals/2663-define-nonexistent-push-rule-enable.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# MSC2663
-
diff --git a/proposals/2663-errors-nonexistent-push-rules.md b/proposals/2663-errors-nonexistent-push-rules.md
new file mode 100644
index 00000000..ba0a5446
--- /dev/null
+++ b/proposals/2663-errors-nonexistent-push-rules.md
@@ -0,0 +1,44 @@
+# MSC2663: Errors for dealing with inexistent push rules
+
+This MSC proposes that homeservers respond with a HTTP 404 ('Not Found') status
+code and an `errcode` of `M_NOT_FOUND` when a client attempts to read or write
+the `enabled` status or `actions` of a non-existent push rule.
+
+## Background
+
+The current revision of the Client-Server specification does not make clear what
+a homeserver implementation is meant to do when getting or setting the `enabled`
+or `actions` properties of a supposed push rule that does not exist.
+
+## Motivation
+
+This change is considered minor and the proposed error code is deemed
+unsurprising as it matches the remainder of the specification.
+
+## Proposal
+
+The following endpoints of the Client-Server specification are affected:
+
+- `GET /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}`
+- `DELETE /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}`
+- `PUT /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}`
+- `GET /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}/enabled`
+- `PUT /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}/enabled`
+- `GET /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}/actions`
+- `PUT /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}/actions`
+
+The affected endpoints will have the following response status code added:
+
+**Status code 404:**
+
+The push rule does not exist.
+
+**Example**
+```json
+{
+  "errcode": "M_NOT_FOUND"
+}
+```
+
+This error response is to be returned when the push rule represented by
+`{scope}/{kind}/{ruleId}` does not exist.