Minki/abaddon
1
0
Fork 0
mirror of https://github.com/uowuo/abaddon.git synced 2024-09-20 06:51:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/uowuo/abaddon

Browse Source
This commit is contained in:
ouwou 2024-06-02 20:32:31 -04:00
commit 01865075a4
4 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -347,7 +347,7 @@ For example, memory_db would be set by adding `memory_db = true` under the line
| Setting | Type | Default | Description |
|---------------|---------|---------|-------------------------|
| `hideconsole` | boolean | true | Hide console on startup |
| `hideconsole` | boolean | false | Hide console on startup |
### Environment variables

60
src/discord/user.cpp
View File

@ -220,34 +220,34 @@ void UserData::update_from_json(const nlohmann::json &j) {
}
const char *UserData::GetFlagName(uint64_t flag) {
switch (flag) {
case DiscordEmployee:
switch (static_cast<UserData::EFlags>(flag)) {
case UserData::EFlags::DiscordEmployee:
return "discordstaff";
case PartneredServerOwner:
case UserData::EFlags::PartneredServerOwner:
return "partneredowner";
case HypeSquadEvents:
case UserData::EFlags::HypeSquadEvents:
return "hypesquadevents";
case BugHunterLevel1:
case UserData::EFlags::BugHunterLevel1:
return "discordbughunter";
case HouseBravery:
case UserData::EFlags::HouseBravery:
return "hypesquadbravery";
case HouseBrilliance:
case UserData::EFlags::HouseBrilliance:
return "hypesquadbrilliance";
case HouseBalance:
case UserData::EFlags::HouseBalance:
return "hypesquadbalance";
case EarlySupporter:
case UserData::EFlags::EarlySupporter:
return "earlysupporter";
case TeamUser:
case UserData::EFlags::TeamUser:
return "teamuser";
case System:
case UserData::EFlags::System:
return "system";
case BugHunterLevel2:
case UserData::EFlags::BugHunterLevel2:
return "discordbughunter2";
case VerifiedBot:
case UserData::EFlags::VerifiedBot:
return "verifiedbot";
case EarlyVerifiedBotDeveloper:
case UserData::EFlags::EarlyVerifiedBotDeveloper:
return "earlyverifiedbotdeveloper";
case CertifiedModerator:
case UserData::EFlags::CertifiedModerator:
return "certifiedmoderator";
default:
return "unknown";
@ -255,34 +255,34 @@ const char *UserData::GetFlagName(uint64_t flag) {
}
const char *UserData::GetFlagReadableName(uint64_t flag) {
switch (flag) {
case DiscordEmployee:
switch (static_cast<UserData::EFlags>(flag)) {
case UserData::EFlags::DiscordEmployee:
return "Discord Staff";
case PartneredServerOwner:
case UserData::EFlags::PartneredServerOwner:
return "Partnered Server Owner";
case HypeSquadEvents:
case UserData::EFlags::HypeSquadEvents:
return "HypeSquad Events";
case BugHunterLevel1:
case UserData::EFlags::BugHunterLevel1:
return "Discord Bug Hunter";
case HouseBravery:
case UserData::EFlags::HouseBravery:
return "HypeSquad Bravery";
case HouseBrilliance:
case UserData::EFlags::HouseBrilliance:
return "HypeSquad Brilliance";
case HouseBalance:
case UserData::EFlags::HouseBalance:
return "HypeSquad Balance";
case EarlySupporter:
case UserData::EFlags::EarlySupporter:
return "Early Supporter";
case TeamUser:
case UserData::EFlags::TeamUser:
return "Team User"; // ???
case System:
case UserData::EFlags::System:
return "System";
case BugHunterLevel2:
case UserData::EFlags::BugHunterLevel2:
return "Discord Bug Hunter Level 2";
case VerifiedBot:
case UserData::EFlags::VerifiedBot:
return "Verified Bot";
case EarlyVerifiedBotDeveloper:
case UserData::EFlags::EarlyVerifiedBotDeveloper:
return "Early Verified Bot Developer";
case CertifiedModerator:
case UserData::EFlags::CertifiedModerator:
return "Discord Certified Moderator";
default:
return "";

3
src/discord/user.hpp
View File

@ -11,8 +11,7 @@ enum class EPremiumType {
};
struct UserData {
// todo: enum class? (for consistencys sake)
enum {
enum class EFlags : uint64_t {
DiscordEmployee = 1 << 0,
PartneredServerOwner = 1 << 1,
HypeSquadEvents = 1 << 2,

5
src/windows/profilewindow.cpp
View File

@ -1,6 +1,7 @@
#include "profilewindow.hpp"
#include "abaddon.hpp"
#include "discord/user.hpp"
#include "util.hpp"
ProfileWindow::ProfileWindow(Snowflake user_id)
@ -116,13 +117,13 @@ void ProfileWindow::OnFetchProfile(const UserProfileData &data) {
if (!data.User.PublicFlags.has_value()) return;
const auto x = *data.User.PublicFlags;
for (uint64_t i = 1; i <= UserData::MaxFlag; i <<= 1) {
for (uint64_t i = 1; i <= static_cast<uint64_t>(UserData::EFlags::MaxFlag); i <<= 1) {
if (!(x & i)) continue;
const std::string name = UserData::GetFlagName(i);
if (name == "unknown") continue;
Glib::RefPtr<Gdk::Pixbuf> pixbuf;
try {
if (name == "verifiedbot")
if (i == static_cast<uint64_t>(UserData::EFlags::VerifiedBot))
pixbuf = Gdk::Pixbuf::create_from_file(Abaddon::GetResPath("/checkmark.png"), 24, 24);
else
pixbuf = Gdk::Pixbuf::create_from_file(Abaddon::GetResPath("/" + name + ".png"), 24, 24);