GraphQL - Implement more commands for MUC #3627

Premwoik · 2022-04-11T13:25:25Z

This PR refers to MIM-1629 and extends the GraphQL MUC category about new commands.

Extended commands

Command `inviteUser`

When the room is password secured, then this command attaches the password to the invitation.

The new commands

Command `setAffiliation`

grant member aff,
grant admin aff,
grant owner aff,
ban user (set outcast aff)
revoke aff

Command `setRole`

grant voice (participant role),
revoke voice (visitant role),
grant moderator role

Command `listUserAffiliations`

Allows listing all users with given affiliation or list all room affiliations.

Commands `enterRoom` and `exitRoom`

Allows entering/exiting room per user session with the given nickname.
It is possible to enter the password-secured room.

Command `sendPrivateMesssage`

The user can send a private message to the other room occupant. The message is sent to the given nickname.

Small GraphQL Bug

When working on this PR I found a bug in graphql_erlang causing a crash when the user passes the wrong type value, and that value is present in more than one enum. The PR with a fix Premwoik/graphql-erlang#1

codecov · 2022-04-11T13:33:59Z

Codecov Report

Merging #3627 (0d0e86d) into feature/graphql (e85c138) will increase coverage by 0.09%.
The diff coverage is 96.36%.

@@                 Coverage Diff                 @@
##           feature/graphql    #3627      +/-   ##
===================================================
+ Coverage            81.64%   81.74%   +0.09%     
===================================================
  Files                  478      478              
  Lines                33126    33248     +122     
===================================================
+ Hits                 27047    27177     +130     
+ Misses                6079     6071       -8

Impacted Files	Coverage Δ
src/mod_muc_commands.erl	`78.12% <71.42%> (-16.71%)`	⬇️
src/mod_muc_room.erl	`78.70% <94.73%> (+1.09%)`	⬆️
...raphql/user/mongoose_graphql_muc_user_mutation.erl	`97.95% <95.83%> (-2.05%)`	⬇️
...phql/admin/mongoose_graphql_muc_admin_mutation.erl	`100.00% <100.00%> (ø)`
...graphql/admin/mongoose_graphql_muc_admin_query.erl	`100.00% <100.00%> (ø)`
src/graphql/mongoose_graphql_enum.erl	`80.00% <100.00%> (+16.66%)`	⬆️
src/graphql/mongoose_graphql_muc_helper.erl	`100.00% <100.00%> (ø)`
src/graphql/mongoose_graphql_scalar.erl	`71.42% <100.00%> (+4.76%)`	⬆️
...c/graphql/user/mongoose_graphql_muc_user_query.erl	`100.00% <100.00%> (ø)`
src/mod_muc_api.erl	`99.45% <100.00%> (+0.31%)`	⬆️
... and 9 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 e85c138...0d0e86d. Read the comment docs.

mongoose-im · 2022-04-12T08:18:25Z

small_tests_24 / small_tests / 8427ad6
Reports root / small

small_tests_23 / small_tests / 8427ad6
Reports root / small

dynamic_domains_mysql_redis_24 / mysql_redis / 8427ad6
Reports root/ big
OK: 3009 / Failed: 0 / User-skipped: 150 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / 8427ad6
Reports root/ big
OK: 3026 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 8427ad6
Reports root/ big
OK: 3026 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / 8427ad6
Reports root/ big
OK: 3026 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

ldap_mnesia_24 / ldap_mnesia / 8427ad6
Reports root/ big
OK: 1679 / Failed: 0 / User-skipped: 429 / Auto-skipped: 0

ldap_mnesia_23 / ldap_mnesia / 8427ad6
Reports root/ big
OK: 1679 / Failed: 0 / User-skipped: 429 / Auto-skipped: 0

internal_mnesia_24 / internal_mnesia / 8427ad6
Reports root/ big
OK: 1725 / Failed: 0 / User-skipped: 383 / Auto-skipped: 0

pgsql_mnesia_24 / pgsql_mnesia / 8427ad6
Reports root/ big
OK: 3400 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

pgsql_mnesia_23 / pgsql_mnesia / 8427ad6
Reports root/ big
OK: 3400 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

mysql_redis_24 / mysql_redis / 8427ad6
Reports root/ big
OK: 3395 / Failed: 0 / User-skipped: 147 / Auto-skipped: 0

mssql_mnesia_24 / odbc_mssql_mnesia / 8427ad6
Reports root/ big
OK: 3400 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

riak_mnesia_24 / riak_mnesia / 8427ad6
Reports root/ big
OK: 1886 / Failed: 0 / User-skipped: 379 / Auto-skipped: 0

chrzaszcz

It looks good in general, I added a few comments.

big_tests/tests/graphql_muc_SUITE.erl

priv/graphql/schemas/admin/muc.gql

priv/graphql/schemas/user/muc.gql

src/mod_muc_api.erl

- Add a function to list room affiliation in order to return it from the GraphQL API. - Add a sync normal_state handler that allows seting the user role or affiliance and receiving the result.

Bugs: - The user role was not verified, so each user has moderator privileges. - Moderator not in the room error was not caught

chrzaszcz

Looks good 👍

chrzaszcz · 2022-04-26T11:56:55Z

big_tests/tests/graphql_muc_SUITE.erl

     admin_try_invite_user_to_nonexistent_room,
     admin_kick_user,
+     admin_try_kick_user_from_nonexistent_room,
+     admin_try_kick_user_in_room_without_moderators,


Suggested change

admin_try_kick_user_in_room_without_moderators,

admin_try_kick_user_from_room_without_moderators,

chrzaszcz · 2022-04-26T11:58:35Z

priv/graphql/schemas/user/muc.gql

@@ -24,8 +34,10 @@ type MUCUserQuery @protected{
  listRooms(mucDomain: String!, limit: Int, index: Int): MUCRoomsPayload!
  "Get configuration of the MUC room"
  getRoomConfig(room: JID!): MUCRoomConfig
-  "Get user list of a given MUC room"
+  "Get users list of a given MUC room"


I think it should be "user list". Alternatively, "the list of users".

mongoose-im · 2022-04-26T13:04:54Z

small_tests_24 / small_tests / 0d0e86d
Reports root / small

small_tests_23 / small_tests / 0d0e86d
Reports root / small

dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / 0d0e86d
Reports root/ big
OK: 3072 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 0d0e86d
Reports root/ big
OK: 3072 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

dynamic_domains_mysql_redis_24 / mysql_redis / 0d0e86d
Reports root/ big
OK: 3055 / Failed: 0 / User-skipped: 150 / Auto-skipped: 0

ldap_mnesia_23 / ldap_mnesia / 0d0e86d
Reports root/ big
OK: 1688 / Failed: 0 / User-skipped: 431 / Auto-skipped: 0

ldap_mnesia_24 / ldap_mnesia / 0d0e86d
Reports root/ big
OK: 1688 / Failed: 0 / User-skipped: 431 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / 0d0e86d
Reports root/ big
OK: 3072 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

internal_mnesia_24 / internal_mnesia / 0d0e86d
Reports root/ big
OK: 1734 / Failed: 0 / User-skipped: 385 / Auto-skipped: 0

pgsql_mnesia_23 / pgsql_mnesia / 0d0e86d
Reports root/ big
OK: 3446 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 0d0e86d
Reports root/ big
OK: 2048 / Failed: 0 / User-skipped: 386 / Auto-skipped: 0

mysql_redis_24 / mysql_redis / 0d0e86d
Reports root/ big
OK: 3441 / Failed: 0 / User-skipped: 147 / Auto-skipped: 0

pgsql_mnesia_24 / pgsql_mnesia / 0d0e86d
Reports root/ big
OK: 3446 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

mssql_mnesia_24 / odbc_mssql_mnesia / 0d0e86d
Reports root/ big
OK: 3446 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

riak_mnesia_24 / riak_mnesia / 0d0e86d
Reports root/ big
OK: 1895 / Failed: 0 / User-skipped: 381 / Auto-skipped: 0

chrzaszcz

Looks good :)

Premwoik changed the base branch from master to feature/graphql April 11, 2022 13:25

This comment was marked as outdated.

Sign in to view

Premwoik force-pushed the graphql/muc-api-cont branch from d95e0c9 to f5727d4 Compare April 12, 2022 06:32

This comment was marked as outdated.

Sign in to view

Premwoik force-pushed the graphql/muc-api-cont branch from f5727d4 to 3c2357d Compare April 12, 2022 07:34

This comment was marked as outdated.

Sign in to view

Premwoik marked this pull request as ready for review April 12, 2022 08:08

chrzaszcz reviewed Apr 20, 2022

View reviewed changes

Premwoik added 10 commits April 22, 2022 13:32

Add new queries to the schemas

9eb28ec

Make selected mod_muc_room logic able to call from MUC API

021aa9d

- Add a function to list room affiliation in order to return it from the GraphQL API. - Add a sync normal_state handler that allows seting the user role or affiliance and receiving the result.

Extend API about the new commands

1bf8301

Implement admin resolvers for new queries

20a16d7

Implement user resolvers for new queries

360cbdd

Add tests for the new admin and user queries

9c1ea57

Add missing non-existent room test cases

49e7012

Add FullJID scalar

60047af

Apply simple review comments

ec569ea

Add tests for FullJID

991fe8d

Premwoik force-pushed the graphql/muc-api-cont branch from c856e06 to 8ccabcd Compare April 22, 2022 11:36

This comment was marked as outdated.

Sign in to view

Premwoik added 4 commits April 23, 2022 12:19

Fix kick command

3a25506

Bugs: - The user role was not verified, so each user has moderator privileges. - Moderator not in the room error was not caught

Apply review - keep the Pid-based API in mod_muc_room and fix spec types

c8d6007

Test kicking user from non-existing room and fix formatting

8f88a85

Handle seting role for nonexistent nick error

e1817cf

Premwoik force-pushed the graphql/muc-api-cont branch from 5e93558 to 4141d2a Compare April 23, 2022 11:32

This comment was marked as outdated.

Sign in to view

Use mod_muc_api in mod_muc_commands

105162b

Premwoik force-pushed the graphql/muc-api-cont branch from 4141d2a to 105162b Compare April 23, 2022 12:12

This comment was marked as outdated.

Sign in to view

Premwoik requested a review from chrzaszcz April 23, 2022 12:44

Premwoik added the waiting-for-review label Apr 23, 2022

chrzaszcz approved these changes Apr 26, 2022

View reviewed changes

Apply review

0d0e86d

Premwoik requested a review from chrzaszcz April 26, 2022 15:21

chrzaszcz approved these changes Apr 27, 2022

View reviewed changes

chrzaszcz merged commit 46c6bc1 into feature/graphql Apr 27, 2022

chrzaszcz deleted the graphql/muc-api-cont branch April 27, 2022 05:46

chrzaszcz added this to the 6.0.0 milestone Dec 12, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GraphQL - Implement more commands for MUC #3627

GraphQL - Implement more commands for MUC #3627

Premwoik commented Apr 11, 2022 •

edited

Loading

This comment was marked as outdated.

codecov bot commented Apr 11, 2022 •

edited

Loading

This comment was marked as outdated.

This comment was marked as outdated.

mongoose-im commented Apr 12, 2022 •

edited

Loading

chrzaszcz left a comment

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

chrzaszcz left a comment

chrzaszcz Apr 26, 2022

chrzaszcz Apr 26, 2022

mongoose-im commented Apr 26, 2022 •

edited

Loading

chrzaszcz left a comment

	admin_try_kick_user_in_room_without_moderators,
	admin_try_kick_user_from_room_without_moderators,

GraphQL - Implement more commands for MUC #3627

GraphQL - Implement more commands for MUC #3627

Conversation

Premwoik commented Apr 11, 2022 • edited Loading

Extended commands

Command inviteUser

The new commands

Command setAffiliation

Command setRole

Command listUserAffiliations

Commands enterRoom and exitRoom

Command sendPrivateMesssage

Small GraphQL Bug

This comment was marked as outdated.

codecov bot commented Apr 11, 2022 • edited Loading

Codecov Report

This comment was marked as outdated.

This comment was marked as outdated.

mongoose-im commented Apr 12, 2022 • edited Loading

chrzaszcz left a comment

Choose a reason for hiding this comment

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

chrzaszcz left a comment

Choose a reason for hiding this comment

chrzaszcz Apr 26, 2022

Choose a reason for hiding this comment

chrzaszcz Apr 26, 2022

Choose a reason for hiding this comment

mongoose-im commented Apr 26, 2022 • edited Loading

chrzaszcz left a comment

Choose a reason for hiding this comment

Premwoik commented Apr 11, 2022 •

edited

Loading

Command `inviteUser`

Command `setAffiliation`

Command `setRole`

Command `listUserAffiliations`

Commands `enterRoom` and `exitRoom`

Command `sendPrivateMesssage`

codecov bot commented Apr 11, 2022 •

edited

Loading

mongoose-im commented Apr 12, 2022 •

edited

Loading

mongoose-im commented Apr 26, 2022 •

edited

Loading