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
"""
thanks = """
Alixander Court <alixandercourt.com> (Utah); \
Chriss Farrell (SalixOS, Oregon); \
Christian Dersch (SalixOS); \
Cyrille Pontvieux <enialis.net> (SalixOS, France); \
Denis Fomin (Gajim, Russia); \
Dimitris Tzemos (SalixOS, Greece); \
Emmanuel Gil Peyrot (Poezio, France); \
Florent Le Coz (Poezio, France); \
George Vlahavas <vlahavas.com> (SalixOS, Greece); \
Guus der Kinderen <igniterealtime.org> (Openfire, Netherlands); \
habnabit_ from #python on irc.libera.chat; \
Imar van Erven Dorens <simplicit.nl> (SalixOS, Netherlands); \
imattau (atomtopubsub); \
Jaussoin Timothée <mov.im> (Movim, France); \
Justin Karneges <jblog.andbit.net> (Psi, California); \
Kevin Smith <isode.com> (Swift IM, Wales); \
Lars Windolf (Liferea, Germany); \
Luis Henrique Mello (SalixOS, Brazil); \
magicfelix; \
Markus Muttilainen (SalixOS); \
Martin <debacle@debian.org> (Debian, Germany); \
Mathieu Pasquet (slixmpp, France); \
Maxime Buquet (slixmpp, France); \
mirux (Germany); \
Phillip Watkins (SalixOS, United Kingdom); \
Pierrick Le Brun (SalixOS, France); \
Raphael Groner (Fedora, Germany); \
Remko Tronçon <mko.re> (Psi , Belgium); \
Simone "roughnecks" Canaletti <woodpeckersnest.space> (Italy); \
Richard Lapointe (SalixOS, Connecticut); \
Stephen Paul Weber <singpolyma.net>; \
Strix from Loqi; \
Thibaud Guerin (SalixOS); \
Thorsten Fröhlich (France); \
Thorsten Mühlfelder (SalixOS, Germany); \
Tim Beech (SalixOS, Brazil); \
Yann Leboulanger (Gajim, France).
"""
thanks = [
"Alixander Court <alixandercourt.com> (Utah)",
"Chriss Farrell (SalixOS, Oregon)",
"Christian Dersch (SalixOS)",
"Cyrille Pontvieux <enialis.net> (SalixOS, France)",
"Denis Fomin (Gajim, Russia)",
"Dimitris Tzemos (SalixOS, Greece)",
"Emmanuel Gil Peyrot (Poezio, France)",
"Florent Le Coz (Poezio, France)",
"George Vlahavas <vlahavas.com> (SalixOS, Greece)",
"Guus der Kinderen <igniterealtime.org> (Openfire, Netherlands)",
"habnabit_ from #python on irc.libera.chat",
"Imar van Erven Dorens <simplicit.nl> (SalixOS, Netherlands)",
"imattau (atomtopubsub)",
"Jaussoin Timothée <mov.im> (Movim, France)",
"Justin Karneges <jblog.andbit.net> (Psi, California)",
"Kevin Smith <isode.com> (Swift IM, Wales)",
"Lars Windolf (Liferea, Germany)",
"Luis Henrique Mello (SalixOS, Brazil)",
"magicfelix",
"Markus Muttilainen (SalixOS)",
"Martin <debacle@debian.org> (Debian, Germany)",
"Mathieu Pasquet (slixmpp, France)",
"Maxime Buquet (slixmpp, France)",
"mirux (Germany)",
"Phillip Watkins (SalixOS, United Kingdom)",
"Pierrick Le Brun (SalixOS, France)",
"Raphael Groner (Fedora, Germany)",
"Remko Tronçon <mko.re> (Psi , Belgium)",
"Simone \"roughnecks\" Canaletti <woodpeckersnest.space> (Italy)",
"Richard Lapointe (SalixOS, Connecticut)",
"Stephen Paul Weber <singpolyma.net>",
"Strix from Loqi",
"Thibaud Guerin (SalixOS)",
"Thorsten Fröhlich (France)",
"Thorsten Mühlfelder (SalixOS, Germany)",
"Tim Beech (SalixOS, Brazil)",
"Yann Leboulanger (Gajim, France)"
]
xmpp = """
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):
# form = self['xep_0004'].make_form('result', 'Thanks')
# form['instructions'] = action.manual('information.toml', 'thanks')
# session['payload'] = form
text = 'We are XMPP\n\n'
fren = action.manual('information.toml', 'thanks')
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]]
form = self['xep_0004'].make_form('result', 'Credits')
form['instructions'] = "We are XMPP"
form.add_field(ftype="text-multi", value=action.manual('information.toml', 'thanks'))
form['instructions'] = 'YOU!\n🫵️\n- Join us -'
session['payload'] = form
return session