Merge pull request 'allow vorstand to send mail + notifications' (#603 ) from allow-vorstand-to-send-things into main

Reviewed-on: #603
allow vorstand to send mail + notifications
2024-06-21 11:25:27 +02:00 · 2024-06-21 11:24:14 +02:00 · 2024-06-21 11:15:37 +02:00 · 2024-06-21 11:14:48 +02:00 · 2024-06-19 13:44:08 +02:00 · 2024-06-19 13:43:04 +02:00
5 changed files with 59 additions and 69 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -221,9 +221,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"

 [[package]]
 name = "backtrace"
-version = "0.3.72"
+version = "0.3.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"
+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
 dependencies = [
 "addr2line",
 "cc",
@ -309,9 +309,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"

 [[package]]
 name = "bytemuck"
-version = "1.16.0"
+version = "1.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"
+checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"

 [[package]]
 name = "byteorder"
@ -327,9 +327,9 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"

 [[package]]
 name = "cc"
-version = "1.0.98"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
+checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"

 [[package]]
 name = "cfg-if"
@ -992,8 +992,8 @@ dependencies = [
 "aho-corasick",
 "bstr",
 "log",
- "regex-automata 0.4.6",
- "regex-syntax 0.8.3",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
 ]

 [[package]]
@ -1139,9 +1139,9 @@ dependencies = [

 [[package]]
 name = "httparse"
-version = "1.8.0"
+version = "1.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"

 [[package]]
 name = "httpdate"
@ -1237,7 +1237,7 @@ dependencies = [
 "globset",
 "log",
 "memchr",
- "regex-automata 0.4.6",
+ "regex-automata 0.4.7",
 "same-file",
 "walkdir",
 "winapi-util",
@ -1306,15 +1306,6 @@ version = "1.70.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"

-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.13.0"
@ -1485,9 +1476,9 @@ dependencies = [

 [[package]]
 name = "memchr"
-version = "2.7.2"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"

 [[package]]
 name = "mime"
@ -1503,9 +1494,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"

 [[package]]
 name = "miniz_oxide"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 dependencies = [
 "adler",
 ]
@ -1671,9 +1662,9 @@ dependencies = [

 [[package]]
 name = "object"
-version = "0.35.0"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"
+checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
 dependencies = [
 "memchr",
 ]
@ -1768,7 +1759,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
 "cfg-if",
 "libc",
- "redox_syscall 0.5.1",
+ "redox_syscall 0.5.2",
 "smallvec",
 "windows-targets 0.52.5",
 ]
@ -2076,9 +2067,9 @@ dependencies = [

 [[package]]
 name = "redox_syscall"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
 dependencies = [
 "bitflags 2.5.0",
 ]
@ -2105,14 +2096,14 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
 "aho-corasick",
 "memchr",
- "regex-automata 0.4.6",
- "regex-syntax 0.8.3",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
 ]

 [[package]]
@ -2126,13 +2117,13 @@ dependencies = [

 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
 "aho-corasick",
 "memchr",
- "regex-syntax 0.8.3",
+ "regex-syntax 0.8.4",
 ]

 [[package]]
@ -2143,9 +2134,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"

 [[package]]
 name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"

 [[package]]
 name = "ring"
@ -2267,7 +2258,7 @@ dependencies = [
 "env_logger",
 "futures",
 "ics",
- "itertools 0.13.0",
+ "itertools",
 "job_scheduler_ng",
 "lettre",
 "log",
@ -2615,11 +2606,10 @@ dependencies = [

 [[package]]
 name = "sqlformat"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c"
+checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f"
 dependencies = [
- "itertools 0.12.1",
 "nom",
 "unicode_categories",
 ]
@ -3328,14 +3318,14 @@ dependencies = [
 "serde",
 "serde_json",
 "url",
- "webpki-roots 0.26.2",
+ "webpki-roots 0.26.3",
 ]

 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
 dependencies = [
 "form_urlencoded",
 "idna",
@ -3350,9 +3340,9 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"

 [[package]]
 name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"

 [[package]]
 name = "uuid"
@ -3474,9 +3464,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"

 [[package]]
 name = "webpki-roots"
-version = "0.26.2"
+version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c452ad30530b54a4d8e71952716a212b08efd0f3562baa66c29a618b07da7c3"
+checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd"
 dependencies = [
 "rustls-pki-types",
 ]
@ -3691,9 +3681,9 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"

 [[package]]
 name = "winnow"
-version = "0.6.11"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c52728401e1dc672a56e81e593e912aa54c78f40246869f78359a2bf24d29d"
+checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
 dependencies = [
 "memchr",
 ]
--- a/src/model/user.rs
+++ b/src/model/user.rs
@ -273,7 +273,7 @@ ASKÖ Ruderverein Donau Linz", self.name, SCHECKBUCH/100),

 herzlich willkommen im ASKÖ Ruderverein Donau Linz! Wir freuen uns sehr, dich als neues Mitglied in unserem Verein begrüßen zu dürfen. 

-Um dir den Einstieg zu erleichtern, findest du in unserem Handbuch alle wichtigen Informationen über unseren Verein: https://rudernlinz.at/book. Bei weiteren Fragen stehen dir die Adressen info@rudernlinz.at und it@rudernlinz.at jederzeit zur Verfügung.
+Um dir den Einstieg zu erleichtern, findest du in unserem Handbuch alle wichtigen Informationen über unseren Verein: https://rudernlinz.at/book. Bei weiteren Fragen stehen dir die Adressen info@rudernlinz.at (für allgemeine Fragen) und it@rudernlinz.at (bei technischen Fragen) jederzeit zur Verfügung.

 Du kannst auch gerne unserer Signal-Gruppe beitreten, um auf dem Laufenden zu bleiben und dich mit anderen Mitgliedern auszutauschen: https://signal.group/#CjQKICFrq6zSsRHxrucS3jEcQn6lknEXacAykwwLV3vNLKxPEhA17jxz7cpjfu3JZokLq1TH

@ -281,7 +281,7 @@ Für die Organisation unserer Ausfahrten nutzen wir app.rudernlinz.at. Logge dic

 Beim nächsten Treffen im Verein, erinnere mich (Philipp Hofer) bitte daran, deinen Fingerabdruck zu registrieren, damit du eigenständig Zugang zum Bootshaus erhältst.

-Außerdem haben wir im Bootshaus ein WLAN für Vereinsmitglieder 'ASKÖ Ruderverein Donau Linz'. Das Passwort dafür lautet 'donau1921' (ohne Anführungszeichen). Bitte gib das Passwort an keine vereinsfremden Personen weiter.
+Damit du dich noch mehr verbunden fühlst (:-)), haben wir im Bootshaus ein WLAN für Vereinsmitglieder 'ASKÖ Ruderverein Donau Linz' eingerichtet. Das Passwort dafür lautet 'donau1921' (ohne Anführungszeichen). Bitte gib das Passwort an keine vereinsfremden Personen weiter.

 Wir freuen uns darauf, dich bald am Wasser zu sehen und gemeinsam tolle Erfahrungen zu sammeln!

--- a/src/tera/admin/mail.rs
+++ b/src/tera/admin/mail.rs
@ -9,14 +9,14 @@ use sqlx::SqlitePool;
 use crate::model::log::Log;
 use crate::model::mail::Mail;
 use crate::model::role::Role;
-use crate::model::user::AdminUser;
 use crate::model::user::UserWithDetails;
+use crate::model::user::{AdminUser, VorstandUser};
 use crate::tera::Config;

 #[get("/mail")]
 async fn index(
    db: &State<SqlitePool>,
-    admin: AdminUser,
+    admin: VorstandUser,
    flash: Option<FlashMessage<'_>>,
 ) -> Template {
    let mut context = Context::new();
@ -27,7 +27,7 @@ async fn index(

    context.insert(
        "loggedin_user",
-        &UserWithDetails::from_user(admin.user, db).await,
+        &UserWithDetails::from_user(admin.0, db).await,
    );
    context.insert("roles", &roles);

@ -65,7 +65,7 @@ async fn update(
    db: &State<SqlitePool>,
    data: Form<MailToSend<'_>>,
    config: &State<Config>,
-    admin: AdminUser,
+    admin: VorstandUser,
 ) -> Flash<Redirect> {
    let d = data.into_inner();
    Log::create(db, format!("{admin:?} trying to send this mail: {d:?}")).await;
--- a/src/tera/admin/notification.rs
+++ b/src/tera/admin/notification.rs
@ -2,7 +2,7 @@ use crate::model::{
    log::Log,
    notification::Notification,
    role::Role,
-    user::{AdminUser, User, UserWithDetails},
+    user::{User, UserWithDetails, VorstandUser},
 };
 use itertools::Itertools;
 use rocket::{
@ -18,7 +18,7 @@ use sqlx::SqlitePool;
 #[get("/notification")]
 async fn index(
    db: &State<SqlitePool>,
-    user: AdminUser,
+    user: VorstandUser,
    flash: Option<FlashMessage<'_>>,
 ) -> Template {
    let mut context = Context::new();
@ -27,7 +27,7 @@ async fn index(
    }
    context.insert(
        "loggedin_user",
-        &UserWithDetails::from_user(user.user, db).await,
+        &UserWithDetails::from_user(user.0, db).await,
    );

    let users: Vec<User> = User::all(db)
@ -62,7 +62,7 @@ pub struct NotificationToSendUser {
 async fn send_group(
    db: &State<SqlitePool>,
    data: Form<NotificationToSendGroup>,
-    admin: AdminUser,
+    admin: VorstandUser,
 ) -> Flash<Redirect> {
    let d = data.into_inner();
    Log::create(
@ -89,7 +89,7 @@ async fn send_group(
 async fn send_user(
    db: &State<SqlitePool>,
    data: Form<NotificationToSendUser>,
-    admin: AdminUser,
+    admin: VorstandUser,
 ) -> Flash<Redirect> {
    let d = data.into_inner();
    Log::create(
--- a/templates/index.html.tera
+++ b/templates/index.html.tera
@ -155,6 +155,13 @@
                            <a href="/board/boathouse"
                               class="block w-100 py-2 hover:text-primary-600">Bootshaus</a>
                        </li>
+                        <li class="py-1">
+                            <a href="/admin/mail" class="block w-100 py-2 hover:text-primary-600">Mail ausschicken</a>
+                        </li>
+                        <li class="py-1">
+                            <a href="/admin/notification"
+                               class="block w-100 py-2 hover:text-primary-600">Nachricht ausschreiben</a>
+                        </li>
                    </ul>
                </div>
            {% endif %}
@ -169,19 +176,12 @@
                        <li class="py-1">
                            <a href="/admin/user" class="block w-100 py-2 hover:text-primary-600">User</a>
                        </li>
-                        <li class="py-1">
-                            <a href="/admin/mail" class="block w-100 py-2 hover:text-primary-600">Mail</a>
-                        </li>
                        <li class="py-1">
                            <a href="/admin/rss" class="block w-100 py-2 hover:text-primary-600">Logs</a>
                        </li>
                        <li class="py-1">
                            <a href="/admin/list" class="block w-100 py-2 hover:text-primary-600">Fingerabdruck-Liste überprüfen</a>
                        </li>
-                        <li class="py-1">
-                            <a href="/admin/notification"
-                               class="block w-100 py-2 hover:text-primary-600">Nachricht ausschreiben</a>
-                        </li>
                    </ul>
                </div>
            {% endif %}
Author	SHA1	Message	Date
philipp	79f8efc34b	Merge pull request 'allow vorstand to send mail + notifications' (#603 ) from allow-vorstand-to-send-things into main All checks were successful CI/CD Pipeline / test (push) Successful in 10m5s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Successful in 6m27s Details Reviewed-on: #603	2024-06-21 11:25:27 +02:00
philipp	3e983e05f9	allow vorstand to send mail + notifications Some checks failed CI/CD Pipeline / deploy-staging (push) Has been cancelled Details CI/CD Pipeline / deploy-main (push) Has been cancelled Details CI/CD Pipeline / test (push) Has been cancelled Details	2024-06-21 11:24:14 +02:00
philipp	8f91cc4e88	Merge pull request 'allow vorstand to send mail + notifications' (#601 ) from allow-vorstand-to-send-things into main Some checks failed CI/CD Pipeline / test (push) Failing after 1m36s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #601	2024-06-21 11:15:37 +02:00
philipp	76290a64ae	allow vorstand to send mail + notifications Some checks failed CI/CD Pipeline / test (push) Failing after 1m50s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Has been skipped Details	2024-06-21 11:14:48 +02:00
philipp	4b48fbaa82	Merge pull request 'update deps' (#599 ) from update-deps into main All checks were successful CI/CD Pipeline / test (push) Successful in 9m39s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Successful in 18m11s Details Reviewed-on: #599	2024-06-19 13:44:08 +02:00
philipp	def8affb5f	update deps Some checks failed CI/CD Pipeline / deploy-staging (push) Has been cancelled Details CI/CD Pipeline / deploy-main (push) Has been cancelled Details CI/CD Pipeline / test (push) Has been cancelled Details	2024-06-19 13:43:04 +02:00
philipp	dfa7be9928	Merge pull request 'fix migration' (#597 ) from fix-migration into main All checks were successful CI/CD Pipeline / test (push) Successful in 9m13s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Successful in 6m26s Details Reviewed-on: #597	2024-06-16 20:15:58 +02:00
philipp	1c04462c30	Merge pull request 'add more life to the mails :-)' (#595 ) from more-sympatic-welcome-mail into main All checks were successful CI/CD Pipeline / test (push) Successful in 10m11s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Successful in 6m40s Details Reviewed-on: #595	2024-06-15 18:28:24 +02:00
philipp	b2393eb6ec	mb is too serious Some checks failed CI/CD Pipeline / deploy-staging (push) Has been cancelled Details CI/CD Pipeline / deploy-main (push) Has been cancelled Details CI/CD Pipeline / test (push) Has been cancelled Details	2024-06-15 18:27:09 +02:00
philipp	a5e82851ba	fix missing word All checks were successful CI/CD Pipeline / test (push) Successful in 9m41s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Has been skipped Details	2024-06-10 22:23:26 +02:00
philipp	80725e223b	add more life to the mails :-) Some checks are pending CI/CD Pipeline / test (push) Waiting to run Details CI/CD Pipeline / deploy-staging (push) Blocked by required conditions Details CI/CD Pipeline / deploy-main (push) Blocked by required conditions Details	2024-06-10 22:17:41 +02:00