From 3f2934458e608f7181737b81642806b8dea567c9 Mon Sep 17 00:00:00 2001
From: TwoSixtyThreeFiftyFour
<108928957+TwoSixtyThreeFiftyFour@users.noreply.github.com>
Date: Fri, 12 Aug 2022 16:53:18 +0000
Subject: [PATCH 1/2] Update chatroom rules to add #OSINT
Update chatroom rules to add #OSINT
---
chatrooms-rules.md | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/chatrooms-rules.md b/chatrooms-rules.md
index d7b126d..fe99588 100644
--- a/chatrooms-rules.md
+++ b/chatrooms-rules.md
@@ -14,7 +14,7 @@ You will find here the rules for the rooms part of the PSA Community. These rule
- [Ban Appeals](#appeals)
#### General default rules for PSA rooms **unless specific rules are mentioned below**:
-These are currently only enforced on **Anonymity** and **Security**, and not applied on rooms with their own ruleset below.
+These are currently enforced on **```#anonymity:matrix.org```**, **```#security:matrix.org```**, **```#OSINT:matrix.org```**, and not applied on rooms with their own ruleset below.
- Keep it legal
- English only
@@ -29,24 +29,24 @@ These are currently only enforced on **Anonymity** and **Security**, and not app
- No upload of any non-media files (binaries, executables, compressed files...)
- No voice messages (these will be auto-deleted by the bots)
- **Avoid drifting too much off-topic or move to an off-topic room like #bnonymity**
-- **Any discussion about AnonyPla / Lena whereabouts is only tolerated, to an extent, in the #Bnonymity room.**
+- **Any discussion about AnonyPla / Lena whereabouts is only tolerated, to an extent, in the ```#Bnonymity:matrix.org``` room.**
Some exceptions can apply, see the [exceptions](#exceptions) section at the bottom of this page. Violations will be handled at the discretion of the acting moderator.
-#### Rules for Nothing To Hide Privacy:
+#### Rules for Nothing To Hide Privacy (```#privacy:matrix.org```):
- Zero tolerance for discussion of how to commit illicit acts
- LIMIT POLITICAL DISCUSSION TO PRIVACY-RELATED TOPICS ONLY
- Do not dox others
- No suspicious links or uploading of non-image binary files
- Be respectful
-#### Rules for Modern Cryptography:
+#### Rules for Modern Cryptography (```#moderncrypto:gnuradio.org```):
See
#### Rules for OS Security:
See
-#### Rules for Bnonymity:
+#### Rules for Bnonymity (```#bnonymity:matrix.org```):
- Keep it legal (seriously)
- English only (no Russian, no Chinese, English only)
- Be "somewhat" respectful to each other
@@ -64,11 +64,12 @@ See
#### PSA Bans:
Currently, the following rooms are sharing a common PSA banlist for serious offenders:
-- #Anonymity
-- #Security
-- #Bnonymity
-- #OS-Security
-- #ModernCrypto
+- ```#Anonymity:matrix.org```
+- ```#Security:matrix.org```
+- ```#Bnonymity:matrix.org```
+- ```#OSINT:matrix.org```
+- ```#OS-Security```
+- ```#ModernCrypto:gnuradio.org```
This means that those PSA bans are effectively applied on all those rooms and can be issued by admins of these rooms. See the next section for information about appeals.
From 92bb1e2a00d3bbb8f11997a14fec317db8b60895 Mon Sep 17 00:00:00 2001
From: Alex Anderson <84602909+NobodySpecial256@users.noreply.github.com>
Date: Mon, 15 Aug 2022 21:02:27 +0000
Subject: [PATCH 2/2] Update chatrooms-rules.md
---
chatrooms-rules.md | 1 -
1 file changed, 1 deletion(-)
diff --git a/chatrooms-rules.md b/chatrooms-rules.md
index fe99588..b6fe288 100644
--- a/chatrooms-rules.md
+++ b/chatrooms-rules.md
@@ -68,7 +68,6 @@ Currently, the following rooms are sharing a common PSA banlist for serious offe
- ```#Security:matrix.org```
- ```#Bnonymity:matrix.org```
- ```#OSINT:matrix.org```
-- ```#OS-Security```
- ```#ModernCrypto:gnuradio.org```
This means that those PSA bans are effectively applied on all those rooms and can be issued by admins of these rooms. See the next section for information about appeals.