Skip to content

Commit 43e6bf9

Browse files
vitalystervitalyster
committed
sleekxmpp -> slixmpp
1 parent d3909b9 commit 43e6bf9

17 files changed

Lines changed: 839 additions & 491 deletions

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ARG APT_LISTCHANGES_FRONTEND=none
2929

3030
WORKDIR /spectrum2
3131

32-
RUN apt-get install --no-install-recommends -y prosody ngircd python3-sleekxmpp python3-dateutil python3-dnspython libcppunit-dev purple-xmpp-carbons libglib2.0-dev psmisc
32+
RUN apt-get install --no-install-recommends -y prosody ngircd python3-slixmpp python3-dateutil python3-dnspython libcppunit-dev purple-xmpp-carbons libglib2.0-dev psmisc
3333

3434
RUN cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_TESTS=ON -DENABLE_QT4=OFF -DCMAKE_UNITY_BUILD=ON . && make -j4
3535

‎tests/libcommuni/muc_away.py‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,46 @@
44
import subprocess
55
import os
66

7-
import sleekxmpp
7+
import slixmpp
88

99

10-
class Responder(sleekxmpp.ClientXMPP):
10+
class Responder(slixmpp.ClientXMPP):
1111
def __init__(self, jid, password, room, room_password, nick):
12-
sleekxmpp.ClientXMPP.__init__(self, jid, password)
12+
slixmpp.ClientXMPP.__init__(self, jid, password)
1313
self.room = room
1414
self.room_password = room_password
1515
self.nick = nick
1616
self.finished = False
17+
self.register_plugin('xep_0045') # MUC plugin
1718
self.add_event_handler("session_start", self.start)
1819
self.add_event_handler("muc::" + room + "::presence", self.muc_got_online)
1920

2021
self.tests = {}
2122
self.tests["online_received"] = ["libcommuni: Received away presence from 'client'", False]
2223

23-
def muc_got_online(self, presence):
24-
if presence['muc']['nick'] == "client" and presence['show'] == "away":
24+
async def muc_got_online(self, presence):
25+
# In slixmpp, nick is in presence['from'].resource, not presence['muc']['nick']
26+
if presence['from'].resource == "client" and presence['show'] == "away":
2527
self.tests["online_received"][1] = True
2628
self.finished = True
2729

28-
def start(self, event):
29-
self.plugin['xep_0045'].joinMUC(self.room, self.nick, password=self.room_password, wait=True)
30+
async def start(self, event):
31+
self.plugin['xep_0045'].join_muc(self.room, self.nick, password=self.room_password)
3032

31-
class Client(sleekxmpp.ClientXMPP):
33+
class Client(slixmpp.ClientXMPP):
3234
def __init__(self, jid, password, room, nick):
33-
sleekxmpp.ClientXMPP.__init__(self, jid, password)
35+
slixmpp.ClientXMPP.__init__(self, jid, password)
3436
self.room = room
3537
self.nick = nick
38+
self.register_plugin('xep_0045') # MUC plugin
3639
self.add_event_handler("session_start", self.start)
3740
self.finished = False
3841

3942
self.tests = {}
4043

41-
def start(self, event):
42-
self.getRoster()
43-
self.sendPresence()
44-
self.plugin['xep_0045'].joinMUC(self.room, self.nick, wait=True)
45-
self.sendPresence(ptype = "away")
44+
async def start(self, event):
45+
self.get_roster()
46+
self.send_presence()
47+
self.plugin['xep_0045'].join_muc(self.room, self.nick)
48+
self.send_presence(pshow = "away")
4649

‎tests/libcommuni/muc_change_topic.py‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
44
import subprocess
55
import os
66

7-
import sleekxmpp
7+
import slixmpp
88

99

10-
class Responder(sleekxmpp.ClientXMPP):
10+
class Responder(slixmpp.ClientXMPP):
1111
def __init__(self, jid, password, room, room_password, nick):
12-
sleekxmpp.ClientXMPP.__init__(self, jid, password)
12+
slixmpp.ClientXMPP.__init__(self, jid, password)
1313
self.room = room
1414
self.nick = nick
1515
self.finished = False
1616
self.room_password = room_password
17+
self.register_plugin('xep_0045') # MUC plugin
1718
self.add_event_handler("session_start", self.start)
1819
self.add_event_handler("groupchat_message", self.muc_message)
1920

@@ -24,13 +25,14 @@ def muc_message(self, msg):
2425
self.send_message(mto=self.room, mbody=None, msubject='The new subject', mtype='groupchat')
2526

2627
def start(self, event):
27-
self.plugin['xep_0045'].joinMUC(self.room, self.nick, password=self.room_password, wait=True)
28+
self.plugin['xep_0045'].join_muc(self.room, self.nick, password=self.room_password)
2829

29-
class Client(sleekxmpp.ClientXMPP):
30+
class Client(slixmpp.ClientXMPP):
3031
def __init__(self, jid, password, room, nick):
31-
sleekxmpp.ClientXMPP.__init__(self, jid, password)
32+
slixmpp.ClientXMPP.__init__(self, jid, password)
3233
self.room = room
3334
self.nick = nick
35+
self.register_plugin('xep_0045') # MUC plugin
3436
self.add_event_handler("session_start", self.start)
3537
self.add_event_handler("groupchat_subject", self.muc_subject)
3638
self.finished = False
@@ -44,7 +46,7 @@ def muc_subject(self, msg):
4446
self.finished = True
4547

4648
def start(self, event):
47-
self.getRoster()
48-
self.sendPresence()
49-
self.plugin['xep_0045'].joinMUC(self.room, self.nick, wait=True)
49+
self.get_roster()
50+
self.send_presence()
51+
self.plugin['xep_0045'].join_muc(self.room, self.nick)
5052
self.send_message(mto=self.room, mbody="ready", mtype='groupchat')

‎tests/libcommuni/muc_echo.py‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
import subprocess
55
import os
66

7-
import sleekxmpp
7+
import slixmpp
88

99

10-
class Responder(sleekxmpp.ClientXMPP):
10+
class Responder(slixmpp.ClientXMPP):
1111
def __init__(self, jid, password, room, room_password, nick):
12-
sleekxmpp.ClientXMPP.__init__(self, jid, password)
12+
slixmpp.ClientXMPP.__init__(self, jid, password)
1313
self.room = room
1414
self.nick = nick
1515
self.room_password = room_password
@@ -19,18 +19,19 @@ def __init__(self, jid, password, room, room_password, nick):
1919

2020
self.tests = {}
2121

22+
self.register_plugin('xep_0045') # MUC plugin
2223
def muc_message(self, msg):
2324
if msg['mucnick'] != self.nick:
2425
self.send_message(mto=msg['from'].bare,
2526
mbody="echo %s" % msg['body'],
2627
mtype='groupchat')
2728

2829
def start(self, event):
29-
self.plugin['xep_0045'].joinMUC(self.room, self.nick, password=self.room_password, wait=True)
30+
self.plugin['xep_0045'].join_muc(self.room, self.nick, password=self.room_password)
3031

31-
class Client(sleekxmpp.ClientXMPP):
32+
class Client(slixmpp.ClientXMPP):
3233
def __init__(self, jid, password, room, nick):
33-
sleekxmpp.ClientXMPP.__init__(self, jid, password)
34+
slixmpp.ClientXMPP.__init__(self, jid, password)
3435
self.room = room
3536
self.nick = nick
3637
self.add_event_handler("session_start", self.start)
@@ -40,14 +41,15 @@ def __init__(self, jid, password, room, nick):
4041
self.tests = {}
4142
self.tests["echo_received"] = ["libcommuni: Send and receive messages", False]
4243

44+
self.register_plugin('xep_0045') # MUC plugin
4345
def muc_message(self, msg):
4446
if msg['mucnick'] != self.nick:
4547
if msg['body'] == "echo abc" or msg['body'] == "<owner> echo abc":
4648
self.tests["echo_received"][1] = True
4749
self.finished = True
4850

4951
def start(self, event):
50-
self.getRoster()
51-
self.sendPresence()
52-
self.plugin['xep_0045'].joinMUC(self.room, self.nick, wait=True)
52+
self.get_roster()
53+
self.send_presence()
54+
self.plugin['xep_0045'].join_muc(self.room, self.nick)
5355
self.send_message(mto=self.room, mbody="abc", mtype='groupchat')

‎tests/libcommuni/muc_join_leave.py‎

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,54 +4,62 @@
44
import subprocess
55
import os
66

7-
import sleekxmpp
7+
import slixmpp
88

99

10-
class Responder(sleekxmpp.ClientXMPP):
10+
class Responder(slixmpp.ClientXMPP):
1111
def __init__(self, jid, password, room, room_password, nick):
12-
sleekxmpp.ClientXMPP.__init__(self, jid, password)
12+
slixmpp.ClientXMPP.__init__(self, jid, password)
1313
self.room = room
1414
self.room_password = room_password
1515
self.nick = nick
1616
self.finished = False
17+
self.register_plugin('xep_0045') # MUC plugin
1718
self.add_event_handler("session_start", self.start)
1819
self.add_event_handler("muc::" + room + "::got_online", self.muc_got_online)
1920
self.add_event_handler("muc::" + room + "::got_offline", self.muc_got_offline)
2021

2122
self.tests = {}
2223
self.tests["online_received"] = ["libcommuni: Received available presence from 'client'", False]
23-
self.tests["offline_received"] = ["libcommuni: Received unavailable presence frin 'client'", False]
24+
self.tests["offline_received"] = ["libcommuni: Received unavailable presence from 'client'", False]
2425

25-
def muc_got_online(self, presence):
26-
if presence['muc']['nick'] == "client":
26+
async def muc_got_online(self, presence):
27+
# In slixmpp, nick is in presence['from'].resource, not presence['muc']['nick']
28+
print(f"DEBUG: Responder muc_got_online called, from={presence['from']}, resource={presence['from'].resource if presence['from'] else 'None'}")
29+
if presence['from'] and presence['from'].resource == "client":
2730
self.tests["online_received"][1] = True
2831

29-
def muc_got_offline(self, presence):
30-
if presence['muc']['nick'] == "client":
32+
async def muc_got_offline(self, presence):
33+
# In slixmpp, nick is in presence['from'].resource, not presence['muc']['nick']
34+
print(f"DEBUG: Responder muc_got_offline called, from={presence['from']}, resource={presence['from'].resource if presence['from'] else 'None'}")
35+
if presence['from'] and presence['from'].resource == "client":
3136
self.tests["offline_received"][1] = True
3237
self.finished = True
3338

34-
def start(self, event):
35-
self.plugin['xep_0045'].joinMUC(self.room, self.nick, password=self.room_password, wait=True)
39+
async def start(self, event):
40+
self.plugin['xep_0045'].join_muc(self.room, self.nick, password=self.room_password)
3641

37-
class Client(sleekxmpp.ClientXMPP):
42+
class Client(slixmpp.ClientXMPP):
3843
def __init__(self, jid, password, room, nick):
39-
sleekxmpp.ClientXMPP.__init__(self, jid, password)
44+
slixmpp.ClientXMPP.__init__(self, jid, password)
4045
self.room = room
4146
self.nick = nick
47+
self.register_plugin('xep_0045') # MUC plugin
4248
self.add_event_handler("session_start", self.start)
4349
self.add_event_handler("muc::" + room + "::got_online", self.muc_got_online)
4450
self.finished = False
4551

4652
self.tests = {}
4753
self.tests["online_received"] = ["libcommuni: Received available presence from 'responder'", False]
4854

49-
def muc_got_online(self, presence):
50-
if presence['muc']['nick'] == "responder":
55+
async def muc_got_online(self, presence):
56+
# In slixmpp, nick is in presence['from'].resource, not presence['muc']['nick']
57+
print(f"DEBUG: Client muc_got_online called, from={presence['from']}, resource={presence['from'].resource if presence['from'] else 'None'}")
58+
if presence['from'] and presence['from'].resource == "responder":
5159
self.tests["online_received"][1] = True
52-
self.plugin['xep_0045'].leaveMUC(self.room, self.nick)
60+
self.plugin['xep_0045'].leave_muc(self.room, self.nick)
5361

54-
def start(self, event):
55-
self.getRoster()
56-
self.sendPresence()
57-
self.plugin['xep_0045'].joinMUC(self.room, self.nick, wait=True)
62+
async def start(self, event):
63+
self.get_roster()
64+
self.send_presence()
65+
self.plugin['xep_0045'].join_muc(self.room, self.nick)

‎tests/libcommuni/muc_join_nickname_used.py‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
44
import subprocess
55
import os
66

7-
import sleekxmpp
7+
import slixmpp
88

99

10-
class Responder(sleekxmpp.ClientXMPP):
10+
class Responder(slixmpp.ClientXMPP):
1111
def __init__(self, jid, password, room, room_password, nick):
12-
sleekxmpp.ClientXMPP.__init__(self, jid, password)
12+
slixmpp.ClientXMPP.__init__(self, jid, password)
1313
self.room = room
1414
self.room_password = room_password
1515
self.nick = nick
1616
self.finished = False
17+
self.register_plugin('xep_0045') # MUC plugin
1718
self.add_event_handler("session_start", self.start)
1819
self.add_event_handler("muc::" + room + "::got_online", self.muc_got_online)
1920
self.add_event_handler("muc::" + room + "::got_offline", self.muc_got_offline)
@@ -22,36 +23,39 @@ def __init__(self, jid, password, room, room_password, nick):
2223
self.tests["online_received"] = ["libcommuni: Received available presence", False]
2324
self.tests["offline_received"] = ["libcommuni: Received unavailable presence", False]
2425

25-
def muc_got_online(self, presence):
26-
if presence['muc']['nick'] == "respond_":
26+
async def muc_got_online(self, presence):
27+
# In slixmpp, nick is in presence['from'].resource, not presence['muc']['nick']
28+
if presence['from'].resource == "respond_":
2729
self.tests["online_received"][1] = True
2830
self.send_message(mto=self.room,
2931
mbody="disconnect please :)",
3032
mtype='groupchat')
3133

32-
def muc_got_offline(self, presence):
33-
if presence['muc']['nick'] == "respond_":
34+
async def muc_got_offline(self, presence):
35+
# In slixmpp, nick is in presence['from'].resource, not presence['muc']['nick']
36+
if presence['from'].resource == "respond_":
3437
self.tests["offline_received"][1] = True
3538
self.finished = True
3639

37-
def start(self, event):
38-
self.plugin['xep_0045'].joinMUC(self.room, "respond", password=self.room_password, wait=True)
40+
async def start(self, event):
41+
self.plugin['xep_0045'].join_muc(self.room, "respond", password=self.room_password)
3942

40-
class Client(sleekxmpp.ClientXMPP):
43+
class Client(slixmpp.ClientXMPP):
4144
def __init__(self, jid, password, room, nick):
42-
sleekxmpp.ClientXMPP.__init__(self, jid, password)
45+
slixmpp.ClientXMPP.__init__(self, jid, password)
4346
self.room = room
4447
self.nick = nick
48+
self.register_plugin('xep_0045') # MUC plugin
4549
self.add_event_handler("session_start", self.start)
4650
self.add_event_handler("groupchat_message", self.muc_message)
4751
self.finished = False
4852

4953
self.tests = {}
5054

51-
def muc_message(self, msg):
52-
self.plugin['xep_0045'].leaveMUC(self.room, "respond_")
55+
async def muc_message(self, msg):
56+
self.plugin['xep_0045'].leave_muc(self.room, "respond_")
5357

54-
def start(self, event):
55-
self.getRoster()
56-
self.sendPresence()
57-
self.plugin['xep_0045'].joinMUC(self.room, "respond", wait=True)
58+
async def start(self, event):
59+
self.get_roster()
60+
self.send_presence()
61+
self.plugin['xep_0045'].join_muc(self.room, "respond")

‎tests/libcommuni/muc_pm.py‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
import subprocess
55
import os
66

7-
import sleekxmpp
7+
import slixmpp
88

99

10-
class Responder(sleekxmpp.ClientXMPP):
10+
class Responder(slixmpp.ClientXMPP):
1111
def __init__(self, jid, password, room, room_password, nick):
12-
sleekxmpp.ClientXMPP.__init__(self, jid, password)
12+
slixmpp.ClientXMPP.__init__(self, jid, password)
1313
self.room = room
1414
self.room_password = room_password
1515
self.nick = nick
@@ -19,6 +19,7 @@ def __init__(self, jid, password, room, room_password, nick):
1919

2020
self.tests = {}
2121

22+
self.register_plugin('xep_0045') # MUC plugin
2223
def message(self, msg):
2324
if msg['body'] == "abc" and msg['from'] == self.room + "/client":
2425
self.send_message(mto=self.room + "/client",
@@ -32,11 +33,11 @@ def message(self, msg):
3233
self.finished = True
3334

3435
def start(self, event):
35-
self.plugin['xep_0045'].joinMUC(self.room, self.nick, password=self.room_password, wait=True)
36+
self.plugin['xep_0045'].join_muc(self.room, self.nick, password=self.room_password)
3637

37-
class Client(sleekxmpp.ClientXMPP):
38+
class Client(slixmpp.ClientXMPP):
3839
def __init__(self, jid, password, room, nick):
39-
sleekxmpp.ClientXMPP.__init__(self, jid, password)
40+
slixmpp.ClientXMPP.__init__(self, jid, password)
4041
self.room = room
4142
self.nick = nick
4243
self.add_event_handler("session_start", self.start)
@@ -47,6 +48,7 @@ def __init__(self, jid, password, room, nick):
4748
self.tests["echo1_received"] = ["libcommuni: Send and receive private messages - 1st msg", False]
4849
self.tests["echo2_received"] = ["libcommuni: Send and receive private messages - 2nd msg", False]
4950

51+
self.register_plugin('xep_0045') # MUC plugin
5052
def message(self, msg):
5153
if msg['body'] == "echo abc" and msg['from'] == self.room + "/responder":
5254
self.tests["echo1_received"][1] = True
@@ -56,7 +58,7 @@ def message(self, msg):
5658
self.finished = True
5759

5860
def start(self, event):
59-
self.getRoster()
60-
self.sendPresence()
61-
self.plugin['xep_0045'].joinMUC(self.room, self.nick, wait=True)
61+
self.get_roster()
62+
self.send_presence()
63+
self.plugin['xep_0045'].join_muc(self.room, self.nick)
6264
self.send_message(mto=self.room + "/responder", mbody="abc", mtype='chat')

0 commit comments

Comments
 (0)