update tos

content/policy/moar.cachapa.xyz/privacy-policy.md

@@ -30,3 +30,7 @@ Seriously, I'm not handing over anything as long as no laws are broken.
 ## Warrant Canary
 
 There's no format for a warrant canary notice for now. Might work on it soon.
+
+## Media Policy
+
+This instance, and part of the media it contains, is hosted in Finland. However, it uses object storage to host most of the media files (local or remotely cached), and the bucket these files are hosted in is located in Tokyo, Japan. Therefore, media file are subject to Finnish and Japanese jurisdiction.

content/policy/moar.cachapa.xyz/terms-of-service.md

@@ -46,13 +46,13 @@ The general rules and guidelines for content to be posted and hosted in this ins
 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.
 2. Block evasion, be it account-wise or intance-wise, is **prohibited**. Any account found to be in violation of this will be immedately suspended.
 3. The following content is **strictly prohibited** to be posted and/or hosted in this instance, and will result in a permanent ban/suspension:
-   1. Fedposting (credible threats to governement actors or institutions that might incur in a response from law enforcement).
+   1. Fedposting (i.e. credible threats to governement actors or institutions that might incur in a response from law enforcement).
    2. Doxxing.
    3. Unsolicited spam and/or advertising.
    4. Photorealistic images, be them real or CGI/3D renders, of children in any state of dress or activity.
    5. Discussions inciting or encouraging pedophilia or the use/consumption/acquisition/distribution of CSEM/CSAM.
-   6. Fringe/degenerate content, such as snuff, extreme displays of violence, animal cruelty, etc; in audio, video, photographic or illustrated form.
-   7. Content that might allude to or include furry, scat, vore, gore and/or other paraphilias egregious in nature, in written, audio, video, photographic or illustrated form, including CGI/3D renders.
+   6. Glorification of fringe and/or degenerate content, such as snuff, extreme displays of violence, animal cruelty, etc; in any audiovisual form or manner.
+   7. Glorification of content that might allude to or include furry, scat, vore, gore and/or other paraphilias egregious in nature, in any audiovisual form or manner.
    8. Anything that might include any combination of the above mentioned.
    9. 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 anything from point (3).{{< rawhtml >}}<sup>2</sup>{{< /rawhtml >}}
@@ -63,17 +63,19 @@ The general rules and guidelines for content to be posted and hosted in this ins
 9.  Don't be shy, you can use slurs here.{{< rawhtml >}}<sup>5</sup>{{< /rawhtml >}}
 
 ---
-{{< rawhtml >}}<sub>1</sub>{{< /rawhtml >}} *In case you didn't read the general terms, this instance is hosted in Finland, but I still put this thing because most Americans don't know there's other countries in the planet, apparently.*\
+{{< rawhtml >}}<sub>1</sub>{{< /rawhtml >}} *While this instance is hosted in Finland and the media files are located in an object storage bucket in Japan, most of the internet revolves aroung the US because fuck it.*\
 {{< rawhtml >}}<sub>2</sub>{{< /rawhtml >}} *Don't try to get funny with this one.*\
 {{< rawhtml >}}<sub>3</sub>{{< /rawhtml >}} *Cope seethe and mald.*\
 {{< rawhtml >}}<sub>4</sub>{{< /rawhtml >}} *AI-generated lolicon images can be posted, as long as they don't blatantly go over uncanny valley territory or violate point (3.4)*\
 {{< rawhtml >}}<sub>5</sub>{{< /rawhtml >}} *KIKE NIGGER FAGGOT!!!*
 
+---
+
 ## Federation
 
 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/CSEM or content promoting and/or discussing pedophilia, zoophilia and other paraphilias egregious in nature.
+* Instances known to host either CSAM/CSEM or content promoting and/or discussing pedophilia, zoophilia and other paraphilias egregious in nature. (NOTE: instances in *italics* have mutual block/suspension status with *.cachapa.xyz)
 
 | Offending Instance | Defederation Reason |
 | --- | --- |
@@ -81,7 +83,7 @@ While open to federation, this instance and its **admin** reserve the right to b
 | freak.university | Pedophiles, hosts CSAM |
 | youjo.love | Pedophiles, hosts CSAM |
 | nnia.space | Pedophiles, hosts CSAM |
-| lolison.top | Pedophiles, hosts CSAM |
+| *lolison.top* | Pedophiles, hosts CSAM |
 | lolison.network | Pedophiles, hosts CSAM |
 | ghetti.monster | Pedophiles, hosts CSAM |
 | nnia.space | Pedophiles, hosts CSAM |
@@ -130,7 +132,7 @@ In case of inquiries or comments, you can write an email, using the following su
 * captain_arepa[at]cachapa.xyz
 * captain.arepa[at]yandex.com
 
-You can also reach out to any of my alts on the fediverse (prove the instance isn't nuked yet):
+You can also reach out to any of my alts on the fediverse (proven the instance isn't nuked yet):
 * {{< rawhtml >}}
 <a href="https://breastmilk.club/users/captain_arepa" target="_blank" rel="noopener noreferrer">@captain_arepa@breastmilk.club</a> (tits/admin)
 {{< /rawhtml >}}

public/policy/moar.cachapa.xyz/privacy-policy/index.html

@@ -606,7 +606,7 @@ body{background:#300a24}body #terminal{color:#fff}body #user{color:#4e9a06}body
         contentDelay = parseDelay("0");
     const typeeffetct = async () => {
         await typewriter("\u003cspan id=\u0027terminal\u0027\u003e\u003ch1 id=\u0027title\u0027\u003ePrivacy Policy\u003c\/h1\u003e\u003c\/span\u003e", "activity-title", titleDelay);
-        await typewriter("\u003cspan id=\u0027terminal\u0027\u003e\u003ch2 id=\u0022disclaimer\u0022\u003eDisclaimer\u003c\/h2\u003e\n\u003cp\u003eAs stated in the \n\u003cb\u003e\u003ca href=\u0022\/policy\/moar.cachapa.xyz\/terms-of-service\u0022 target=\u0022_blank\u0022 rel=\u0022noopener noreferrer\u0022\u003eTerms of Service\u003c\/a\u003e\u003c\/b\u003e, \u003cstrong\u003emoar.cachapa.xyz\u003c\/strong\u003e is a private instance, with sign-up disabled. However, external users are welcome to apply for an account through the channels listed in said page.\u003c\/p\u003e\n\u003ch2 id=\u0022stored-information\u0022\u003eStored Information\u003c\/h2\u003e\n\u003cp\u003eAs a service provider, \u003cstrong\u003emoar.cachapa.xyz\u003c\/strong\u003e holds and store information regarding its local users. Such information is limited only to:\u003c\/p\u003e\n\u003cul\u003e\n\u003cli\u003eEmail address\u003c\/li\u003e\n\u003cli\u003eIP from where the user is accessing and its respective timestamp\u003c\/li\u003e\n\u003c\/ul\u003e\n\u003cp\u003eThis instance doesn\u0026rsquo;t require user to enter any personal information that might represente a liability to the or the site.\u003c\/p\u003e\n\u003ch2 id=\u0022what-the-information-can-be-used-for\u0022\u003eWhat the information can be used for.\u003c\/h2\u003e\n\u003cp\u003eOther than sitting there doing nothing, the information listed and stored can be used for the following purposes:\u003c\/p\u003e\n\u003cul\u003e\n\u003cli\u003eEmail: used for password reset, authentication and general moderation. It is therefore recommended for users to register a valid and functional email address in order to receive any notification from \u003cstrong\u003emoar.cachapa.xyz\u003c\/strong\u003e.\u003c\/li\u003e\n\u003cli\u003eIP address: any audit that might be required by the site on a technical capacity (detecting bad faith actors), or by any authority that may require them, proven they have an valid order to do so.\u003c\/li\u003e\n\u003c\/ul\u003e\n\u003cp\u003eSeriously, I\u0026rsquo;m not handing over anything as long as no laws are broken.\u003c\/p\u003e\n\u003ch2 id=\u0022warrant-canary\u0022\u003eWarrant Canary\u003c\/h2\u003e\n\u003cp\u003eThere\u0026rsquo;s no format for a warrant canary notice for now. Might work on it soon.\u003c\/p\u003e\n\u003c\/span\u003e", "activity-content", contentDelay);
+        await typewriter("\u003cspan id=\u0027terminal\u0027\u003e\u003ch2 id=\u0022disclaimer\u0022\u003eDisclaimer\u003c\/h2\u003e\n\u003cp\u003eAs stated in the \n\u003cb\u003e\u003ca href=\u0022\/policy\/moar.cachapa.xyz\/terms-of-service\u0022 target=\u0022_blank\u0022 rel=\u0022noopener noreferrer\u0022\u003eTerms of Service\u003c\/a\u003e\u003c\/b\u003e, \u003cstrong\u003emoar.cachapa.xyz\u003c\/strong\u003e is a private instance, with sign-up disabled. However, external users are welcome to apply for an account through the channels listed in said page.\u003c\/p\u003e\n\u003ch2 id=\u0022stored-information\u0022\u003eStored Information\u003c\/h2\u003e\n\u003cp\u003eAs a service provider, \u003cstrong\u003emoar.cachapa.xyz\u003c\/strong\u003e holds and store information regarding its local users. Such information is limited only to:\u003c\/p\u003e\n\u003cul\u003e\n\u003cli\u003eEmail address\u003c\/li\u003e\n\u003cli\u003eIP from where the user is accessing and its respective timestamp\u003c\/li\u003e\n\u003c\/ul\u003e\n\u003cp\u003eThis instance doesn\u0026rsquo;t require user to enter any personal information that might represente a liability to the or the site.\u003c\/p\u003e\n\u003ch2 id=\u0022what-the-information-can-be-used-for\u0022\u003eWhat the information can be used for.\u003c\/h2\u003e\n\u003cp\u003eOther than sitting there doing nothing, the information listed and stored can be used for the following purposes:\u003c\/p\u003e\n\u003cul\u003e\n\u003cli\u003eEmail: used for password reset, authentication and general moderation. It is therefore recommended for users to register a valid and functional email address in order to receive any notification from \u003cstrong\u003emoar.cachapa.xyz\u003c\/strong\u003e.\u003c\/li\u003e\n\u003cli\u003eIP address: any audit that might be required by the site on a technical capacity (detecting bad faith actors), or by any authority that may require them, proven they have an valid order to do so.\u003c\/li\u003e\n\u003c\/ul\u003e\n\u003cp\u003eSeriously, I\u0026rsquo;m not handing over anything as long as no laws are broken.\u003c\/p\u003e\n\u003ch2 id=\u0022warrant-canary\u0022\u003eWarrant Canary\u003c\/h2\u003e\n\u003cp\u003eThere\u0026rsquo;s no format for a warrant canary notice for now. Might work on it soon.\u003c\/p\u003e\n\u003ch2 id=\u0022media-policy\u0022\u003eMedia Policy\u003c\/h2\u003e\n\u003cp\u003eThis instance, and part of the media it contains, is hosted in Finland. However, it uses object storage to host most of the media files (local or remotely cached), and the bucket these files are hosted in is located in Tokyo, Japan. Therefore, media file are subject to Finnish and Japanese jurisdiction.\u003c\/p\u003e\n\u003c\/span\u003e", "activity-content", contentDelay);
         return;
     }