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

A/V moderation #734

Merged
merged 26 commits into from
May 12, 2021
Merged

A/V moderation #734

merged 26 commits into from
May 12, 2021

Conversation

damencho
Copy link
Member

No description provided.

@codecov
Copy link

codecov bot commented Apr 29, 2021

Codecov Report

Merging #734 (4707b2c) into master (b260941) will decrease coverage by 0.48%.
The diff coverage is 30.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #734      +/-   ##
============================================
- Coverage     47.20%   46.71%   -0.49%     
- Complexity      881      882       +1     
============================================
  Files           113      115       +2     
  Lines          6500     6627     +127     
  Branches        914      935      +21     
============================================
+ Hits           3068     3096      +28     
- Misses         3037     3121      +84     
- Partials        395      410      +15     
Impacted Files Coverage Δ Complexity Δ
...ava/org/jitsi/impl/protocol/xmpp/ChatRoomImpl.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...org/jitsi/impl/protocol/xmpp/XmppProviderImpl.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...ain/java/org/jitsi/jicofo/JitsiMeetConference.java 0.00% <ø> (ø) 0.00 <0.00> (ø)
.../org/jitsi/jicofo/ParticipantChannelAllocator.java 47.71% <0.00%> (-1.29%) 10.00 <0.00> (ø)
src/main/java/org/jitsi/jicofo/xmpp/IqHandler.java 100.00% <ø> (+65.90%) 4.00 <0.00> (-1.00) ⬆️
...otlin/org/jitsi/impl/protocol/xmpp/XmppProvider.kt 0.00% <ø> (ø) 0.00 <0.00> (ø)
...java/org/jitsi/jicofo/JitsiMeetConferenceImpl.java 47.21% <15.55%> (-2.79%) 109.00 <3.00> (-4.00)
...main/kotlin/org/jitsi/jicofo/xmpp/MuteIqHandler.kt 26.22% <26.22%> (ø) 0.00 <0.00> (?)
...otlin/org/jitsi/jicofo/xmpp/AvModerationHandler.kt 29.78% <29.78%> (ø) 4.00 <4.00> (?)
...l/protocol/xmpp/colibri/ColibriConferenceImpl.java 50.71% <30.76%> (+0.53%) 28.00 <1.00> (+3.00)
... and 12 more

Continue to review full report at Codecov.

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

@damencho
Copy link
Member Author

damencho commented May 1, 2021

I think that all comments across the PRs are fixed, but I realized there is one flow missing in the logic ... but I think we need to discuss it, I have a simple resolution of it, but we need to take care of the concurrency ... so let's discuss it offline on Monday.

logger.warn("Unmute not allowed, muterJid=" + muterJid + ", toBeMutedJid=" + toBeMutedJid);
return MuteResult.NOT_ALLOWED;
}
else if (this.chatRoom.isAvModerationEnabled(mediaType))
Copy link
Member

Choose a reason for hiding this comment

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

This first check is redundant, since isMemberAllowedToUnmute performs it.

bgrozev
bgrozev previously approved these changes May 12, 2021
@damencho damencho merged commit 9ba91b4 into master May 12, 2021
@damencho damencho deleted the av-moderation branch May 12, 2021 18:59
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