diff options
Diffstat (limited to 'src/users.cpp')
| -rw-r--r-- | src/users.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/users.cpp b/src/users.cpp index 4968c7a37..04d2114dc 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -357,7 +357,7 @@ void User::Oper(OperInfo* info) this->SetMode(opermh, true); this->oper = info; - this->WriteServ("MODE %s :+o", this->nick.c_str()); + this->WriteCommand("MODE", "+o"); FOREACH_MOD(OnOper, (this, info->name)); std::string opername; @@ -863,9 +863,9 @@ void User::WriteServ(const char* text, ...) this->WriteServ(textbuffer); } -void User::WriteNotice(const std::string& text) +void User::WriteCommand(const char* command, const std::string& text) { - this->WriteServ("NOTICE " + (this->registered == REG_ALL ? this->nick : "*") + " :" + text); + this->WriteServ(command + (this->registered & REG_NICK ? " " + this->nick : " *") + " " + text); } void User::WriteNumeric(unsigned int numeric, const char* text, ...) @@ -885,7 +885,7 @@ void User::WriteNumeric(unsigned int numeric, const std::string &text) return; const std::string message = InspIRCd::Format(":%s %03u %s %s", ServerInstance->Config->ServerName.c_str(), - numeric, !this->nick.empty() ? this->nick.c_str() : "*", text.c_str()); + numeric, this->registered & REG_NICK ? this->nick.c_str() : "*", text.c_str()); this->Write(message); } |