Compare commits

..

No commits in common. "bb5d84633b65054947910e4397003dc93de6765b" and "46007e3b2b37965c89c3a552a4810164a2abb680" have entirely different histories.

6 changed files with 5 additions and 74 deletions

View File

@ -54,7 +54,7 @@ repos:
args: [--update-only, --notitle] args: [--update-only, --notitle]
- repo: https://github.com/python-jsonschema/check-jsonschema - repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.28.0 rev: 0.27.4
hooks: hooks:
#- id: check-dependabot #- id: check-dependabot
#- id: check-github-actions #- id: check-github-actions

@ -1 +1 @@
Subproject commit eae5df3f06c2f64cfa73f7dbc273e51a3e6da57f Subproject commit 03e8c1ba68ee210ed608250fb8d80dc4abfd9eb7

@ -1 +1 @@
Subproject commit f5a0692e96b8c33a547ca453493e02287cf8bcb1 Subproject commit 9aa5b0df4b8c170bd002ccb2836ab6ba7f7a0c0a

View File

@ -1,69 +0,0 @@
# Proposed `m.room.join_rules` for Community Moderation Effort
For more information about `m.room.join_rules`, refer to `README.md` in this
directory.
<!-- editorconfig-checker-disable -->
<!-- prettier-ignore-start -->
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
- [The problem](#the-problem)
- [The solution](#the-solution)
- [The rooms](#the-rooms)
- [Relevant excluded rooms](#relevant-excluded-rooms)
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
<!-- prettier-ignore-end -->
<!-- editorconfig-checker-enable -->
## The problem
Whenever new moderators join us, they are generally invited to the main room
and expected to find their way to the other rooms.
However the other rooms will error at them for not being a member of the
space first as that is how Element or Matrix has designed it.
## The solution
Allow moderators to join any room, including the space, as long as they are
a member of another room, even if it was the room they were attempting to
join.
```json
{
"allow": [
{
"room_id": "!DcaHQxyIyPiGpoyUcx:fairydust.space",
"type": "m.room_membership"
},
{
"room_id": "!etDMqntYVqugEClPcE:artemislena.eu",
"type": "m.room_membership"
},
{
"room_id": "!UzhJxpVKFHtlgsIjjr:fairydust.space",
"type": "m.room_membership"
},
{
"room_id": "!feRAxFkutgWTcPZMDf:neko.dev",
"type": "m.room_membership"
}
],
"join_rule": "restricted"
}
```
### The rooms
- `!DcaHQxyIyPiGpoyUcx:fairydust.space` - The space version 9.
- `!etDMqntYVqugEClPcE:artemislena.eu` - Main version 9.
- `!UzhJxpVKFHtlgsIjjr:fairydust.space` - Secondary version 9.
- `!feRAxFkutgWTcPZMDf:neko.dev` - Code of Conduct discussion version 9.
### Relevant excluded rooms
- `!fTjMjIzNKEsFlUIiru:neko.dev` - The policy room version 9.

@ -1 +1 @@
Subproject commit 8067d86139234986f1e33dfd2a53d52c40d8051c Subproject commit 3a3a0427ac9fdf1d18f9f6f2597023abe7158d24

@ -1 +1 @@
Subproject commit 4a849a88113c270f3873bcc1f3ee2f76fc2d1bd5 Subproject commit 3c9a97ed2f20cde445f64cba15014fb01627fa26