mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use generic send_presence_error() instead of almost identical specializations

Browse Source
This commit is contained in:
Florent Le Coz
2014-08-08 00:46:27 +02:00
parent 7d99ba8dd9
commit e3ea0d62c7
5 changed files with 24 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bridge/bridge.cpp
+5 -3
View File
@@ -331,9 +331,11 @@ void Bridge::send_message(const Iid& iid, const std::string& nick, const std::st
}
}
void Bridge::send_join_failed(const Iid& iid, const std::string& nick, const std::string& type, const std::string& condition, const std::string& text)
void Bridge::send_presence_error(const Iid& iid, const std::string& nick,
const std::string& type, const std::string& condition,
const std::string& error_code, const std::string& text)
{
this->xmpp->send_presence_error(std::to_string(iid), nick, this->user_jid, type, condition, text);
this->xmpp->send_presence_error(std::to_string(iid), nick, this->user_jid, type, condition, error_code, text);
}
void Bridge::send_muc_leave(Iid&& iid, std::string&& nick, const std::string& message, const bool self)
@@ -412,7 +414,7 @@ void Bridge::kick_muc_user(Iid&& iid, const std::string& target, const std::stri
void Bridge::send_nickname_conflict_error(const Iid& iid, const std::string& nickname)
{
this->xmpp->send_nickname_conflict_error(std::to_string(iid), nickname, this->user_jid);
this->xmpp->send_presence_error(std::to_string(iid), nickname, this->user_jid, "cancel", "conflict", "409", "");
}
void Bridge::send_affiliation_role_change(const Iid& iid, const std::string& target, const char mode)
src/bridge/bridge.hpp
+2 -3
View File
@@ -100,10 +100,9 @@ public:
*/
void send_message(const Iid& iid, const std::string& nick, const std::string& body, const bool muc);
/**
* Send a presence of type error, from a room. This is used to indicate
* why joining a room failed.
* Send a presence of type error, from a room.
*/
void send_join_failed(const Iid& iid, const std::string& nick, const std::string& type, const std::string& condition, const std::string& text);
void send_presence_error(const Iid& iid, const std::string& nick, const std::string& type, const std::string& condition, const std::string& error_code, const std::string& text);
/**
* Send an unavailable presence from this participant
*/