Skip to content

Conversation

@bgrozev
Copy link
Member

@bgrozev bgrozev commented Jun 25, 2025

  • log: Remove meeting_id when resetting log context.
  • chore: Update jitsi-xmpp-extensions.
  • fix: Consider blank string from MUC form as unset meeting_id.
  • chore: Fix warnings.


ChatRoomInfo chatRoomInfo = chatRoom.join();
if (chatRoomInfo.getMeetingId() == null)
if (org.apache.commons.lang3.StringUtils.isBlank(chatRoomInfo.getMeetingId()))
Copy link
Member

Choose a reason for hiding this comment

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

Can this not be imported?

/**
* Selects a visitor node for a new participant, and joins the associated chat room if not already joined
* @return
* @return the ID of the selected node, or null if the endpoint is to be sent to the main room.
Copy link
Member

Choose a reason for hiding this comment

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

Annotate return type with @Nullable?

@codecov
Copy link

codecov bot commented Jun 25, 2025

Codecov Report

Attention: Patch coverage is 33.33333% with 18 lines in your changes missing coverage. Please review.

Project coverage is 26.45%. Comparing base (a4f3fe4) to head (16e794e).
Report is 1 commits behind head on master.

Files with missing lines Patch % Lines
...o/src/main/kotlin/org/jitsi/jicofo/FocusManager.kt 10.00% 9 Missing ⚠️
...tsi/jicofo/conference/JitsiMeetConferenceImpl.java 50.00% 5 Missing and 3 partials ⚠️
...n/kotlin/org/jitsi/jicofo/xmpp/muc/ChatRoomImpl.kt 0.00% 1 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #1233      +/-   ##
============================================
- Coverage     26.45%   26.45%   -0.01%     
- Complexity      464      465       +1     
============================================
  Files           127      127              
  Lines          8410     8429      +19     
  Branches       1183     1185       +2     
============================================
+ Hits           2225     2230       +5     
- Misses         5889     5901      +12     
- Partials        296      298       +2     
Files with missing lines Coverage Δ
...n/kotlin/org/jitsi/jicofo/xmpp/muc/ChatRoomImpl.kt 0.00% <0.00%> (ø)
...tsi/jicofo/conference/JitsiMeetConferenceImpl.java 39.55% <50.00%> (+0.04%) ⬆️
...o/src/main/kotlin/org/jitsi/jicofo/FocusManager.kt 38.37% <10.00%> (-1.63%) ⬇️

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a4f3fe4...16e794e. Read the comment docs.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

if (attempts >= 100)
if (!listener.meetingIdSet(this, meetingId))
{
logger.error("Failed to set a unique meeting ID after 100 attempts, giving up.");
Copy link
Member

Choose a reason for hiding this comment

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

This is no longer doing 100 attempts, log should change

}

String meetingId;
if (org.apache.commons.lang3.StringUtils.isBlank(chatRoomMeetingId))
Copy link
Member

Choose a reason for hiding this comment

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

Can this be imported?

/**
* Fire an event attempting to set the meeting ID for the conference. The implementation should return `false`
* in case another meeting with the same ID already exists, which will result in a new randomly generated
* meeting ID to be attempted.
Copy link
Member

Choose a reason for hiding this comment

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

This comment should be changed now

@bgrozev bgrozev merged commit f1393ab into jitsi:master Jun 25, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants