diff --git a/content/fediverse/server-rules.md b/content/fediverse/server-rules.md index 1a38034..f936b7d 100644 --- a/content/fediverse/server-rules.md +++ b/content/fediverse/server-rules.md @@ -8,9 +8,10 @@ tags: [] Here's a more friendly version of the **Rules and Guidelines** found in the {{< rawhtml >}}Terms of Service{{< /rawhtml >}}. 1. Users **must** be 18+ years old. -2. The server's *lingua franca* is English, but you can post in whatever language you want (as long as it can be translated, lmao). +2. The server *lingua franca* is English, but you can post in whatever translatable language. 3. **ALWAYS** mark NSFW attachments as **"Sensitive"**. Use Content Warnings when necessary. -4. **GOOD TO GO**: +4. If you want an specific role, please DM the Admin. +5. **GOOD TO GO**: 1. Posting slurs of any kind. 2. Poting memes of any nature. 3. Posting cunny (including AI). @@ -18,25 +19,23 @@ 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 >}}1{{< /rawhtml >}} -5. **PROHIBITED**: +6. **PROHIBITED**: 1. Fedposting, doxxing (others or self) or spamming. 2. Posting CSAM/CSEM material, including photorealistic 3D/CGI/AI renders, montages or edits. - 3. Posting goon edits, scat, vore, snuff, gore, zoophilia, animal cruelty or any other degenerate content. + 3. Posting goon edits, scat, vore, snuff, gore, zoophilia/bestiality, animal cruelty or any other degenerate content. 4. To be a retard, glowie, useful idiot, globohomo shill, saboteur or any combination of those. -6. **AVOID**: +7. **AVOID**: 1. Posting uncanny valley content, specially lolicon/toddlercon, be it 3D/CGI or AI renders. 2. Uploading personal stuff on the Drive (files are visible to the Admin). 3. Interacting with bad faith actors.{{< rawhtml >}}2{{< /rawhtml >}} - 4. Pissing me off.{{< rawhtml >}}3{{< /rawhtml >}} -7. **DO AT YOUR OWN RISK**: +8. **DO AT YOUR OWN RISK**: 1. Hellthread diving (Misskey's UI is not fun for this, actually). - 2. Messing with bot.{{< rawhtml >}}4{{< /rawhtml >}} + 2. Messing with bot.{{< rawhtml >}}3{{< /rawhtml >}} 3. tl;dr free speech, baby. --- {{< rawhtml >}}1{{< /rawhtml >}} *Remember, with great power comes great responsibility, and yada yada.*\ {{< rawhtml >}}2{{< /rawhtml >}} *i.e. remote users who might represent a liability to this instance.*\ -{{< rawhtml >}}3{{< /rawhtml >}} *This one is hard to achieve, but I'll let you know when it happens* 😉\ -{{< rawhtml >}}4{{< /rawhtml >}} *You'll know when and if this happens.* +{{< rawhtml >}}3{{< /rawhtml >}} *You'll know when and if this happens.* diff --git a/content/fediverse/terms-of-service.md b/content/fediverse/terms-of-service.md index 7362ea5..ba72328 100644 --- a/content/fediverse/terms-of-service.md +++ b/content/fediverse/terms-of-service.md @@ -31,24 +31,20 @@ All regular **user** accounts will be given a "Simple Cachapa" role, equivalent * Lists: 10 * Users per list: 1000 -Additionally, there are other roles on the instance that serve as identifier labels (mostly): -* **Party Cachapa**: role that enable users to send invites. Active only when registrations are closed. +Additionally, there are other public roles on the instance that serve as identifier labels (mostly): * **Ero Cachapa**: role for users who post NSFW content. Will automatically mark all media as sensitive. * **Artistic Cachapa**: role for users who are illustrators or media creators. Only additional perk is 5GB (5000MB) of Drive storage. * **Chachapa Bot**: role for automated service accounts (bots). * **Proxy**: role for the instance proxy account, used for federation purposes. -* **Gaius Cachapa Maximus**: role for the owner. For now, only the **Ero Cachapa** and **Artistic Cachapa** roles can be assigned at request. -Depending on the state of the server and the number of users in the instance, the drive capacity for the "User" role can be upgraded. +Depending on the state of the server and the number of users in the instance, the drive capacity for the **Simple Cachapa** role can be upgraded. User accounts are subject to suspension were they to violate any of the rules listed in the **Rules and Guidelines** section. ### Services -A **service** is, in the context of Misskey (the software this instance uses) and the Fediverse in general, an automated account. All **users** in this instance have the ability to generate access tokens in order to interact with Misskey's API (be it through an Android application, like Milktea or through some script running on a server). - -Any **user** with the intention to run a **service** account in this instance must notify it first to the **admin**. Failure to do so will result in the offending account's suspension and deletion. +A **service** is, in the context of Misskey (the software this instance uses) and the Fediverse in general, an automated account. All **users** in this instance have the ability to generate access tokens in order to interact with Misskey's API (be it through an Android application, like Milktea or through some script running on a server). Any **user** with the intention to run a **service** account in this instance must notify it first to the **admin**. ### Rules and Guidelines @@ -60,7 +56,7 @@ The general rules and guidelines for content to be posted and hosted in this ins 2. Doxxing (including self-doxxing). 3. Unsolicited spam and/or advertising. 4. Photorealistic depictions, be them audiovisual records or CGI/3D renders, of actual children in any state of dress or activity. - 5. Discussions inciting or encouraging the use, consumption, acquisition or distribution of CSEM/CSAM. + 5. Discussions or content inciting or encouraging the use, consumption, acquisition or distribution of CSEM/CSAM. 6. 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. 7. Anything that might include any combination of the above mentioned. 8. Anything that may, in one way or another, be illegal in the United States of America.{{< rawhtml >}}1{{< /rawhtml >}} @@ -179,4 +175,6 @@ In case of a more casual approach, you can contact the admin directly to {{< raw * 2023-08-21: * Updated Terms of Service * 2023-08-22: - * Fixed some typos \ No newline at end of file + * Fixed some typos +* 2023-08-25: + * Updated roles. \ No newline at end of file diff --git a/public/fediverse/index.xml b/public/fediverse/index.xml index 87cd26e..c5fec83 100644 --- a/public/fediverse/index.xml +++ b/public/fediverse/index.xml @@ -15,7 +15,7 @@ https://cachapa.xyz/fediverse/server-rules/ Here&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&rsquo;s lingua franca is English, but you can post in whatever language you want (as long as it can be translated, lmao). ALWAYS mark NSFW attachments as &ldquo;Sensitive&rdquo;. Use Content Warnings when necessary. GOOD TO GO: Posting slurs of any kind. Poting memes of any nature. + Users must be 18+ years old. The server lingua franca is English, but you can post in whatever translatable language. ALWAYS mark NSFW attachments as &ldquo;Sensitive&rdquo;. Use Content Warnings when necessary. If you want an specific role, please DM the Admin. GOOD TO GO: Posting slurs of any kind. Poting memes of any nature. diff --git a/public/fediverse/server-rules/index.html b/public/fediverse/server-rules/index.html index e85eb5b..d58592e 100644 --- a/public/fediverse/server-rules/index.html +++ b/public/fediverse/server-rules/index.html @@ -52,8 +52,9 @@ Here’s a more friendly version of the Rules and GuidelinesTerms of Service.

  1. Users must be 18+ years old.
    2. -
  2. The server’s lingua franca is English, but you can post in whatever language you want (as long as it can be translated, lmao).
    3. +
  3. The server lingua franca is English, but you can post in whatever translatable language.
  4. ALWAYS mark NSFW attachments as “Sensitive”. Use Content Warnings when necessary.
    5. +
  5. If you want an specific role, please DM the Admin.
  6. GOOD TO GO:
    1. Posting slurs of any kind.
      2. @@ -70,7 +71,7 @@ Here’s a more friendly version of the Rules and Guidelines
    2. Fedposting, doxxing (others or self) or spamming.
    3. Posting CSAM/CSEM material, including photorealistic 3D/CGI/AI renders, montages or edits.
      4. -
    4. Posting goon edits, scat, vore, snuff, gore, zoophilia, animal cruelty or any other degenerate content.
      5. +
    5. Posting goon edits, scat, vore, snuff, gore, zoophilia/bestiality, animal cruelty or any other degenerate content.
    6. To be a retard, glowie, useful idiot, globohomo shill, saboteur or any combination of those.
    7. @@ -80,15 +81,13 @@ Here’s a more friendly version of the Rules and GuidelinesUploading personal stuff on the Drive (files are visible to the Admin).
  7. Interacting with bad faith actors. 2
    8. -
  8. Pissing me off. -3
  • DO AT YOUR OWN RISK:
    1. Hellthread diving (Misskey’s UI is not fun for this, actually).
    2. Messing with bot. -4
      3. +3
    3. tl;dr free speech, baby.
    • @@ -99,9 +98,7 @@ Here’s a more friendly version of the Rules and Guidelines2 i.e. remote users who might represent a liability to this instance.
    -3 This one is hard to achieve, but I’ll let you know when it happens 😉
    - -4 You’ll know when and if this happens.

    +3 You’ll know when and if this happens.

    diff --git a/public/fediverse/terms-of-service/index.html b/public/fediverse/terms-of-service/index.html index fc8896c..8ffbb83 100644 --- a/public/fediverse/terms-of-service/index.html +++ b/public/fediverse/terms-of-service/index.html @@ -68,21 +68,18 @@
  • Lists: 10
  • Users per list: 1000
    • -

    Additionally, there are other roles on the instance that serve as identifier labels (mostly):

    +

    Additionally, there are other public roles on the instance that serve as identifier labels (mostly):

    For now, only the Ero Cachapa and Artistic Cachapa roles can be assigned at request.

    -

    Depending on the state of the server and the number of users in the instance, the drive capacity for the “User” role can be upgraded. +

    Depending on the state of the server and the number of users in the instance, the drive capacity for the Simple Cachapa role can be upgraded. User accounts are subject to suspension were they to violate any of the rules listed in the Rules and Guidelines section.

    Services

    -

    A service is, in the context of Misskey (the software this instance uses) and the Fediverse in general, an automated account. All users in this instance have the ability to generate access tokens in order to interact with Misskey’s API (be it through an Android application, like Milktea or through some script running on a server).

    -

    Any user with the intention to run a service account in this instance must notify it first to the admin. Failure to do so will result in the offending account’s suspension and deletion.

    +

    A service is, in the context of Misskey (the software this instance uses) and the Fediverse in general, an automated account. All users in this instance have the ability to generate access tokens in order to interact with Misskey’s API (be it through an Android application, like Milktea or through some script running on a server). Any user with the intention to run a service account in this instance must notify it first to the admin.

    Rules and Guidelines

    The general rules and guidelines for content to be posted and hosted in this instance are the following:

      @@ -94,7 +91,7 @@ User accounts are subject to suspension were they to violate any of the rules li
    1. Doxxing (including self-doxxing).
    2. Unsolicited spam and/or advertising.
    3. Photorealistic depictions, be them audiovisual records or CGI/3D renders, of actual children in any state of dress or activity.
      4. -
    4. Discussions inciting or encouraging the use, consumption, acquisition or distribution of CSEM/CSAM.
      5. +
    5. Discussions or content inciting or encouraging the use, consumption, acquisition or distribution of CSEM/CSAM.
    6. 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.
    7. Anything that might include any combination of the above mentioned.
    8. Anything that may, in one way or another, be illegal in the United States of America. @@ -343,6 +340,11 @@ User accounts are subject to suspension were they to violate any of the rules li
    9. Fixed some typos
      10. +
    10. 2023-08-25: +
        +
      • Updated roles.
        • +
      +
      11. diff --git a/public/index.xml b/public/index.xml index abc6892..e3da564 100644 --- a/public/index.xml +++ b/public/index.xml @@ -15,7 +15,7 @@ https://cachapa.xyz/fediverse/server-rules/ Here&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&rsquo;s lingua franca is English, but you can post in whatever language you want (as long as it can be translated, lmao). ALWAYS mark NSFW attachments as &ldquo;Sensitive&rdquo;. Use Content Warnings when necessary. GOOD TO GO: Posting slurs of any kind. Poting memes of any nature. + Users must be 18+ years old. The server lingua franca is English, but you can post in whatever translatable language. ALWAYS mark NSFW attachments as &ldquo;Sensitive&rdquo;. Use Content Warnings when necessary. If you want an specific role, please DM the Admin. GOOD TO GO: Posting slurs of any kind. Poting memes of any nature.