Don't clobber a displayname or avatar_url if provided by an m.room.member event #1852

Merged
merged 1 commit into from Jan 25, 2017

Projects

None yet

2 participants

@leonerd
Member
leonerd commented Jan 24, 2017 edited

This fixes #1382

This functionallity is required by the matrix-appservice-tg Telegram portal, to provide displaynames on a per-room basis in a way that doesn't leak them as public information.

This is tested by matrix-org/sytest#337

@leonerd leonerd Don't clobber a displayname or avatar_url if provided by an m.room.me…
…mber event
10e48d8
@leonerd leonerd merged commit e978247 into develop Jan 25, 2017

7 of 8 checks passed

Sytest Dendron (Merged PR) Build finished.
Details
Sytest Dendron (Commit) Build #1421 origin/paul/issue-1382 succeeded in 9 min 21 sec
Details
Sytest Postgres (Commit) Build #2238 origin/paul/issue-1382 succeeded in 7 min 21 sec
Details
Sytest Postgres (Merged PR) Build finished.
Details
Sytest SQLite (Commit) Build #2306 origin/paul/issue-1382 succeeded in 6 min 7 sec
Details
Sytest SQLite (Merged PR) Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment