Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: weird behaviour of dates in base node banned peers #4037

Merged
merged 3 commits into from
Apr 29, 2022
Merged

fix: weird behaviour of dates in base node banned peers #4037

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0777a6
fix peer time format
mrnaveira Apr 13, 2022
7fe5498
improve local datetime format
mrnaveira Apr 14, 2022
61bac16
Merge branch 'development' into fix-banned-peer-time
aviator-app[bot] Apr 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions comms/core/src/peer_manager/peer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ use crate::{
peer_manager::identity_signature::IdentitySignature,
protocol::ProtocolId,
types::CommsPublicKey,
utils::datetime::safe_future_datetime_from_duration,
utils::datetime::{format_local_datetime, is_max_datetime, safe_future_datetime_from_duration},
};

bitflags! {
Expand Down Expand Up @@ -336,11 +336,15 @@ impl Display for Peer {
let status_str = {
let mut s = Vec::new();
if let Some(offline_at) = self.offline_at.as_ref() {
s.push(format!("Offline since: {}", offline_at));
s.push(format!("Offline since: {}", format_local_datetime(offline_at)));
}

if let Some(dt) = self.banned_until() {
s.push(format!("Banned until: {}", dt));
if is_max_datetime(dt) {
s.push("Banned permanently".to_string());
} else {
s.push(format!("Banned until: {}", format_local_datetime(dt)));
}
s.push(format!("Reason: {}", self.banned_reason))
}
s.join(". ")
Expand Down
19 changes: 13 additions & 6 deletions comms/core/src/utils/datetime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,13 @@

use std::time::Duration;

use chrono::{DateTime, NaiveTime, Utc};
use chrono::{DateTime, Local, NaiveDateTime, Utc};

pub fn safe_future_datetime_from_duration(duration: Duration) -> DateTime<Utc> {
let old_duration = chrono::Duration::from_std(duration).unwrap_or_else(|_| chrono::Duration::max_value());
Utc::now().checked_add_signed(old_duration).unwrap_or_else(|| {
chrono::MAX_DATE
.and_time(NaiveTime::from_hms(0, 0, 0))
.expect("cannot fail")
})
Utc::now()
.checked_add_signed(old_duration)
.unwrap_or(chrono::MAX_DATETIME)
}

pub fn format_duration(duration: Duration) -> String {
Expand All @@ -48,6 +46,15 @@ pub fn format_duration(duration: Duration) -> String {
}
}

pub fn format_local_datetime(datetime: &NaiveDateTime) -> String {
let local_datetime = DateTime::<Local>::from_utc(*datetime, Local::now().offset().to_owned());
local_datetime.format("%Y-%m-%d %H:%M:%S").to_string()
}

pub fn is_max_datetime(datetime: &NaiveDateTime) -> bool {
chrono::MAX_DATETIME.naive_utc() == *datetime
}

#[cfg(test)]
mod test {
use super::*;
Expand Down