Compare commits

...

9 Commits

9 changed files with 40 additions and 59 deletions

View File

@ -34,7 +34,7 @@ repos:
args: [--update-only, --notitle]
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.24.0
rev: 0.24.1
hooks:
#- id: check-dependabot
#- id: check-github-actions
@ -42,15 +42,15 @@ repos:
- id: check-gitlab-ci
- repo: https://github.com/pre-commit/mirrors-prettier
rev: "v3.0.1"
rev: "v3.0.2"
hooks:
- id: prettier
additional_dependencies:
[
"prettier@3.0.1",
"@prettier/plugin-xml@3.0.0",
"prettier-plugin-toml@1.0.0",
]
#additional_dependencies:
#[
#"prettier@3.0.1",
#"@prettier/plugin-xml@3.0.0",
#"prettier-plugin-toml@1.0.0",
#]
- repo: https://github.com/scop/pre-commit-shfmt
rev: v3.7.0-1

@ -1 +1 @@
Subproject commit b3ed5bcfc94eb6630df939407b3d24d1f998a8b8
Subproject commit 523679db6a272f8a70388e937c197fd96c947d14

2
food

@ -1 +1 @@
Subproject commit b0c566a1d4443b6c6099de119bdede337073c698
Subproject commit 466b75ae696970f6acf17f4c9754eb27344bff06

@ -1 +1 @@
Subproject commit 2c4e3f1c4df2e4498505af5ef45d0c8fe63b902b
Subproject commit 9a0668e596e6316e8b1741e36783b7c80b069c58

View File

@ -15,29 +15,27 @@ The main point I do this for is users `users`
```json
{
"users": {
"@Ciblia:matrix.org": 100,
"@aminda:dendrite.matrix.org": 100,
"@aminda:matrix.org": 100,
"@aminda:mozilla.org": 100,
"@aminda:pikaviestin.fi": 100,
"@aminda:tedomum.net": 100,
"@mikaela:pirateriot.net": 100,
"@mikaela:tchncs.de": 100,
"@mikaela-5756df8cc43b8c6019785660:gitter.im": 100,
"@mkaysi:fedora.im": 100,
"@mikaela.suomalainen:matrix.org": 100,
"@mikaela.matterbridge:converser.eu": 100,
"@mikaela.matterbridge:tedomum.net": 100,
"@aminda.matterbridge:jae.fi": 100,
"@aminda:the-apothecary.club": 99,
"@aminda:masfloss.net": 99,
"@leon:the-apothecary.club": 99,
"@leon:masfloss.net": 99,
"@fidino:artemislena.eu": 99,
"@aminda.git:pirateriot.net": 13,
"users": {
"@Ciblia:matrix.org": 100,
"@aminda:dendrite.matrix.org": 100,
"@aminda:matrix.org": 100,
"@aminda:mozilla.org": 100,
"@aminda:pikaviestin.fi": 100,
"@aminda:tedomum.net": 100,
"@mikaela:pirateriot.net": 100,
"@mikaela:tchncs.de": 100,
"@mikaela-5756df8cc43b8c6019785660:gitter.im": 100,
"@mkaysi:fedora.im": 100,
"@mikaela.suomalainen:matrix.org": 100,
"@mikaela.matterbridge:converser.eu": 100,
"@mikaela.matterbridge:tedomum.net": 100,
"@aminda.matterbridge:jae.fi": 100,
"@aminda:masfloss.net": 99,
"@leon:masfloss.net": 99,
"@fidino:artemislena.eu": 99,
"@aminda.git:pirateriot.net": 13,
"@mjolnir_3a78dd65-60a4-4c3a-9a60-01e214a5d6f6:draupnir.midnightthoughts.space": 99
}
}
},
```

View File

@ -18,23 +18,12 @@ Note:
- When sending the custom event via `/devtools` for the first time, click
the `Event` so it says `State Event` and asks for `State key` in addition to `type`,
which can/is left empty as usual.
- Subdomains appear to be implied by specifying 2nd level domain. E.g.
`matrix.org` appears to apply to `*.matrix.org` at least on Synapse.
- See a later section for the allow list explanation
```json
{
"allow": [
"*",
"pikaviestin.fi",
"dendrite.matrix.org",
"tedomum.net",
"artemislena.eu"
],
"allow": ["*", "pikaviestin.fi", "tedomum.net", "artemislena.eu"],
"allow_ip_literals": false,
"deny": [
"matrix.org",
"mjolnir.matrix.org",
"the-apothecary.club",
"disroot.org",
"privacytools.io",
@ -56,18 +45,12 @@ Note:
Explanations:
- `matrix.org`, `*.matrix.org`
- Very big homeservers promoting centralisation of users and power. Also
big source of spam, poor moderation and abusive bot performing public
logging of members-only rooms.
- **_DEAR AMINDA FROM THE FUTURE, DO NOT UNBAN `mjolnir.matrix.org` OR IT WILL LIKELY ACL BAN EVERYONE
ELSE. YOU HAVE BEEN WARNED.._**
- `matrix.org`, `evulid.cc`
- Run instances of [matrix-public-archive](https://github.com/matrix-org/matrix-public-archive/issues/47) which [misses proper ability to opt-out](https://github.com/matrix-org/matrix-public-archive/issues/47)
- `dendrite.matrix.org` is innocent :sweat_smile:
- `evulid.cc`
- Runs instance of [matrix-public-archive](https://github.com/matrix-org/matrix-public-archive/issues/47) which [misses proper ability to opt-out](https://github.com/matrix-org/matrix-public-archive/issues/47)
- `the-apothecary.club`
- _USA far left_ homeserver, confusing in Fenno-Scandia, may be banned from
my public rooms to avoid fourth worse conflict.
- _USA far left_ authoritarian homeserver, confusing in Fenno-Scandia, may be banned from
my public rooms to avoid fourth worse conflict. I have also deactivated
my accounts on it so the homeserver may accidentally have power there.
- `nitro.chat`
- Poorly protected from abuse, abuse contact joins room that their users are raiding and leaves immediately without doing anything.
- `disroot.org`, `privacytools.io`, `feneas.org`, `liberta.casa`

@ -1 +1 @@
Subproject commit df31d87bd46019c803008db02e49d3fb2d47082f
Subproject commit 1f1aa0cf26d7a8e28ed523d91798867a513f5733

@ -1 +1 @@
Subproject commit 89008417c81db990450a6c2e814cee1f9a0d80f2
Subproject commit bfc2648936b847b6a5014da9ef28267ab3b2bb92

@ -1 +1 @@
Subproject commit 78bb0cdcc85d50f80bf1f9774f0ba90c45ac3829
Subproject commit cd544a9b688d934027cb0cadf2472eda6b47e614