Compare commits

..

2 commits

Author SHA1 Message Date
Ash Vollmer
bb745c9595 adjusted for changes in model 2026-08-05 21:16:36 +02:00
Ash Vollmer
c2c83ff66f refactored into impl and added get validity function 2026-08-05 21:16:16 +02:00
2 changed files with 83 additions and 39 deletions

View file

@ -6,27 +6,25 @@ use dotenv::dotenv;
use models::Notice;
use serenity::{
all::{
Colour, Context, CreateAttachment, CreateEmbed, CreateEmbedFooter, CreateMessage,
EventHandler, GatewayIntents, Message, Ready, Timestamp,
Colour, Context, CreateEmbed, CreateEmbedFooter, CreateMessage, EventHandler,
GatewayIntents, Message, Ready, Timestamp,
},
async_trait, Client,
};
use crate::models::get_line_color;
struct Handler;
#[async_trait]
impl EventHandler for Handler {
async fn message(&self, ctx: Context, msg: Message) {
let new = Notice {
let mut new = Notice {
affected_lines: vec!(String::from("10")),
dest_1: String::from("Hannover/Wettbergen"),
dest_2: String::from("Hannover/Misburg"),
headline: String::from("Linie 7 fährt erst bzw. bis Haltestelle In den Sieben Stücken"),
detail: String::from("Die Stadtbahnlinie 7 fährt während der Baumaßnahme erst ab beziehungsweise bis zur Haltestelle In den Sieben Stücken. Dort besteht die Umsteigemöglichkeit vom bzw. in den Schienenersatzverkehr (SEV) und die Stadtbahnlinien 3 und 13. An der Haltestelle Buchholz/Betriebshof ist kein Zustieg bzw. Ausstieg möglich."),
from: 12,
to: 30,
from: None,
to: None,
last_modified: String::from("2026-07-24T13:37:00Z"),
};
if msg.content == "!hello" {
@ -42,24 +40,37 @@ impl EventHandler for Handler {
));
let timestamp: Timestamp = new.last_modified.parse().expect("Invalid timestamp!");
let color =
get_line_color(new.affected_lines.first().expect("No single line affected"));
let embed = CreateEmbed::new()
let color = new.get_line_color();
new.get_validity_period();
let embed = if new.from.is_none() || new.to.is_none() {
CreateEmbed::new()
.title(new.headline)
.description(new.detail)
.color(Colour::from_rgb(color.0, color.1, color.2))
.timestamp(timestamp)
.field(
"Fahrtrichtungen",
format!("{} & {}", &new.dest_1, &new.dest_2),
false,
)
.footer(footer)
} else {
CreateEmbed::new()
.title(new.headline)
.description(new.detail)
.color(Colour::from_rgb(color.0, color.1, color.2))
.timestamp(timestamp)
.fields(vec![
("Start", new.from.to_string(), true),
("Ende", new.to.to_string(), true),
("Start", new.from.unwrap().to_string(), true),
("Ende", new.to.unwrap().to_string(), true),
])
.field(
"Fahrtrichtungen",
format!("{} & {}", new.dest_1, new.dest_2),
false,
)
.footer(footer);
.footer(footer)
};
// let embed = CreateEmbed::new()
// .title("This is a title")

View file

@ -1,16 +1,25 @@
use chrono::NaiveDateTime;
use regex::Regex;
pub struct Notice {
pub affected_lines: Vec<String>,
pub dest_1: String,
pub dest_2: String,
pub headline: String,
pub detail: String,
pub from: u32,
pub to: u32,
pub from: Option<NaiveDateTime>,
pub to: Option<NaiveDateTime>,
pub last_modified: String,
}
pub fn get_line_color(line_number: &str) -> (u8, u8, u8) {
match line_number {
impl Notice {
pub fn get_line_color(&self) -> (u8, u8, u8) {
match self
.affected_lines
.first()
.expect("Does not affect any line")
.as_str()
{
// Rot: Linien 1, 2, 8
"1" | "2" | "8" => (238, 66, 36),
@ -27,3 +36,27 @@ pub fn get_line_color(line_number: &str) -> (u8, u8, u8) {
_ => (55, 101, 174),
}
}
pub fn get_validity_period(&mut self) {
let re = Regex::new(
r"Gültig ab (\d{2}\.\d{2}\.\d{4} \d{2}:\d{2}) bis (\d{2}\.\d{2}\.\d{4} \d{2}:\d{2})",
)
.unwrap();
if let Some(caps) = re.captures(&self.detail) {
let valid_from = caps.get(1).unwrap().as_str();
let valid_to = caps.get(1).unwrap().as_str();
let format = "%d.%m.%Y %H:%M";
if let (Ok(start_dt), Ok(end_dt)) = (
NaiveDateTime::parse_from_str(valid_from, format),
NaiveDateTime::parse_from_str(valid_to, format),
) {
self.from = Some(start_dt);
self.to = Some(end_dt);
}
} else {
println!("No validity period found in the text.");
}
}
}