matrix/weechat-matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'rudis-master'

Browse source
This commit is contained in:
Damir Jelić 2020-05-13 17:07:11 +02:00
commit 427cb9f0be
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
matrix/buffer.py
View file

@ -1054,7 +1054,7 @@ class RoomBuffer(object):
# operation (the nicks are added to a linked list sorted).
# The search time is O(N * min(a,b)) where N is the number
# of nicks already added and a/b are the length of
# the strings that are compared at every itteration.
# the strings that are compared at every iteration.
# Because the search time get's increasingly longer we're
# going to stop adding inactive users, they will be lazily added if
# they become active.
@ -1540,7 +1540,7 @@ class RoomBuffer(object):
self.print_bad_event(event, extra_tags)
elif isinstance(event, UnknownBadEvent):
self.error("Unkwnown bad event: {}".format(
self.error("Unknown bad event: {}".format(
pprint.pformat(event.source)
))
@ -1633,7 +1633,7 @@ class RoomBuffer(object):
line.tags = new_tags
def replace_undecrypted_line(self, event):
"""Find a undecrypted message in the buffer and replace it with the now
"""Find an undecrypted message in the buffer and replace it with the now
decrypted event."""
# TODO different messages need different formatting
# To implement this, refactor out the different formatting code
@ -1660,7 +1660,7 @@ class RoomBuffer(object):
data = formatted.to_weechat() if formatted else event.body
# TODO this isn't right if the data has multiple lines, that is
# everything is printed on a signle line and newlines are shown as a
# everything is printed on a single line and newlines are shown as a
# space.
# Weechat should support deleting lines and printing new ones at an
# arbitrary position.

4
matrix/commands.py
View file

@ -805,7 +805,7 @@ def olm_export_command(server, args):
except (OSError, IOError) as e:
server.error("Error exporting keys: {}".format(str(e)))
server.info("Succesfully exported keys")
server.info("Successfully exported keys")
def olm_import_command(server, args):
file_path = os.path.expanduser(args.file)
@ -814,7 +814,7 @@ def olm_import_command(server, args):
except (OSError, IOError, EncryptionError) as e:
server.error("Error importing keys: {}".format(str(e)))
server.info("Succesfully imported keys")
server.info("Successfully imported keys")
def olm_sas_command(server, args):

6
matrix/server.py
View file

@ -507,7 +507,7 @@ class MatrixServer(object):
device = sas.other_olm_device
if sas.verified:
self.info_highlight("Device {} of user {} succesfully "
self.info_highlight("Device {} of user {} successfully "
"verified".format(
device.id,
device.user_id
@ -1161,7 +1161,7 @@ class MatrixServer(object):
return True
def print_unconfirmed_message(self, room_buffer, message):
"""Print an outoing message before getting a recieve confirmation.
"""Print an outgoing message before getting a receive confirmation.
The message is printed out greyed out and only printed out if the
client is configured to do so. The message needs to be later modified
@ -1489,7 +1489,7 @@ class MatrixServer(object):
device = sas.other_olm_device
if sas.verified:
self.info("Device {} of user {} succesfully verified".format(
self.info("Device {} of user {} successfully verified".format(
device.id,
device.user_id
))