zelo72
/
documentation
mirror of https://github.com/mastodon/documentation
1
0
Fork 0
Code Issues 6 Releases Wiki Activity

Merge branch 'mastodon:main' into main

This commit is contained in:
John Haugabook 2024-04-29 13:58:15 -04:00 committed by GitHub
parent 2a2fe8efe5 7403a1c55f
commit 96991b0835
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/en/entities/CustomEmoji.md
View File

@ -61,7 +61,7 @@ aliases: [
### `category` {#category}
**Description:** Used for sorting custom emoji in the picker.\
**Type:** String\
**Type:** {{<nullable>}} String\
**Version history:**\
3.0.0 - added

10
content/en/entities/Role.md
View File

@ -16,10 +16,10 @@ aliases: [
```json
{
"id": 3,
"id": "3",
"name": "Owner",
"color": "#ff3838",
"permissions": 1048575,
"permissions": "1048575",
"highlighted": true
}
```
@ -29,7 +29,7 @@ aliases: [
### `id` {#id}
**Description:** The ID of the Role in the database.\
**Type:** Integer\
**Type:** String\
**Version history:**\
4.0.0 - added
@ -50,7 +50,7 @@ aliases: [
### `permissions` {#permissions}
**Description:** A bitmask that represents the sum of all permissions granted to the role.\
**Type:** Integer\
**Type:** String\
**Version history:**\
4.0.0 - added
@ -127,4 +127,4 @@ To determine the permissions available to a certain role, convert the `permissio
## See also
{{< caption-link url="https://github.com/mastodon/mastodon/blob/main/app/serializers/rest/role_serializer.rb" caption="app/serializers/rest/role_serializer.rb" >}}
{{< caption-link url="https://github.com/mastodon/mastodon/blob/main/app/serializers/rest/role_serializer.rb" caption="app/serializers/rest/role_serializer.rb" >}}