Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
8c1cfd90 by wurstsalat at 2023-02-24T10:12:12+01:00
fix: Fix nickname highlight in group chats
Fixes #11413
- - - - -
2 changed files:
- gajim/common/helpers.py
- test/common/test_message_needs_highlight.py
Changes:
=====================================
gajim/common/helpers.py
=====================================
@@ -584,8 +584,9 @@ def message_needs_highlight(text: str, nickname: str,
own_jid: str) -> bool:
return True
char_before_allowed = bool(
- not text[match - 1].isalpha() and
- text[match - 1] not in ('/', '-'))
+ match == 0 or
+ (not text[match - 1].isalpha() and
+ text[match - 1] not in ('/', '-')))
if char_before_allowed and search_end == len(text):
# search_string found at the end of text and
=====================================
test/common/test_message_needs_highlight.py
=====================================
@@ -21,12 +21,19 @@ def test_highlight(self):
t_text7 = 'Did you test this?'
t_text8 = 'Hi romeo'
t_text9 = 'My address is juliet@xmppserver'
-
- f_text1 = 'RomeoDoes this work?'
- f_text2 = ''
- f_text3 = 'https://romeo.tld'
- f_text4 = 'https://romeo.tld message'
- f_text5 = 'https://test.tld/where-is-romeo'
+ t_text10 = 'Romeo, asd'
+ t_text11 = 'Romeo,'
+ t_text12 = 'Romeo,hi'
+ t_text13 = '@Romeo'
+ t_text14 = '#Romeo'
+
+ f_text1 = ''
+ f_text2 = 'RomeoDoes this work?'
+ f_text3 = 'nRomeo'
+ f_text4 = 'nRomeoa'
+ f_text_url_1 = 'https://romeo.tld'
+ f_text_url_2 = 'https://romeo.tld message'
+ f_text_url_3 = 'https://test.tld/where-is-romeo'
self.assertTrue(message_needs_highlight(t_text1, NICK, JID))
self.assertTrue(message_needs_highlight(t_text2, NICK, JID))
@@ -37,9 +44,16 @@ def test_highlight(self):
self.assertTrue(message_needs_highlight(t_text7, NICK, JID))
self.assertTrue(message_needs_highlight(t_text8, NICK, JID))
self.assertTrue(message_needs_highlight(t_text9, NICK, JID))
+ self.assertTrue(message_needs_highlight(t_text10, NICK, JID))
+ self.assertTrue(message_needs_highlight(t_text11, NICK, JID))
+ self.assertTrue(message_needs_highlight(t_text12, NICK, JID))
+ self.assertTrue(message_needs_highlight(t_text13, NICK, JID))
+ self.assertTrue(message_needs_highlight(t_text14, NICK, JID))
self.assertFalse(message_needs_highlight(f_text1, NICK, JID))
self.assertFalse(message_needs_highlight(f_text2, NICK, JID))
self.assertFalse(message_needs_highlight(f_text3, NICK, JID))
self.assertFalse(message_needs_highlight(f_text4, NICK, JID))
- self.assertFalse(message_needs_highlight(f_text5, NICK, JID))
+ self.assertFalse(message_needs_highlight(f_text_url_1, NICK, JID))
+ self.assertFalse(message_needs_highlight(f_text_url_2, NICK, JID))
+ self.assertFalse(message_needs_highlight(f_text_url_3, NICK, JID))
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/8c1cfd90f37503b3f3fe6125a984448b6850b74e
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/8c1cfd90f37503b3f3fe6125a984448b6850b74e
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
