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

modify_message: change variable name

Browse source 
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2020-04-05 02:17:16 +02:00
parent 88e5b2d1d7
commit 156beca13f
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
poezio/text_buffer.py
View file

@ -188,20 +188,20 @@ class TextBuffer:
return min(ret_val, 1) return min(ret_val, 1)
def _find_message(self, old_id: str) -> Tuple[str, int]: def _find_message(self, orig_id: str) -> Tuple[str, int]:
""" """
Find a message in the text buffer from its message id Find a message in the text buffer from its message id
""" """
# When looking for a message, ensure the id doesn't appear in a # When looking for a message, ensure the id doesn't appear in a
# message we've removed from our message list. If so return the index # message we've removed from our message list. If so return the index
# of the corresponding id for the original message instead. # of the corresponding id for the original message instead.
old_id = self.correction_ids.get(old_id, old_id) orig_id = self.correction_ids.get(orig_id, orig_id)
for i in range(len(self.messages) - 1, -1, -1): for i in range(len(self.messages) - 1, -1, -1):
msg = self.messages[i] msg = self.messages[i]
if msg.identifier == old_id: if msg.identifier == orig_id:
return (old_id, i) return (orig_id, i)
return (old_id, -1) return (orig_id, -1)
def ack_message(self, old_id: str, jid: str) -> Union[None, bool, Message]: def ack_message(self, old_id: str, jid: str) -> Union[None, bool, Message]:
"""Mark a message as acked""" """Mark a message as acked"""
@ -235,7 +235,7 @@ class TextBuffer:
def modify_message(self, def modify_message(self,
txt: str, txt: str,
old_id: str, orig_id: str,
new_id: str, new_id: str,
highlight: bool = False, highlight: bool = False,
time: Optional[datetime] = None, time: Optional[datetime] = None,
@ -250,12 +250,12 @@ class TextBuffer:
are now required to link all corrections to the original messages. are now required to link all corrections to the original messages.
""" """
old_id, i = self._find_message(old_id) orig_id, i = self._find_message(orig_id)
if i == -1: if i == -1:
log.debug( log.debug(
'Message %s not found in text_buffer, abort replacement.', 'Message %s not found in text_buffer, abort replacement.',
old_id) orig_id)
raise CorrectionError("nothing to replace") raise CorrectionError("nothing to replace")
msg = self.messages[i] msg = self.messages[i]
@ -270,12 +270,12 @@ class TextBuffer:
elif not msg.user and msg.jid != jid: elif not msg.user and msg.jid != jid:
raise CorrectionError( raise CorrectionError(
'Messages %s and %s have not been ' 'Messages %s and %s have not been '
'sent by the same fullJID' % (old_id, new_id)) 'sent by the same fullJID' % (orig_id, new_id))
if not time: if not time:
time = msg.time time = msg.time
self.correction_ids[new_id] = old_id self.correction_ids[new_id] = orig_id
message = Message( message = Message(
txt, txt,
time, time,
@ -283,13 +283,13 @@ class TextBuffer:
msg.nick_color, msg.nick_color,
False, False,
msg.user, msg.user,
old_id, orig_id,
highlight=highlight, highlight=highlight,
old_message=msg, old_message=msg,
revisions=msg.revisions + 1, revisions=msg.revisions + 1,
jid=jid) 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.', orig_id, new_id)
return message return message
def del_window(self, win) -> None: def del_window(self, win) -> None: