From 4adbee8c89647aa1bb92e78fa61921cc70d4f908 Mon Sep 17 00:00:00 2001 From: Captain Arepa Date: Sun, 28 Jan 2024 13:11:21 -0400 Subject: [PATCH] mod --- content/about.md | 3 +-- content/contact.md | 2 ++ content/donate.md | 3 +-- content/fediverse/privacy-policy.md | 3 ++- content/fediverse/server-rules.md | 4 ++-- content/fediverse/terms-of-service.md | 6 +++++- public/about/index.html | 3 +-- public/contact/index.html | 12 +----------- public/fediverse/index.xml | 2 +- public/fediverse/privacy-policy/index.html | 2 +- public/fediverse/server-rules/index.html | 8 ++++---- public/fediverse/terms-of-service/index.html | 8 +++++++- public/index.xml | 7 +++---- 13 files changed, 31 insertions(+), 32 deletions(-) diff --git a/content/about.md b/content/about.md index bd8eebd..db2bb7f 100644 --- a/content/about.md +++ b/content/about.md @@ -8,10 +8,9 @@ tags: [] ## What you have to know about me. I'm Captain Arepa. Well, that's my online alias, d'uh.\ -I also go as "Colonel Sponsz Arepa" on Twitter, but mainly because I've gotten suspended quite a lot and it seems bird site hates my nickname a lot.\ I'm a 30-something y/o Android/backend developer of sorts.\ I live in a pariah banana wannabe-commie republic called "Venezuela". Most people don't know or care about it, so I won't talk too much about that either. -I'll move to Europe sometime during 2023 (hopefully), so I guess my life will be a bit more interesting, heh. +I'll move ~~to Europe sometime during 2023~~ overseas someday (hopefully), ~~so I guess my life will be a bit more interesting, heh~~ life sucks way too much right now. ## Likes diff --git a/content/contact.md b/content/contact.md index 4967c06..a2c3ca6 100644 --- a/content/contact.md +++ b/content/contact.md @@ -28,3 +28,5 @@ I'm also on Discord and Matrix: * Discord: @captain_arepa * Matrix: @captain_arepa:matrix.5dollah.click +I'm not on Twitter anymore, and I won't bother with that site again. + diff --git a/content/donate.md b/content/donate.md index d28e513..6ffd503 100644 --- a/content/donate.md +++ b/content/donate.md @@ -11,5 +11,4 @@ In case you feel generous, here I leave some links for donos and wotnot: * XMR (Monero): 44uYq6gCveKEFfJNCyeYev4ZvBt96oqNgTWn49JoLWJ2TrhzZmeeLeA8BvBYAsefxxM3w1KCAuogWLDPM1ukizMiDGJ2MLs And also the QR code, because why not. -![xrm captain arepa](/img/captain_arepa_xmr.png) - +![xrm captain arepa](/img/captain_arepa_xmr.png) \ No newline at end of file diff --git a/content/fediverse/privacy-policy.md b/content/fediverse/privacy-policy.md index 43fef24..5021e72 100644 --- a/content/fediverse/privacy-policy.md +++ b/content/fediverse/privacy-policy.md @@ -5,9 +5,10 @@ draft: false tags: [] --- + ## Disclaimer -As stated in the {{< rawhtml >}}Terms of Service{{< /rawhtml >}}, **moar.cachapa.xyz** is a private instance, with registrations open "temporarily", unless stated otherwise. +As stated in the {{< rawhtml >}}Terms of Service{{< /rawhtml >}}, **moar.cachapa.xyz** is a private instance, ~~with registrations open "temporarily", unless stated otherwise.~~ with registrations closed. ## Stored Information diff --git a/content/fediverse/server-rules.md b/content/fediverse/server-rules.md index 1fce270..e2050db 100644 --- a/content/fediverse/server-rules.md +++ b/content/fediverse/server-rules.md @@ -30,14 +30,14 @@ Here's a more friendly version of the **Rules and Guidelines** found in the {{< 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 >}}2{{< /rawhtml >}} 9. **DO AT YOUR OWN RISK**: - 1. Messing with bot.{{< rawhtml >}}3{{< /rawhtml >}} + 1. ~~Messing with bot.{{< rawhtml >}}3{{< /rawhtml >}}~~ 2. tl;dr **Free Speech**, baby. --- {{< rawhtml >}}1{{< /rawhtml >}} *Be responsible and don't get into trouble.*\ {{< rawhtml >}}2{{< /rawhtml >}} *i.e. remote users who might represent a liability to this instance (I really don't want the feds on my tail).*\ -{{< rawhtml >}}3{{< /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 659c966..c560923 100644 --- a/content/fediverse/terms-of-service.md +++ b/content/fediverse/terms-of-service.md @@ -19,7 +19,9 @@ Any changes to these **Terms of Service** shall be reflected in the **Changelog* ### User Account -This instance has open registrations, unless stated otherwise on the landing page. A valid email must be used for sign up since a verification email will be sent. +~~This instance has open registrations, unless stated otherwise on the landing page. A valid email must be used for sign up since a verification email will be sent.~~ + +This instance has registrations closed. If you want an account and have an acquaintance you can ask them to vouch for you. Otherwise you can create an account on other fediverse instance. All regular **user** accounts will be given a "Simple Cachapa" role, equivalent to that of a regular user without elevated privileges, with the following features: * Drive storage capacity: 2GB (2000MB) @@ -164,6 +166,8 @@ In case of a more casual approach, you can contact the admin directly to {{< raw ## Changelog +* 2024-01-28: + * Changed Terms of Service. * 2023-03-22: * Updated Terms of service. * Added changelog. diff --git a/public/about/index.html b/public/about/index.html index 96f54e0..e61de1a 100644 --- a/public/about/index.html +++ b/public/about/index.html @@ -49,10 +49,9 @@

What you have to know about me.

I’m Captain Arepa. Well, that’s my online alias, d’uh.
-I also go as “Colonel Sponsz Arepa” on Twitter, but mainly because I’ve gotten suspended quite a lot and it seems bird site hates my nickname a lot.
I’m a 30-something y/o Android/backend developer of sorts.
I live in a pariah banana wannabe-commie republic called “Venezuela”. Most people don’t know or care about it, so I won’t talk too much about that either. -I’ll move to Europe sometime during 2023 (hopefully), so I guess my life will be a bit more interesting, heh.

+I’ll move to Europe sometime during 2023 overseas someday (hopefully), so I guess my life will be a bit more interesting, heh life sucks way too much right now.

Likes

-

And last, but not least, I’m also on Twatter (until I get yeeted again):

- +

I’m not on Twitter anymore, and I won’t bother with that site again.

diff --git a/public/fediverse/index.xml b/public/fediverse/index.xml index a6b4b96..d4a0fbe 100644 --- a/public/fediverse/index.xml +++ b/public/fediverse/index.xml @@ -24,7 +24,7 @@ Mon, 01 Jan 0001 00:00:00 +0000 https://cachapa.xyz/fediverse/privacy-policy/ - Disclaimer As stated in the Terms of Service, moar.cachapa.xyz is a private instance, with registrations open &ldquo;temporarily&rdquo;, unless stated otherwise. + Disclaimer As stated in the Terms of Service, moar.cachapa.xyz is a private instance, with registrations open &ldquo;temporarily&rdquo;, unless stated otherwise. with registrations closed. Stored Information As a service provider, moar.cachapa.xyz holds and store information regarding its local users. Such information is limited only to: Email address IP from where the user is accessing and its respective timestamp This instance doesn&rsquo;t require user to enter any personal information that might represente a liability to the or the site. diff --git a/public/fediverse/privacy-policy/index.html b/public/fediverse/privacy-policy/index.html index b3c5af6..88eb89f 100644 --- a/public/fediverse/privacy-policy/index.html +++ b/public/fediverse/privacy-policy/index.html @@ -49,7 +49,7 @@

Disclaimer

As stated in the -Terms of Service, moar.cachapa.xyz is a private instance, with registrations open “temporarily”, unless stated otherwise.

+Terms of Service, moar.cachapa.xyz is a private instance, with registrations open “temporarily”, unless stated otherwise. with registrations closed.

Stored Information

As a service provider, moar.cachapa.xyz holds and store information regarding its local users. Such information is limited only to:

    diff --git a/public/fediverse/server-rules/index.html b/public/fediverse/server-rules/index.html index aa3447d..8cba573 100644 --- a/public/fediverse/server-rules/index.html +++ b/public/fediverse/server-rules/index.html @@ -86,8 +86,8 @@ Here’s a more friendly version of the Rules and Guidelines
  • DO AT YOUR OWN RISK:
      -
    1. Messing with bot. -3
      2. +
    2. Messing with bot. +3
    3. tl;dr Free Speech, baby.
    • @@ -97,8 +97,8 @@ Here’s a more friendly version of the Rules and Guidelines1 Be responsible and don’t get into trouble.
    2 i.e. remote users who might represent a liability to this instance (I really don’t want the feds on my tail).
    - -3 You’ll know when and if this happens.

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

    The admin reserves the right to change this Server Rules and the corresponding Rules and Guidelines found in the Terms of Service in order to cater a broader audience in a safe, non-compromising way.

    diff --git a/public/fediverse/terms-of-service/index.html b/public/fediverse/terms-of-service/index.html index 954ec7d..28cd5e9 100644 --- a/public/fediverse/terms-of-service/index.html +++ b/public/fediverse/terms-of-service/index.html @@ -56,7 +56,8 @@

    Terms of Service

    moar.cachapa.xyz is a private instance with strong advocacy for freedom of speech and freedon of expression. On this regard, the terms for its usage are apply only to this instance’s user and service accounts hosted in it.

    User Account

    -

    This instance has open registrations, unless stated otherwise on the landing page. A valid email must be used for sign up since a verification email will be sent.

    +

    This instance has open registrations, unless stated otherwise on the landing page. A valid email must be used for sign up since a verification email will be sent.

    +

    This instance has registrations closed. If you want an account and have an acquaintance you can ask them to vouch for you. Otherwise you can create an account on other fediverse instance.

    All regular user accounts will be given a “Simple Cachapa” role, equivalent to that of a regular user without elevated privileges, with the following features:

    • Drive storage capacity: 2GB (2000MB)
      • @@ -287,6 +288,11 @@ User accounts are subject to suspension were they to violate any of the rules li @captain_arepa@moar.cachapa.xyz.

      Changelog

        +
      • 2024-01-28: +
          +
        • Changed Terms of Service.
          • +
        +
      • 2023-03-22:
        • Updated Terms of service.
          • diff --git a/public/index.xml b/public/index.xml index 38c16c2..885fafb 100644 --- a/public/index.xml +++ b/public/index.xml @@ -25,9 +25,8 @@ https://cachapa.xyz/about/ What you have to know about me. I&rsquo;m Captain Arepa. Well, that&rsquo;s my online alias, d&rsquo;uh. -I also go as &ldquo;Colonel Sponsz Arepa&rdquo; on Twitter, but mainly because I&rsquo;ve gotten suspended quite a lot and it seems bird site hates my nickname a lot. I&rsquo;m a 30-something y/o Android/backend developer of sorts. -I live in a pariah banana wannabe-commie republic called &ldquo;Venezuela&rdquo;. Most people don&rsquo;t know or care about it, so I won&rsquo;t talk too much about that either. +I live in a pariah banana wannabe-commie republic called &ldquo;Venezuela&rdquo;. Most people don&rsquo;t know or care about it, so I won&rsquo;t talk too much about that either. I&rsquo;ll move to Europe sometime during 2023 overseas someday (hopefully), so I guess my life will be a bit more interesting, heh life sucks way too much right now. @@ -39,7 +38,7 @@ I live in a pariah banana wannabe-commie republic called &ldquo;Venezuela&am You can find me on the following instances on the fediverse: Moar Cachapas (main/admin) Breastmilk Club (tits/admin) Baest (alt/backup) Lolicon.Rocks (alt/backup) You can also send me an email to any of the following addresses: captain_arepa@cachapa.xyz (main) captain.arepa@yandex.com (backup) captain.arepa@fedora.email (backup, I rarely check it) I&rsquo;m also on Discord and Matrix: - Discord: @captain_arepa Matrix: @captain_arepa:matrix.5dollah.click And last, but not least, I&rsquo;m also on Twatter (until I get yeeted again): + Discord: @captain_arepa Matrix: @captain_arepa:matrix.5dollah.click I&rsquo;m not on Twitter anymore, and I won&rsquo;t bother with that site again. @@ -58,7 +57,7 @@ I live in a pariah banana wannabe-commie republic called &ldquo;Venezuela&am Mon, 01 Jan 0001 00:00:00 +0000 https://cachapa.xyz/fediverse/privacy-policy/ - Disclaimer As stated in the Terms of Service, moar.cachapa.xyz is a private instance, with registrations open &ldquo;temporarily&rdquo;, unless stated otherwise. + Disclaimer As stated in the Terms of Service, moar.cachapa.xyz is a private instance, with registrations open &ldquo;temporarily&rdquo;, unless stated otherwise. with registrations closed. Stored Information As a service provider, moar.cachapa.xyz holds and store information regarding its local users. Such information is limited only to: Email address IP from where the user is accessing and its respective timestamp This instance doesn&rsquo;t require user to enter any personal information that might represente a liability to the or the site.