Revert prefix changes.

This commit is contained in:
AZ Huang 2014-02-18 17:14:33 +08:00
parent 5d22a23527
commit d8ea091abd

View file

@ -92,7 +92,7 @@ class SyncBot(Tox):
CHANNEL, line, re.S) CHANNEL, line, re.S)
if rx: if rx:
print('IRC> %s: %s' % rx.groups()) print('IRC> %s: %s' % rx.groups())
msg = '%s\ %s' % rx.groups() msg = '%s> %s' % rx.groups()
content = rx.group(2) content = rx.group(2)
if content == '^syncbot' or \ if content == '^syncbot' or \
@ -100,7 +100,7 @@ class SyncBot(Tox):
self.irc_send('PRIVMSG %s :%s\r\n' % self.irc_send('PRIVMSG %s :%s\r\n' %
(CHANNEL, self.get_address())) (CHANNEL, self.get_address()))
elif content[1:].startswith('ACTION '): elif content[1:].startswith('ACTION '):
action = '\%s %s' % (rx.group(1), action = '%s> %s' % (rx.group(1),
rx.group(2)[8:-1]) rx.group(2)[8:-1])
self.sent = action self.sent = action
self.ensure_exe(self.group_action_send, self.ensure_exe(self.group_action_send,
@ -148,13 +148,13 @@ class SyncBot(Tox):
if message != self.sent: if message != self.sent:
name = self.group_peername(groupnumber, friendgroupnumber) name = self.group_peername(groupnumber, friendgroupnumber)
print('TOX> %s: %s' % (name, message)) print('TOX> %s: %s' % (name, message))
self.irc_send('PRIVMSG %s :%s\ %s\r\n' % (CHANNEL, name, message)) self.irc_send('PRIVMSG %s :%s> %s\r\n' % (CHANNEL, name, message))
def on_group_action(self, groupnumber, friendgroupnumber, action): def on_group_action(self, groupnumber, friendgroupnumber, action):
if action != self.sent: if action != self.sent:
name = self.group_peername(groupnumber, friendgroupnumber) name = self.group_peername(groupnumber, friendgroupnumber)
print('TOX> %s: %s' % (name, action)) print('TOX> %s: %s' % (name, action))
self.irc_send('PRIVMSG %s :\x01ACTION \%s %s\x01\r\n' % self.irc_send('PRIVMSG %s :\x01ACTION %s> %s\x01\r\n' %
(CHANNEL, name, action)) (CHANNEL, name, action))
def on_friend_request(self, pk, message): def on_friend_request(self, pk, message):