aboutsummaryrefslogtreecommitdiff
path: root/lib/csapi/whoami.h
diff options
context:
space:
mode:
authorAlexey Rusakov <Kitsune-Ral@users.sf.net>2021-07-10 20:43:09 +0200
committerAlexey Rusakov <Kitsune-Ral@users.sf.net>2021-07-10 20:43:09 +0200
commit90a5ad87ac455d1d1eb6401824312b28a318fddb (patch)
treed006483f6c5c91b042f566fe210bb9f6732df55e /lib/csapi/whoami.h
parentb04ff258cc60687fadf0129eba0be2071f0da00c (diff)
parent32d6616677bc4a94554527110e8d227aaf3aea34 (diff)
downloadlibquotient-90a5ad87ac455d1d1eb6401824312b28a318fddb.tar.gz
libquotient-90a5ad87ac455d1d1eb6401824312b28a318fddb.zip
Merge branch '0.6.x' into kitsune-fix-read-receipts-and-markers-0.6
Diffstat (limited to 'lib/csapi/whoami.h')
-rw-r--r--lib/csapi/whoami.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/csapi/whoami.h b/lib/csapi/whoami.h
index af8f1e8a..184459ea 100644
--- a/lib/csapi/whoami.h
+++ b/lib/csapi/whoami.h
@@ -14,8 +14,8 @@ namespace Quotient {
*
* Note that, as with the rest of the Client-Server API,
* Application Services may masquerade as users within their
- * namespace by giving a ``user_id`` query parameter. In this
- * situation, the server should verify that the given ``user_id``
+ * namespace by giving a `user_id` query parameter. In this
+ * situation, the server should verify that the given `user_id`
* is registered by the appservice, and return it in the response
* body.
*/
@@ -33,7 +33,7 @@ public:
// Result properties
- /// The user id that owns the access token.
+ /// The user ID that owns the access token.
QString userId() const { return loadFromJson<QString>("user_id"_ls); }
};