thecoffemaker/Slixfeed
1
0
Fork 0
forked from sch/Slixfeed
Code Pull requests Activity

Fix error upon attempt to get JID from values['jid'] (Thank you roughnecks).

Browse source
This commit is contained in:
Schimon Jehudah 2024-03-26 19:32:24 +00:00
parent df7cc6ed2b
commit 5f946fe0b6
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
slixfeed/version.py
View file

@ -1,2 +1,2 @@
__version__ = '0.1.49' __version__ = '0.1.50'
__version_info__ = (0, 1, 49) __version_info__ = (0, 1, 50)

3
slixfeed/xmpp/client.py
View file

@ -1523,7 +1523,7 @@ class Slixfeed(slixmpp.ClientXMPP):
values = payload['values'] values = payload['values']
node = values['node'] if 'node' in values else None node = values['node'] if 'node' in values else None
url = values['subscription'] url = values['subscription']
jid = values['jid'] jid = values['jid'] if 'jid' in values else None
jid_bare = session['from'].bare jid_bare = session['from'].bare
if is_operator(self, jid_bare) and jid: if is_operator(self, jid_bare) and jid:
jid_file = jid[0] if isinstance(jid, list) else jid jid_file = jid[0] if isinstance(jid, list) else jid
@ -2810,6 +2810,7 @@ class Slixfeed(slixmpp.ClientXMPP):
await Config.set_setting_value(self.settings, jid_bare, db_file, 'enabled', value) await Config.set_setting_value(self.settings, jid_bare, db_file, 'enabled', value)
print(self.settings) print(self.settings)
text_note = 'Done.' text_note = 'Done.'
session['has_next'] = False
session['next'] = None session['next'] = None
session['notes'] = [['info', text_note]] session['notes'] = [['info', text_note]]
session['payload'] = None session['payload'] = None

3
slixfeed/xmpp/component.py
View file

@ -1484,7 +1484,7 @@ class SlixfeedComponent(slixmpp.ComponentXMPP):
values = payload['values'] values = payload['values']
node = values['node'] if 'node' in values else None node = values['node'] if 'node' in values else None
url = values['subscription'] url = values['subscription']
jid = values['jid'] jid = values['jid'] if 'jid' in values else None
jid_bare = session['from'].bare jid_bare = session['from'].bare
if is_operator(self, jid_bare) and jid: if is_operator(self, jid_bare) and jid:
jid_file = jid[0] if isinstance(jid, list) else jid jid_file = jid[0] if isinstance(jid, list) else jid
@ -2771,6 +2771,7 @@ class SlixfeedComponent(slixmpp.ComponentXMPP):
await Config.set_setting_value(self.settings, jid_bare, db_file, 'enabled', value) await Config.set_setting_value(self.settings, jid_bare, db_file, 'enabled', value)
print(self.settings) print(self.settings)
text_note = 'Done.' text_note = 'Done.'
session['has_next'] = False
session['next'] = None session['next'] = None
session['notes'] = [['info', text_note]] session['notes'] = [['info', text_note]]
session['payload'] = None session['payload'] = None