celisej567/abaddon
1
0
Fork 0
mirror of https://github.com/celisej567/abaddon.git synced 2026-09-04 11:33:27 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

friends: handle presence updates

Browse Source
This commit is contained in:
ouwou
2021-05-07 03:04:05 -04:00
parent 19a2aed020
commit e44484cc26
2 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
components/friendslist.cpp
View File

@@ -5,8 +5,10 @@
FriendsList::FriendsList()
: Gtk::Box(Gtk::ORIENTATION_VERTICAL)
, m_filter_mode(FILTER_FRIENDS) {
for (const auto &[id, type] : Abaddon::Get().GetDiscordClient().GetRelationships()) {
const auto user = Abaddon::Get().GetDiscordClient().GetUser(id);
auto &discord = Abaddon::Get().GetDiscordClient();
for (const auto &[id, type] : discord.GetRelationships()) {
const auto user = discord.GetUser(id);
if (!user.has_value()) continue;
auto *row = Gtk::manage(new FriendsListFriendRow(type, *user));
m_list.add(*row);
@@ -81,7 +83,7 @@ bool FriendsList::ListFilterFunc(Gtk::ListBoxRow *row_) {
case FILTER_FRIENDS:
return row->Type == RelationshipType::Friend;
case FILTER_ONLINE:
return false; // blah
return row->Type == RelationshipType::Friend && row->Status != PresenceStatus::Offline;
case FILTER_PENDING:
return row->Type == RelationshipType::PendingIncoming || row->Type == RelationshipType::PendingOutgoing;
case FILTER_BLOCKED:
@@ -115,14 +117,18 @@ FriendsListFriendRow::FriendsListFriendRow(RelationshipType type, const UserData
: Name(data.Username + "#" + data.Discriminator)
, Type(type)
, ID(data.ID)
, Status(Abaddon::Get().GetDiscordClient().GetUserStatus(data.ID))
, m_accept("Accept") {
auto *ev = Gtk::manage(new Gtk::EventBox);
auto *box = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL));
auto *img = Gtk::manage(new LazyImage(32, 32, true));
auto *namelbl = Gtk::manage(new Gtk::Label(Name, Gtk::ALIGN_START));
auto *statuslbl = Gtk::manage(new Gtk::Label("", Gtk::ALIGN_START));
m_status_lbl = Gtk::manage(new Gtk::Label("", Gtk::ALIGN_START));
auto *lblbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
auto &discord = Abaddon::Get().GetDiscordClient();
discord.signal_presence_update().connect(sigc::mem_fun(*this, &FriendsListFriendRow::OnPresenceUpdate));
if (data.HasAnimatedAvatar()) {
img->SetAnimated(true);
img->SetURL(data.GetAvatarURL("gif", "32"));
@@ -130,17 +136,7 @@ FriendsListFriendRow::FriendsListFriendRow(RelationshipType type, const UserData
img->SetURL(data.GetAvatarURL("png", "32"));
}
switch (Type) {
case RelationshipType::PendingIncoming:
statuslbl->set_text("Incoming Friend Request");
break;
case RelationshipType::PendingOutgoing:
statuslbl->set_text("Outgoing Friend Request");
break;
default:
statuslbl->set_text(GetPresenceDisplayString(Abaddon::Get().GetDiscordClient().GetUserStatus(data.ID)));
break;
}
UpdatePresenceLabel();
AddWidgetMenuHandler(ev, m_menu, [this] {
m_accept.set_visible(Type == RelationshipType::PendingIncoming);
@@ -178,7 +174,7 @@ FriendsListFriendRow::FriendsListFriendRow(RelationshipType type, const UserData
img->set_margin_end(5);
lblbox->add(*namelbl);
lblbox->add(*statuslbl);
lblbox->add(*m_status_lbl);
box->add(*img);
box->add(*lblbox);
@@ -188,6 +184,27 @@ FriendsListFriendRow::FriendsListFriendRow(RelationshipType type, const UserData
show_all_children();
}
void FriendsListFriendRow::UpdatePresenceLabel() {
switch (Type) {
case RelationshipType::PendingIncoming:
m_status_lbl->set_text("Incoming Friend Request");
break;
case RelationshipType::PendingOutgoing:
m_status_lbl->set_text("Outgoing Friend Request");
break;
default:
m_status_lbl->set_text(GetPresenceDisplayString(Status));
break;
}
}
void FriendsListFriendRow::OnPresenceUpdate(const UserData &user, PresenceStatus status) {
if (user.ID != ID) return;
Status = status;
UpdatePresenceLabel();
changed();
}
FriendsListFriendRow::type_signal_remove FriendsListFriendRow::signal_action_remove() {
return m_signal_remove;
}

7
components/friendslist.hpp
View File

@@ -1,6 +1,7 @@
#pragma once
#include <gtkmm.h>
#include "../discord/relationship.hpp"
#include "../discord/activity.hpp"
class FriendsListAddComponent : public Gtk::Box {
public:
@@ -45,8 +46,14 @@ public:
Snowflake ID;
RelationshipType Type;
Glib::ustring Name;
PresenceStatus Status;
private:
void UpdatePresenceLabel();
void OnPresenceUpdate(const UserData &user, PresenceStatus status);
Gtk::Label *m_status_lbl;
Gtk::Menu m_menu;
Gtk::MenuItem m_remove; // or cancel or ignore
Gtk::MenuItem m_accept; // incoming