Commit Graph

1351 Commits

Author SHA1 Message Date
Gustavo Trott
54dfe4bc3e ActivityTracker handle/stores more important events 2021-06-23 11:51:10 -03:00
Joao Siebel
1d7bab7e0b Prevent unnecessary call to unassign presenter and add logs 2021-06-22 14:44:34 -03:00
germanocaumo
349af23f0a Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into anonymous-polls 2021-06-16 21:54:28 +00:00
Anton Georgiev
5ee5ed1970 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-june16 2021-06-16 19:54:28 +00:00
germanocaumo
31138d440e fix(poll): readd userId for non secret poll record event 2021-06-16 17:01:56 +00:00
Gustavo Trott
37dea2215b Translates dynamically breakout room Names when default name is being used 2021-06-14 16:59:27 -03:00
Richard Alam
b6e49e5218 Merge branch 'develop' into paultrudel-analytics-actor-for-meeting-info 2021-06-12 01:29:28 +00:00
Richard Alam
ef766217f7 Merge branch 'analytics-actor-for-meeting-info' of https://github.com/paultrudel/bigbluebutton into paultrudel-analytics-actor-for-meeting-info 2021-06-12 01:28:37 +00:00
Anton Georgiev
1369cb2269
Merge pull request #12505 from gustavotrott/breakoutroom-inscrease-time
Add 'Extend duration' option for breakout rooms
2021-06-11 16:33:15 -04:00
germanocaumo
7bedcb08e5 fix(poll): don't translate user/presenter typed answers
When the answer is not default (Custom or UserResponse), don't translate the answers.
2021-06-11 16:55:53 +00:00
paultrudel
90fd6f4d2f analytics endpoint now successfully returns meeting info 2021-06-11 09:31:51 -04:00
Gustavo Trott
c33f2f48ef Add Actor to receive and store user activities 2021-06-09 10:00:18 -03:00
Gustavo Trott
5b579d3a16 Avoid extend breakout rooms time exceed parent meeting remaining time 2021-06-07 14:19:20 -03:00
tibroc
8f80f95251 removed userId and added secretPoll flag to RecordEvents 2021-06-07 11:01:34 +02:00
tibroc
1f329a70e3 pass secret polls also to handlers and object models 2021-06-07 10:57:53 +02:00
tibroc
828cf60cb2 Add option to hide individual answers in polls
This patch adds a new option to hide the individual answers to the presenter
when starting a poll. This includes hiding the answers for the presenter and
informing the other users that the current poll is anonymous.

See #9524
2021-06-07 10:56:14 +02:00
Gustavo Trott
02ef1186be Avoid set negative values in Extend time for breakout rooms 2021-06-02 17:36:43 -03:00
Gustavo Trott
a312557461 Adds extend breakout room time functionality 2021-06-02 15:29:40 -03:00
Pedro Beschorner Marin
d4888f585c refactor(external videos): state as integer
A media state may have more than 2 states. Moving this property back to
integer so it can be extended.
2021-06-02 15:07:03 -03:00
Pedro Beschorner Marin
4a5b92445a refactor(external videos): system stop
Move all external video's system stop control events to akka-apps:
- on presenter change
- on presenter leave
- on screenshare start
2021-06-02 15:06:17 -03:00
Arthur B. Grossi
b0f2297809 refactor(external videos): add akka-apps model 2021-06-02 13:06:41 -03:00
Arthur B. Grossi
e606df6031 feat(external video): permission check
Checks permission of start, stop and update external video messages
and only broadcast it if the sender is presenter (unless it's system
messages).
2021-06-02 12:54:37 -03:00
Anton Georgiev
93c9aecab8
Merge pull request #12447 from gustavotrott/fix-user-inactive-while-in-breakoutroom
fix: Avoid users to be ejected due to inactivity while they are in a breakout room
2021-05-31 11:00:15 -04:00
Anton Georgiev
8868e84e9f
Merge pull request #12395 from gustavotrott/end-when-no-moderator
Implements endWhenNoModerator
2021-05-31 10:59:55 -04:00
Anton Georgiev
9f84b993f7
Merge pull request #12467 from pedrobmarin/f-r-mow
fix!(recording): moderator only webcams
2021-05-31 10:49:17 -04:00
Anton Georgiev
2b4746fc85
Merge pull request #12465 from pedrobmarin/f-r-rrce
feat(recording): record role change event
2021-05-31 10:47:15 -04:00
Pedro Beschorner Marin
0e34d7239d fix!(recording): moderator only webcams
BREAKING CHANGE: fix typo at moderator only webcams recorded event.
2021-05-30 14:13:39 -03:00
Pedro Beschorner Marin
ed64e330ee feat(recording): record role change event
Reuse `ParticipantStatusChangeEvent` record event, already used by emojis and
webcam streams, to record `UserRoleChangedEvtMsg`.

Role change is stored at `events.xml` as:

- promotion
```
  <event timestamp="2068340" module="PARTICIPANT" eventname="ParticipantStatusChangeEvent">
    <timestampUTC>1622384175759</timestampUTC>
    <date>2021-05-30T14:16:15.759Z</date>
    <status>role</status>
    <userId>w_fowyht7g0tfi</userId>
    <value>MODERATOR</value>
  </event>
```

- demotion
```
  <event timestamp="2071437" module="PARTICIPANT" eventname="ParticipantStatusChangeEvent">
    <timestampUTC>1622384178855</timestampUTC>
    <date>2021-05-30T14:16:18.855Z</date>
    <status>role</status>
    <userId>w_fowyht7g0tfi</userId>
    <value>VIEWER</value>
  </event>
```
2021-05-30 11:19:30 -03:00
germanocaumo
ed6e895b67 refactor: rename inside question parameters 2021-05-27 21:11:50 +00:00
germanocaumo
4d347be53b refactor: use questionText instead of title for poll question 2021-05-27 21:04:15 +00:00
Gustavo Trott
b3f1d51f44 Updates user lastActivityTime in parent room while user is in breakout room 2021-05-26 17:16:15 -03:00
germanocaumo
674d23105e fix: don't show empty line when poll have 7 answers 2021-05-20 18:39:33 +00:00
Gustavo Trott
979b21c0ed Improve code reading 2021-05-17 18:13:00 -03:00
Gustavo Trott
00240c925e Implements endWhenNoModerator 2021-05-17 17:52:59 -03:00
Anton Georgiev
1bc324b657
Merge pull request #12353 from germanocaumo/poll-record-improvs
Recorded polling events improvements
2021-05-13 13:43:36 -04:00
germanocaumo
ca2ad30e12 fix(record): add missing info to polling events
Add PollPublishedRecordEvent with all infos (also fix duplicated handlePollStoppedEvtMsg)
Add answer text to UserRespondedToPollRecordEvent (useful for custom answers)
Add type in PollStartedRecordEvent
2021-05-11 18:37:23 +00:00
germanocaumo
af6180a618 fix(record): add question title in pollstartedrecordevent 2021-05-11 18:36:42 +00:00
Gustavo Trott
62b24b8c19 Code improvements in inactivity warning funcs 2021-05-11 10:01:35 -03:00
Gustavo Trott
17994bb4dd Fix problem that users was not being ejected after inactivity warning timeout 2021-05-10 15:12:13 -03:00
Michael Zinsmeister
5ca831ff86 Merged upstream develop branch 2021-05-01 16:59:20 +02:00
Richard Alam
22d434416a - lump other responses in the poll and include in the display 2021-04-29 14:44:18 +00:00
Richard Alam
39c69675a4 - sort answers based on number of votes
- limit display of responses to 7 to prevent squishing of display in the whiteboard
2021-04-28 21:34:21 +00:00
Richard Alam
414716d23b - remote debug logs 2021-04-28 21:33:34 +00:00
Anton Georgiev
867edc695c
Merge pull request #12142 from ritzalam/do-not-log-chat-msgs
Do not log chat msgs
2021-04-26 15:06:05 -04:00
Richard Alam
ebf883d087 - add flag to not log the chat messages 2021-04-24 02:23:17 +00:00
Richard Alam
19c66dac6c - remove debug logs 2021-04-24 02:15:22 +00:00
Richard Alam
ba40af8324 - let parent meeting manage breakout lifecycle 2021-04-23 23:22:01 +00:00
Richard Alam
722fb707cc - fix issue https://github.com/bigbluebutton/bigbluebutton/issues/11358 by having the parent meeting
tell the breakout rooms the remaining time. Currently, each room has its own countdown timer which
   could introduce drifting resulting in breakout rooms ending at different times.
2021-04-23 21:25:06 +00:00
Richard Alam
b89fd1dbe2 - only update parent meeting if this is breakout room 2021-04-23 21:21:23 +00:00
Anton Georgiev
3ebb2cf46d
Merge pull request #12004 from prlanzarin/u23-isitcoldinthewater
video: voice activity video sorting
2021-04-20 09:47:43 -04:00
hiroshisuga
4db28a2824
Fancy random viewer selection (#11297)
* Revert "Delete bbb-icons-ori.woff"

This reverts commit 84937a0d07.

* Revert "Add files via upload"

This reverts commit 391434445a.

* Revert "Delete bbb-icons.woff"

This reverts commit 7c245c666d.

* Revert "Add files via upload"

This reverts commit 6f8c764c4b.

* Revert "Delete tmp.woff"

This reverts commit 5141e65359.

* Revert "Add files via upload"

This reverts commit c8f7b17b04.

* Revert "Create tmp.woff"

This reverts commit 73c4506594.

* Revert "Delete bbb-icons.woff"

This reverts commit 9d01d58527.

* Revert "Revert "Delete bbb-icons.woff""

This reverts commit d221d290cd.

* Revert "Revert "Revert "Delete bbb-icons.woff"""

This reverts commit c415ff02d1.

* Revert "Revert "Delete bbb-icons.woff""

This reverts commit d221d290cd.

* Revert "Revert "Create tmp.woff""

This reverts commit 267dc412d5.

* Revert "Delete bbb-icons-ori.woff"

This reverts commit 84937a0d07.

* Revert "Delete bbb-icons.woff"

This reverts commit 7c245c666d.

* Revert "Add files via upload"

This reverts commit 6f8c764c4b.

* Revert "Add files via upload"

This reverts commit c8f7b17b04.

* Revert "Create tmp.woff"

This reverts commit 73c4506594.

* Revert "Delete bbb-icons.woff"

This reverts commit 9d01d58527.

* Revert "Revert "Delete bbb-icons.woff""

This reverts commit 64a48f2bd6.

* Revert "Revert "Revert "Delete bbb-icons.woff"""

This reverts commit 9d1b4a068a.

* Revert "Revert "Revert "Revert "Delete bbb-icons.woff""""

This reverts commit b60491d933.

* Revert "Revert "Revert "Revert "Revert "Delete bbb-icons.woff"""""

This reverts commit 16e357091d.

* Revert "Revert "Revert "Revert "Revert "Revert "Delete bbb-icons.woff""""""

This reverts commit e0b70f2055.

* Revert "Revert "Revert "Revert "Revert "Revert "Revert "Delete bbb-icons.woff"""""""

This reverts commit 7b1bde97ed.

* Update UsersMgs.scala

* Update selectRandomViewer.js

* Update clearRandomlySelectedUser.js

* Update addMeeting.js

* Update updateRandomViewer.js

* Update component.jsx

* Update container.jsx

* Update component.jsx

* Update container.jsx

* Update styles.scss

* Update en.json

* Update SelectRandomViewerReqMsgHdlr.scala

* code simplification

* in case only one person to be selected

* Update en.json

* Create en.json

* Update en.json

* Update component.jsx

* Update styles.scss

* Update en.json

* Update updateRandomViewer.js

Fix a typo

* Update component.jsx

When the presenter is moved to a viewer, in the modal of ex-presenter "somebody is selected" should be displayed. Before this modification, "somebody is the only viewer" was displayed.

* add a comment

explaining why a condition is needed.

* Update en.json

* Update en.json

* revert (due to the rename UserMgs -> UserMsgs)

* Update UsersMsgs.scala
2021-04-15 11:12:10 -04:00
prlanzarin
172e31b78e Rework of the floor event
Now it`s called AudioFloorChanged* to properly reflect its role

Add fields to carry the floor state (boolean) along with the uID and vID to be able to send events for a floor takeover and a floor surrender
2021-04-12 18:25:58 +00:00
Anton Georgiev
ef337acbe6
Merge pull request #11956 from gustavotrott/upload-maxsize-error
Creates a pubSub error message when Upload max size exceeded
2021-04-09 16:41:22 -04:00
Aron Engineer
182340112a feat: Meeting id query param added, support for get and getall added 2021-04-09 18:47:01 +00:00
Gustavo Trott
b7d61e45eb Reorganize code 2021-04-08 16:53:22 -03:00
Gustavo Trott
3e675af3b5 Akka broadcasts UploadedFile Too Large error msg 2021-04-08 16:49:17 -03:00
Aron Engineer
e5903ccfdd feat:Meeting analytics web api endpoint added to expose meeting info 2021-04-08 19:19:22 +00:00
Gustavo Trott
3d1575e635 Send pubSub FileTooLarge Error Msg from bbb-web when file is too large, (and makes Akka send meetingId with presentation token msg) 2021-04-08 14:18:15 -03:00
Aron Engineer
d4ed29b49d Merge branch 'develop' into analytics_actor_for_meeting_info 2021-04-06 12:52:36 +00:00
Aron Engineer
35909a4cba fix: Null value replaced with other relevant placeholder values for analytics logging. 2021-04-05 20:55:55 +00:00
Aron Engineer
c7563765c6 fix: Analytics logging value Meeting Recorded corrected, common messages change 2021-04-05 18:43:39 +00:00
Marcel Waldvogel
9140613a96 Services run as starting PID
The starting scripts now `exec` the main service instead of starting
it as a subprocess. Also in line with docker-entrypoint recommendations.
2021-04-05 12:24:29 +02:00
Aron Engineer
66b320c26a fix: extra lines removed from updateWebcamStream 2021-04-01 18:12:36 +00:00
Aron Engineer
2d740ec2a9 feat: CamStreamSubscribeSysMsg added with handler and update webcam functionality, ScreenStreamSubscribeSysMsg added 2021-04-01 17:35:09 +00:00
Aron Engineer
1a2af980cf fix: literal renamed for readability 2021-03-30 20:28:01 +00:00
Aron Engineer
21ad951f5f feat: TwoWay user params added to MeetingAnalyticsInfo message, Message body modified with correct ref naming 2021-03-30 20:08:41 +00:00
Anton Georgiev
cf6491adc8
Merge branch 'develop' into multiple-choice-poll 2021-03-30 12:49:35 -04:00
Aron Engineer
7c06f3b85e Merge branch 'develop' into analytics_actor_for_meeting_info 2021-03-29 19:50:03 +00:00
Aron Engineer
c3640f2971 fix:Banned user rejoining error code modified with error message 2021-03-29 17:22:55 +00:00
Anton Georgiev
aae72c0547
Merge branch 'develop' into multiple-choice-poll 2021-03-29 11:54:44 -04:00
Aron Engineer
7195a67e4e fix: MeetingInfoAnalyticsMessage WebcamStream modified 2021-03-26 20:29:27 +00:00
Aron Engineer
4c328e980a Merge branch 'develop' into analytics_actor_for_meeting_info 2021-03-24 20:32:22 +00:00
Aron Engineer
fe898bc276 WIP: Meeting actor modified to separate individual params 2021-03-24 20:30:01 +00:00
Aron Engineer
105e1d0166 fix: Option removed from ValidateAuthTokenRespMsg and respective handlers, default eject reason added 2021-03-24 17:42:19 +00:00
Aron Engineer
376dfcc59a Merge branch 'develop' into logout_response_message_modified_reasoncode 2021-03-24 13:15:45 +00:00
Aron Engineer
52d57645c4 fix: ValidateAuthTokenRespMsg reason code added to the message. 2021-03-23 21:13:14 +00:00
Pedro Beschorner Marin
0c4cf0135d Handle pad's events and Meteor's instances
Since Meteor was split in multiple process and events started to be
filtered by instances, all Etherpad's Redis events were being discarded.

Etherpad has a Redis' publisher plugin that is unaware of BigBlueButton's
existence. All the communication between them is kept simple with minimal
of internal data exchange. The concept of distincts subscribers at Meteor's
side broke part of this simplicity and, now, Etherpad has to know which
instance must receive it's messages. To provide such information I decided
to include Meteor's instance as part of the pad's id. Should look like:

 - [instanceId]padId for the shared notes
 - [instanceId]padId_cc_(locale) for the closed captions

With those changes the pad id generation made at the recording scripts had to
be re-done because there is no instance id available. Pad id is now recorded at
akka-apps and queried while archiving the shared notes.
2021-03-23 18:03:50 -03:00
Aron Engineer
6d100d2a21 WIP: New params added to MeetingInfoAnalyticsLogMessage 2021-03-23 20:13:40 +00:00
Aron Engineer
f0b7aea734 Merge branch 'develop' into analytics_actor_for_meeting_info 2021-03-23 13:06:15 +00:00
Aron Engineer
f598862149 feat: Presenter added to presentationInfo analytics message 2021-03-19 19:25:08 +00:00
Aron Engineer
af528b26d1 feat: WIP meeting info analytics logging messages computed 2021-03-18 21:43:49 +00:00
Anton Georgiev
b1bbc3fd52
Merge branch 'develop' into multiple-choice-poll 2021-03-17 16:11:49 -04:00
Pedro Beschorner Marin
d90ba5e286 Merge branch '2.3-per-user-wb' into develop 2021-03-16 20:28:39 -03:00
Pedro Beschorner Marin
381c5cb15c Isolated whiteboard access
Modified the previous implementation of the whiteboard individual access to remove
multiple Collections dependency on this feature. Multi-user whiteboard is now an
array instead of a boolean value and most of the access control can be synchronized
and handled by akka-apps.
2021-03-16 19:55:25 -03:00
Michael Z
4d3bda1306
Merge branch 'develop' into multiple-choice-poll 2021-03-16 18:38:48 +01:00
Aron Engineer
eb601eef3e fix: create meeting message order precedes group chat message in akka-apps 2021-03-15 22:34:54 +00:00
Michael Zinsmeister
b99bd3be0c Merged upstream develop branch 2021-03-14 22:17:19 +01:00
Anton Georgiev
9f841bd64b
Merge pull request #11622 from prlanzarin/u23-ilgiardino
[screenshare] Rewrite SFU/Kurento screensharing bridge (+reconnections|audio sharing|QoL, was #11025)
2021-03-12 05:13:11 -05:00
prlanzarin
7eb91f9273 Merge branch 'u22-screenshare18102020' of https://github.com/prlanzarin/bigbluebutton-1 into u23-ilgiardino 2021-03-11 18:49:14 +00:00
Aron Engineer
625c4962a0 feat: ValidateAuthToken revoked when user is logged out, reason added to response message 2021-03-11 14:32:01 +00:00
Aron Engineer
56a2ff5df8 feat: User modified to add logged out attribute 2021-03-11 14:32:01 +00:00
Pedro Beschorner Marin
0365018e92 Add guest lobby messages
Moderators are able to send a message to the meeting's guest lobby. This new
event reaches bbb-web and is sent to the guest user with her/his status response
while polling. All guest users that are waiting for acceptance will be able to
read this message.

enableGuestLobbyMessage is disabled by default.
2021-03-09 11:02:25 -03:00
Michael Zinsmeister
6ac09c25cf change back application.conf 2021-03-07 15:32:52 +01:00
Michael Zinsmeister
81d5129084 Merge with upstream 2021-03-07 15:28:39 +01:00
Michael Zinsmeister
214b236701 Merge with upstream 2021-03-07 15:12:49 +01:00
Richard Alam
28245a1b58
Merge pull request #11557 from aron-2809/bbb-core-http-endpoint-wip
Bbb core http endpoint wip
2021-03-05 14:27:48 -05:00
Aron Engineer
2c8220a897 fix: HealthActor messages optimized for the timestamp value update 2021-03-05 18:31:31 +00:00
Aron Engineer
284ba1af97 fix: Timeout exception response modified with typesafety. 2021-03-05 17:23:51 +00:00
Anton Georgiev
228bad03d5 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into march4-merge 2021-03-04 21:25:47 +00:00
Aron Engineer
cae124aed7 feat: pubsub send and receive statuses added to health endpoint 2021-03-04 21:16:48 +00:00