Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show name for bridged messages #5667

Merged
merged 6 commits into from
Jul 15, 2021
Merged

Conversation

gary-kim
Copy link
Member

@gary-kim gary-kim commented May 27, 2021

Requires 42wim/matterbridge#1506. Now merged!

The way the current iteration works is that messages received from the bridge-bot user is labeled as Actor Type bridged. Actor Type bridged messages store the message author name in the Actor Id field in oc_comments. When serving to the frontend, this is slightly changed to put what is in Actor Id into Actor Display Name and set the Actor Id to bridge-bot (the reason it was done this way was to simplify the changes that would need to be made to clients).

As far as clients have to care, the only difference is the addition of the Actor Type bridged and that for bridged messages, the Actor Display Name can be different for every message.

Screenshots

Screenshot 2021-05-28 at 09-52-29 Element  20  Test Room
Screenshot 2021-05-28 at 09-51-48 Test 2 - Talk - Nextcloud

@gary-kim gary-kim force-pushed the enh/noid/matterbridge-set-names branch 3 times, most recently from c2feb1e to 6a62ef1 Compare May 27, 2021 23:29
@gary-kim gary-kim marked this pull request as ready for review May 28, 2021 13:54
@gary-kim gary-kim changed the title WIP: Show name for bridged messages Show name for bridged messages May 28, 2021
@gary-kim gary-kim added the feature: integration 📦 Integration with 3rd party (chat) service label May 28, 2021
@gary-kim gary-kim self-assigned this May 28, 2021
@nickvergessen
Copy link
Member

Requires 42wim/matterbridge#1506

I guess we have to wait until that is merged?

@gary-kim
Copy link
Member Author

gary-kim commented Jun 7, 2021

Yup. It'd be noop if merged right now

@nickvergessen
Copy link
Member

noop in terms of "works as before" or in terms of "breaks and doesn't do anything anymore"

@gary-kim
Copy link
Member Author

gary-kim commented Jun 7, 2021

Works as before

@gary-kim gary-kim force-pushed the enh/noid/matterbridge-set-names branch from 39adb2c to d5a79a4 Compare June 7, 2021 13:35
@gary-kim gary-kim force-pushed the enh/noid/matterbridge-set-names branch from d5a79a4 to d553423 Compare June 8, 2021 21:25
@gary-kim
Copy link
Member Author

gary-kim commented Jun 8, 2021

If everything seems fine on this side, we could merge now. It should does (tested) function the same as before with a Matterbridge version that does not support the SeperateDisplayName config.

@nickvergessen
Copy link
Member

Maybe you can ping them again?

@gary-kim
Copy link
Member Author

42wim/matterbridge#1506 is now merged so this feature should now work with the executables here: https://github.com/42wim/matterbridge/actions/runs/953056470.

@gary-kim gary-kim requested a review from nickvergessen June 20, 2021 13:00
Copy link
Member

@nickvergessen nickvergessen left a comment

Choose a reason for hiding this comment

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

Good from my POV, but I guess we should wait for 22 to go out as the mobile apps need a patch too

@gary-kim
Copy link
Member Author

Would have been nice to get it into 22 but we're lacking in time, I suppose

@nickvergessen
Copy link
Member

Android patch at nextcloud/talk-android#1355
iOS ticket raised in nextcloud/talk-ios#579 but at least it shows something already.

@nickvergessen
Copy link
Member

Can you rebase @gary-kim

gary-kim added 6 commits July 14, 2021 13:44
Signed-off-by: Gary Kim <gary@garykim.dev>
Signed-off-by: Gary Kim <gary@garykim.dev>
Signed-off-by: Gary Kim <gary@garykim.dev>
Signed-off-by: Gary Kim <gary@garykim.dev>
Signed-off-by: Gary Kim <gary@garykim.dev>
Signed-off-by: Gary Kim <gary@garykim.dev>
@gary-kim gary-kim force-pushed the enh/noid/matterbridge-set-names branch from d553423 to e736c8a Compare July 14, 2021 17:45
@nickvergessen nickvergessen merged commit ddda9be into master Jul 15, 2021
@nickvergessen nickvergessen deleted the enh/noid/matterbridge-set-names branch July 15, 2021 16:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants