Skip to content

Fix display name of reshare with one-to-one room not invited to#1426

Merged
nickvergessen merged 1 commit into
masterfrom
fix-display-name-of-reshare-with-one-to-one-room-not-invited-to
Jan 30, 2019
Merged

Fix display name of reshare with one-to-one room not invited to#1426
nickvergessen merged 1 commit into
masterfrom
fix-display-name-of-reshare-with-one-to-one-room-not-invited-to

Conversation

@danxuliu

Copy link
Copy Markdown
Member

The display name of reshares with one-to-one rooms not invited to was always set to the display name of the last participant. However, this happens since 4afa2d7; before that the first participant was always used. Now the name of both participants in the room is used instead, which also fixes the integration tests that were broken in 4afa2d7.

The display name of reshares with one-to-one rooms not invited to was
always set to the display name of the last participant. Now it includes
the name of both participants in the room instead.

Note that this is not needed for deleted shares, as in that case only
shares by the user, not reshares, need to be formatted.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@danxuliu danxuliu added 3. to review bug feature: upload & shares & voice 📤🎙️ Sharing files into a chat and audio recordings labels Dec 20, 2018
@danxuliu danxuliu added this to the 💚 Next Major milestone Dec 20, 2018
@danxuliu
danxuliu requested a review from Ivansss December 20, 2018 14:19
@danxuliu

Copy link
Copy Markdown
Member Author

/backport to stable15

@Ivansss Ivansss left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Tested and works 👍

@nickvergessen nickvergessen left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Does what it says, however i'm not sure if we should leak the room/group/one2one names when the user is not part of it.

@danxuliu

Copy link
Copy Markdown
Member Author

I'm not sure if we should leak the room/group/one2one names when the user is not part of it.

I thought the same, but the leaking is consistent with the behaviour of other shares; for example, when a share is reshared with a group, the name of the group can be seen too by the owner of the share even if she is not in that group.

@nickvergessen

Copy link
Copy Markdown
Member

the name of the group can be seen too by the owner of the share even if she is not in that group

True, but there is a difference, you can share to that group yourself, while you can not share to rooms you are not a member off

@nickvergessen
nickvergessen merged commit ae6c1fc into master Jan 30, 2019
@nickvergessen
nickvergessen deleted the fix-display-name-of-reshare-with-one-to-one-room-not-invited-to branch January 30, 2019 10:12
@backportbot-nextcloud

Copy link
Copy Markdown

backport to stable15 in #1495

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug feature: upload & shares & voice 📤🎙️ Sharing files into a chat and audio recordings

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants