Browse Source

Updated jupiter submodule; adjusted code as necessary to compile

pull/15/head
Jessica James 4 years ago
parent
commit
482bd8114b
  1. 2
      src/Jupiter
  2. 4
      src/Plugins/ExtraCommands/ExtraCommands.cpp
  3. 6
      src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp
  4. 4
      src/Plugins/RenX/RenX.Core/RenX_Server.cpp

2
src/Jupiter

@ -1 +1 @@
Subproject commit 84455254c6fd4918e8f87f8804c0139bfc4487d4 Subproject commit 15c69edc7c466077928dededc2028b65113b0fab

4
src/Plugins/ExtraCommands/ExtraCommands.cpp

@ -264,8 +264,8 @@ Jupiter::GenericCommand::ResponseLine *DebugInfoGenericCommand::trigger(const Ju
line = line->next; line = line->next;
for (auto& user_pair : channel.getUsers()) { for (auto& user_pair : channel.getUsers()) {
Jupiter::IRC::Client::User *user = user_pair.second.getUser(); Jupiter::IRC::Client::User *user = user_pair.second->getUser();
line->next = new Jupiter::GenericCommand::ResponseLine(Jupiter::StringS::Format("User %.*s!%.*s@%.*s (prefix: %c) of channel %.*s (of %u shared)", user->getNickname().size(), user->getNickname().ptr(), user->getUsername().size(), user->getUsername().ptr(), user->getHostname().size(), user->getHostname().ptr(), channel.getUserPrefix(user_pair.second) ? channel.getUserPrefix(user_pair.second) : ' ', channel.getName().size(), channel.getName().ptr(), user->getChannelCount()), GenericCommand::DisplayType::PublicSuccess); line->next = new Jupiter::GenericCommand::ResponseLine(Jupiter::StringS::Format("User %.*s!%.*s@%.*s (prefix: %c) of channel %.*s (of %u shared)", user->getNickname().size(), user->getNickname().ptr(), user->getUsername().size(), user->getUsername().ptr(), user->getHostname().size(), user->getHostname().ptr(), channel.getUserPrefix(*user_pair.second) ? channel.getUserPrefix(*user_pair.second) : ' ', channel.getName().size(), channel.getName().ptr(), user->getChannelCount()), GenericCommand::DisplayType::PublicSuccess);
line = line->next; line = line->next;
}; };
}; };

6
src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp

@ -3413,10 +3413,10 @@ void ModRequestGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *play
user_message += channel.getName(); user_message += channel.getName();
for (auto& user : channel.getUsers()) { for (auto& user : channel.getUsers()) {
if (channel.getUserPrefix(user.second) != 0 // If the user has a prefix... if (channel.getUserPrefix(*user.second) != 0 // If the user has a prefix...
&& !user.second.getNickname().equals(server.getNickname())) { // And the user isn't this bot... && !user.second->getNickname().equals(server.getNickname())) { // And the user isn't this bot...
// Alert the user // Alert the user
server.sendMessage(user.second.getNickname(), user_message); server.sendMessage(user.second->getNickname(), user_message);
++total_user_alerts; ++total_user_alerts;
} }
} }

4
src/Plugins/RenX/RenX.Core/RenX_Server.cpp

@ -680,8 +680,8 @@ void RenX::Server::banCheck(RenX::PlayerInfo &player)
user_message += channel.second.getName(); user_message += channel.second.getName();
for (auto& user : channel.second.getUsers()) { for (auto& user : channel.second.getUsers()) {
if (channel.second.getUserPrefix(user.second) != 0 && user.second.getNickname().equals(server->getNickname()) == false) if (channel.second.getUserPrefix(*user.second) != 0 && user.second->getNickname().equals(server->getNickname()) == false)
server->sendMessage(user.second.getUser()->getNickname(), user_message); server->sendMessage(user.second->getUser()->getNickname(), user_message);
} }
user_message -= channel.second.getName().size(); user_message -= channel.second.getName().size();
} }

Loading…
Cancel
Save