Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename Client Config to Account Data #2032

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Rename Client Config to Account Data for issue #2030
richvdh marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion content/client-server-api/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2927,7 +2927,7 @@ that profile.
| [Typing Notifications](#typing-notifications) | Required | Required | Required | Required | Optional |
| [User and Room Mentions](#user-and-room-mentions) | Required | Required | Required | Optional | Optional |
| [Voice over IP](#voice-over-ip) | Required | Required | Required | Optional | Optional |
| [Client Config](#client-config) | Optional | Optional | Optional | Optional | Optional |
| [Account Data](#account-data) | Optional | Optional | Optional | Optional | Optional |
| [Device Management](#device-management) | Optional | Optional | Optional | Optional | Optional |
| [End-to-End Encryption](#end-to-end-encryption) | Optional | Optional | Optional | Optional | Optional |
| [Event Annotations and reactions](#event-annotations-and-reactions) | Optional | Optional | Optional | Optional | Optional |
Expand Down
2 changes: 1 addition & 1 deletion content/client-server-api/modules/account_data.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

### Client Config
### Account Data

Clients can store custom config data for their account on their
homeserver. This account data will be synced between different devices
Expand Down
4 changes: 2 additions & 2 deletions content/client-server-api/modules/read_markers.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ read receipt marks the last event of the second section.
##### Events

The user's fully read marker is kept as an event in the room's [account
data](#client-config). The event may be read to determine the user's
data](#account-data). The event may be read to determine the user's
current fully read marker location in the room, and just like other
account data events the event will be pushed down the event stream when
updated.
Expand Down Expand Up @@ -66,7 +66,7 @@ attention irrespective of [read receipts](#receipts) or
##### Events

The user's unread marker in a room is kept under an `m.marked_unread`
event in the room's [account data](#client-config). The event may be read
event in the room's [account data](#account-data). The event may be read
to determine the user's current unread marker state in the room. Just
like other account data events, the event will be pushed down the event
stream when updated.
Expand Down
2 changes: 1 addition & 1 deletion content/client-server-api/modules/secrets.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ sharing", "SSSS", or "4S".
#### Storage

When secrets are stored on the server, they are stored in the user's
[account-data](#client-config), using an event type equal to the
[account-data](#account-data), using an event type equal to the
secret's identifier. The keys that secrets are encrypted with are
described by data that is also stored in the user's account-data. Users
can have multiple keys, allowing them to control what sets of secrets
Expand Down
2 changes: 1 addition & 1 deletion data/api/client-server/account-data.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.
openapi: 3.1.0
info:
title: Matrix Client-Server Client Config API
title: Matrix Client-Server Account Data API
version: 1.0.0
paths:
"/user/{userId}/account_data/{type}":
Expand Down
2 changes: 1 addition & 1 deletion data/api/client-server/keys.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.
openapi: 3.1.0
info:
title: Matrix Client-Server Client Config API
title: Matrix Client-Server Key Management API
version: 1.0.0
paths:
/keys/upload:
Expand Down
2 changes: 1 addition & 1 deletion data/api/client-server/registration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ paths:
might still serve unredacted copies.

The server should additionally erase any non-event data
associated with the user, such as [account data](/client-server-api/#client-config)
associated with the user, such as [account data](/client-server-api/#account-data)
and [contact 3PIDs](/client-server-api/#adding-account-administrative-contact-information).

Defaults to `false` if not present.
Expand Down
Loading