From acbdc9b1a204b06ae8ca31dea66d7545324c0353 Mon Sep 17 00:00:00 2001 From: Milad Nekofar <milad@nekofar.com> Date: Mon, 20 Nov 2023 10:20:14 +0330 Subject: [PATCH 1/2] revert: update date format to use Utc timestamp across discord handlers This reverts commit 3bab60f2c52ddbb282079e409b9effee894d3a36. --- src/lil_nouns/handler/discord.rs | 6 +++--- src/meta_gov/handler/discord.rs | 6 +++--- src/prop_house/handler/discord.rs | 8 ++++---- src/prop_lot/handler/discord.rs | 8 ++++---- src/second_market/handler/discord.rs | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/lil_nouns/handler/discord.rs b/src/lil_nouns/handler/discord.rs index 624f1e5..563d44b 100644 --- a/src/lil_nouns/handler/discord.rs +++ b/src/lil_nouns/handler/discord.rs @@ -1,5 +1,5 @@ use async_trait::async_trait; -use chrono::Utc; +use chrono::Local; use header::CONTENT_TYPE; use log::{error, info}; use reqwest::{header, Client}; @@ -68,7 +68,7 @@ impl Handler for DiscordHandler { info!("Handling new proposal: {}", proposal.title); let url = format!("{}/{}", self.base_url, proposal.id); - let date = format!("<t:{}:R>", Utc::now().timestamp()); + let date = Local::now().format("%m/%d/%Y %I:%M %p").to_string(); let wallet = get_domain_name(&proposal.proposer) .await .unwrap_or(get_short_address(&proposal.proposer)); @@ -111,7 +111,7 @@ impl Handler for DiscordHandler { .clone(); let url = format!("{}/{}", self.base_url, proposal.id); - let date = format!("<t:{}:R>", Utc::now().timestamp()); + let date = Local::now().format("%m/%d/%Y %I:%M %p").to_string(); let wallet = get_domain_name(&vote.voter) .await .unwrap_or(get_short_address(&vote.voter)); diff --git a/src/meta_gov/handler/discord.rs b/src/meta_gov/handler/discord.rs index 5d8fed0..329b94d 100644 --- a/src/meta_gov/handler/discord.rs +++ b/src/meta_gov/handler/discord.rs @@ -1,5 +1,5 @@ use async_trait::async_trait; -use chrono::Utc; +use chrono::Local; use log::{error, info}; use regex::Regex; use reqwest::{header, Client}; @@ -90,7 +90,7 @@ impl Handler for DiscordHandler { info!("Handling new proposal: {}", proposal_title); let url = format!("{}/{}", self.base_url, proposal_id); - let date = format!("<t:{}:R>", Utc::now().timestamp()); + let date = Local::now().format("%m/%d/%Y %I:%M %p").to_string(); let description = format!( "A new Meta Gov proposal has been created: “{}”", proposal_title @@ -134,7 +134,7 @@ impl Handler for DiscordHandler { info!("Handling new proposal: {}", proposal_title); let url = format!("{}/{}", self.base_url, proposal_id); - let date = format!("<t:{}:R>", Utc::now().timestamp()); + let date = Local::now().format("%m/%d/%Y %I:%M %p").to_string(); let wallet = get_domain_name(&vote.voter) .await .unwrap_or(get_short_address(&vote.voter)); diff --git a/src/prop_house/handler/discord.rs b/src/prop_house/handler/discord.rs index b88244d..b60fb32 100644 --- a/src/prop_house/handler/discord.rs +++ b/src/prop_house/handler/discord.rs @@ -1,5 +1,5 @@ use async_trait::async_trait; -use chrono::Utc; +use chrono::Local; use log::{error, info}; use reqwest::{header, Client}; use serde_json::{json, Value}; @@ -71,7 +71,7 @@ impl Handler for DiscordHandler { self.base_url, auction.title.replace(' ', "-").to_lowercase() ); - let date = format!("<t:{}:R>", Utc::now().timestamp()); + let date = Local::now().format("%m/%d/%Y %I:%M %p").to_string(); let description = format!( "A new Prop House round has been created: “{}”", auction.title @@ -111,7 +111,7 @@ impl Handler for DiscordHandler { auction.title.replace(' ', "-").to_lowercase(), proposal.id ); - let date = format!("<t:{}:R>", Utc::now().timestamp()); + let date = Local::now().format("%m/%d/%Y %I:%M %p").to_string(); let wallet = get_domain_name(&proposal.address) .await .unwrap_or(get_short_address(&proposal.address)); @@ -159,7 +159,7 @@ impl Handler for DiscordHandler { proposal.title.replace(' ', "-").to_lowercase(), proposal.id ); - let date = format!("<t:{}:R>", Utc::now().timestamp()); + let date = Local::now().format("%m/%d/%Y %I:%M %p").to_string(); let wallet = get_domain_name(&vote.address) .await .unwrap_or(get_short_address(&vote.address)); diff --git a/src/prop_lot/handler/discord.rs b/src/prop_lot/handler/discord.rs index 301f4bb..47ae68b 100644 --- a/src/prop_lot/handler/discord.rs +++ b/src/prop_lot/handler/discord.rs @@ -1,5 +1,5 @@ use async_trait::async_trait; -use chrono::Utc; +use chrono::Local; use log::{error, info}; use reqwest::{header, Client}; use serde_json::{json, Value}; @@ -66,7 +66,7 @@ impl Handler for DiscordHandler { async fn handle_new_idea(&self, idea: &Idea) -> Result<()> { info!("Handling new idea: {}", idea.title); - let date = format!("<t:{}:R>", Utc::now().timestamp()); + let date = Local::now().format("%m/%d/%Y %I:%M %p").to_string(); let url = format!("{}/idea/{}", self.base_url, idea.id); let wallet = get_domain_name(&idea.creator_id) .await @@ -109,7 +109,7 @@ impl Handler for DiscordHandler { .unwrap() .clone(); - let date = format!("<t:{}:R>", Utc::now().timestamp()); + let date = Local::now().format("%m/%d/%Y %I:%M %p").to_string(); let wallet = get_domain_name(&vote.voter_id) .await .unwrap_or(get_short_address(&vote.voter_id)); @@ -158,7 +158,7 @@ impl Handler for DiscordHandler { .clone(); let url = format!("{}/idea/{}", self.base_url, idea.id); - let date = format!("<t:{}:R>", Utc::now().timestamp()); + let date = Local::now().format("%m/%d/%Y %I:%M %p").to_string(); let wallet = get_domain_name(&comment.author_id) .await .unwrap_or(get_short_address(&comment.author_id)); diff --git a/src/second_market/handler/discord.rs b/src/second_market/handler/discord.rs index 67caf68..0a8ae16 100644 --- a/src/second_market/handler/discord.rs +++ b/src/second_market/handler/discord.rs @@ -1,5 +1,5 @@ use async_trait::async_trait; -use chrono::Utc; +use chrono::Local; use log::{error, info}; use reqwest::{header, Client}; use serde_json::{json, Value}; @@ -65,7 +65,7 @@ impl Handler for DiscordHandler { async fn handle_new_floor(&self, floor: &Floor) -> Result<()> { info!("Handling new floor: {:?}", floor.new_price); - let date = format!("<t:{}:R>", Utc::now().timestamp()); + let date = Local::now().format("%m/%d/%Y %I:%M %p").to_string(); let url = match floor.clone().source.unwrap_or_else(String::new).as_str() { "blur.io" => format!("https://blur.io/collection/{}", self.collection), _ => format!("https://opensea.io/assets/ethereum/{}", self.collection), From 87f0711ffd1a1b1303b285d321b41e0d3332aba6 Mon Sep 17 00:00:00 2001 From: Milad Nekofar <milad@nekofar.com> Date: Mon, 20 Nov 2023 10:21:53 +0330 Subject: [PATCH 2/2] chore(release): prepare for version 1.1.0-alpha.11 --- CHANGELOG.md | 6 ++++++ Cargo.lock | 2 +- Cargo.toml | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03c1c9a..32aebdf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. +## [1.1.0-alpha.11] - 2023-11-20 + +### Revert + +- Update date format to use Utc timestamp across discord handlers + ## [1.1.0-alpha.10] - 2023-11-19 ### Refactor diff --git a/Cargo.lock b/Cargo.lock index f2da734..af61875 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1536,7 +1536,7 @@ checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "lilnouns-bots" -version = "1.1.0-alpha.10" +version = "1.1.0-alpha.11" dependencies = [ "anyhow", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index c751c9c..120af30 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lilnouns-bots" -version = "1.1.0-alpha.10" +version = "1.1.0-alpha.11" authors = ["Milad Nekofar <milad@nekofar.com>"] edition = "2021" description = "Our bots are designed to keep the Lil Nouns DAO community informed and engaged."