diff --git a/src/main.rs b/src/main.rs
index 3384941..3e1e463 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -68,9 +68,9 @@ fn abuse() -> Template {
fn post() -> Template {
Template::render("post", context! {})
}
-#[get("/members")]
-fn members() -> Template {
- Template::render("members", context! {})
+#[get("/people")]
+fn people() -> Template {
+ Template::render("people", context! {})
}
#[get("/")]
@@ -116,7 +116,7 @@ fn rocket() -> _ {
build()
.mount(
"/",
- routes![index, guests, post_msg, members, post, services, abuse],
+ routes![index, guests, post_msg, people, post, services, abuse],
)
.mount("/assets", FileServer::from(ASSETS_DIR))
.attach(Template::fairing())
diff --git a/templates/abuse.html.tera b/templates/abuse.html.tera
index bef5c49..bcd5b71 100644
--- a/templates/abuse.html.tera
+++ b/templates/abuse.html.tera
@@ -13,7 +13,7 @@ Please make sure your e-mail contains the following:
Please consider the following when sending an abuse e-mail.
- We are *not* able to provide any personal identifiable information, as we do not store them.
- - We take abuse notifications very serious. Sending us multiple false abuse reports will result in a permanent block from our mailserver.
+ - We take abuse notifications very serious. Sending us multiple false abuse reports will result in being blacklisted from any further communication with us.
- We try to respond within 48 hours. Do not flood our inboxes.
- Please be respectful at all times.
diff --git a/templates/base.html.tera b/templates/base.html.tera
index 0104aeb..5eda2f8 100644
--- a/templates/base.html.tera
+++ b/templates/base.html.tera
@@ -16,7 +16,7 @@
home
services
guestbook
- members
+ people
report abuse
{% block content %}{% endblock content %}
diff --git a/templates/macros.html.tera b/templates/macros.html.tera
index 6655393..913d1a5 100644
--- a/templates/macros.html.tera
+++ b/templates/macros.html.tera
@@ -1,8 +1,11 @@
-{% macro service(title, description, href, img, h="16") %}
+{% macro service(title, description, href, img, h="16", available=true) %}
{{title}}
+ {% if not available %}
+ unavailable
+ {% endif %}
{{description}}
diff --git a/templates/members.html.tera b/templates/people.html.tera
similarity index 63%
rename from templates/members.html.tera
rename to templates/people.html.tera
index 9d0e056..853bd60 100644
--- a/templates/members.html.tera
+++ b/templates/people.html.tera
@@ -2,11 +2,10 @@
{% extends "base" %}
{% block title %}members{% endblock title %}
{% block content %}
-These are currently members of iwakura.rip, participating in some form.
+These people are in some way related to iwakura.rip and have an account on here :3
{{macros::user_display(username="hex", role=2)}}
{{macros::user_display(username="andre", role=1)}}
{{macros::user_display(username="grng", role=1)}}
-If communicating with any of our members, please encrypt your message against their pgp key, if they have one.
{% endblock content %}
diff --git a/templates/services.html.tera b/templates/services.html.tera
index 0a5f476..e479d91 100644
--- a/templates/services.html.tera
+++ b/templates/services.html.tera
@@ -4,10 +4,10 @@
{% block content %}
{{macros::service(title="Forgejo", description="A place for everyone to host their source code!", href="https://git.iwakura.rip", img="https://www.marefa.org/w/images/thumb/0/05/Forgejo_logo.svg/640px-Forgejo_logo.svg.png")}}
- {{macros::service(title="Jellyfin", description="For all your media consumption needs.", href="https://media.iwakura.rip", img="/assets/img/jellyfin.png")}}
+ {{macros::service(title="Jellyfin", description="For all your media consumption needs.", href="https://media.iwakura.rip", img="/assets/img/jellyfin.png", available=false)}}
{{macros::service(title="Woodpecker CI", description="Powerful CI/CD to use together with Forgejo.", href="https://ci.iwakura.rip", img="/assets/img/woodpecker.svg")}}
- {{macros::service(title="Jellyseerr", description="Get information about your favorite movies and TV shows, all together in one place.", href="https://request.iwakura.rip", img="/assets/img/jellyseerr.ico")}}
- {{macros::service(title="DN42", description="We are currently in the process of connecting all of our services to DN42 - an overlay network using internet technologies.", href="https://iwakura.dn42", img="/assets/img/dn42.png")}}
+ {{macros::service(title="Jellyseerr", description="Get information about your favorite movies and TV shows, all together in one place.", href="https://request.iwakura.rip", img="/assets/img/jellyseerr.ico", available=false)}}
+ {{macros::service(title="DN42", description="We are currently in the process of connecting all of our services to DN42 - an overlay network using internet technologies.", href="https://iwakura.dn42", img="/assets/img/dn42.png", available=false)}}
{{macros::service(title="Authelia", description="Open-source authentication & authorization platform.", href="https://a.iwakura.rip", img="/assets/img/authelia.png")}}
{{macros::service(title="E-mail", description="We are hosting our own e-mail servers on an off-shore hosting provider. Note: all emails are currently being stored in plain text. We recommend using PGP encryption.", href="https://mail.iwakura.rip", img="/assets/img/mail.png")}}
{{macros::service(title="Blog", description="Our blog where we post some stuff, sometimes :)", href="https://blog.iwakura.rip", img="")}}