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

Add a nick field in the IRC server configuration form

Browse Source 
fix #3317
This commit is contained in:
louiz’
2018-03-19 20:15:44 +01:00
parent d7427fc9ca
commit 619c991a69
7 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bridge/bridge.cpp
+6 -1
View File
@@ -166,10 +166,15 @@ IrcClient* Bridge::find_irc_client(const std::string& hostname) const
}
}
bool Bridge::join_irc_channel(const Iid& iid, const std::string& nickname, const std::string& password,
bool Bridge::join_irc_channel(const Iid& iid, std::string nickname, const std::string& password,
const std::string& resource, HistoryLimit history_limit)
{
const auto& hostname = iid.get_server();
#ifdef USE_DATABASE
auto soptions = Database::get_irc_server_options(this->get_bare_jid(), hostname);
if (!soptions.col<Database::Nick>().empty())
nickname = soptions.col<Database::Nick>();
#endif
IrcClient* irc = this->make_irc_client(hostname, nickname);
irc->history_limit = history_limit;
this->add_resource_to_server(hostname, resource);
src/bridge/bridge.hpp
+1 -1
View File
@@ -75,7 +75,7 @@ public:
* Try to join an irc_channel, does nothing and return true if the channel
* was already joined.
*/
bool join_irc_channel(const Iid& iid, const std::string& nickname, const std::string& password, const std::string& resource, HistoryLimit history_limit);
bool join_irc_channel(const Iid& iid, std::string nickname, const std::string& password, const std::string& resource, HistoryLimit history_limit);
void send_channel_message(const Iid& iid, const std::string& body, std::string id);
void send_private_message(const Iid& iid, const std::string& body, const std::string& type="PRIVMSG");