Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/isida/3.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiSabler <dissy@ya.ru>2013-06-28 11:46:46 +0400
committerdiSabler <dissy@ya.ru>2013-06-28 11:46:46 +0400
commite992f2c2e7d9720dd050791b9ab4efd85f7bfa4f (patch)
tree63537c6a051b30f4872600a5af80eefbd43b810e /kernel.py
parent69905f0d76792d432b0df563b27fc448a5e82c42 (diff)
add: exception in censor
fix: censore different nick and status message
Diffstat (limited to 'kernel.py')
-rw-r--r--kernel.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel.py b/kernel.py
index 42f7887..89897f1 100644
--- a/kernel.py
+++ b/kernel.py
@@ -1366,7 +1366,7 @@ def presenceCB(sess,mess):
caps_and_send(xmpp.Presence(room, 'unsubscribed'))
pprint('Unsubscribtion accepted %s' % room,'light_gray')
else: pprint('Unsubscribtion rejected %s' % room,'red')
- if nick != '' and nick != 'None' and nick != nowname and len(text)>1 and text != 'None' and al >= 0 and get_config(getRoom(room),'censor'):
+ if reason in ['','None',None] and nick != '' and (nick != 'None' or (text != 'None' and len(text)>1)) and nick != nowname and al >= 0 and get_config(getRoom(room),'censor'):
nt = '%s %s' % (nick,text)
if nt != to_censore(nt,room):
cens_text = L('Censored!','%s/%s'%(room,nick))