Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Update aliases event after deletion #652

Merged
merged 2 commits into from
Mar 18, 2016
Merged

Conversation

erikjohnston
Copy link
Member

Attempt to update the appropriate m.room.aliases event after deleting an alias. This may fail due to the deleter not being in the room.

Will also check if the canonical alias of the event is set to the deleted alias, and if so will attempt to delete it.

Attempt to update the appropriate `m.room.aliases` event after deleting
an alias. This may fail due to the deleter not being in the room.

Will also check if the canonical alias of the event is set to the
deleted alias, and if so will attempt to delete it.
@erikjohnston
Copy link
Member Author

Sytest: matrix-org/sytest#216

@NegativeMjark
Copy link
Contributor

LGTM

@@ -93,7 +95,7 @@ def create_appservice_association(self, service, room_alias, room_id,
yield self._create_association(room_alias, room_id, servers)

@defer.inlineCallbacks
def delete_association(self, user_id, room_alias):
def delete_association(self, requester, user_id, room_alias):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the user_id different from the requester?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The requester is a separate type, which includes a user. Not sure why the functions in this module ask for both. I'm not even sure why the requester is needed.

erikjohnston added a commit that referenced this pull request Mar 18, 2016
Update aliases event after deletion
@erikjohnston erikjohnston merged commit 916227b into develop Mar 18, 2016
@richvdh richvdh deleted the erikj/delete_alias branch December 1, 2016 14:09
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants