Merge branch 'master' into stages

src/abaddon.cpp

@@ -1,5 +1,4 @@
 #include "abaddon.hpp"
-#include <cstdlib>
 #include <memory>
 #include <spdlog/spdlog.h>
 #include <spdlog/cfg/env.h>
@@ -1154,35 +1153,15 @@ void Abaddon::on_window_hide() {
     }
 }
 
-// clang-format off
-
-#ifdef __GLIBC__
-    #ifndef _GNU_SOURCE
-        #define _GNU_SOURCE
-        #include <features.h>
-        #ifndef __USE_GNU
-            #define __MUSL__
-        #endif
-        #undef _GNU_SOURCE
-    #else
-        #include <features.h>
-        #ifndef __USE_GNU
-            #define __MUSL__
-        #endif
-    #endif
-#endif
-
-// clang-format on
-
 int main(int argc, char **argv) {
-#ifdef __MUSL__
-    char env[] = "LANG=C";
-    putenv(env);
-#endif
-
-    if (std::getenv("ABADDON_NO_FC") == nullptr)
+    if (std::getenv("ABADDON_NO_FC") == nullptr) {
         Platform::SetupFonts();
+    }
 
+    // windows doesnt have langinfo.h so some localization falls back to translation strings
+    // i dont like the default translation so this lets us use strftime
+
+#ifdef _WIN32
     char *systemLocale = std::setlocale(LC_ALL, "");
     try {
         if (systemLocale != nullptr) {
@@ -1196,6 +1175,7 @@ int main(int argc, char **argv) {
             }
         } catch (...) {}
     }
+#endif
 
 #if defined(_WIN32) && defined(_MSC_VER)
     TCHAR buf[2] { 0 };

src/components/channellist/channellisttree.cpp

@@ -1179,8 +1179,11 @@ bool ChannelListTree::SelectionFunc(const Glib::RefPtr<Gtk::TreeModel> &model, c
         }
     }
 
-    const auto type = (*model->get_iter(path))[m_columns.m_type];
-    const auto id = static_cast<Snowflake>((*model->get_iter(path))[m_columns.m_id]);
+    const auto iter = model->get_iter(path);
+    if (!iter) return false;
+
+    const auto type = (*iter)[m_columns.m_type];
+    const auto id = static_cast<Snowflake>((*iter)[m_columns.m_id]);
     // todo maybe just keep this last check?
     if (type == RenderType::TextChannel || type == RenderType::DM || type == RenderType::Thread || (id == m_active_channel)) return true;
     return is_currently_selected;

src/discord/snowflake.cpp

@@ -6,6 +6,8 @@
 
 #include "util.hpp"
 
+#include <glibmm/datetime.h>
+
 constexpr static uint64_t DiscordEpochSeconds = 1420070400;
 
 const Snowflake Snowflake::Invalid = -1ULL;
@@ -56,11 +58,8 @@ bool Snowflake::IsValid() const {
 }
 
 Glib::ustring Snowflake::GetLocalTimestamp() const {
-    const time_t secs_since_epoch = (m_num / SecondsInterval) + DiscordEpochSeconds;
-    const std::tm tm = *localtime(&secs_since_epoch);
-    std::array<char, 256> tmp {};
-    std::strftime(tmp.data(), sizeof(tmp), "%X %x", &tm);
-    return tmp.data();
+    const gint64 secs_since_epoch = (m_num / SecondsInterval) + DiscordEpochSeconds;
+    return FormatUnixEpoch(secs_since_epoch);
 }
 
 uint64_t Snowflake::GetUnixMilliseconds() const noexcept {

src/util.cpp

@@ -63,27 +63,33 @@ int GetTimezoneOffset() {
     return static_cast<int>(local_secs - gmt_secs);
 }
 
-std::string FormatISO8601(const std::string &in, int extra_offset, const std::string &fmt) {
-    int yr, mon, day, hr, min, sec, tzhr, tzmin;
-    float milli;
-    std::sscanf(in.c_str(), "%d-%d-%dT%d:%d:%d%f+%d:%d",
-                &yr, &mon, &day, &hr, &min, &sec, &milli, &tzhr, &tzmin);
+Glib::ustring FormatUnixEpoch(gint64 time, const std::string &fmt) {
+    auto dt = Glib::wrap(g_date_time_new_from_unix_utc(time));
+
+#ifdef _WIN32
     std::tm tm {};
-    tm.tm_year = yr - 1900;
-    tm.tm_mon = mon - 1;
-    tm.tm_mday = day;
-    tm.tm_hour = hr;
-    tm.tm_min = min;
-    tm.tm_sec = sec;
+    tm.tm_year = dt.get_year() - 1900;
+    tm.tm_mon = dt.get_month() - 1;
+    tm.tm_mday = dt.get_day_of_month();
+    tm.tm_hour = dt.get_hour() + 1;
+    tm.tm_min = dt.get_minute();
+    tm.tm_sec = dt.get_second();
     tm.tm_wday = 0;
     tm.tm_yday = 0;
     tm.tm_isdst = -1;
-    int offset = GetTimezoneOffset();
-    tm.tm_sec += offset + extra_offset;
+    tm.tm_sec += GetTimezoneOffset();
     mktime(&tm);
     std::array<char, 512> tmp {};
     std::strftime(tmp.data(), sizeof(tmp), fmt.c_str(), &tm);
     return tmp.data();
+#else
+    return dt.format(fmt);
+#endif
+}
+
+Glib::ustring FormatISO8601(const std::string &in, int extra_offset, const std::string &fmt) {
+    const auto epoch = Glib::DateTime::create_from_iso8601(in).add_seconds(extra_offset).to_unix();
+    return FormatUnixEpoch(epoch);
 }
 
 void ScrollListBoxToSelected(Gtk::ListBox &list) {

src/util.hpp

@@ -11,6 +11,7 @@
 #include <regex>
 #include <mutex>
 #include <condition_variable>
+#include <glibconfig.h>
 #include <optional>
 #include <type_traits>
 
@@ -50,7 +51,8 @@ std::string GetExtension(std::string url);
 bool IsURLViewableImage(const std::string &url);
 std::vector<uint8_t> ReadWholeFile(const std::string &path);
 std::string HumanReadableBytes(uint64_t bytes);
-std::string FormatISO8601(const std::string &in, int extra_offset = 0, const std::string &fmt = "%x %X");
+Glib::ustring FormatUnixEpoch(gint64 time, const std::string &fmt = "%x %X");
+Glib::ustring FormatISO8601(const std::string &in, int extra_offset = 0, const std::string &fmt = "%x %X");
 void AddPointerCursor(Gtk::Widget &widget);
 
 template<typename T>