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

Merge branch 'nicer-credits' into 'master'

Browse source 
Nicer format for credits page

See merge request sjehuda/slixfeed!8
This commit is contained in:
Schimon Jehudah 2024-02-16 01:38:07 +00:00
commit 6c0c571c1d
2 changed files with 44 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
slixfeed/assets/information.toml
View file

@ -119,45 +119,45 @@ MIT License for more details.
https://gitgud.io/sjehuda/slixfeed https://gitgud.io/sjehuda/slixfeed
""" """
thanks = """ thanks = [
Alixander Court <alixandercourt.com> (Utah); \ "Alixander Court <alixandercourt.com> (Utah)",
Chriss Farrell (SalixOS, Oregon); \ "Chriss Farrell (SalixOS, Oregon)",
Christian Dersch (SalixOS); \ "Christian Dersch (SalixOS)",
Cyrille Pontvieux <enialis.net> (SalixOS, France); \ "Cyrille Pontvieux <enialis.net> (SalixOS, France)",
Denis Fomin (Gajim, Russia); \ "Denis Fomin (Gajim, Russia)",
Dimitris Tzemos (SalixOS, Greece); \ "Dimitris Tzemos (SalixOS, Greece)",
Emmanuel Gil Peyrot (Poezio, France); \ "Emmanuel Gil Peyrot (Poezio, France)",
Florent Le Coz (Poezio, France); \ "Florent Le Coz (Poezio, France)",
George Vlahavas <vlahavas.com> (SalixOS, Greece); \ "George Vlahavas <vlahavas.com> (SalixOS, Greece)",
Guus der Kinderen <igniterealtime.org> (Openfire, Netherlands); \ "Guus der Kinderen <igniterealtime.org> (Openfire, Netherlands)",
habnabit_ from #python on irc.libera.chat; \ "habnabit_ from #python on irc.libera.chat",
Imar van Erven Dorens <simplicit.nl> (SalixOS, Netherlands); \ "Imar van Erven Dorens <simplicit.nl> (SalixOS, Netherlands)",
imattau (atomtopubsub); \ "imattau (atomtopubsub)",
Jaussoin Timothée <mov.im> (Movim, France); \ "Jaussoin Timothée <mov.im> (Movim, France)",
Justin Karneges <jblog.andbit.net> (Psi, California); \ "Justin Karneges <jblog.andbit.net> (Psi, California)",
Kevin Smith <isode.com> (Swift IM, Wales); \ "Kevin Smith <isode.com> (Swift IM, Wales)",
Lars Windolf (Liferea, Germany); \ "Lars Windolf (Liferea, Germany)",
Luis Henrique Mello (SalixOS, Brazil); \ "Luis Henrique Mello (SalixOS, Brazil)",
magicfelix; \ "magicfelix",
Markus Muttilainen (SalixOS); \ "Markus Muttilainen (SalixOS)",
Martin <debacle@debian.org> (Debian, Germany); \ "Martin <debacle@debian.org> (Debian, Germany)",
Mathieu Pasquet (slixmpp, France); \ "Mathieu Pasquet (slixmpp, France)",
Maxime Buquet (slixmpp, France); \ "Maxime Buquet (slixmpp, France)",
mirux (Germany); \ "mirux (Germany)",
Phillip Watkins (SalixOS, United Kingdom); \ "Phillip Watkins (SalixOS, United Kingdom)",
Pierrick Le Brun (SalixOS, France); \ "Pierrick Le Brun (SalixOS, France)",
Raphael Groner (Fedora, Germany); \ "Raphael Groner (Fedora, Germany)",
Remko Tronçon <mko.re> (Psi , Belgium); \ "Remko Tronçon <mko.re> (Psi , Belgium)",
Simone "roughnecks" Canaletti <woodpeckersnest.space> (Italy); \ "Simone \"roughnecks\" Canaletti <woodpeckersnest.space> (Italy)",
Richard Lapointe (SalixOS, Connecticut); \ "Richard Lapointe (SalixOS, Connecticut)",
Stephen Paul Weber <singpolyma.net>; \ "Stephen Paul Weber <singpolyma.net>",
Strix from Loqi; \ "Strix from Loqi",
Thibaud Guerin (SalixOS); \ "Thibaud Guerin (SalixOS)",
Thorsten Fröhlich (France); \ "Thorsten Fröhlich (France)",
Thorsten Mühlfelder (SalixOS, Germany); \ "Thorsten Mühlfelder (SalixOS, Germany)",
Tim Beech (SalixOS, Brazil); \ "Tim Beech (SalixOS, Brazil)",
Yann Leboulanger (Gajim, France). "Yann Leboulanger (Gajim, France)"
""" ]
xmpp = """ xmpp = """
XMPP is the Extensible Messaging and Presence Protocol, a set \ XMPP is the Extensible Messaging and Presence Protocol, a set \

17
slixfeed/xmpp/client.py
View file

@ -972,18 +972,11 @@ class Slixfeed(slixmpp.ClientXMPP):
async def _handle_credit(self, iq, session): async def _handle_credit(self, iq, session):
# form = self['xep_0004'].make_form('result', 'Thanks') form = self['xep_0004'].make_form('result', 'Credits')
# form['instructions'] = action.manual('information.toml', 'thanks') form['instructions'] = "We are XMPP"
# session['payload'] = form form.add_field(ftype="text-multi", value=action.manual('information.toml', 'thanks'))
text = 'We are XMPP\n\n' form['instructions'] = 'YOU!\n🫵️\n- Join us -'
fren = action.manual('information.toml', 'thanks') session['payload'] = form
fren = "".join(fren)
fren = fren.split(';')
fren = "\n".join(fren)
text += fren
# text += '\n\nYOU!\n\n🫵️\n\n- Join us -\n\n🤝️'
text += '\n\nYOU!\n\n🫵️\n\n- Join us -'
session['notes'] = [['info', text]]
return session return session