From 1f12637d3f8973301e0ec6b7ebdfb167603b7d49 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 4 Jul 2018 12:23:51 -0600
Subject: [PATCH 1/3] Getting presence requires authentication

---
 api/client-server/presence.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/api/client-server/presence.yaml b/api/client-server/presence.yaml
index ba202c2da..ab32f9833 100644
--- a/api/client-server/presence.yaml
+++ b/api/client-server/presence.yaml
@@ -83,6 +83,8 @@ paths:
       description: |-
         Get the given user's presence state.
       operationId: getPresence
+      security:
+        - accessToken: []
       parameters:
         - in: path
           type: string

From b61fe201718ca121c62a8edde9093bb2c0611bf7 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 4 Jul 2018 13:02:32 -0600
Subject: [PATCH 2/3] Add to changelog

---
 changelogs/client_server.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/changelogs/client_server.rst b/changelogs/client_server.rst
index 44d41f4e4..eb0387c11 100644
--- a/changelogs/client_server.rst
+++ b/changelogs/client_server.rst
@@ -39,6 +39,8 @@ Unreleased changes
     (`#1152 <https://github.com/matrix-org/matrix-doc/pull/1152>`_).
   - Mark ``GET /rooms/{roomId}/members`` as requiring authentication
     (`#1245 <https://github.com/matrix-org/matrix-doc/pull/1244>`_).
+  - Mark ``GET /presence/{userId}/status`` as requiring authentication
+    (`#1371 <https://github.com/matrix-org/matrix-doc/pull/1371>`_).
   - Describe ``StateEvent`` for ``/createRoom``
     (`#1329 <https://github.com/matrix-org/matrix-doc/pull/1329>`_).
 

From 05c85fd840b3feda4916596365387e1e75cb1e8b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 4 Jul 2018 14:37:21 -0600
Subject: [PATCH 3/3] Spec the 403 on GET /presence/{userId}/status

---
 api/client-server/presence.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/api/client-server/presence.yaml b/api/client-server/presence.yaml
index ab32f9833..461344308 100644
--- a/api/client-server/presence.yaml
+++ b/api/client-server/presence.yaml
@@ -123,6 +123,15 @@ paths:
           description: |-
             There is no presence state for this user. This user may not exist or
             isn't exposing presence information to you.
+        403:
+          description: You are not allowed to see this user's presence status.
+          examples:
+            application/json: {
+              "errcode": "M_FORBIDDEN",
+              "error": "You are not allowed to see their presence"
+            }
+          schema:
+            "$ref": "definitions/error.yaml"
       tags:
         - Presence
   "/presence/list/{userId}":