Minki/abaddon-ppc
1
0
Fork 0
forked from OpenGamers/abaddon
Code Issues Pull Requests Packages Projects Releases Wiki Activity

format timestamps and place them on the right (#17)

Browse Source
This commit is contained in:
ouwou 2021-01-02 01:02:23 -05:00
parent b863c3740b
commit 5cf2b7c2db
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/chatmessage.cpp
View File

@ -1080,7 +1080,10 @@ ChatMessageHeader::ChatMessageHeader(const Message *data) {
else if (data->WebhookID.has_value())
m_extra->set_markup("<b>Webhook</b>");
m_timestamp->set_text(data->Timestamp);
m_timestamp->set_text(data->ID.GetLocalTimestamp());
m_timestamp->set_hexpand(true);
m_timestamp->set_halign(Gtk::ALIGN_END);
m_timestamp->set_ellipsize(Pango::ELLIPSIZE_END);
m_timestamp->set_opacity(0.5);
m_timestamp->set_single_line_mode(true);
m_timestamp->set_margin_start(12);
@ -1090,6 +1093,7 @@ ChatMessageHeader::ChatMessageHeader(const Message *data) {
m_main_box->set_vexpand(true);
m_main_box->set_can_focus(true);
m_meta_box->set_hexpand(true);
m_meta_box->set_can_focus(false);
m_content_box->set_can_focus(false);

12
discord/snowflake.cpp
View File

@ -1,4 +1,6 @@
#include "snowflake.hpp"
#include <ctime>
#include <iomanip>
Snowflake::Snowflake()
: m_num(Invalid) {}
@ -23,6 +25,16 @@ bool Snowflake::IsValid() const {
return m_num != Invalid;
}
std::string Snowflake::GetLocalTimestamp() const {
const time_t secs_since_epoch = (m_num / 4194304000) + 1420070400;
const std::tm tm = *localtime(&secs_since_epoch);
std::stringstream ss;
const static std::locale locale("");
ss.imbue(locale);
ss << std::put_time(&tm, "%X %x");
return ss.str();
}
void from_json(const nlohmann::json &j, Snowflake &s) {
if (j.is_string()) {
std::string tmp;

1
discord/snowflake.hpp
View File

@ -10,6 +10,7 @@ struct Snowflake {
Snowflake(const Glib::ustring &str);
bool IsValid() const;
std::string GetLocalTimestamp() const;
bool operator==(const Snowflake &s) const noexcept {
return m_num == s.m_num;