Skip to content

Commit

Permalink
fix(mode): bugs detected during testing
Browse files Browse the repository at this point in the history
  • Loading branch information
jdomingu98 committed May 8, 2024
1 parent 1a66f4c commit f8fcf5e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions src/Channel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -348,10 +348,10 @@ void Channel::removeUser(const std::string &nickname) {
*/
void Channel::makeUserAnOper(std::string nickname) {
std::vector<User *>::iterator it = findUser(nickname);
if (it == this->_users.end())
throw UserNotInChannelException(nickname, this->_name);
this->_operators.push_back(*it);
this->_users.erase(it);
if (it != this->_users.end()) {
this->_operators.push_back(*it);
this->_users.erase(it);
}
}

/**
Expand All @@ -363,10 +363,10 @@ void Channel::makeUserAnOper(std::string nickname) {
*/
void Channel::makeOperAnUser(std::string nickname) {
std::vector<User *>::iterator it = findOper(nickname);
if (it == this->_operators.end())
throw UserNotInChannelException(nickname, this->_name);
this->_users.push_back(*it);
this->_operators.erase(it);
if (it == this->_operators.end()) {
this->_users.push_back(*it);
this->_operators.erase(it);
}
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/parser/ModeParser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ ACommand *ModeParser::parse(const std::vector<std::string>& tokens) {
for (size_t i = 3; i < tokens.size(); i++)
modeParams.push_back(tokens[i]);

return new ModeCommand(modesTok[0] == '+', tokens[1], modes, modeParams);
return new ModeCommand(modesTok[0] != '-', tokens[1], modes, modeParams);
}

0 comments on commit f8fcf5e

Please sign in to comment.