nigger

content/fediverse/server-rules.md

@@ -11,7 +11,8 @@ Here's a more friendly version of the **Rules and Guidelines** found in the {{<
 2. The server *lingua franca* is English, but you can post in whatever translatable language.
 3. When posting on public or federated timlines, **ALWAYS** mark NSFW attachments as **"Sensitive"**. Use Content Warnings when necessary.
 4. If you want an specific role, please DM the Admin.
-5. **GOOD TO GO**:
+5. Please pay attention to the announcements, especially when they're related to maintenance.
+6. **GOOD TO GO**:
    1. Posting slurs of any kind.
    2. Posting cunny (including AI).
    3. Poting memes of any nature.
@@ -19,16 +20,16 @@ Here's a more friendly version of the **Rules and Guidelines** found in the {{<
    5. Discussing subjects of any realm of knowledge.
    6. Posting informative and/or educational content on any subject.
    7. tl;dr **Free Speech**, baby.{{< rawhtml >}}<sup>1</sup>{{< /rawhtml >}}
-6. **PROHIBITED (SUSPENSION IF BROKEN)**:
+7. **PROHIBITED (SUSPENSION IF BROKEN)**:
    1. Ban/block evasion, be it from this or remote instances.
    2. Fedposting, doxxing (others or self) or spamming.
-   3. Posting CSAM content, including photorealistic 3D/CGI renders of actual children, montages or edits.
+   3. Posting CSAM content, including photorealistic depictions of *actual* children (3D/CGI, montages or edits).
    4. Posting scat, vore, snuff, gore, zoophilia/bestiality, animal cruelty or any other degenerate content.
    5. To be a retard, glowie, useful idiot, globohomo shill, saboteur or engage in illegal activities through the instance.
-7. **AVOID**:
+8. **AVOID**:
    1. Uploading personal stuff on the Drive (files are visible to the Admin).
    2. Interacting with bad faith actors. This could lead to suspension depending on the case.{{< rawhtml >}}<sup>2</sup>{{< /rawhtml >}}
-8. **DO AT YOUR OWN RISK**:
+9. **DO AT YOUR OWN RISK**:
    1. Messing with bot.{{< rawhtml >}}<sup>3</sup>{{< /rawhtml >}}
    2. tl;dr **Free Speech**, baby.
 
@@ -40,5 +41,4 @@ Here's a more friendly version of the **Rules and Guidelines** found in the {{<
 
 ---
 
-*NOTE: the admin reserves the right to modify the rules, as well as overlook any potential violations, proven they don't compromise the instance or break the law.*
-
+*The **admin** reserves the right to change this **Server Rules** and the corresponding **Rules and Guidelines** found in the {{< rawhtml >}}<a href="/fediverse/terms-of-service" target="_blank" rel="noopener noreferrer">Terms of Service</a>{{< /rawhtml >}} in order to cater a broader audience in a safe, non-compromising way.*

content/fediverse/terms-of-service.md

@@ -49,19 +49,19 @@ A **service** is, in the context of Misskey (the software this instance uses) an
 ### Rules and Guidelines
 
 The general rules and guidelines for content to be posted and hosted in this instance are the following:
-1. **Users** must be 18 years old or more in order to apply for and have an account in this instance. No underage user will be accepted. If a user is found to be underaged their account will be promptly suspended.
+1. **Users** must be 18 years old or more in order to apply for and have an account on this instance. No underage user will be accepted. If a user is found to be underaged their account will be promptly suspended.
 2. Ban/block evasion, be it account-wise or intance-wise, from this instance or from a remote one, is **prohibited**. Any account found or reported to be in violation of this will be immedately suspended.
 3. The following content is **strictly prohibited** to be publicly and intentionally posted on this instance, and will result in a permanent ban/suspension:
    1. Fedposting (i.e. credible threats to governement actors or institutions that might incur in a response from law enforcement).
    2. Doxxing (including self-doxxing).
    3. Unsolicited spam and/or advertising.
-   4. Discussions related to/inciting/encouraging the use, consumption, acquisition and/or distribution of CSAM.
+   4. Discussions related to/inciting/encouraging the acquisition, use and/or distribution of CSAM, as well as *actual* CSAM content.
    5. Fringe and/or degenerate content that might allude or include furry, scat, vore, gore and/or other paraphilias egregious in nature; snuff, extreme displays of violence, animal cruelty, etc; in any audiovisual form or manner.
    6. Anything that may, in one way or another, be illegal in the United States of America.{{< rawhtml >}}<sup>1</sup>{{< /rawhtml >}}
 4. Posting content deemed to be educational or informative, regardless of their nature or origin, is allowed in this instance as long as it's done in good faith and doesn't violate these **Rules and Guidelines**.{{< rawhtml >}}<sup>2</sup>{{< /rawhtml >}}
 5. Avoid uploading personal files (i.e. anything with personal information) to the Drive. The **admin** has access to every uploaded file on the server, and will start administrative procedures if content violating these **Rules and Guidelines** is found.
 6. All NSFW media files must be marked as **Sensitive**. Content Warning (CW) label must be used whenever applicable (i.e. content or discussions that require discretion).
-7. Don't be a retard, glowie or globohomo shill.
+7. Don't be a retard, useful idiot, saboteur, glowie or globohomo shill.
 8. Lolicon/shotacon content is not CSAM, therefore, it can be posted here.{{< rawhtml >}}<sup>3</sup>{{< /rawhtml >}} {{< rawhtml >}}<sup>4</sup>{{< /rawhtml >}}
 9. Don't be shy, you can use slurs here.{{< rawhtml >}}<sup>5</sup>{{< /rawhtml >}}
 
@@ -80,7 +80,7 @@ The **admin** reserves the right to change the **Rules and Guidelines** in order
 
 While open to federation, this instance and its **admin** reserve the right to block or defederate from any instance or service that might represent a potential liability or threat. The following lists contains such instances and the reason for their block/suspension/defederation.
 
-* Instances known to host either CSAM or content related to paraphilias egregious in nature. Crossed-out instances are currently down or non-functional, they're kept on this list just for informative purposes.
+* Instances known to host either CSAM or content related to paraphilias egregious in nature. Crossed-out instances are currently down or non-functional, they're kept on this list just for informative purposes; instances on italics have mutual block/defederation status with **\*.cachapa.xyz**.
 
 | Offending Instance | Defederation Reason |
 | --- | --- |
@@ -192,4 +192,6 @@ In case of a more casual approach, you can contact the admin directly to {{< raw
 * 2023-09-30:
   * Updated Rules and Guidelines, Federation.
 * 2023-10-02:
-  * Updates Rules and Guidelines, Federation and Server Rules.
+  * Updates Rules and Guidelines, Federation and Server Rules.
+* 2023-10-06:
+  * Fixed typos and some lingo.

public/fediverse/index.xml

@@ -15,7 +15,7 @@
       
       <guid>https://cachapa.xyz/fediverse/server-rules/</guid>
       <description>Here&amp;rsquo;s a more friendly version of the Rules and Guidelines found in the Terms of Service.
- Users must be 18+ years old. The server lingua franca is English, but you can post in whatever translatable language. When posting on public or federated timlines, ALWAYS mark NSFW attachments as &amp;ldquo;Sensitive&amp;rdquo;. Use Content Warnings when necessary. If you want an specific role, please DM the Admin. GOOD TO GO:  Posting slurs of any kind.</description>
+ Users must be 18+ years old. The server lingua franca is English, but you can post in whatever translatable language. When posting on public or federated timlines, ALWAYS mark NSFW attachments as &amp;ldquo;Sensitive&amp;rdquo;. Use Content Warnings when necessary. If you want an specific role, please DM the Admin. Please pay attention to the announcements, especially when they&amp;rsquo;re related to maintenance.</description>
     </item>
     
     <item>

public/fediverse/server-rules/index.html

@@ -55,6 +55,7 @@ Here&rsquo;s a more friendly version of the <strong>Rules and Guidelines</strong
 <li>The server <em>lingua franca</em> is English, but you can post in whatever translatable language.</li>
 <li>When posting on public or federated timlines, <strong>ALWAYS</strong> mark NSFW attachments as <strong>&ldquo;Sensitive&rdquo;</strong>. Use Content Warnings when necessary.</li>
 <li>If you want an specific role, please DM the Admin.</li>
+<li>Please pay attention to the announcements, especially when they&rsquo;re related to maintenance.</li>
 <li><strong>GOOD TO GO</strong>:
 <ol>
 <li>Posting slurs of any kind.</li>
@@ -71,7 +72,7 @@ Here&rsquo;s a more friendly version of the <strong>Rules and Guidelines</strong
 <ol>
 <li>Ban/block evasion, be it from this or remote instances.</li>
 <li>Fedposting, doxxing (others or self) or spamming.</li>
-<li>Posting CSAM content, including photorealistic 3D/CGI renders of actual children, montages or edits.</li>
+<li>Posting CSAM content, including photorealistic depictions of <em>actual</em> children (3D/CGI, montages or edits).</li>
 <li>Posting scat, vore, snuff, gore, zoophilia/bestiality, animal cruelty or any other degenerate content.</li>
 <li>To be a retard, glowie, useful idiot, globohomo shill, saboteur or engage in illegal activities through the instance.</li>
 </ol>
@@ -99,7 +100,8 @@ Here&rsquo;s a more friendly version of the <strong>Rules and Guidelines</strong
 
 <sub>3</sub> <em>You&rsquo;ll know when and if this happens.</em></p>
 <hr>
-<p><em>NOTE: the admin reserves the right to modify the rules, as well as overlook any potential violations, proven they don&rsquo;t compromise the instance or break the law.</em></p>
+<p><em>The <strong>admin</strong> reserves the right to change this <strong>Server Rules</strong> and the corresponding <strong>Rules and Guidelines</strong> found in the 
+<a href="/fediverse/terms-of-service" target="_blank" rel="noopener noreferrer">Terms of Service</a> in order to cater a broader audience in a safe, non-compromising way.</em></p>
 
     </div>
     <footer class="content__footer"></footer>

public/fediverse/terms-of-service/index.html

@@ -83,14 +83,14 @@ User accounts are subject to suspension were they to violate any of the rules li
 <h3 id="rules-and-guidelines">Rules and Guidelines</h3>
 <p>The general rules and guidelines for content to be posted and hosted in this instance are the following:</p>
 <ol>
-<li><strong>Users</strong> must be 18 years old or more in order to apply for and have an account in this instance. No underage user will be accepted. If a user is found to be underaged their account will be promptly suspended.</li>
+<li><strong>Users</strong> must be 18 years old or more in order to apply for and have an account on this instance. No underage user will be accepted. If a user is found to be underaged their account will be promptly suspended.</li>
 <li>Ban/block evasion, be it account-wise or intance-wise, from this instance or from a remote one, is <strong>prohibited</strong>. Any account found or reported to be in violation of this will be immedately suspended.</li>
 <li>The following content is <strong>strictly prohibited</strong> to be publicly and intentionally posted on this instance, and will result in a permanent ban/suspension:
 <ol>
 <li>Fedposting (i.e. credible threats to governement actors or institutions that might incur in a response from law enforcement).</li>
 <li>Doxxing (including self-doxxing).</li>
 <li>Unsolicited spam and/or advertising.</li>
-<li>Discussions related to/inciting/encouraging the use, consumption, acquisition and/or distribution of CSAM.</li>
+<li>Discussions related to/inciting/encouraging the acquisition, use and/or distribution of CSAM, as well as <em>actual</em> CSAM content.</li>
 <li>Fringe and/or degenerate content that might allude or include furry, scat, vore, gore and/or other paraphilias egregious in nature; snuff, extreme displays of violence, animal cruelty, etc; in any audiovisual form or manner.</li>
 <li>Anything that may, in one way or another, be illegal in the United States of America.
 <sup>1</sup></li>
@@ -100,7 +100,7 @@ User accounts are subject to suspension were they to violate any of the rules li
 <sup>2</sup></li>
 <li>Avoid uploading personal files (i.e. anything with personal information) to the Drive. The <strong>admin</strong> has access to every uploaded file on the server, and will start administrative procedures if content violating these <strong>Rules and Guidelines</strong> is found.</li>
 <li>All NSFW media files must be marked as <strong>Sensitive</strong>. Content Warning (CW) label must be used whenever applicable (i.e. content or discussions that require discretion).</li>
-<li>Don&rsquo;t be a retard, glowie or globohomo shill.</li>
+<li>Don&rsquo;t be a retard, useful idiot, saboteur, glowie or globohomo shill.</li>
 <li>Lolicon/shotacon content is not CSAM, therefore, it can be posted here.
 <sup>3</sup> 
 <sup>4</sup></li>
@@ -123,7 +123,7 @@ User accounts are subject to suspension were they to violate any of the rules li
 <h2 id="federation">Federation</h2>
 <p>While open to federation, this instance and its <strong>admin</strong> reserve the right to block or defederate from any instance or service that might represent a potential liability or threat. The following lists contains such instances and the reason for their block/suspension/defederation.</p>
 <ul>
-<li>Instances known to host either CSAM or content related to paraphilias egregious in nature. Crossed-out instances are currently down or non-functional, they&rsquo;re kept on this list just for informative purposes.</li>
+<li>Instances known to host either CSAM or content related to paraphilias egregious in nature. Crossed-out instances are currently down or non-functional, they&rsquo;re kept on this list just for informative purposes; instances on italics have mutual block/defederation status with <strong>*.cachapa.xyz</strong>.</li>
 </ul>
 <table>
 <thead>
@@ -355,6 +355,11 @@ User accounts are subject to suspension were they to violate any of the rules li
 <li>Updates Rules and Guidelines, Federation and Server Rules.</li>
 </ul>
 </li>
+<li>2023-10-06:
+<ul>
+<li>Fixed typos and some lingo.</li>
+</ul>
+</li>
 </ul>
 
     </div>

public/index.xml

@@ -15,7 +15,7 @@
       
       <guid>https://cachapa.xyz/fediverse/server-rules/</guid>
       <description>Here&amp;rsquo;s a more friendly version of the Rules and Guidelines found in the Terms of Service.
- Users must be 18+ years old. The server lingua franca is English, but you can post in whatever translatable language. When posting on public or federated timlines, ALWAYS mark NSFW attachments as &amp;ldquo;Sensitive&amp;rdquo;. Use Content Warnings when necessary. If you want an specific role, please DM the Admin. GOOD TO GO:  Posting slurs of any kind.</description>
+ Users must be 18+ years old. The server lingua franca is English, but you can post in whatever translatable language. When posting on public or federated timlines, ALWAYS mark NSFW attachments as &amp;ldquo;Sensitive&amp;rdquo;. Use Content Warnings when necessary. If you want an specific role, please DM the Admin. Please pay attention to the announcements, especially when they&amp;rsquo;re related to maintenance.</description>
     </item>
     
     <item>