mbk/pesterchum
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix GETMOOD and remove non-functional ctcp quirk disable

Browse source
This commit is contained in:
Dpeta 2023-02-12 02:28:31 +01:00
parent 9040ad0419
commit b5899d3a0c
No known key found for this signature in database
GPG key ID: 51227517CEA0030C
2 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
irc.py
View file

@ -303,9 +303,9 @@ class PesterIRC(QtCore.QThread):
else: else:
# Legacy # Legacy
PchumLog.warning( PchumLog.warning(
"Server doesn't seem to support metadata, using legacy get_mood." "Server doesn't seem to support metadata, using legacy GETMOOD."
) )
chumglub = "get_mood " chumglub = "GETMOOD "
for chum in chums: for chum in chums:
if len(chumglub + chum.handle) >= 350: if len(chumglub + chum.handle) >= 350:
try: try:
@ -313,11 +313,11 @@ class PesterIRC(QtCore.QThread):
except OSError as e: except OSError as e:
PchumLog.warning(e) PchumLog.warning(e)
self.set_connection_broken() self.set_connection_broken()
chumglub = "get_mood " chumglub = "GETMOOD "
# No point in get_mood-ing services # No point in GETMOOD-ing services
if chum.handle.casefold() not in SERVICES: if chum.handle.casefold() not in SERVICES:
chumglub += chum.handle chumglub += chum.handle
if chumglub != "get_mood ": if chumglub != "GETMOOD ":
try: try:
self._send_irc.privmsg("#pesterchum", chumglub) self._send_irc.privmsg("#pesterchum", chumglub)
except OSError as e: except OSError as e:
@ -621,9 +621,8 @@ class PesterIRC(QtCore.QThread):
"https://github.com/Dpeta/pesterchum-alt-servers", "https://github.com/Dpeta/pesterchum-alt-servers",
) )
# ??? # ???
elif msg.startswith("NOQUIRKS") and chan[0] == "#": else:
op = nick[0 : nick.find("!")] PchumLog.warning("Unknown CTCP command '%s' from %s to %s", msg, nick, chan)
self.quirkDisable.emit(chan, msg[9:], op)
def _privmsg(self, nick: str, chan: str, msg: str): def _privmsg(self, nick: str, chan: str, msg: str):
"""'PRIVMSG' message from server, the standard message.""" """'PRIVMSG' message from server, the standard message."""
@ -653,7 +652,7 @@ class PesterIRC(QtCore.QThread):
) )
mood = Mood(0) mood = Mood(0)
self.moodUpdated.emit(handle, mood) self.moodUpdated.emit(handle, mood)
elif msg.startswith("get_mood"): elif msg.startswith("GETMOOD"):
mychumhandle = self.mainwindow.profile().handle mychumhandle = self.mainwindow.profile().handle
if mychumhandle in msg: if mychumhandle in msg:
mymood = self.mainwindow.profile().mood.value_str() mymood = self.mainwindow.profile().mood.value_str()
@ -730,6 +729,7 @@ class PesterIRC(QtCore.QThread):
unrealircd_channel_modes = "cCdfGHikKLlmMNnOPpQRrsSTtVzZ" unrealircd_channel_modes = "cCdfGHikKLlmMNnOPpQRrsSTtVzZ"
if any(md in mode for md in unrealircd_channel_modes): if any(md in mode for md in unrealircd_channel_modes):
PchumLog.debug("Channel mode in string.") PchumLog.debug("Channel mode in string.")
self._send_irc.mode(channel)
modes = list(self.mainwindow.modes) modes = list(self.mainwindow.modes)
for md in unrealircd_channel_modes: for md in unrealircd_channel_modes:
if mode.find(md) != -1: # -1 means not found if mode.find(md) != -1: # -1 means not found
@ -762,7 +762,7 @@ class PesterIRC(QtCore.QThread):
# Server-set usermodes don't need to be passed. # Server-set usermodes don't need to be passed.
if handles == [""] and not ("x" in m or "z" in m or "o" in m or "x" in m): if handles == [""] and not ("x" in m or "z" in m or "o" in m or "x" in m):
try: try:
self.userPresentUpdate.emit(handles[i], channel, m + f":{op}") self.userPresentUpdate.emit(handles[i], channel, f"{m}:{op}")
except IndexError as e: except IndexError as e:
PchumLog.exception("modeSetIndexError: %s", e) PchumLog.exception("modeSetIndexError: %s", e)
@ -930,8 +930,8 @@ class PesterIRC(QtCore.QThread):
def _reset_nick(self, oldnick): def _reset_nick(self, oldnick):
"""Set our nick to a random pesterClient.""" """Set our nick to a random pesterClient."""
random_number = int( random_number = int(
random.random() * 9999 random.random() * 9999 # Random int in range 0 <---> 9999
) # Random int in range 1000 <---> 9999 )
newnick = f"pesterClient{random_number}" newnick = f"pesterClient{random_number}"
self._send_irc.nick(newnick) self._send_irc.nick(newnick)
self.nickCollision.emit(oldnick, newnick) self.nickCollision.emit(oldnick, newnick)
@ -966,24 +966,24 @@ class PesterIRC(QtCore.QThread):
def _nomatchingkey(self, _target, _our_handle, failed_handle, _key, *_error): def _nomatchingkey(self, _target, _our_handle, failed_handle, _key, *_error):
"""METADATA DRAFT numeric reply 766 ERR_NOMATCHINGKEY, no matching key.""" """METADATA DRAFT numeric reply 766 ERR_NOMATCHINGKEY, no matching key."""
PchumLog.info("_nomatchingkey: %s", failed_handle) PchumLog.info("_nomatchingkey: %s", failed_handle)
# No point in get_mood-ing services # No point in GETMOOD-ing services
# Fallback to the normal get_mood method if getting mood via metadata fails. # Fallback to the normal GETMOOD method if getting mood via metadata fails.
if failed_handle.casefold() not in SERVICES: if failed_handle.casefold() not in SERVICES:
self._send_irc.privmsg("#pesterchum", f"get_mood {failed_handle}") self._send_irc.privmsg("#pesterchum", f"GETMOOD {failed_handle}")
def _keynotset(self, _target, _our_handle, failed_handle, _key, *_error): def _keynotset(self, _target, _our_handle, failed_handle, _key, *_error):
"""METADATA DRAFT numeric reply 768 ERR_KEYNOTSET, key isn't set.""" """METADATA DRAFT numeric reply 768 ERR_KEYNOTSET, key isn't set."""
PchumLog.info("_keynotset: %s", failed_handle) PchumLog.info("_keynotset: %s", failed_handle)
# Fallback to the normal get_mood method if getting mood via metadata fails. # Fallback to the normal GETMOOD method if getting mood via metadata fails.
if failed_handle.casefold() not in SERVICES: if failed_handle.casefold() not in SERVICES:
self._send_irc.privmsg("#pesterchum", f"get_mood {failed_handle}") self._send_irc.privmsg("#pesterchum", f"GETMOOD {failed_handle}")
def _keynopermission(self, _target, _our_handle, failed_handle, _key, *_error): def _keynopermission(self, _target, _our_handle, failed_handle, _key, *_error):
"""METADATA DRAFT numeric reply 769 ERR_KEYNOPERMISSION, no permission for key.""" """METADATA DRAFT numeric reply 769 ERR_KEYNOPERMISSION, no permission for key."""
PchumLog.info("_keynopermission: %s", failed_handle) PchumLog.info("_keynopermission: %s", failed_handle)
# Fallback to the normal get_mood method if getting mood via metadata fails. # Fallback to the normal GETMOOD method if getting mood via metadata fails.
if failed_handle.casefold() not in SERVICES: if failed_handle.casefold() not in SERVICES:
self._send_irc.privmsg("#pesterchum", f"get_mood {failed_handle}") self._send_irc.privmsg("#pesterchum", f"GETMOOD {failed_handle}")
def _metadatasubok(self, *params): def _metadatasubok(self, *params):
""" "METADATA DRAFT numeric reply 770 RPL_METADATASUBOK, we subbed to a key.""" """ "METADATA DRAFT numeric reply 770 RPL_METADATASUBOK, we subbed to a key."""
@ -1007,5 +1007,4 @@ class PesterIRC(QtCore.QThread):
askToConnect = QtCore.pyqtSignal(Exception) askToConnect = QtCore.pyqtSignal(Exception)
userPresentUpdate = QtCore.pyqtSignal("QString", "QString", "QString") userPresentUpdate = QtCore.pyqtSignal("QString", "QString", "QString")
cannotSendToChan = QtCore.pyqtSignal("QString", "QString") cannotSendToChan = QtCore.pyqtSignal("QString", "QString")
quirkDisable = QtCore.pyqtSignal("QString", "QString", "QString")
signal_forbiddenchannel = QtCore.pyqtSignal("QString", "QString") signal_forbiddenchannel = QtCore.pyqtSignal("QString", "QString")

3
pesterchum.py
View file

@ -4415,7 +4415,6 @@ class MainProgram(QtCore.QObject):
(irc.modesUpdated, widget.modesUpdated), (irc.modesUpdated, widget.modesUpdated),
(irc.cannotSendToChan, widget.cannotSendToChan), (irc.cannotSendToChan, widget.cannotSendToChan),
(irc.signal_forbiddenchannel, widget.forbiddenchannel), (irc.signal_forbiddenchannel, widget.forbiddenchannel),
(irc.quirkDisable, widget.quirkDisable),
) )
def connectWidgets(self, irc, widget): def connectWidgets(self, irc, widget):
@ -4493,7 +4492,7 @@ class MainProgram(QtCore.QObject):
def restartIRC(self, verify_hostname=True): def restartIRC(self, verify_hostname=True):
if hasattr(self, "irc") and self.irc: if hasattr(self, "irc") and self.irc:
self.disconnectWidgets(self.irc, self.widget) self.disconnectWidgets(self.irc, self.widget)
stop = self.irc.stopIRC stop = self.irc.stop_irc
del self.irc del self.irc
else: else:
stop = None stop = None