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. --- poezio/config.py | 1 - poezio/connection.py | 6 ------ 2 files changed, 7 deletions(-) (limited to 'poezio') diff --git a/poezio/config.py b/poezio/config.py index 15380b8b..f2002382 100644 --- a/poezio/config.py +++ b/poezio/config.py @@ -95,7 +95,6 @@ DEFAULT_CONFIG = { 'private_auto_response': '', 'remote_fifo_path': './', 'request_message_receipts': True, - 'resource': '', 'rooms': '', 'roster_group_sort': 'name', 'roster_show_offline': False, diff --git a/poezio/connection.py b/poezio/connection.py index 7b12a6eb..be030497 100644 --- a/poezio/connection.py +++ b/poezio/connection.py @@ -32,8 +32,6 @@ class Connection(slixmpp.ClientXMPP): """ __init = False def __init__(self): - resource = config.get('resource') - keyfile = config.get('keyfile') certfile = config.get('certfile') @@ -43,8 +41,6 @@ class Connection(slixmpp.ClientXMPP): # depending on this setting self.anon = False jid = '%s' % config.get('jid') - if resource: - jid = '%s/%s'% (jid, resource) password = config.get('password') eval_password = config.get('eval_password') if not password and not eval_password and not (keyfile and certfile): @@ -63,8 +59,6 @@ class Connection(slixmpp.ClientXMPP): else: # anonymous auth self.anon = True jid = config.get('server') - if resource: - jid = '%s/%s' % (jid, resource) password = None jid = safeJID(jid) # TODO: use the system language -- cgit v1.2.3