Philipp Hörist pushed to branch master at gajim / gajim
Commits:
6f2fbde6 by Philipp Hörist at 2017-10-07T11:10:53+02:00
Highlight on mention of own real JID in Groupchat
Fixes #8752
- - - - -
2a2d4477 by Philipp Hörist at 2017-10-07T11:15:10+02:00
Fix broken highlight sound in Groupchat
tim is epoch, time.localtime() a struct_time
- - - - -
1 changed file:
- gajim/groupchat_control.py
Changes:
=====================================
gajim/groupchat_control.py
=====================================
--- a/gajim/groupchat_control.py
+++ b/gajim/groupchat_control.py
@@ -1290,7 +1290,7 @@ class GroupchatControl(ChatControlBase):
sound = 'received'
# Is it a history message? Don't want sound-floods when we join.
- if tim != time.localtime():
+ if tim != time.mktime(time.localtime()):
sound = None
return (highlight, sound)
@@ -1320,6 +1320,8 @@ class GroupchatControl(ChatControlBase):
"""
special_words = app.config.get('muc_highlight_words').split(';')
special_words.append(self.nick)
+ con = app.connections[self.account]
+ special_words.append(con.get_own_jid().getStripped())
# Strip empties: ''.split(';') == [''] and would highlight everything.
# Also lowercase everything for case insensitive compare.
special_words = [word.lower() for word in special_words if word]
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/4e1d296dcfff5836b32132dfb11721cefdd91834...2a2d4477a715fb8d837796dd8832a7a026feca89
---
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/4e1d296dcfff5836b32132dfb11721cefdd91834...2a2d4477a715fb8d837796dd8832a7a026feca89
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
