pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove force_remote_bookmarks option

Browse source 
It is 2021, servers ought to not be broken that much.
This commit is contained in:
mathieui 2021-01-29 11:23:31 +01:00
parent b2c846f959
commit 9f1e80cd5c
4 changed files with 1 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/default_config.cfg
View file

@ -132,10 +132,6 @@ use_bookmarks_method =
# possible values are: anything/false # possible values are: anything/false
#use_remote_bookmarks = true #use_remote_bookmarks = true
# Force the retrieval of the remote bookmarks even when the server
# doesn't advertise support for your method
#force_remote_bookmarks = false
# Whether you want all bookmarks, even those without # Whether you want all bookmarks, even those without
# autojoin, to be open on startup # autojoin, to be open on startup
#open_all_bookmarks = false #open_all_bookmarks = false

7
doc/source/configuration.rst
View file

@ -384,13 +384,6 @@ to understand what is :ref:`carbons <carbons-details>` or
This was previously named ``bookmark_on_join``. This was previously named ``bookmark_on_join``.
force_remote_bookmarks
**Default value:** ``false``
Try to retrieve your remote bookmarks, even when your server doesn’t advertise
support.
use_bookmark_method use_bookmark_method
**Default value:** ``[empty]`` **Default value:** ``[empty]``

18
poezio/bookmarks.py
View file

@ -279,25 +279,9 @@ class BookmarkList:
def get_remote(self, xmpp, information, callback): def get_remote(self, xmpp, information, callback):
"""Add the remotely stored bookmarks to the list.""" """Add the remotely stored bookmarks to the list."""
force = config.get('force_remote_bookmarks') if xmpp.anon or not any(self.available_storage.values()):
if xmpp.anon or not (any(self.available_storage.values()) or force):
information('No remote bookmark storage available', 'Warning') information('No remote bookmark storage available', 'Warning')
return return
if force and not any(self.available_storage.values()):
old_callback = callback
method = 'pep' if self.preferred == 'pep' else 'privatexml'
def new_callback(result):
if result['type'] != 'error':
self.available_storage[method] = True
old_callback(result)
else:
information('No remote bookmark storage available',
'Warning')
callback = new_callback
if self.preferred == 'pep': if self.preferred == 'pep':
self.get_pep(xmpp, callback=callback) self.get_pep(xmpp, callback=callback)
else: else:

1
poezio/config.py
View file

@ -73,7 +73,6 @@ DEFAULT_CONFIG = {
'extract_inline_images': True, 'extract_inline_images': True,
'filter_info_messages': '', 'filter_info_messages': '',
'force_encryption': True, 'force_encryption': True,
'force_remote_bookmarks': False,
'go_to_previous_tab_on_alt_number': False, 'go_to_previous_tab_on_alt_number': False,
'group_corrections': True, 'group_corrections': True,
'hide_exit_join': -1, 'hide_exit_join': -1,