Skip to content

Commit

Permalink
Merge remote-tracking branch 'mrjohnson22/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
tulir committed Dec 31, 2020
2 parents fe24baf + a43e78d commit f272f16
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion mautrix/appservice/api/intent.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ def quote(*args, **kwargs):
ClientAPI.search_users, ClientAPI.set_displayname, ClientAPI.set_avatar_url,

ClientAPI.upload_media,

ClientAPI.send_receipt, ClientAPI.set_fully_read_marker,
)

ENSURE_JOINED_METHODS = (
Expand All @@ -50,7 +52,6 @@ def quote(*args, **kwargs):
ClientAPI.get_event, ClientAPI.get_state_event, ClientAPI.get_state,
ClientAPI.get_joined_members, ClientAPI.get_messages, ClientAPI.send_state_event,
ClientAPI.send_message_event, ClientAPI.redact,
ClientAPI.send_receipt, ClientAPI.set_fully_read_marker,
)


Expand Down

0 comments on commit f272f16

Please sign in to comment.