jack/Toast
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: jack:develop
Branches Tags
jack:release jack:develop
jack:5 jack:3 jack:1
...
compare: jack:5
Branches Tags
jack:release jack:develop
jack:5 jack:3 jack:1

2 Commits
develop ... 5

Author SHA1 Message Date
jackb-p
301d99ca2f Fix bad role name checking code 2016-08-19 17:47:07 +01:00
Jack
b68ac1d3b2 Merge pull request #8 from jackb-p/develop 
Merge Develop branch
 2016-08-19 17:41:54 +01:00
1 changed files with 2 additions and 2 deletions
Expand all files Collapse all files

4
TriviaBot/bot/GatewayHandler.cpp
View File

@ -519,7 +519,7 @@ void GatewayHandler::on_event_message_create(json data, client &c, websocketpp::
}); });
BotConfig &conf = config; BotConfig &conf = config;
bool disallowed = std::find_if(member->roles.begin(), member->roles.end(), [conf](DiscordObjects::Role *r) -> bool { bool disallowed = std::find_if(member->roles.begin(), member->roles.end(), [conf](DiscordObjects::Role *r) -> bool {
return conf.createjs_roles.count(r->name); return conf.js_allowed_roles.count(r->name);
}) == member->roles.end(); // checks if the user has the required roles }) == member->roles.end(); // checks if the user has the required roles
if (disallowed) { if (disallowed) {
@ -537,7 +537,7 @@ void GatewayHandler::on_event_message_create(json data, client &c, websocketpp::
auto &member = *std::find_if(guild.members.begin(), guild.members.end(), [sender](DiscordObjects::GuildMember *m) { return sender.id == m->user->id; }); auto &member = *std::find_if(guild.members.begin(), guild.members.end(), [sender](DiscordObjects::GuildMember *m) { return sender.id == m->user->id; });
BotConfig &conf = config; BotConfig &conf = config;
bool disallowed = std::find_if(member->roles.begin(), member->roles.end(), [conf](DiscordObjects::Role *r) -> bool { bool disallowed = std::find_if(member->roles.begin(), member->roles.end(), [conf](DiscordObjects::Role *r) -> bool {
return conf.createjs_roles.count(r->name); return conf.js_allowed_roles.count(r->name);
}) == member->roles.end(); // checks if the user has the required roles }) == member->roles.end(); // checks if the user has the required roles
if (disallowed) { if (disallowed) {