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

Merge branch 'master' into mobile

Browse Source
This commit is contained in:
ouwou
2021-05-02 00:45:00 -04:00
parent c04fc2e60c 5394c67079
commit 1ca6235e09
5 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/chatmessage.cpp
View File

@@ -277,6 +277,18 @@ void ChatMessageItemContainer::UpdateTextComponent(Gtk::TextView *tv) {
case MessageType::CALL: {
b->insert_markup(s, "<span color='#999999'><i>[started a call]</i></span>");
} break;
case MessageType::GUILD_DISCOVERY_DISQUALIFIED: {
b->insert_markup(s, "<i><span color='#999999'>This server has been removed from Server Discovery because it no longer passes all the requirements.</span></i>");
} break;
case MessageType::GUILD_DISCOVERY_REQUALIFIED: {
b->insert_markup(s, "<i><span color='#999999'>This server is eligible for Server Discovery again and has been automatically relisted!</span></i>");
} break;
case MessageType::GUILD_DISCOVERY_GRACE_PERIOD_INITIAL_WARNING: {
b->insert_markup(s, "<i><span color='#999999'>This server has failed Discovery activity requirements for 1 week. If this server fails for 4 weeks in a row, it will be automatically removed from Discovery.</span></i>");
} break;
case MessageType::GUILD_DISCOVERY_GRACE_PERIOD_FINAL_WARNING: {
b->insert_markup(s, "<i><span color='#999999'>This server has failed Discovery activity requirements for 3 weeks in a row. If this server fails for 1 more week, it will be removed from Discovery.</span></i>");
} break;
default: break;
}
}

5
components/completer.cpp
View File

@@ -160,8 +160,11 @@ void Completer::CompleteEmojis(const Glib::ustring &term) {
return entry;
};
const auto self_id = discord.GetUserData().ID;
const bool can_use_external = discord.GetSelfPremiumType() != EPremiumType::None && discord.HasChannelPermission(self_id, channel_id, Permission::USE_EXTERNAL_EMOJIS);
int i = 0;
if (discord.GetSelfPremiumType() == EPremiumType::None) {
if (!can_use_external) {
if (channel->GuildID.has_value()) {
const auto guild = discord.GetGuild(*channel->GuildID);