Merge branch 'clear-next' into 'master'

Clear session['next'] if we are done

See merge request sjehuda/slixfeed!7
This commit is contained in:
Schimon Jehudah 2024-02-16 01:34:09 +00:00
commit 21bfd3e3d5

View file

@ -875,6 +875,7 @@ class Slixfeed(slixmpp.ClientXMPP):
async def _handle_import_complete(self, payload, session): async def _handle_import_complete(self, payload, session):
session['next'] = None
url = payload['values']['url'] url = payload['values']['url']
if url.startswith('http') and url.endswith('.opml'): if url.startswith('http') and url.endswith('.opml'):
jid = session['from'].bare jid = session['from'].bare
@ -895,17 +896,9 @@ class Slixfeed(slixmpp.ClientXMPP):
except: except:
session['notes'] = [['error', 'Import failed. Filetype does not appear to be an OPML file.']] session['notes'] = [['error', 'Import failed. Filetype does not appear to be an OPML file.']]
session['has_next'] = False session['has_next'] = False
# Mitigate Cheogram issue
# Gajim acts also strage, so this might be an issue with slixmmpp
# session['next'] = False
else: else:
session['notes'] = [['error', 'Import aborted. Send URL of OPML file.']] session['notes'] = [['error', 'Import aborted. Send URL of OPML file.']]
session['has_next'] = False session['has_next'] = False
# Mitigate Cheogram issue
# Gajim acts also strage, so this might be an issue with slixmmpp
# session['next'] = False
return session return session