mirror/mCaptcha
1
0
Fork 1
mirror of https://github.com/mCaptcha/mCaptcha.git synced 2026-02-11 18:15:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump sqlx to 0.7

Browse Source
This commit is contained in:
Aravinth Manivannan
2023-10-16 21:11:04 +05:30
parent 0d2c02348b
commit 0e75a22beb
105 changed files with 2455 additions and 1183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/v1/pow/verify_pow.rs
View File

@@ -141,7 +141,7 @@ pub mod tests {
assert_eq!(get_config_resp.status(), StatusCode::OK);
let config: PoWConfig = test::read_body_json(get_config_resp).await;
let pow = pow_sha256::ConfigBuilder::default()
let pow = mcaptcha_pow_sha256::ConfigBuilder::default()
.salt(config.salt)
.build()
.unwrap();
@@ -204,7 +204,7 @@ pub mod tests {
assert_eq!(get_config_resp.status(), StatusCode::OK);
let config: PoWConfig = test::read_body_json(get_config_resp).await;
let pow = pow_sha256::ConfigBuilder::default()
let pow = mcaptcha_pow_sha256::ConfigBuilder::default()
.salt(config.salt)
.build()
.unwrap();

2
src/api/v1/pow/verify_token.rs
View File

@@ -123,7 +123,7 @@ pub mod tests {
assert_eq!(get_config_resp.status(), StatusCode::OK);
let config: PoWConfig = test::read_body_json(get_config_resp).await;
let pow = pow_sha256::ConfigBuilder::default()
let pow = mcaptcha_pow_sha256::ConfigBuilder::default()
.salt(config.salt)
.build()
.unwrap();

22
src/date.rs
View File

@@ -33,7 +33,7 @@ impl Date {
let difference = now - timestamp;
if difference >= 3 * WEEK {
date.format("%d-%m-%y")
format!("{}{}{}", date.year(), date.month(), date.date())
} else if (DAY..(3 * WEEK)).contains(&difference) {
format!("{} days ago", date.hour())
} else if (HOUR..DAY).contains(&difference) {
@@ -52,12 +52,12 @@ impl Date {
/// print date
pub fn date(&self) -> String {
self.time.format("%F %r %z")
format!("{}{}{}", self.time.year(), self.time.month(), self.time.date())
}
pub fn new(unix: i64) -> Self {
Self {
time: OffsetDateTime::from_unix_timestamp(unix),
time: OffsetDateTime::from_unix_timestamp(unix).unwrap(),
}
}
}
@@ -77,28 +77,28 @@ mod tests {
// seconds test
assert!(n.print_date().contains("seconds ago"));
n.time = OffsetDateTime::from_unix_timestamp(timestamp - 5);
n.time = OffsetDateTime::from_unix_timestamp(timestamp - 5).unwrap();
assert!(n.print_date().contains("seconds ago"));
// minutes test
n.time = OffsetDateTime::from_unix_timestamp(timestamp - MINUTE * 2);
n.time = OffsetDateTime::from_unix_timestamp(timestamp - MINUTE * 2).unwrap();
assert!(n.print_date().contains("minutes ago"));
n.time = OffsetDateTime::from_unix_timestamp(timestamp - MINUTE * 56);
n.time = OffsetDateTime::from_unix_timestamp(timestamp - MINUTE * 56).unwrap();
assert!(n.print_date().contains("minutes ago"));
// hours test
n.time = OffsetDateTime::from_unix_timestamp(timestamp - HOUR);
n.time = OffsetDateTime::from_unix_timestamp(timestamp - HOUR).unwrap();
assert!(n.print_date().contains("hours ago"));
n.time = OffsetDateTime::from_unix_timestamp(timestamp - HOUR * 23);
n.time = OffsetDateTime::from_unix_timestamp(timestamp - HOUR * 23).unwrap();
assert!(n.print_date().contains("hours ago"));
// days test
n.time = OffsetDateTime::from_unix_timestamp(timestamp - 2 * WEEK);
n.time = OffsetDateTime::from_unix_timestamp(timestamp - 2 * WEEK).unwrap();
assert!(n.print_date().contains("days ago"));
// date test
n.time = OffsetDateTime::from_unix_timestamp(timestamp - 6 * WEEK);
let date = n.time.format("%d-%m-%y");
n.time = OffsetDateTime::from_unix_timestamp(timestamp - 6 * WEEK).unwrap();
let date = format!("{}{}{}", n.time.year(), n.time.month(), n.time.date());
assert!(n.print_date().contains(&date))
}
}

18
src/pages/panel/notifications.rs
View File

@@ -38,7 +38,7 @@ impl From<db_core::Notification> for Notification {
Notification {
name: n.name.unwrap(),
heading: n.heading.unwrap(),
received: OffsetDateTime::from_unix_timestamp(n.received.unwrap()),
received: OffsetDateTime::from_unix_timestamp(n.received.unwrap()).unwrap(),
id: n.id.unwrap(),
message: n.message.unwrap(),
}
@@ -91,28 +91,28 @@ mod tests {
// seconds test
assert!(n.print_date().contains("seconds ago"));
n.received = OffsetDateTime::from_unix_timestamp(timestamp - 5);
n.received = OffsetDateTime::from_unix_timestamp(timestamp - 5).unwrap();
assert!(n.print_date().contains("seconds ago"));
// minutes test
n.received = OffsetDateTime::from_unix_timestamp(timestamp - MINUTE * 2);
n.received = OffsetDateTime::from_unix_timestamp(timestamp - MINUTE * 2).unwrap();
assert!(n.print_date().contains("minutes ago"));
n.received = OffsetDateTime::from_unix_timestamp(timestamp - MINUTE * 56);
n.received = OffsetDateTime::from_unix_timestamp(timestamp - MINUTE * 56).unwrap();
assert!(n.print_date().contains("minutes ago"));
// hours test
n.received = OffsetDateTime::from_unix_timestamp(timestamp - HOUR);
n.received = OffsetDateTime::from_unix_timestamp(timestamp - HOUR).unwrap();
assert!(n.print_date().contains("hours ago"));
n.received = OffsetDateTime::from_unix_timestamp(timestamp - HOUR * 23);
n.received = OffsetDateTime::from_unix_timestamp(timestamp - HOUR * 23).unwrap();
assert!(n.print_date().contains("hours ago"));
// days test
n.received = OffsetDateTime::from_unix_timestamp(timestamp - 2 * WEEK);
n.received = OffsetDateTime::from_unix_timestamp(timestamp - 2 * WEEK).unwrap();
assert!(n.print_date().contains("days ago"));
// date test
n.received = OffsetDateTime::from_unix_timestamp(timestamp - 6 * WEEK);
let date = n.received.format("%d-%m-%y");
n.received = OffsetDateTime::from_unix_timestamp(timestamp - 6 * WEEK).unwrap();
let date = format!("{}{}{}", n.received.year(), n.received.month(), n.received.date());
assert!(n.print_date().contains(&date))
}
}