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.

Sign up for GitHub

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

Jump to bottom

feat(metadata): Keeps track of participants last used display name. #546

Merged
merged 2 commits into from
Sep 17, 2024
Merged

feat(metadata): Keeps track of participants last used display name. #546

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8533a7
feat(metadata): Keeps track of participants last used display name.
damencho Sep 17, 2024
1948a96
squash: Fixes comments.
damencho Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions src/main/kotlin/org/jitsi/jibri/selenium/pageobjects/CallPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,16 @@ class CallPage(driver: RemoteWebDriver) : AbstractPageObject(driver) {
val result = driver.executeScript(
"""
try {
window._jibriParticipants = [];
window._jibriParticipants = new Map();
const existingMembers = APP.conference._room.room.members || {};
const existingMemberJids = Object.keys(existingMembers);
console.log("There were " + existingMemberJids.length + " existing members");
existingMemberJids.forEach(jid => {
const existingMember = existingMembers[jid];
if (existingMember.identity) {
console.log("Member ", existingMember, " has identity, adding");
window._jibriParticipants.push(existingMember.identity);
existingMember.identity.lastKnownDisplayName = existingMember.nick;
window._jibriParticipants.set(jid, existingMember.identity);
} else {
console.log("Member ", existingMember.jid, " has no identity, skipping");
}
Expand All @@ -141,10 +142,21 @@ class CallPage(driver: RemoteWebDriver) : AbstractPageObject(driver) {
(from, nick, role, hidden, statsid, status, identity) => {
console.log("Jibri got MUC_MEMBER_JOINED: ", from, identity);
if (!hidden && identity) {
window._jibriParticipants.push(identity);
identity.lastKnownDisplayName = nick;
window._jibriParticipants.set(from, identity);
}
}
);
APP.conference._room.room.addListener(
"xmpp.display_name_changed",
(jid, displayName) => {
Copy link
Member

Choose a reason for hiding this comment

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

Skip if display name is undefined or 0 length.

const identity = window._jibriParticipants.get(jid);
if (identity) {
identity.lastKnownDisplayName = displayName;
Copy link
Member

Choose a reason for hiding this comment

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

Pl set the display name property instead, so the JaaS webhook payload doesn't change since it takes it from the metadata file.

Copy link
Member Author

Choose a reason for hiding this comment

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

So identity already has the display name that is coming from the jwt. Do you want to override that one and lost any values from it?

Copy link
Member Author

Choose a reason for hiding this comment

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

I see, to overwrite name in user:

{
  "user": {
    "id": "123",
    "name": "damencho",
    "avatar": "https://"
  },
  "group": "456"
}

}
}
);

return true;
} catch (e) {
return e.message;
Expand Down Expand Up @@ -189,7 +201,7 @@ class CallPage(driver: RemoteWebDriver) : AbstractPageObject(driver) {
val result = driver.executeScript(
"""
try {
return window._jibriParticipants;
return window._jibriParticipants.values().toArray();
} catch (e) {
return e.message;
}
Expand Down
Loading