pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Split highlight logic and UI changes

Browse source 
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2018-09-08 20:21:39 +01:00 committed by Emmanuel Gil Peyrot
parent 791d44f1b9
commit 4b8c63d25b
1 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
poezio/tabs/muctab.py
View file

@ -1251,34 +1251,37 @@ class MucTab(ChatTab):
1, self.width, self.height - 2 - self.core.information_win_size - 1, self.width, self.height - 2 - self.core.information_win_size -
Tab.tab_win_height(), 0) Tab.tab_win_height(), 0)
def is_highlight(self, txt, time, nickname, own_nick, highlight_on,
corrected=False):
highlighted = False
if (not time or corrected) and nickname and nickname != own_nick:
if re.search(r'\b' + own_nick.lower() + r'\b', txt.lower()):
highlighted = True
else:
highlight_words = highlight_on.split(':')
for word in highlight_words:
if word and word.lower() in txt.lower():
highlighted = True
break
return highlighted
def do_highlight(self, txt, time, nickname, corrected=False): def do_highlight(self, txt, time, nickname, corrected=False):
""" """
Set the tab color and returns the nick color Set the tab color and returns the nick color
""" """
highlighted = False own_nick = self.own_nick
if (not time or corrected highlight_on = config.get_by_tabname('highlight_on', self.general_jid)
) and nickname and nickname != self.own_nick and self.joined: highlighted = self.is_highlight(txt, time, nickname, own_nick,
highlight_on, corrected)
if re.search(r'\b' + self.own_nick.lower() + r'\b', txt.lower()): if highlighted and self.joined:
if self.state != 'current': if self.state != 'current':
self.state = 'highlight' self.state = 'highlight'
highlighted = True
else:
highlight_words = config.get_by_tabname(
'highlight_on', self.general_jid)
highlight_words = highlight_words.split(':')
for word in highlight_words:
if word and word.lower() in txt.lower():
if self.state != 'current':
self.state = 'highlight'
highlighted = True
break
if highlighted:
beep_on = config.get('beep_on').split() beep_on = config.get('beep_on').split()
if 'highlight' in beep_on and 'message' not in beep_on: if 'highlight' in beep_on and 'message' not in beep_on:
if not config.get_by_tabname('disable_beep', self.name): if not config.get_by_tabname('disable_beep', self.name):
curses.beep() curses.beep()
return highlighted return True
return False
########################## COMMANDS #################################### ########################## COMMANDS ####################################