Skip to content

Check for meetingId conflicts #1233

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

Merged
merged 8 commits into from
Jun 25, 2025
Merged

Check for meetingId conflicts #1233

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d649eae
log: Remove meeting_id when resetting log context.
bgrozev Jun 25, 2025
9ab91d1
chore: Update jitsi-xmpp-extensions.
bgrozev Jun 25, 2025
a4b1687
fix: Consider blank string from MUC form as unset meeting_id.
bgrozev Jun 25, 2025
9c15953
chore: Fix warnings.
bgrozev Jun 25, 2025
9f219f2
Check for meetingId conflicts.
bgrozev Jun 25, 2025
4c415b3
squash: Do not override meetingId coming from muc, fail instead.
bgrozev Jun 25, 2025
d7a14ab
squash: Fix log message.
bgrozev Jun 25, 2025
16e794e
squash: Address feedback.
bgrozev Jun 25, 2025
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
2 changes: 1 addition & 1 deletion jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/muc/ChatRoomImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ class ChatRoomImpl(
}
synchronized(this) {
lastPresenceSent = null
logger.addContext("meeting_id", "")
logger.removeContext("meeting_id")
avModerationByMediaType.values.forEach { it.reset() }
}
}
Expand Down
11 changes: 5 additions & 6 deletions jicofo/src/main/java/org/jitsi/jicofo/conference/JitsiMeetConferenceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
import org.jxmpp.jid.*;

import java.time.*;
import java.net.*;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
Expand Down Expand Up @@ -257,7 +256,7 @@ public class JitsiMeetConferenceImpl
* Whether broadcasting to visitors is currently enabled.
* TODO: support changing it.
*/
private boolean visitorsBroadcastEnabled = VisitorsConfig.config.getAutoEnableBroadcast();
private final boolean visitorsBroadcastEnabled = VisitorsConfig.config.getAutoEnableBroadcast();

@NotNull private final Instant createdInstant = Instant.now();

Expand Down Expand Up @@ -521,7 +520,7 @@ private void joinTheRoom()
chatRoom.addListener(chatRoomListener);

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?

{
meetingId = UUID.randomUUID().toString();
logger.warn("No meetingId set for the MUC. Generating one locally.");
Expand Down Expand Up @@ -998,7 +997,7 @@ private void onMemberLeft(ChatRoomMember chatRoomMember)
{
rescheduleSingleParticipantTimeout();
}
else if (participants.size() == 0)
else if (participants.isEmpty())
{
expireBridgeSessions();
}
Expand Down Expand Up @@ -1098,7 +1097,7 @@ else if (removed.getChatMember().getRole() == MemberRole.VISITOR)
}

@Override
public void componentsChanged(Set<XmppProvider.Component> components)
public void componentsChanged(@NotNull Set<XmppProvider.Component> components)
{
}

Expand Down Expand Up @@ -1903,7 +1902,7 @@ private long getUserParticipantCount()

/**
* 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?

* @throws Exception if joining the chat room failed.
*/
private String selectVisitorNode()
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<kotest.version>5.7.2</kotest.version>
<slf4j.version>1.7.32</slf4j.version>
<jackson.version>2.19.0</jackson.version>
<jitsi.utils.version>1.0-140-g16ddce7</jitsi.utils.version>
<jitsi.utils.version>1.0-141-g3b92141</jitsi.utils.version>
<jicoco.version>1.1-160-g4ad2288</jicoco.version>
<ktlint-maven-plugin.version>3.0.0</ktlint-maven-plugin.version>
<spotbugs.version>4.8.6</spotbugs.version>
Expand Down Expand Up @@ -176,7 +176,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jitsi-xmpp-extensions</artifactId>
<version>1.0-96-gb0509fc</version>
<version>1.0-97-g6f2f8f9</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down