sch/Slixfeed
sch/Slixfeed
3
1
Fork 1
Code Issues 15 Pull requests Projects Releases Packages Wiki Activity Actions

Restrict Ad-Hoc Publish to moderators (Thank you mirux).

Browse source
This commit is contained in:
Schimon Jehudah 2024-05-13 07:54:09 +00:00
parent 0c4efbb650
commit 3597777bcc
2 changed files with 12 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.62' __version__ = '0.1.63'
__version_info__ = (0, 1, 62) __version_info__ = (0, 1, 63)

12
slixfeed/xmpp/client.py
View file

@ -817,7 +817,11 @@ class Slixfeed(slixmpp.ClientXMPP):
logger.debug('{}: jid_full: {}' logger.debug('{}: jid_full: {}'
.format(function_name, jid_full)) .format(function_name, jid_full))
jid_bare = session['from'].bare jid_bare = session['from'].bare
if is_operator(self, jid_bare): chat_type = await get_chat_type(self, jid_bare)
moderator = None
if chat_type == 'groupchat':
moderator = is_moderator(self, jid_bare, jid_full)
if is_operator(self, jid_bare) or moderator:
form = self['xep_0004'].make_form('form', 'PubSub') form = self['xep_0004'].make_form('form', 'PubSub')
form['instructions'] = 'Publish news items to PubSub nodes.' form['instructions'] = 'Publish news items to PubSub nodes.'
options = form.add_field(desc='From which medium source do you ' options = form.add_field(desc='From which medium source do you '
@ -838,7 +842,11 @@ class Slixfeed(slixmpp.ClientXMPP):
session['prev'] = None session['prev'] = None
session['payload'] = form session['payload'] = form
else: else:
text_warn = 'This resource is restricted to operators.' if chat_type == 'groupchat':
text_warn = ('This resource is restricted to moderators of {}.'
.format(jid_bare))
else:
text_warn = 'This resource is restricted to operators.'
session['notes'] = [['warn', text_warn]] session['notes'] = [['warn', text_warn]]
return session return session