mirror of
https://github.com/FliegendeWurst/telegram_notes_bot.git
synced 2024-09-07 21:21:22 +00:00
Add weekday to /next response
This commit is contained in:
parent
d0d19fbd72
commit
fc0992c4c8
@ -78,7 +78,7 @@ pub fn error<S: Into<String>>(msg: S) -> Error {
|
||||
}
|
||||
|
||||
pub async fn send_message<S: Into<String>>(msg: S) -> Result<(), Error> {
|
||||
API.send(SendMessage::new(*OWNER, msg.into())).await?;
|
||||
API.send(SendMessage::new(*OWNER, msg.into()).parse_mode(ParseMode::MarkdownV2)).await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
19
src/main.rs
19
src/main.rs
@ -69,7 +69,7 @@ async fn process_one(update: Update, context: &mut Context) -> Result<(), Error>
|
||||
let now = Local::now();
|
||||
println!("[{}-{:02}-{:02} {:02}:{:02}] Receiving msg {:?}", now.year(), now.month(), now.day(), now.hour(), now.minute(), message);
|
||||
if message.from.id != *OWNER {
|
||||
// don't handle message
|
||||
println!("ignoring, not sent by authorized user");
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
@ -239,22 +239,35 @@ async fn command_next() -> Result<(), Error> {
|
||||
all.sort_by_key(|x| x.time());
|
||||
let mut printed = 0;
|
||||
let now = Local::now();
|
||||
let mut buf = String::new();
|
||||
let mut buf = "```\n".to_owned();
|
||||
for x in all {
|
||||
let time = x.time();
|
||||
if time < now {
|
||||
continue;
|
||||
}
|
||||
buf += &format!("{} {}\n", time.format("%Y-%m-%d %H:%M").to_string(), x.description());
|
||||
buf += &format!("{} {} {}\n", weekday_to_name(time.weekday()), time.format("%Y-%m-%d %H:%M").to_string(), x.description());
|
||||
printed += 1;
|
||||
if printed >= 10 {
|
||||
break;
|
||||
}
|
||||
}
|
||||
buf += "```\n";
|
||||
send_message(buf).await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn weekday_to_name(wd: Weekday) -> &'static str {
|
||||
match wd {
|
||||
Weekday::Mon => "Mo",
|
||||
Weekday::Tue => "Di",
|
||||
Weekday::Wed => "Mi",
|
||||
Weekday::Thu => "Do",
|
||||
Weekday::Fri => "Fr",
|
||||
Weekday::Sat => "Sa",
|
||||
Weekday::Sun => "So",
|
||||
}
|
||||
}
|
||||
|
||||
enum EventOrTask {
|
||||
Event(UsefulEvent),
|
||||
Task(UsefulTask)
|
||||
|
Loading…
Reference in New Issue
Block a user