Support all allowed channel prefixes
RFC 2812 specifies in §1.3 that “Channels names are strings (beginning with a '&', '#', '+' or '!' character) of length up to fifty (50) characters.” We previously only allowed the first two prefix characters, or any other one if the server overrides the list with ISUPPORT.
This commit is contained in:
@@ -1160,7 +1160,7 @@ std::set<char> Bridge::get_chantypes(const std::string& hostname) const
|
||||
{
|
||||
IrcClient* irc = this->find_irc_client(hostname);
|
||||
if (!irc)
|
||||
return {'#', '&'};
|
||||
return {'&', '#', '+', '!'};
|
||||
return irc->get_chantypes();
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -20,7 +20,7 @@ class Bridge;
|
||||
* It’s possible to have an empty-string server, but it makes no sense in
|
||||
* biboumi’s context.
|
||||
*
|
||||
* Assuming the chantypes are '#' and '&':
|
||||
* Assuming the chantypes are '&', '#', '+' and '!':
|
||||
*
|
||||
* #test%irc.example.org has :
|
||||
* - local: "#test" (the # is part of the name, it could very well be absent, or & (for example) instead)
|
||||
|
||||
@@ -155,7 +155,7 @@ IrcClient::IrcClient(std::shared_ptr<Poller>& poller, std::string hostname,
|
||||
bridge(bridge),
|
||||
welcomed(false),
|
||||
chanmodes({"", "", "", ""}),
|
||||
chantypes({'#', '&'}),
|
||||
chantypes({'&', '#', '+', '!'}),
|
||||
tokens_bucket(this->get_throttle_limit(), 1s, [this]() {
|
||||
if (message_queue.empty())
|
||||
return true;
|
||||
|
||||
@@ -482,7 +482,7 @@ void BiboumiComponent::handle_iq(const Stanza& stanza)
|
||||
|
||||
// Depending on the 'to' jid in the request, we use one adhoc
|
||||
// command handler or an other
|
||||
Iid iid(to.local, {'#', '&'});
|
||||
Iid iid(to.local, {'&', '#', '+', '!'});
|
||||
AdhocCommandsHandler* adhoc_handler;
|
||||
if (to.local.empty())
|
||||
adhoc_handler = &this->adhoc_commands_handler;
|
||||
@@ -532,7 +532,7 @@ void BiboumiComponent::handle_iq(const Stanza& stanza)
|
||||
const XmlNode* query;
|
||||
if ((query = stanza.get_child("query", DISCO_INFO_NS)))
|
||||
{ // Disco info
|
||||
Iid iid(to.local, {'#', '&'});
|
||||
Iid iid(to.local, {'&', '#', '+', '!'});
|
||||
const std::string node = query->get_tag("node");
|
||||
if (to_str == this->served_hostname)
|
||||
{
|
||||
@@ -736,7 +736,7 @@ bool BiboumiComponent::handle_mam_request(const Stanza& stanza)
|
||||
|
||||
const XmlNode* query = stanza.get_child("query", MAM_NS);
|
||||
|
||||
Iid iid(to.local, {'#', '&'});
|
||||
Iid iid(to.local, {'&', '#', '+', '!'});
|
||||
if (query && iid.type == Iid::Type::Channel && to.resource.empty())
|
||||
{
|
||||
const std::string query_id = query->get_tag("queryid");
|
||||
@@ -865,7 +865,7 @@ void BiboumiComponent::send_archived_message(const Database::MucLogLine& log_lin
|
||||
|
||||
bool BiboumiComponent::handle_room_configuration_form_request(const std::string& from, const Jid& to, const std::string& id)
|
||||
{
|
||||
Iid iid(to.local, {'#', '&'});
|
||||
Iid iid(to.local, {'&', '#', '+', '!'});
|
||||
|
||||
if (iid.type != Iid::Type::Channel || !to.resource.empty())
|
||||
return false;
|
||||
@@ -887,7 +887,7 @@ bool BiboumiComponent::handle_room_configuration_form_request(const std::string&
|
||||
|
||||
bool BiboumiComponent::handle_room_configuration_form(const XmlNode& query, const std::string &from, const Jid &to, const std::string &id)
|
||||
{
|
||||
Iid iid(to.local, {'#', '&'});
|
||||
Iid iid(to.local, {'&', '#', '+', '!'});
|
||||
|
||||
if (iid.type != Iid::Type::Channel || !to.resource.empty())
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user