colors, fallback if guild_folders is empty

basic folder support
add option to dump ready payload because thats useful
2022-12-24 02:44:56 -05:00 · 2022-12-23 20:14:10 -05:00 · 2022-12-21 21:49:18 -05:00 · 2022-12-18 20:52:19 +00:00 · 2022-12-16 19:28:39 -05:00 · 2022-12-03 23:18:14 +00:00
15 changed files with 440 additions and 133 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -160,7 +160,7 @@ jobs:
          cd deps
          git clone https://github.com/nlohmann/json
          cd json
-          git checkout db78ac1d7716f56fc9f1b030b715f872f93964e4
+          git checkout bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d
          mkdir build
          cd build
          cmake ..
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "subprojects/ixwebsocket"]
 	path = subprojects/ixwebsocket
 	url = https://github.com/machinezone/ixwebsocket
+[submodule "subprojects/keychain"]
+	path = subprojects/keychain
+	url = https://github.com/hrantzsch/keychain
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")

 option(USE_LIBHANDY "Enable features that require libhandy (default)" ON)
+option(USE_KEYCHAIN "Store the token in the keychain (default)" ON)

 find_package(nlohmann_json REQUIRED)
 find_package(CURL)
@@ -106,3 +107,13 @@ if (USE_LIBHANDY)
        target_compile_definitions(abaddon PRIVATE WITH_LIBHANDY)
    endif ()
 endif ()
+
+if (USE_KEYCHAIN)
+    find_package(keychain QUIET)
+    if (NOT keychain_FOUND)
+        message("keychain was not found and will be included as a submodule")
+        add_subdirectory(subprojects/keychain)
+        target_link_libraries(abaddon keychain)
+        target_compile_definitions(abaddon PRIVATE WITH_KEYCHAIN)
+    endif ()
+endif ()
--- a/README.md
+++ b/README.md
@@ -75,6 +75,10 @@ the result of fundamental issues with Discord's thread implementation.
      ```Shell
      $ sudo apt install g++ cmake libgtkmm-3.0-dev libcurl4-gnutls-dev libsqlite3-dev libssl-dev nlohmann-json3-dev
      ```
+    * On Arch Linux
+      ```Shell
+      $ sudo pacman -S gcc cmake gtkmm3 libcurl-gnutls lib32-sqlite lib32-openssl nlohmann-json libhandy
+      ```
 2. `git clone https://github.com/uowuo/abaddon --recurse-submodules="subprojects" && cd abaddon`
 3. `mkdir build && cd build`
 4. `cmake ..`
@@ -92,7 +96,7 @@ Latest release version: https://github.com/uowuo/abaddon/releases/latest
 - Linux: [here](https://nightly.link/uowuo/abaddon/workflows/ci/master/build-linux-MinSizeRel.zip) unpackaged (for now),
  requires gtkmm3. built on Ubuntu 18.04 + gcc9

-⚠️ If you use Windows, make sure to start from the `bin` directory
+> **Warning**: If you use Windows, make sure to start from the `bin` directory

 On Linux, `css` and `res` can also be loaded from `~/.local/share/abaddon` or `/usr/share/abaddon`

@@ -135,145 +139,158 @@ spam filter's wrath:

 #### CSS selectors

-.app-window - Applied to all windows. This means the main window and all popups  
-.app-popup - Additional class for `.app-window`s when the window is not the main window
+| Selector                       | Description                                                                                       |
+|--------------------------------|---------------------------------------------------------------------------------------------------|
+| `.app-window`                  | Applied to all windows. This means the main window and all popups                                 |
+| `.app-popup`                   | Additional class for `.app-window`s when the window is not the main window                        |
+| `.channel-list`                | Container of the channel list                                                                     |
+| `.messages`                    | Container of user messages                                                                        |
+| `.message-container`           | The container which holds a user's messages                                                       |
+| `.message-container-author`    | The author label for a message container                                                          |
+| `.message-container-timestamp` | The timestamp label for a message container                                                       |
+| `.message-container-avatar`    | Avatar for a user in a message                                                                    |
+| `.message-container-extra`     | Label containing BOT/Webhook                                                                      |
+| `.message-text`                | The text of a user message                                                                        |
+| `.pending`                     | Extra class of .message-text for messages pending to be sent                                      |
+| `.failed`                      | Extra class of .message-text for messages that failed to be sent                                  |
+| `.message-attachment-box`      | Contains attachment info                                                                          |
+| `.message-reply`               | Container for the replied-to message in a reply (these elements will also have .message-text set) |
+| `.message-input`               | Applied to the chat input container                                                               |
+| `.replying`                    | Extra class for chat input container when a reply is currently being created                      |
+| `.reaction-box`                | Contains a reaction image and the count                                                           |
+| `.reacted`                     | Additional class for reaction-box when the user has reacted with a particular reaction            |
+| `.reaction-count`              | Contains the count for reaction                                                                   |
+| `.completer`                   | Container for the message completer                                                               |
+| `.completer-entry`             | Container for a single entry in the completer                                                     |
+| `.completer-entry-label`       | Contains the label for an entry in the completer                                                  |
+| `.completer-entry-image`       | Contains the image for an entry in the completer                                                  |
+| `.embed`                       | Container for a message embed                                                                     |
+| `.embed-author`                | The author of an embed                                                                            |
+| `.embed-title`                 | The title of an embed                                                                             |
+| `.embed-description`           | The description of an embed                                                                       |
+| `.embed-field-title`           | The title of an embed field                                                                       |
+| `.embed-field-value`           | The value of an embed field                                                                       |
+| `.embed-footer`                | The footer of an embed                                                                            |
+| `.members`                     | Container of the member list                                                                      |
+| `.members-row`                 | All rows within the members container                                                             |
+| `.members-row-label`           | All labels in the members container                                                               |
+| `.members-row-member`          | Rows containing a member                                                                          |
+| `.members-row-role`            | Rows containing a role                                                                            |
+| `.members-row-avatar`          | Contains the avatar for a row in the member list                                                  |
+| `.status-indicator`            | The status indicator                                                                              |
+| `.online`                      | Applied to status indicators when the associated user is online                                   |
+| `.idle`                        | Applied to status indicators when the associated user is away                                     |
+| `.dnd`                         | Applied to status indicators when the associated user is on do not disturb                        |
+| `.offline`                     | Applied to status indicators when the associated user is offline                                  |
+| `.typing-indicator`            | The typing indicator (also used for replies)                                                      |

-.channel-list - Container of the channel list
+Used in reorderable list implementation:
+| Selector             |
+|----------------------|
+| `.drag-icon`         |
+| `.drag-hover-top`    |
+| `.drag-hover-bottom` |

-.messages - Container of user messages  
-.message-container - The container which holds a user's messages  
-.message-container-author - The author label for a message container  
-.message-container-timestamp - The timestamp label for a message container  
-.message-container-avatar - Avatar for a user in a message  
-.message-container-extra - Label containing BOT/Webhook  
-.message-text - The text of a user message  
-.pending - Extra class of .message-text for messages pending to be sent  
-.failed - Extra class of .message-text for messages that failed to be sent   
-.message-attachment-box - Contains attachment info  
-.message-reply - Container for the replied-to message in a reply (these elements will also have .message-text set)  
-.message-input - Applied to the chat input container  
-.replying - Extra class for chat input container when a reply is currently being created  
-.reaction-box - Contains a reaction image and the count  
-.reacted - Additional class for reaction-box when the user has reacted with a particular reaction  
-.reaction-count - Contains the count for reaction
+Used in guild settings popup:

-.completer - Container for the message completer  
-.completer-entry - Container for a single entry in the completer  
-.completer-entry-label - Contains the label for an entry in the completer  
-.completer-entry-image - Contains the image for an entry in the completer
+| Selector                   | Description                                       |
+|----------------------------|---------------------------------------------------|
+| `.guild-settings-window`   | Container for list of members in the members pane |
+| `.guild-members-pane-list` |                                                   |
+| `.guild-members-pane-info` | Container for member info                         |
+| `.guild-roles-pane-list`   | Container for list of roles in the roles pane     |

-.embed - Container for a message embed  
-.embed-author - The author of an embed  
-.embed-title - The title of an embed  
-.embed-description - The description of an embed  
-.embed-field-title - The title of an embed field  
-.embed-field-value - The value of an embed field  
-.embed-footer - The footer of an embed
+Used in profile popup:

-.members - Container of the member list  
-.members-row - All rows within the members container  
-.members-row-label - All labels in the members container  
-.members-row-member - Rows containing a member  
-.members-row-role - Rows containing a role  
-.members-row-avatar - Contains the avatar for a row in the member list
-
-.status-indicator - The status indicator  
-.online - Applied to status indicators when the associated user is online  
-.idle - Applied to status indicators when the associated user is away  
-.dnd - Applied to status indicators when the associated user is on do not disturb  
-.offline - Applied to status indicators when the associated user is offline
-
-.typing-indicator - The typing indicator (also used for replies)
-
-Used in reorderable list implementation:  
-.drag-icon .drag-hover-top .drag-hover-bottom
-
-Used in guild settings popup:  
-.guild-settings-window  
-.guild-members-pane-list - Container for list of members in the members pane  
-.guild-members-pane-info - Container for member info  
-.guild-roles-pane-list - Container for list of roles in the roles pane
-
-Used in profile popup:  
-.mutual-friend-item - Applied to every item in the mutual friends list  
-.mutual-friend-item-name - Name in mutual friend item  
-.mutual-friend-item-avatar - Avatar in mutual friend item   
-.mutual-guild-item - Applied to every item in the mutual guilds list  
-.mutual-guild-item-name - Name in mutual guild item  
-.mutual-guild-item-icon - Icon in mutual guild item  
-.mutual-guild-item-nick - User nickname in mutual guild item  
-.profile-connection - Applied to every item in the user connections list  
-.profile-connection-label - Label in profile connection item  
-.profile-connection-check - Checkmark in verified profile connection items  
-.profile-connections - Container for profile connections  
-.profile-notes - Container for notes in profile window  
-.profile-notes-label - Label that says "NOTE"  
-.profile-notes-text - Actual note text  
-.profile-info-pane - Applied to container for info section of profile popup  
-.profile-info-created - Label for creation date of profile  
-.user-profile-window  
-.profile-main-container - Inner container for profile  
-.profile-avatar  
-.profile-username  
-.profile-switcher - Buttons used to switch viewed section of profile  
-.profile-stack - Container for profile info that can be switched between  
-.profile-badges - Container for badges  
-.profile-badge
+| Selector                     | Description                                             |
+|------------------------------|---------------------------------------------------------|
+| `.mutual-friend-item`        | Applied to every item in the mutual friends list        |
+| `.mutual-friend-item-name`   | Name in mutual friend item                              |
+| `.mutual-friend-item-avatar` | Avatar in mutual friend item                            |
+| `.mutual-guild-item`         | Applied to every item in the mutual guilds list         |
+| `.mutual-guild-item-name`    | Name in mutual guild item                               |
+| `.mutual-guild-item-icon`    | Icon in mutual guild item                               |
+| `.mutual-guild-item-nick`    | User nickname in mutual guild item                      |
+| `.profile-connection`        | Applied to every item in the user connections list      |
+| `.profile-connection-label`  | Label in profile connection item                        |
+| `.profile-connection-check`  | Checkmark in verified profile connection items          |
+| `.profile-connections`       | Container for profile connections                       |
+| `.profile-notes`             | Container for notes in profile window                   |
+| `.profile-notes-label`       | Label that says "NOTE"                                  |
+| `.profile-notes-text`        | Actual note text                                        |
+| `.profile-info-pane`         | Applied to container for info section of profile popup  |
+| `.profile-info-created`      | Label for creation date of profile                      |
+| `.user-profile-window`       |                                                         |
+| `.profile-main-container`    | Inner container for profile                             |
+| `.profile-avatar`            |                                                         |
+| `.profile-username`          |                                                         |
+| `.profile-switcher`          | Buttons used to switch viewed section of profile        |
+| `.profile-stack`             | Container for profile info that can be switched between |
+| `.profile-badges`            | Container for badges                                    |
+| `.profile-badge`             |                                                         |

 ### Settings

-Settings are configured (for now) by editing abaddon.ini  
+Settings are configured (for now) by editing `abaddon.ini`.
 The format is similar to the standard Windows ini format **except**:

 * `#` is used to begin comments as opposed to `;`
 * Section and key names are case-sensitive

-You should edit these while the client is closed even though there's an option to reload while running  
-This listing is organized by section.  
+> **Warning**: You should edit these while the client is closed, even though there's an option to reload while running.
+
+This listing is organized by section.
 For example, memory_db would be set by adding `memory_db = true` under the line `[discord]`

 #### discord

-* gateway (string) - override url for Discord gateway. must be json format and use zlib stream compression
-* api_base (string) - override base url for Discord API
-* memory_db (true or false, default false) - if true, Discord data will be kept in memory as opposed to on disk
-* token (string) - Discord token used to login, this can be set from the menu
-* prefetch (true or false, default false) - if true, new messages will cause the avatar and image attachments to be
-  automatically downloaded
+| Setting       | Type    | Default | Description                                                                                      |
+|---------------|---------|---------|--------------------------------------------------------------------------------------------------|
+| `gateway`     | string  |         | override url for Discord gateway. must be json format and use zlib stream compression            |
+| `api_base`    | string  |         | override base url for Discord API                                                                |
+| `memory_db`   | boolean | false   | if true, Discord data will be kept in memory as opposed to on disk                               |
+| `token`       | string  |         | Discord token used to login, this can be set from the menu                                       |
+| `prefetch`    | boolean | false   | if true, new messages will cause the avatar and image attachments to be automatically downloaded |
+| `autoconnect` | boolean | false   | autoconnect to discord                                                                           |

 #### http

-* user_agent (string) - sets the user-agent to use in HTTP requests to the Discord API (not including media/images)
-* concurrent (int, default 20) - how many images can be concurrently retrieved
+| Setting      | Type   | Default | Description                                                                                 |
+|--------------|--------|---------|---------------------------------------------------------------------------------------------|
+| `user_agent` | string |         | sets the user-agent to use in HTTP requests to the Discord API (not including media/images) |
+| `concurrent` | int    | 20      | how many images can be concurrently retrieved                                               |

 #### gui

-* member_list_discriminator (true or false, default true) - show user discriminators in the member list
-* stock_emojis (true or false, default true) - allow abaddon to substitute unicode emojis with images from emojis.bin,
-  must be false to allow GTK to render emojis itself
-* custom_emojis (true or false, default true) - download and use custom Discord emojis
-* css (string) - path to the main CSS file
-* animations (true or false, default true) - use animated images where available (e.g. server icons, emojis, avatars).
-  false means static images will be used
-* animated_guild_hover_only (true or false, default true) - only animate guild icons when the guild is being hovered
-  over
-* owner_crown (true or false, default true) - show a crown next to the owner
-* unreads (true or false, default true) - show unread indicators and mention badges
-* save_state (true or false, default true) - save the state of the gui (active channels, tabs, expanded channels)
-* alt_menu (true or false, default false) - keep the menu hidden unless revealed with alt key
-* hide_to_tray (true or false, default false) - hide abaddon to the system tray on window close
+| Setting                     | Type    | Default | Description                                                                                                                |
+|-----------------------------|---------|---------|----------------------------------------------------------------------------------------------------------------------------|
+| `member_list_discriminator` | boolean | true    | show user discriminators in the member list                                                                                |
+| `stock_emojis`              | boolean | true    | allow abaddon to substitute unicode emojis with images from emojis.bin, must be false to allow GTK to render emojis itself |
+| `custom_emojis`             | boolean | true    | download and use custom Discord emojis                                                                                     |
+| `css`                       | string  |         | path to the main CSS file                                                                                                  |
+| `animations`                | boolean | true    | use animated images where available (e.g. server icons, emojis, avatars). false means static images will be used           |
+| `animated_guild_hover_only` | boolean | true    | only animate guild icons when the guild is being hovered over                                                              |
+| `owner_crown`               | boolean | true    | show a crown next to the owner                                                                                             |
+| `unreads`                   | boolean | true    | show unread indicators and mention badges                                                                                  |
+| `save_state`                | boolean | true    | save the state of the gui (active channels, tabs, expanded channels)                                                       |
+| `alt_menu`                  | boolean | false   | keep the menu hidden unless revealed with alt key                                                                          |
+| `hide_to_tray`              | boolean | false   | hide abaddon to the system tray on window close                                                                            |

 #### style

-* linkcolor (string) - color to use for links in messages
-* expandercolor (string) - color to use for the expander in the channel list
-* nsfwchannelcolor (string) - color to use for NSFW channels in the channel list
-* channelcolor (string) - color to use for SFW channels in the channel list
-* mentionbadgecolor (string) - background color for mention badges
-* mentionbadgetextcolor (string) - color to use for number displayed on mention badges
-* unreadcolor (string) - color to use for the unread indicator
+| Setting                 | Type   | Description                                         |
+|-------------------------|--------|-----------------------------------------------------|
+| `linkcolor`             | string | color to use for links in messages                  |
+| `expandercolor`         | string | color to use for the expander in the channel list   |
+| `nsfwchannelcolor`      | string | color to use for NSFW channels in the channel list  |
+| `channelcolor`          | string | color to use for SFW channels in the channel list   |
+| `mentionbadgecolor`     | string | background color for mention badges                 |
+| `mentionbadgetextcolor` | string | color to use for number displayed on mention badges |
+| `unreadcolor`           | string | color to use for the unread indicator               |

 ### Environment variables

-* ABADDON_NO_FC (Windows only) - don't use custom font config
-* ABADDON_CONFIG - change path of configuration file to use. relative to cwd or can be absolute
+| variable         | Description                                                                  |
+|------------------|------------------------------------------------------------------------------|
+| `ABADDON_NO_FC`  | (Windows only) don't use custom font config                                  |
+| `ABADDON_CONFIG` | change path of configuration file to use. relative to cwd or can be absolute |
--- a/src/components/channels.cpp
+++ b/src/components/channels.cpp
@@ -89,6 +89,7 @@ ChannelList::ChannelList()
    column->add_attribute(renderer->property_id(), m_columns.m_id);
    column->add_attribute(renderer->property_expanded(), m_columns.m_expanded);
    column->add_attribute(renderer->property_nsfw(), m_columns.m_nsfw);
+    column->add_attribute(renderer->property_color(), m_columns.m_color);
    m_view.append_column(*column);

    m_menu_guild_copy_id.signal_activate().connect([this] {
@@ -262,14 +263,51 @@ void ChannelList::UpdateListing() {

    auto &discord = Abaddon::Get().GetDiscordClient();

-    const auto guild_ids = discord.GetUserSortedGuilds();
-    int sortnum = 0;
-    for (const auto &guild_id : guild_ids) {
-        const auto guild = discord.GetGuild(guild_id);
-        if (!guild.has_value()) continue;
+    /*
+    guild_folders looks something like this
+     "guild_folders": [
+        {
+           "color": null,
+           "guild_ids": [
+               "8009060___________"
+           ],
+           "id": null,
+           "name": null
+        },
+        {
+           "color": null,
+           "guild_ids": [
+               "99615594__________",
+               "86132141__________",
+               "35450138__________",
+               "83714048__________"
+           ],
+           "id": 2853066769,
+           "name": null
+        }
+    ]

-        auto iter = AddGuild(*guild);
-        (*iter)[m_columns.m_sort] = sortnum++;
+     so if id != null then its a folder (they can have single entries)
+    */
+
+    int sort_value = 0;
+
+    const auto folders = discord.GetUserSettings().GuildFolders;
+    if (folders.empty()) {
+        // fallback if no organization has occurred (guild_folders will be empty)
+        const auto guild_ids = discord.GetUserSortedGuilds();
+        for (const auto &guild_id : guild_ids) {
+            const auto guild = discord.GetGuild(guild_id);
+            if (!guild.has_value()) continue;
+
+            auto iter = AddGuild(*guild, m_model->children());
+            (*iter)[m_columns.m_sort] = sort_value++;
+        }
+    } else {
+        for (const auto &group : folders) {
+            auto iter = AddFolder(group);
+            (*iter)[m_columns.m_sort] = sort_value++;
+        }
    }

    m_updating_listing = false;
@@ -277,8 +315,9 @@ void ChannelList::UpdateListing() {
    AddPrivateChannels();
 }

+// TODO update for folders
 void ChannelList::UpdateNewGuild(const GuildData &guild) {
-    AddGuild(guild);
+    AddGuild(guild, m_model->children());
    // update sort order
    int sortnum = 0;
    for (const auto guild_id : Abaddon::Get().GetDiscordClient().GetUserSortedGuilds()) {
@@ -405,6 +444,8 @@ void ChannelList::OnThreadListSync(const ThreadListSyncData &data) {
    // get the threads in the guild
    std::vector<Snowflake> threads;
    auto guild_iter = GetIteratorForGuildFromID(data.GuildID);
+    if (!guild_iter) return;
+
    std::queue<Gtk::TreeModel::iterator> queue;
    queue.push(guild_iter);

@@ -546,11 +587,48 @@ ExpansionStateRoot ChannelList::GetExpansionState() const {
    return r;
 }

-Gtk::TreeModel::iterator ChannelList::AddGuild(const GuildData &guild) {
+Gtk::TreeModel::iterator ChannelList::AddFolder(const UserSettingsGuildFoldersEntry &folder) {
+    if (!folder.ID.has_value()) {
+        // just a guild
+        if (!folder.GuildIDs.empty()) {
+            const auto guild = Abaddon::Get().GetDiscordClient().GetGuild(folder.GuildIDs[0]);
+            if (guild.has_value()) {
+                return AddGuild(*guild, m_model->children());
+            }
+        }
+    } else {
+        auto folder_row = *m_model->append();
+        folder_row[m_columns.m_type] = RenderType::Folder;
+        folder_row[m_columns.m_id] = *folder.ID;
+        if (folder.Name.has_value()) {
+            folder_row[m_columns.m_name] = Glib::Markup::escape_text(*folder.Name);
+        } else {
+            folder_row[m_columns.m_name] = "Folder";
+        }
+        if (folder.Color.has_value()) {
+            folder_row[m_columns.m_color] = IntToRGBA(*folder.Color);
+        }
+
+        int sort_value = 0;
+        for (const auto &guild_id : folder.GuildIDs) {
+            const auto guild = Abaddon::Get().GetDiscordClient().GetGuild(guild_id);
+            if (guild.has_value()) {
+                auto guild_row = AddGuild(*guild, folder_row->children());
+                (*guild_row)[m_columns.m_sort] = sort_value++;
+            }
+        }
+
+        return folder_row;
+    }
+
+    return {};
+}
+
+Gtk::TreeModel::iterator ChannelList::AddGuild(const GuildData &guild, const Gtk::TreeNodeChildren &root) {
    auto &discord = Abaddon::Get().GetDiscordClient();
    auto &img = Abaddon::Get().GetImageManager();

-    auto guild_row = *m_model->append();
+    auto guild_row = *m_model->append(root);
    guild_row[m_columns.m_type] = RenderType::Guild;
    guild_row[m_columns.m_id] = guild.ID;
    guild_row[m_columns.m_name] = "<b>" + Glib::Markup::escape_text(guild.Name) + "</b>";
@@ -679,8 +757,15 @@ void ChannelList::UpdateChannelCategory(const ChannelData &channel) {

 Gtk::TreeModel::iterator ChannelList::GetIteratorForGuildFromID(Snowflake id) {
    for (const auto &child : m_model->children()) {
-        if (child[m_columns.m_id] == id)
+        if (child[m_columns.m_type] == RenderType::Guild && child[m_columns.m_id] == id) {
            return child;
+        } else if (child[m_columns.m_type] == RenderType::Folder) {
+            for (const auto &folder_child : child->children()) {
+                if (folder_child[m_columns.m_id] == id) {
+                    return folder_child;
+                }
+            }
+        }
    }
    return {};
 }
@@ -894,6 +979,7 @@ void ChannelList::MoveRow(const Gtk::TreeModel::iterator &iter, const Gtk::TreeM
    M(m_sort);
    M(m_nsfw);
    M(m_expanded);
+    M(m_color);
 #undef M

    // recursively move children
@@ -1006,4 +1092,5 @@ ChannelList::ModelColumns::ModelColumns() {
    add(m_sort);
    add(m_nsfw);
    add(m_expanded);
+    add(m_color);
 }
--- a/src/components/channels.hpp
+++ b/src/components/channels.hpp
@@ -61,6 +61,7 @@ protected:
        Gtk::TreeModelColumn<Glib::RefPtr<Gdk::PixbufAnimation>> m_icon_anim;
        Gtk::TreeModelColumn<int64_t> m_sort;
        Gtk::TreeModelColumn<bool> m_nsfw;
+        Gtk::TreeModelColumn<std::optional<Gdk::RGBA>> m_color; // for folders right now
        // Gtk::CellRenderer's property_is_expanded only works how i want it to if it has children
        // because otherwise it doesnt count as an "expander" (property_is_expander)
        // so this solution will have to do which i hate but the alternative is adding invisible children
@@ -72,7 +73,8 @@ protected:
    ModelColumns m_columns;
    Glib::RefPtr<Gtk::TreeStore> m_model;

-    Gtk::TreeModel::iterator AddGuild(const GuildData &guild);
+    Gtk::TreeModel::iterator AddFolder(const UserSettingsGuildFoldersEntry &folder);
+    Gtk::TreeModel::iterator AddGuild(const GuildData &guild, const Gtk::TreeNodeChildren &root);
    Gtk::TreeModel::iterator UpdateCreateChannelCategory(const ChannelData &channel);
    Gtk::TreeModel::iterator CreateThreadRow(const Gtk::TreeNodeChildren &children, const ChannelData &channel);

--- a/src/components/channelscellrenderer.cpp
+++ b/src/components/channelscellrenderer.cpp
@@ -18,7 +18,8 @@ CellRendererChannels::CellRendererChannels()
    , m_property_pixbuf(*this, "pixbuf")
    , m_property_pixbuf_animation(*this, "pixbuf-animation")
    , m_property_expanded(*this, "expanded")
-    , m_property_nsfw(*this, "nsfw") {
+    , m_property_nsfw(*this, "nsfw")
+    , m_property_color(*this, "color") {
    property_mode() = Gtk::CELL_RENDERER_MODE_ACTIVATABLE;
    property_xpad() = 2;
    property_ypad() = 2;
@@ -55,8 +56,14 @@ Glib::PropertyProxy<bool> CellRendererChannels::property_nsfw() {
    return m_property_nsfw.get_proxy();
 }

+Glib::PropertyProxy<std::optional<Gdk::RGBA>> CellRendererChannels::property_color() {
+    return m_property_color.get_proxy();
+}
+
 void CellRendererChannels::get_preferred_width_vfunc(Gtk::Widget &widget, int &minimum_width, int &natural_width) const {
    switch (m_property_type.get_value()) {
+        case RenderType::Folder:
+            return get_preferred_width_vfunc_folder(widget, minimum_width, natural_width);
        case RenderType::Guild:
            return get_preferred_width_vfunc_guild(widget, minimum_width, natural_width);
        case RenderType::Category:
@@ -74,6 +81,8 @@ void CellRendererChannels::get_preferred_width_vfunc(Gtk::Widget &widget, int &m

 void CellRendererChannels::get_preferred_width_for_height_vfunc(Gtk::Widget &widget, int height, int &minimum_width, int &natural_width) const {
    switch (m_property_type.get_value()) {
+        case RenderType::Folder:
+            return get_preferred_width_for_height_vfunc_folder(widget, height, minimum_width, natural_width);
        case RenderType::Guild:
            return get_preferred_width_for_height_vfunc_guild(widget, height, minimum_width, natural_width);
        case RenderType::Category:
@@ -91,6 +100,8 @@ void CellRendererChannels::get_preferred_width_for_height_vfunc(Gtk::Widget &wid

 void CellRendererChannels::get_preferred_height_vfunc(Gtk::Widget &widget, int &minimum_height, int &natural_height) const {
    switch (m_property_type.get_value()) {
+        case RenderType::Folder:
+            return get_preferred_height_vfunc_folder(widget, minimum_height, natural_height);
        case RenderType::Guild:
            return get_preferred_height_vfunc_guild(widget, minimum_height, natural_height);
        case RenderType::Category:
@@ -108,6 +119,8 @@ void CellRendererChannels::get_preferred_height_vfunc(Gtk::Widget &widget, int &

 void CellRendererChannels::get_preferred_height_for_width_vfunc(Gtk::Widget &widget, int width, int &minimum_height, int &natural_height) const {
    switch (m_property_type.get_value()) {
+        case RenderType::Folder:
+            return get_preferred_height_for_width_vfunc_folder(widget, width, minimum_height, natural_height);
        case RenderType::Guild:
            return get_preferred_height_for_width_vfunc_guild(widget, width, minimum_height, natural_height);
        case RenderType::Category:
@@ -125,6 +138,8 @@ void CellRendererChannels::get_preferred_height_for_width_vfunc(Gtk::Widget &wid

 void CellRendererChannels::render_vfunc(const Cairo::RefPtr<Cairo::Context> &cr, Gtk::Widget &widget, const Gdk::Rectangle &background_area, const Gdk::Rectangle &cell_area, Gtk::CellRendererState flags) {
    switch (m_property_type.get_value()) {
+        case RenderType::Folder:
+            return render_vfunc_folder(cr, widget, background_area, cell_area, flags);
        case RenderType::Guild:
            return render_vfunc_guild(cr, widget, background_area, cell_area, flags);
        case RenderType::Category:
@@ -140,6 +155,69 @@ void CellRendererChannels::render_vfunc(const Cairo::RefPtr<Cairo::Context> &cr,
    }
 }

+// folder functions
+
+void CellRendererChannels::get_preferred_width_vfunc_folder(Gtk::Widget &widget, int &minimum_width, int &natural_width) const {
+    m_renderer_text.get_preferred_width(widget, minimum_width, natural_width);
+}
+
+void CellRendererChannels::get_preferred_width_for_height_vfunc_folder(Gtk::Widget &widget, int height, int &minimum_width, int &natural_width) const {
+    m_renderer_text.get_preferred_width_for_height(widget, height, minimum_width, natural_width);
+}
+
+void CellRendererChannels::get_preferred_height_vfunc_folder(Gtk::Widget &widget, int &minimum_height, int &natural_height) const {
+    m_renderer_text.get_preferred_height(widget, minimum_height, natural_height);
+}
+
+void CellRendererChannels::get_preferred_height_for_width_vfunc_folder(Gtk::Widget &widget, int width, int &minimum_height, int &natural_height) const {
+    m_renderer_text.get_preferred_height_for_width(widget, width, minimum_height, natural_height);
+}
+
+void CellRendererChannels::render_vfunc_folder(const Cairo::RefPtr<Cairo::Context> &cr, Gtk::Widget &widget, const Gdk::Rectangle &background_area, const Gdk::Rectangle &cell_area, Gtk::CellRendererState flags) {
+    constexpr static int len = 5;
+    int x1, y1, x2, y2, x3, y3;
+    if (property_expanded()) {
+        x1 = background_area.get_x() + 7;
+        y1 = background_area.get_y() + background_area.get_height() / 2 - len;
+        x2 = background_area.get_x() + 7 + len;
+        y2 = background_area.get_y() + background_area.get_height() / 2 + len;
+        x3 = background_area.get_x() + 7 + len * 2;
+        y3 = background_area.get_y() + background_area.get_height() / 2 - len;
+    } else {
+        x1 = background_area.get_x() + 7;
+        y1 = background_area.get_y() + background_area.get_height() / 2 - len;
+        x2 = background_area.get_x() + 7 + len * 2;
+        y2 = background_area.get_y() + background_area.get_height() / 2;
+        x3 = background_area.get_x() + 7;
+        y3 = background_area.get_y() + background_area.get_height() / 2 + len;
+    }
+    cr->move_to(x1, y1);
+    cr->line_to(x2, y2);
+    cr->line_to(x3, y3);
+    const auto expander_color = Gdk::RGBA(Abaddon::Get().GetSettings().ChannelsExpanderColor);
+    cr->set_source_rgb(expander_color.get_red(), expander_color.get_green(), expander_color.get_blue());
+    cr->stroke();
+
+    Gtk::Requisition text_minimum, text_natural;
+    m_renderer_text.get_preferred_size(widget, text_minimum, text_natural);
+
+    const int text_x = background_area.get_x() + 22;
+    const int text_y = background_area.get_y() + background_area.get_height() / 2 - text_natural.height / 2;
+    const int text_w = text_natural.width;
+    const int text_h = text_natural.height;
+
+    Gdk::Rectangle text_cell_area(text_x, text_y, text_w, text_h);
+
+    static const auto color = Gdk::RGBA(Abaddon::Get().GetSettings().ChannelColor);
+    if (m_property_color.get_value().has_value()) {
+        m_renderer_text.property_foreground_rgba() = *m_property_color.get_value();
+    } else {
+        m_renderer_text.property_foreground_rgba() = color;
+    }
+    m_renderer_text.render(cr, widget, background_area, text_cell_area, flags);
+    m_renderer_text.property_foreground_set() = false;
+}
+
 // guild functions

 void CellRendererChannels::get_preferred_width_vfunc_guild(Gtk::Widget &widget, int &minimum_width, int &natural_width) const {
--- a/src/components/channelscellrenderer.hpp
+++ b/src/components/channelscellrenderer.hpp
@@ -6,6 +6,7 @@
 #include "discord/snowflake.hpp"

 enum class RenderType : uint8_t {
+    Folder,
    Guild,
    Category,
    TextChannel,
@@ -27,6 +28,7 @@ public:
    Glib::PropertyProxy<Glib::RefPtr<Gdk::PixbufAnimation>> property_icon_animation();
    Glib::PropertyProxy<bool> property_expanded();
    Glib::PropertyProxy<bool> property_nsfw();
+    Glib::PropertyProxy<std::optional<Gdk::RGBA>> property_color();

 protected:
    void get_preferred_width_vfunc(Gtk::Widget &widget, int &minimum_width, int &natural_width) const override;
@@ -39,6 +41,17 @@ protected:
                      const Gdk::Rectangle &cell_area,
                      Gtk::CellRendererState flags) override;

+    // guild functions
+    void get_preferred_width_vfunc_folder(Gtk::Widget &widget, int &minimum_width, int &natural_width) const;
+    void get_preferred_width_for_height_vfunc_folder(Gtk::Widget &widget, int height, int &minimum_width, int &natural_width) const;
+    void get_preferred_height_vfunc_folder(Gtk::Widget &widget, int &minimum_height, int &natural_height) const;
+    void get_preferred_height_for_width_vfunc_folder(Gtk::Widget &widget, int width, int &minimum_height, int &natural_height) const;
+    void render_vfunc_folder(const Cairo::RefPtr<Cairo::Context> &cr,
+                             Gtk::Widget &widget,
+                             const Gdk::Rectangle &background_area,
+                             const Gdk::Rectangle &cell_area,
+                             Gtk::CellRendererState flags);
+
    // guild functions
    void get_preferred_width_vfunc_guild(Gtk::Widget &widget, int &minimum_width, int &natural_width) const;
    void get_preferred_width_for_height_vfunc_guild(Gtk::Widget &widget, int height, int &minimum_width, int &natural_width) const;
@@ -118,6 +131,7 @@ private:
    Glib::Property<Glib::RefPtr<Gdk::PixbufAnimation>> m_property_pixbuf_animation; // guild
    Glib::Property<bool> m_property_expanded;                                       // category
    Glib::Property<bool> m_property_nsfw;                                           // channel
+    Glib::Property<std::optional<Gdk::RGBA>> m_property_color;                      // folder

    // same pitfalls as in https://github.com/uowuo/abaddon/blob/60404783bd4ce9be26233fe66fc3a74475d9eaa3/components/cellrendererpixbufanimation.hpp#L32-L39
    // this will manifest though since guild icons can change
--- a/src/discord/discord.cpp
+++ b/src/discord/discord.cpp
@@ -1204,6 +1204,10 @@ void DiscordClient::SetUserAgent(const std::string &agent) {
    m_websocket.SetUserAgent(agent);
 }

+void DiscordClient::SetDumpReady(bool dump) {
+    m_dump_ready = dump;
+}
+
 bool DiscordClient::IsChannelMuted(Snowflake id) const noexcept {
    return m_muted_channels.find(id) != m_muted_channels.end();
 }
@@ -1566,6 +1570,17 @@ void DiscordClient::ProcessNewGuild(GuildData &guild) {

 void DiscordClient::HandleGatewayReady(const GatewayMessage &msg) {
    m_ready_received = true;
+
+    if (m_dump_ready) {
+        const auto name = "./payload_ready-" + Glib::DateTime::create_now_utc().format("%Y-%m-%d_%H-%M-%S") + ".json";
+        auto *fp = std::fopen(name.c_str(), "wb");
+        if (fp != nullptr) {
+            const auto contents = msg.Data.dump(4);
+            std::fwrite(contents.data(), contents.size(), 1, fp);
+            std::fclose(fp);
+        }
+    }
+
    ReadyEventData data = msg.Data;
    for (auto &g : data.Guilds)
        ProcessNewGuild(g);
@@ -2277,6 +2292,10 @@ std::set<Snowflake> DiscordClient::GetPrivateChannels() const {
    return {};
 }

+const UserSettings &DiscordClient::GetUserSettings() const {
+    return m_user_settings;
+}
+
 EPremiumType DiscordClient::GetSelfPremiumType() const {
    const auto &data = GetUserData();
    if (data.PremiumType.has_value())
--- a/src/discord/discord.hpp
+++ b/src/discord/discord.hpp
@@ -60,6 +60,7 @@ public:
    std::vector<Message> GetMessagesForChannel(Snowflake id, size_t limit = 50) const;
    std::vector<Message> GetMessagesBefore(Snowflake channel_id, Snowflake message_id, size_t limit = 50) const;
    std::set<Snowflake> GetPrivateChannels() const;
+    const UserSettings &GetUserSettings() const;

    EPremiumType GetSelfPremiumType() const;

@@ -211,6 +212,8 @@ public:
    void UpdateToken(const std::string &token);
    void SetUserAgent(const std::string &agent);

+    void SetDumpReady(bool dump);
+
    bool IsChannelMuted(Snowflake id) const noexcept;
    bool IsGuildMuted(Snowflake id) const noexcept;
    int GetUnreadStateForChannel(Snowflake id) const noexcept;
@@ -229,6 +232,8 @@ private:
    std::vector<uint8_t> m_decompress_buf;
    z_stream m_zstream;

+    bool m_dump_ready = false;
+
    static std::string GetAPIURL();
    static std::string GetGatewayURL();

--- a/src/discord/usersettings.hpp
+++ b/src/discord/usersettings.hpp
@@ -1,13 +1,14 @@
 #pragma once
 #include "json.hpp"
 #include "snowflake.hpp"
+#include <optional>
 #include <string>

 struct UserSettingsGuildFoldersEntry {
-    int Color = -1; // null
+    std::optional<int> Color;
    std::vector<Snowflake> GuildIDs;
-    Snowflake ID;     // null (this can be a snowflake as a string or an int that isnt a snowflake lol)
-    std::string Name; // null
+    std::optional<Snowflake> ID; // (this can be a snowflake as a string or an int that isnt a snowflake lol)
+    std::optional<std::string> Name;

    friend void from_json(const nlohmann::json &j, UserSettingsGuildFoldersEntry &m);
 };
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1,6 +1,15 @@
 #include "settings.hpp"
 #include <filesystem>
 #include <fstream>
+#include <glibmm/miscutils.h>
+
+#ifdef WITH_KEYCHAIN
+    #include <keychain/keychain.h>
+#endif
+
+const std::string KeychainPackage = "com.github.uowuo.abaddon";
+const std::string KeychainService = "abaddon-client-token";
+const std::string KeychainUser = "";

 SettingsManager::SettingsManager(const std::string &filename)
    : m_filename(filename) {
@@ -36,7 +45,6 @@ void SettingsManager::ReadSettings() {

    SMSTR("discord", "api_base", APIBaseURL);
    SMSTR("discord", "gateway", GatewayURL);
-    SMSTR("discord", "token", DiscordToken);
    SMBOOL("discord", "memory_db", UseMemoryDB);
    SMBOOL("discord", "prefetch", Prefetch);
    SMBOOL("discord", "autoconnect", Autoconnect);
@@ -61,6 +69,32 @@ void SettingsManager::ReadSettings() {
    SMSTR("style", "mentionbadgetextcolor", MentionBadgeTextColor);
    SMSTR("style", "unreadcolor", UnreadIndicatorColor);

+#ifdef WITH_KEYCHAIN
+    keychain::Error error {};
+
+    // convert to keychain if present in normal settings
+    SMSTR("discord", "token", DiscordToken);
+
+    if (!m_settings.DiscordToken.empty()) {
+        keychain::Error set_error {};
+
+        keychain::setPassword(KeychainPackage, KeychainService, KeychainUser, m_settings.DiscordToken, set_error);
+        if (set_error) {
+            printf("keychain error setting token: %s\n", set_error.message.c_str());
+        } else {
+            m_file.remove_key("discord", "token");
+        }
+    }
+
+    m_settings.DiscordToken = keychain::getPassword(KeychainPackage, KeychainService, KeychainUser, error);
+    if (error && error.type != keychain::ErrorType::NotFound) {
+        printf("keychain error reading token: %s (%d)\n", error.message.c_str(), error.code);
+    }
+
+#else
+    SMSTR("discord", "token", DiscordToken);
+#endif
+
 #undef SMBOOL
 #undef SMSTR
 #undef SMINT
@@ -92,7 +126,6 @@ void SettingsManager::Close() {

        SMSTR("discord", "api_base", APIBaseURL);
        SMSTR("discord", "gateway", GatewayURL);
-        SMSTR("discord", "token", DiscordToken);
        SMBOOL("discord", "memory_db", UseMemoryDB);
        SMBOOL("discord", "prefetch", Prefetch);
        SMBOOL("discord", "autoconnect", Autoconnect);
@@ -117,6 +150,17 @@ void SettingsManager::Close() {
        SMSTR("style", "mentionbadgetextcolor", MentionBadgeTextColor);
        SMSTR("style", "unreadcolor", UnreadIndicatorColor);

+#ifdef WITH_KEYCHAIN
+        keychain::Error error {};
+
+        keychain::setPassword(KeychainPackage, KeychainService, KeychainUser, m_settings.DiscordToken, error);
+        if (error) {
+            printf("keychain error setting token: %s\n", error.message.c_str());
+        }
+#else
+        SMSTR("discord", "token", DiscordToken);
+#endif
+
 #undef SMSTR
 #undef SMBOOL
 #undef SMINT
--- a/src/windows/mainwindow.cpp
+++ b/src/windows/mainwindow.cpp
@@ -255,8 +255,10 @@ void MainWindow::SetupMenu() {
    m_menu_file.set_submenu(m_menu_file_sub);
    m_menu_file_reload_css.set_label("Reload CSS");
    m_menu_file_clear_cache.set_label("Clear file cache");
+    m_menu_file_dump_ready.set_label("Dump ready message");
    m_menu_file_sub.append(m_menu_file_reload_css);
    m_menu_file_sub.append(m_menu_file_clear_cache);
+    m_menu_file_sub.append(m_menu_file_dump_ready);

    m_menu_view.set_label("View");
    m_menu_view.set_submenu(m_menu_view_sub);
@@ -265,6 +267,12 @@ void MainWindow::SetupMenu() {
    m_menu_view_threads.set_label("Threads");
    m_menu_view_mark_guild_as_read.set_label("Mark Server as Read");
    m_menu_view_mark_guild_as_read.add_accelerator("activate", m_accels, GDK_KEY_Escape, Gdk::SHIFT_MASK, Gtk::ACCEL_VISIBLE);
+    m_menu_view_channels.set_label("Channels");
+    m_menu_view_channels.add_accelerator("activate", m_accels, GDK_KEY_L, Gdk::CONTROL_MASK, Gtk::ACCEL_VISIBLE);
+    m_menu_view_channels.set_active(true);
+    m_menu_view_members.set_label("Members");
+    m_menu_view_members.add_accelerator("activate", m_accels, GDK_KEY_M, Gdk::CONTROL_MASK, Gtk::ACCEL_VISIBLE);
+    m_menu_view_members.set_active(true);
 #ifdef WITH_LIBHANDY
    m_menu_view_go_back.set_label("Go Back");
    m_menu_view_go_forward.set_label("Go Forward");
@@ -275,6 +283,8 @@ void MainWindow::SetupMenu() {
    m_menu_view_sub.append(m_menu_view_pins);
    m_menu_view_sub.append(m_menu_view_threads);
    m_menu_view_sub.append(m_menu_view_mark_guild_as_read);
+    m_menu_view_sub.append(m_menu_view_channels);
+    m_menu_view_sub.append(m_menu_view_members);
 #ifdef WITH_LIBHANDY
    m_menu_view_sub.append(m_menu_view_go_back);
    m_menu_view_sub.append(m_menu_view_go_forward);
@@ -327,6 +337,10 @@ void MainWindow::SetupMenu() {
        Abaddon::Get().GetImageManager().ClearCache();
    });

+    m_menu_file_dump_ready.signal_toggled().connect([this]() {
+        Abaddon::Get().GetDiscordClient().SetDumpReady(m_menu_file_dump_ready.get_active());
+    });
+
    m_menu_discord_add_recipient.signal_activate().connect([this] {
        m_signal_action_add_recipient.emit(GetChatActiveChannel());
    });
@@ -354,6 +368,14 @@ void MainWindow::SetupMenu() {
        }
    });

+    m_menu_view_channels.signal_activate().connect([this]() {
+        m_channel_list.set_visible(m_menu_view_channels.get_active());
+    });
+
+    m_menu_view_members.signal_activate().connect([this]() {
+        m_members.GetRoot()->set_visible(m_menu_view_members.get_active());
+    });
+
 #ifdef WITH_LIBHANDY
    m_menu_view_go_back.signal_activate().connect([this] {
        GoBack();
--- a/src/windows/mainwindow.hpp
+++ b/src/windows/mainwindow.hpp
@@ -72,6 +72,7 @@ private:
    Gtk::Menu m_menu_file_sub;
    Gtk::MenuItem m_menu_file_reload_css;
    Gtk::MenuItem m_menu_file_clear_cache;
+    Gtk::CheckMenuItem m_menu_file_dump_ready;

    Gtk::MenuItem m_menu_view;
    Gtk::Menu m_menu_view_sub;
@@ -79,6 +80,8 @@ private:
    Gtk::MenuItem m_menu_view_pins;
    Gtk::MenuItem m_menu_view_threads;
    Gtk::MenuItem m_menu_view_mark_guild_as_read;
+    Gtk::CheckMenuItem m_menu_view_channels;
+    Gtk::CheckMenuItem m_menu_view_members;
 #ifdef WITH_LIBHANDY
    Gtk::MenuItem m_menu_view_go_back;
    Gtk::MenuItem m_menu_view_go_forward;
--- a/subprojects/keychain
+++ b/subprojects/keychain
Author	SHA1	Message	Date
ouwou	d2cbe00af2	colors, fallback if guild_folders is empty	2022-12-24 02:44:56 -05:00
ouwou	1ba3daa04a	basic folder support	2022-12-23 20:14:10 -05:00
ouwou	e0e0a6c767	add option to dump ready payload because thats useful	2022-12-21 21:49:18 -05:00
ouwou	acb03642c2	Merge pull request #124 from uowuo/keychain store token in keychain	2022-12-18 20:52:19 +00:00
ouwou	ba2aea86f9	Merge branch 'master' into keychain	2022-12-16 19:28:39 -05:00
abdalrzag eisa	c704703b14	doc: Display `CSS selectors` and `Settings` as tables (#126 )	2022-12-03 23:18:14 +00:00
Altoids1	33a329f16a	Fixes a few minor typos in the README (#127 )	2022-12-02 20:59:40 +00:00
abdalrzag eisa	f0df06a795	doc: list deps for building on Arch Linux (#125 )	2022-12-02 08:57:29 +00:00
ouwou	9ae41b7335	Merge branch 'master' into keychain	2022-12-01 20:00:44 -05:00
ouwou	b9fee0f6c9	Merge branch 'master' of https://github.com/uowuo/abaddon	2022-12-01 02:25:35 -05:00
ouwou	92273829bb	update ci run to latest nlohmann/json release	2022-12-01 01:33:10 -05:00
abdalrzag eisa	86f6f81d9b	add missing setting (#123 )	2022-12-01 00:56:22 +00:00
ouwou	573a619191	Merge branch 'master' into keychain	2022-11-29 15:53:02 -05:00
abdalrzag eisa	c5807a3463	Make README.md more readable (#120 ) * More noticeable warnings * Make CSS selectors stand out more from their description * Make Settings options stand out more from their description, and make the default value easy to see	2022-11-15 07:47:16 +00:00
ouwou	2a9f49a148	add menu item + shortcuts to hide channel and member lists (closes #118 )	2022-11-03 00:45:45 -04:00
ouwou	77dd9fabfa	change service clear user	2022-08-09 02:06:24 -04:00
ouwou	ee67037a3f	store token in keychain	2022-08-08 23:25:34 -04:00
ouwou	b46cf53be5	add hrantzsch/keychain and link	2022-08-08 22:50:27 -04:00