Mercurial > irccd

changeset 465:b5478ee3d37a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Irccd: fix identity.ctcp-version option, closes #690
author David Demelier <markand@malikania.fr>
date Tue, 22 Aug 2017 16:56:41 +0200
parents 4dd28f5416fe
children 8ea7330101e6
files CHANGES.md doc/examples/irccd.conf.sample doc/html/irccd/configuring.md doc/man/irccd.conf.5.in libirccd/irccd/server.cpp
diffstat 5 files changed, 5 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES.md	Tue Aug 22 16:38:05 2017 +0200
+++ b/CHANGES.md	Tue Aug 22 16:56:41 2017 +0200
@@ -7,7 +7,8 @@
   - Add new Irccd.Util.cut function (#635),
   - Add new irccdctl commands to edit rules (#641),
   - Plugin plugin: add options max-list-lines, max-list-columns (#618),
-  - Import Duktape 2.1.0 (#648).
+  - Import Duktape 2.1.0 (#648),
+  - Fix identity.ctcp-version option (#690).
 
 irccd 2.1.3 2017-07-28
 ----------------------
--- a/doc/examples/irccd.conf.sample	Tue Aug 22 16:38:05 2017 +0200
+++ b/doc/examples/irccd.conf.sample	Tue Aug 22 16:56:41 2017 +0200
@@ -18,13 +18,9 @@
 #    Load plugins by name or by paths.
 #
 # [plugins]
-# abc =                         # This will search for abc
+# abc = ""                      # This will search for abc
 # ask = /tmp/ask.js             # This use /tmp/ask.js to load the plugin
 
-[plugins]
-history = ""
-ask = ""
-
 # Section identities:
 #    This describe identities, you can add any number you want they are used with servers so you can reuse an
 #    identity for one or more servers if you want.
@@ -35,7 +31,6 @@
 # username = "bar"              # (string) the realname (Optional, default: IRC Client daemon),
 # realname = "Jean"             # (string) the username name (Optional, default: irccd),
 # ctcp-version = "irccd"        # (string) what version to respond to CTCP VERSION (Optional, default: IRC Client Daemon),
-# ctcp-autoreply = true         # (bool) enable auto CTCP VERSION reply, (Optional, default: true).
 
 [identity]
 name = "default"
--- a/doc/html/irccd/configuring.md	Tue Aug 22 16:38:05 2017 +0200
+++ b/doc/html/irccd/configuring.md	Tue Aug 22 16:56:41 2017 +0200
@@ -114,8 +114,7 @@
   - **nickname**: (string) the nickname (Optional, default: irccd),
   - **realname**: (string) the realname (Optional, default: IRC Client Daemon),
   - **username**: (string) the username name (Optional, default: irccd),
-  - **ctcp-version**: (string) what version to respond to CTCP VERSION (Optional, default: IRC Client Daemon),
-  - **ctcp-autoreply**: (bool) enable auto CTCP VERSION reply, (Optional, default: true).
+  - **ctcp-version**: (string) what version to respond to CTCP VERSION (Optional, default: IRC Client Daemon).
 
 **Example**
 
--- a/doc/man/irccd.conf.5.in	Tue Aug 22 16:38:05 2017 +0200
+++ b/doc/man/irccd.conf.5.in	Tue Aug 22 16:56:41 2017 +0200
@@ -113,8 +113,6 @@
 (string) the username name (Optional, default: irccd).
 .It ctcp-version
 (string) what version to respond to CTCP VERSION (Optional, default: IRC Client Daemon).
-.It ctcp-autoreply
-(bool) enable auto CTCP VERSION reply, (Optional, default: true).
 .El
 .\" SERVER
 .Ss server
--- a/libirccd/irccd/server.cpp	Tue Aug 22 16:38:05 2017 +0200
+++ b/libirccd/irccd/server.cpp	Tue Aug 22 16:56:41 2017 +0200
@@ -577,7 +577,7 @@
 void Server::setCtcpVersion(std::string ctcpversion)
 {
     m_ctcpversion = std::move(ctcpversion);
-    irc_set_ctcp_version(*m_session, ctcpversion.c_str());
+    irc_set_ctcp_version(*m_session, m_ctcpversion.c_str());
 }
 
 void Server::next(std::unique_ptr<State> state) noexcept