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

Fix #2358 (/correct is broken in private conversations)

Browse source
This commit is contained in:
Mathieu Pasquet 2013-10-06 22:45:38 +02:00
parent 0124ac1b06
commit dd4f8661a9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/text_buffer.py
View file

@ -116,9 +116,9 @@ class TextBuffer(object):
raise CorrectionError("Delayed message") raise CorrectionError("Delayed message")
elif not msg.user and (msg.jid is None or jid is None): elif not msg.user and (msg.jid is None or jid is None):
raise CorrectionError('Could not check the identity of the sender') raise CorrectionError('Could not check the identity of the sender')
elif not msg.user and msg.jid.full != jid.full: elif not msg.user and msg.jid != jid:
raise CorrectionError('Messages %s and %s have not been sent by the same fullJID' % (old_id, new_id)) raise CorrectionError('Messages %s and %s have not been sent by the same fullJID' % (old_id, new_id))
message = self.make_message(txt, time if time else msg.time, msg.nickname, msg.nick_color, None, msg.user, new_id, highlight=highlight, old_message=msg, revisions=msg.revisions + 1) message = self.make_message(txt, time if time else msg.time, msg.nickname, msg.nick_color, None, msg.user, new_id, highlight=highlight, old_message=msg, revisions=msg.revisions + 1, jid=jid)
self.messages[i] = message self.messages[i] = message
log.debug('Replacing message %s with %s.', old_id, new_id) log.debug('Replacing message %s with %s.', old_id, new_id)
return message return message