Firefish>Iceshrimp and remove Pixelfed

instead of making commits for each block from now on, I just paste the list.

.gitignore

@@ -11,3 +11,5 @@ hugo.linux
 
 # Temporary lock file while building
 /.hugo_build.lock
+
+content/pages/blocked-instances/list

content/_index.md

@@ -14,32 +14,26 @@ type: docs
 
 ## What is [snug.moe](https://snug.moe)?
 It is many things! But the main attraciton is
-a laid back comfy [FoundKey](https://akkoma.dev/FoundKeyGang/FoundKey/)
+a laid back comfy [Iceshrimp](https://iceshrimp.dev)
 instance on the [Fediverse](https://en.wikipedia.org/wiki/Fediverse)!
 
-This place is aiming to be relaxed and not too heated up.
+It used to be a fully public instance with open registrations but has closed down to being invite only so it doesn't grow bigger than it should or we can handle.
-Optionally cute, but that is not a requirement; be however you like.
 
 You can receive an invite by being a friend of an existing user and have them ask the admin or mods for a code.
 
 ## Wait, what other things?
 
-A couple more fediverse instances, like
-### <i class="fa fa-pixelfed faicon" aria-hidden="true"></i> Pixelfed -  [pic.snug.moe](https://pic.snug.moe)
-* Showcase images! yay
-* Ask for an invite
 ### <i class="fa fa-peertube faicon" aria-hidden="true"></i> Peertube -  [video.snug.moe](https://video.snug.moe)
-* While sign ups may be open uploading videos is disabled by default.
+* Registrations need approval. You should mention your fedi handle in the Reason if you have that.
-To retain storage space only friends will be allowed to upload,
+* If you're a friend you can ask to have your allocated storage increased.
-but the instance is here still.
 
-...and a few chatting services:
 ### <i class="fa fa-xmpp faicon" aria-hidden="true"></i> XMPP
 * You can register from any XMPP client an account of the format \<username\>@snug.moe
 * Or use the [web registration form](https://snug.moe/xmpp/). You can change the password or delete your account from here too.
+* It supports Conversations Unified Push! Push server is `up.snug.moe`
 
 ### <i class="fa fa-matrix-org faicon" aria-hidden="true"></i> Matrix
-* Sign ups are closed, but more or less because dealing with Matrix bot accounts is not easy and also manually vetting accounts for this is more desireable. So feel free to ask for an account.
+* It is invite only.
 * Web clients hosted by snug.moe: [Element](https://element.snug.moe) - [Schildichat](https://schildi.snug.moe) - [Cinny](https://cinny.snug.moe)
 
 ### <i class="fa fa-microphone faicon" aria-hidden="true"></i> Mumble

content/pages/blocked-instances/_index.md

@@ -10,7 +10,13 @@ yay
 The main goal of blocking is keeping snug.moe a pleasant comfortable place. When another instance disturbs that it may be defederated.
 
 Instances are being defederated for reasons like
-harassment, spamming, posting illegal content or generally their terms/rules go against ours;
+harassment, spamming, posting illegal content or generally their terms/rules go against ours.
-but usually not for only being dumb, like having dumb opinions, unless those opinions are lead to being harmful.
 
-**The list is not public anymore because why keep it, but still blocked instances are visible to logged in users (More > Federation).**
+But to give an idea, the conditions for defederation are a bit more lax than the guidelines applied for local moderation.
+If an instance is being dumb but not really harmful or annoying it _may_ possibly stay.
+
+Every subdomain of a domain listed here is inherently blocked too.
+
+Also no hard feelings, thx.
+
+``` {{% include "/pages/blocked-instances/list" %}} ```

content/pages/emoji-credits/_index.md

@@ -15,6 +15,10 @@ weight: 20
 [BunHD](https://volpeon.ink/projects/emojis/bunhd/) by
 [Volpeon](https://snug.moe/@volpeon@mk.vulpes.one)
 
+<img src="https://snug.moe/files/e7cf329c-649d-4bb6-913c-c9ae821d5400" width="32">
+
+[Mutant Standard](https://mutant.tech/)'s pride flags
+
 <img src="https://snug.moe/files/webpublic-5a1762b5-46da-40c9-844c-1f508b81cc99" width="32">
 
 [Blobhaj](https://heatherhorns.com/emoji/) by

content/pages/rules/_index.md

@@ -7,8 +7,8 @@ Ah, yes, rulz. Or you can call them terms of service. You won't be served the se
 
 1. Be excellent to each other. Have some common sense and basic empathy...
 
-    So obviously no harassment or discrimination; which implies don't do sexism, homophobia, transphobia or xenophobia etc.
+    So obviously no harassment or discrimination; which implies don't do sexism, homophobia, transphobia, racism xenophobia etc.
-    and not only because the rules say it.
+    and not only because the rules say it. We all human...
 
 2. Make use of the NSFW toggle and CW (Content Warning) when needed.
 NSFW content is allowed but as long as it's marked as such.
@@ -19,10 +19,7 @@ NSFW content is allowed but as long as it's marked as such.
 
 5. Don't post anything that would be illegal under Romanian or Finnish law.
 
-6. Accounts used in mainly another language other than English are not allowed for various reasons. 
+6. Don't bulli.
-
-    But to make it clear posting in other languages by itself is fine, don't refrain from that.
-    As long as the whole account is not entirely centered around another language, being disconnected from the rest of the instance.
 
 7. No channers.
 

layouts/shortcodes/include.html

@@ -0,0 +1,2 @@
+{{$file := .Get 0}}
+{{ $file | readFile | markdownify }}