From 5369778bb9141da4e94ff400d66a924f9298c43f Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sat, 8 Oct 2016 22:40:03 +0100 Subject: Remove the resource option from the configuration. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s considered bad practice nowadays to force a specific resource, it can lead to presence leaks or reconnection loops so should be avoided. Moreover this was already possible in the jid option, by setting it to user@domain/resource, setting it would append it a second time in that case. --- data/default_config.cfg | 8 +------- doc/source/commands.rst | 4 ++-- doc/source/configuration.rst | 10 +--------- poezio/config.py | 1 - poezio/connection.py | 6 ------ 5 files changed, 4 insertions(+), 25 deletions(-) diff --git a/data/default_config.cfg b/data/default_config.cfg index dd98e493..d8ec3705 100644 --- a/data/default_config.cfg +++ b/data/default_config.cfg @@ -11,7 +11,7 @@ # account on a server. This is optional and useful only for some features, # like room administration, nickname registration. # The 'server' option will be ignored if you specify a JID (Jabber identifier) -# It should be in the form nickname@server.tld +# It should be in the form nickname@server.tld or nickname@server.tld/resource jid = # A password is needed only if you specified a jid. It will be ignored otherwise @@ -49,12 +49,6 @@ highlight_on = # Colon-separated list of plugins to load on startup plugins_autoload = -# the resource you will use -# If it's empty, your resource will be chosen (most likely randomly) by the server -# It is not recommended to use a resource that is easy to guess, because it can lead -# to presence leak. -resource = - # The server used for anonymous connection. # Make sure the server you're using accepts anonymous authentication #server = anon.jeproteste.info diff --git a/doc/source/commands.rst b/doc/source/commands.rst index 8c0e0d5b..64a2f033 100644 --- a/doc/source/commands.rst +++ b/doc/source/commands.rst @@ -138,7 +138,7 @@ These commands work in *any* tab. Set the value to the option in your configuration file. You can, for example, change your default nickname - by doing "/set default_nick toto" or your resource with "/set resource + by doing "/set default_nick toto" or your password with "/set password blabla". Doing so will write in the main config file, and in the main section ([Poezio]). But you can also write to another section, with ``/set bindings M-i ^i``, to a plugin configuration with ``/set mpd_client| host @@ -152,7 +152,7 @@ These commands work in *any* tab. **Usage:** ``/set_default [section]