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

trigger events *_say BEFORE generating the xhtml, making it possible to add colors in the hook

Browse source 
Conflicts:

	src/tabs.py
This commit is contained in:
Florent Le Coz 2011-11-08 00:19:31 +01:00
parent f13d03c149
commit 4610a1d6e3
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/tabs.py
View file

@ -710,11 +710,10 @@ class MucTab(ChatTab):
needed = 'inactive' if self.core.status.show in ('xa', 'away') else 'active' needed = 'inactive' if self.core.status.show in ('xa', 'away') else 'active'
msg = self.core.xmpp.make_message(self.get_name()) msg = self.core.xmpp.make_message(self.get_name())
msg['type'] = 'groupchat' msg['type'] = 'groupchat'
if line.find('\x19') == -1: msg['body'] = line
msg['body'] = line if msg['body'].find('\x19') != -1:
else: msg['xhtml_im'] = xhtml.poezio_colors_to_html(msg['body'])
msg['body'] = xhtml.clean_text_simple(line) msg['body'] = xhtml.clean_text(msg['body'])
msg['xhtml_im'] = xhtml.poezio_colors_to_html(line)
if config.get('send_chat_states', 'true') == 'true' and self.remote_wants_chatstates is not False: if config.get('send_chat_states', 'true') == 'true' and self.remote_wants_chatstates is not False:
msg['chat_state'] = needed msg['chat_state'] = needed
self.cancel_paused_delay() self.cancel_paused_delay()
@ -1202,11 +1201,10 @@ class PrivateTab(ChatTab):
return return
msg = self.core.xmpp.make_message(self.get_name()) msg = self.core.xmpp.make_message(self.get_name())
msg['type'] = 'chat' msg['type'] = 'chat'
if line.find('\x19') == -1: msg['body'] = line
msg['body'] = line if msg['body'].find('\x19') != -1:
else: msg['body'] = xhtml.clean_text(msg['body'])
msg['body'] = xhtml.clean_text_simple(line) msg['xhtml_im'] = xhtml.poezio_colors_to_html(msg['body'])
msg['xhtml_im'] = xhtml.poezio_colors_to_html(line)
if config.get('send_chat_states', 'true') == 'true' and self.remote_wants_chatstates is not False: if config.get('send_chat_states', 'true') == 'true' and self.remote_wants_chatstates is not False:
needed = 'inactive' if self.core.status.show in ('xa', 'away') else 'active' needed = 'inactive' if self.core.status.show in ('xa', 'away') else 'active'
msg['chat_state'] = needed msg['chat_state'] = needed
@ -1865,11 +1863,10 @@ class ConversationTab(ChatTab):
def command_say(self, line): def command_say(self, line):
msg = self.core.xmpp.make_message(self.get_name()) msg = self.core.xmpp.make_message(self.get_name())
msg['type'] = 'chat' msg['type'] = 'chat'
if line.find('\x19') == -1: msg['body'] = line
msg['body'] = line if msg['body'].find('\x19') != -1:
else: msg['body'] = xhtml.clean_text(msg['body'])
msg['body'] = xhtml.clean_text_simple(line) msg['xhtml_im'] = xhtml.poezio_colors_to_html(msg['body'])
msg['xhtml_im'] = xhtml.poezio_colors_to_html(line)
if config.get('send_chat_states', 'true') == 'true' and self.remote_wants_chatstates is not False: if config.get('send_chat_states', 'true') == 'true' and self.remote_wants_chatstates is not False:
needed = 'inactive' if self.core.status.show in ('xa', 'away') else 'active' needed = 'inactive' if self.core.status.show in ('xa', 'away') else 'active'
msg['chat_state'] = needed msg['chat_state'] = needed