Update version of XEP-0045: Multi-User Chat #4054

jacekwegr · 2023-07-04T14:34:54Z

This PR updates implementation of MUC.
The changes between version 1.25 and 1.34.5 include:

Changes in the types of room config options
Introduction of <x/> element in MUC-PMs
Requirement to maintain the id attribute
Removal of Group Chat 1.0 compatibility
Use of a delay element in the initial subject message

Link to the full list of changes: https://xmpp.org/extensions/xep-0045.html#appendix-revs

codecov · 2023-07-04T14:43:42Z

Codecov Report

Patch coverage: 100.00% and project coverage change: -0.03 ⚠️

Comparison is base (8b12212) 83.85% compared to head (0d9d690) 83.83%.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #4054      +/-   ##
==========================================
- Coverage   83.85%   83.83%   -0.03%     
==========================================
  Files         526      526              
  Lines       33133    33159      +26     
==========================================
+ Hits        27783    27798      +15     
- Misses       5350     5361      +11

Impacted Files	Coverage Δ
src/mod_muc.erl	`75.70% <ø> (ø)`
src/mod_muc_room.erl	`78.95% <100.00%> (+0.19%)`	⬆️

... and 9 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

JanuszJakubiec · 2023-07-14T11:49:44Z

big_tests/tests/muc_SUITE.erl

 stanza_groupchat_enter_room(Room, Nick) ->
-    stanza_to_room(escalus_stanza:presence(<<"available">>), Room, Nick).
+    stanza_to_room(
+        escalus_stanza:presence(  <<"available">>,


Suggested change

escalus_stanza:presence( <<"available">>,

escalus_stanza:presence(<<"available">>,

JanuszJakubiec · 2023-07-14T11:49:54Z

big_tests/tests/muc_SUITE.erl

-    stanza_to_room(escalus_stanza:presence(<<"available">>), Room).
-
+    stanza_to_room(
+        escalus_stanza:presence(  <<"available">>,


Suggested change

escalus_stanza:presence( <<"available">>,

escalus_stanza:presence(<<"available">>,

JanuszJakubiec · 2023-07-14T11:50:12Z

big_tests/tests/muc_SUITE.erl

-    stanza_to_room(escalus_stanza:presence(<<"available">>), Room, Nick).
+    stanza_to_room(
+        escalus_stanza:presence(  <<"available">>,
+                                [#xmlel{ name = <<"x">>, attrs=[{<<"xmlns">>, <<"http://jabber.org/protocol/muc">>}]}]),


Suggested change

[#xmlel{ name = <<"x">>, attrs=[{<<"xmlns">>, <<"http://jabber.org/protocol/muc">>}]}]),

[#xmlel{name = <<"x">>, attrs=[{<<"xmlns">>, <<"http://jabber.org/protocol/muc">>}]}]),

JanuszJakubiec · 2023-07-14T11:50:24Z

big_tests/tests/muc_SUITE.erl

-
+    stanza_to_room(
+        escalus_stanza:presence(  <<"available">>,
+                                [#xmlel{ name = <<"x">>, attrs=[{<<"xmlns">>, <<"http://jabber.org/protocol/muc">>}]}]),


Suggested change

[#xmlel{ name = <<"x">>, attrs=[{<<"xmlns">>, <<"http://jabber.org/protocol/muc">>}]}]),

[#xmlel{name = <<"x">>, attrs=[{<<"xmlns">>, <<"http://jabber.org/protocol/muc">>}]}]),

JanuszJakubiec · 2023-07-14T11:51:03Z

big_tests/tests/muc_SUITE.erl

@@ -3131,8 +3201,9 @@ disco_info_locked_room(Config) ->
                     Alice, stanza_to_room(escalus_stanza:iq_get(?NS_DISCO_INFO,[]), RoomName)),

        %% THEN receives MUC features
-        Namespaces = [?NS_MUC, <<"muc_public">>, <<"muc_temporary">>, <<"muc_open">>,
-                     <<"muc_semianonymous">>, <<"muc_moderated">>, <<"muc_unsecured">>],
+        Namespaces = [?NS_MUC, ?NS_MUC_STABLE_ID,<<"muc_public">>, <<"muc_temporary">>,


Suggested change

Namespaces = [?NS_MUC, ?NS_MUC_STABLE_ID,<<"muc_public">>, <<"muc_temporary">>,

Namespaces = [?NS_MUC, ?NS_MUC_STABLE_ID, <<"muc_public">>, <<"muc_temporary">>,

JanuszJakubiec

Looks good. I've added minor comments

JanuszJakubiec · 2023-07-14T12:40:46Z

big_tests/tests/muc_SUITE.erl

+        #xmlel{name = <<"message">>,
+            attrs = [{<<"to">>, To}, {<<"type">>, <<"chat">>}],
+            children = [#xmlel{name = <<"body">>,
+                                children = [#xmlcdata{content = Msg}]},


Suggested change

children = [#xmlcdata{content = Msg}]},

children = [#xmlcdata{content = Msg}]},

JanuszJakubiec · 2023-07-14T12:40:54Z

big_tests/tests/muc_SUITE.erl

+            children = [#xmlel{name = <<"body">>,
+                                children = [#xmlcdata{content = Msg}]},
+                        #xmlel{name = <<"x">>,
+                                attrs = [{<<"xmlns">>, <<"http://jabber.org/protocol/muc#user">>}]}]}.


Suggested change

attrs = [{<<"xmlns">>, <<"http://jabber.org/protocol/muc#user">>}]}]}.

attrs = [{<<"xmlns">>, <<"http://jabber.org/protocol/muc#user">>}]}]}.

JanuszJakubiec · 2023-07-14T12:42:02Z

big_tests/tests/muc_SUITE.erl

-                                             children=[#xmlel{name = <<"password">>, children = [#xmlcdata{content=[Password]}]} ]}]),
+        escalus_stanza:presence(<<"available">>,
+                                [#xmlel{name = <<"x">>, attrs=[{<<"xmlns">>, <<"http://jabber.org/protocol/muc">>}],
+                                            children=[#xmlel{name = <<"password">>, children = [#xmlcdata{content=[Password]}]} ]}]),


Suggested change

children=[#xmlel{name = <<"password">>, children = [#xmlcdata{content=[Password]}]} ]}]),

children = [#xmlel{name = <<"password">>, children = [#xmlcdata{content=[Password]}]} ]}]),

JanuszJakubiec · 2023-07-14T12:42:13Z

big_tests/tests/muc_SUITE.erl

-    stanza_to_room(escalus_stanza:presence(<<"available">>), Room, Nick).
+    stanza_to_room(
+        escalus_stanza:presence(<<"available">>,
+                                [#xmlel{name = <<"x">>, attrs=[{<<"xmlns">>, <<"http://jabber.org/protocol/muc">>}]}]),


Suggested change

[#xmlel{name = <<"x">>, attrs=[{<<"xmlns">>, <<"http://jabber.org/protocol/muc">>}]}]),

[#xmlel{name = <<"x">>, attrs = [{<<"xmlns">>, <<"http://jabber.org/protocol/muc">>}]}]),

JanuszJakubiec

After rereading the file, I've found some more minor issues.

JanuszJakubiec

Looks good

mongoose-im · 2023-07-14T13:10:33Z

small_tests_24 / small_tests / 0d9d690
Reports root / small

small_tests_25 / small_tests / 0d9d690
Reports root / small

small_tests_25_arm64 / small_tests / 0d9d690
Reports root / small

ldap_mnesia_24 / ldap_mnesia / 0d9d690
Reports root/ big
OK: 2253 / Failed: 0 / User-skipped: 826 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 0d9d690
Reports root/ big
OK: 4215 / Failed: 0 / User-skipped: 82 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 0d9d690
Reports root/ big
OK: 4215 / Failed: 0 / User-skipped: 82 / Auto-skipped: 0

ldap_mnesia_25 / ldap_mnesia / 0d9d690
Reports root/ big
OK: 2253 / Failed: 0 / User-skipped: 826 / Auto-skipped: 0

dynamic_domains_mysql_redis_25 / mysql_redis / 0d9d690
Reports root/ big
OK: 4189 / Failed: 0 / User-skipped: 108 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 0d9d690
Reports root/ big
OK: 4212 / Failed: 0 / User-skipped: 85 / Auto-skipped: 0

pgsql_mnesia_24 / pgsql_mnesia / 0d9d690
Reports root/ big
OK: 4598 / Failed: 0 / User-skipped: 89 / Auto-skipped: 0

elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / 0d9d690
Reports root/ big
OK: 2759 / Failed: 0 / User-skipped: 659 / Auto-skipped: 0

internal_mnesia_25 / internal_mnesia / 0d9d690
Reports root/ big
OK: 2399 / Failed: 0 / User-skipped: 680 / Auto-skipped: 0

pgsql_mnesia_25 / pgsql_mnesia / 0d9d690
Reports root/ big
OK: 4598 / Failed: 0 / User-skipped: 89 / Auto-skipped: 0

mssql_mnesia_25 / odbc_mssql_mnesia / 0d9d690
Reports root/ big
OK: 4595 / Failed: 0 / User-skipped: 92 / Auto-skipped: 0

mysql_redis_25 / mysql_redis / 0d9d690
Reports root/ big
OK: 4584 / Failed: 0 / User-skipped: 103 / Auto-skipped: 0

This comment was marked as outdated.

Sign in to view

Change GC 1.0 protocol behaviour

743cc38

jacekwegr force-pushed the update-multi-user-chat branch from 1c5368a to 743cc38 Compare July 5, 2023 13:56

This comment was marked as outdated.

Sign in to view

jacekwegr added 3 commits July 13, 2023 10:45

Delay element in the initial subject message

2665d88

MUC service shutdown test

3a61b85

Update XEP-0045 version

0bb0ec7

jacekwegr force-pushed the update-multi-user-chat branch from 48121cd to 0bb0ec7 Compare July 13, 2023 08:49

This comment was marked as outdated.

Sign in to view

jacekwegr marked this pull request as ready for review July 13, 2023 09:43

JanuszJakubiec reviewed Jul 14, 2023

View reviewed changes

JanuszJakubiec requested changes Jul 14, 2023

View reviewed changes

JanuszJakubiec reviewed Jul 14, 2023

View reviewed changes

This comment was marked as outdated.

Sign in to view

JanuszJakubiec reviewed Jul 14, 2023

View reviewed changes

JanuszJakubiec requested changes Jul 14, 2023

View reviewed changes

Code formatting muc_SUITE.erl

0d9d690

jacekwegr force-pushed the update-multi-user-chat branch from 08cd1fc to 0d9d690 Compare July 14, 2023 13:03

JanuszJakubiec approved these changes Jul 14, 2023

View reviewed changes

JanuszJakubiec merged commit bfc17d8 into master Jul 14, 2023

JanuszJakubiec deleted the update-multi-user-chat branch July 14, 2023 13:54

chrzaszcz added this to the 6.2.0 milestone Dec 11, 2023

gustawlippa mentioned this pull request Oct 29, 2024

Fix MUC room crash when handling old protocol stanza #4387

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update version of XEP-0045: Multi-User Chat #4054

Update version of XEP-0045: Multi-User Chat #4054

jacekwegr commented Jul 4, 2023 •

edited

Loading

This comment was marked as outdated.

codecov bot commented Jul 4, 2023 •

edited

Loading

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

JanuszJakubiec Jul 14, 2023

JanuszJakubiec Jul 14, 2023

JanuszJakubiec Jul 14, 2023

JanuszJakubiec Jul 14, 2023

JanuszJakubiec Jul 14, 2023

JanuszJakubiec left a comment

JanuszJakubiec Jul 14, 2023

JanuszJakubiec Jul 14, 2023

This comment was marked as outdated.

JanuszJakubiec Jul 14, 2023

JanuszJakubiec Jul 14, 2023

JanuszJakubiec left a comment

JanuszJakubiec left a comment

mongoose-im commented Jul 14, 2023 •

edited

Loading

	escalus_stanza:presence( <<"available">>,
	escalus_stanza:presence(<<"available">>,

	[#xmlel{ name = <<"x">>, attrs=[{<<"xmlns">>, <<"http://jabber.org/protocol/muc">>}]}]),
	[#xmlel{name = <<"x">>, attrs=[{<<"xmlns">>, <<"http://jabber.org/protocol/muc">>}]}]),

	Namespaces = [?NS_MUC, ?NS_MUC_STABLE_ID,<<"muc_public">>, <<"muc_temporary">>,
	Namespaces = [?NS_MUC, ?NS_MUC_STABLE_ID, <<"muc_public">>, <<"muc_temporary">>,

	children = [#xmlcdata{content = Msg}]},
	children = [#xmlcdata{content = Msg}]},

	attrs = [{<<"xmlns">>, <<"http://jabber.org/protocol/muc#user">>}]}]}.
	attrs = [{<<"xmlns">>, <<"http://jabber.org/protocol/muc#user">>}]}]}.

	children=[#xmlel{name = <<"password">>, children = [#xmlcdata{content=[Password]}]} ]}]),
	children = [#xmlel{name = <<"password">>, children = [#xmlcdata{content=[Password]}]} ]}]),

	[#xmlel{name = <<"x">>, attrs=[{<<"xmlns">>, <<"http://jabber.org/protocol/muc">>}]}]),
	[#xmlel{name = <<"x">>, attrs = [{<<"xmlns">>, <<"http://jabber.org/protocol/muc">>}]}]),

Update version of XEP-0045: Multi-User Chat #4054

Update version of XEP-0045: Multi-User Chat #4054

Conversation

jacekwegr commented Jul 4, 2023 • edited Loading

This comment was marked as outdated.

codecov bot commented Jul 4, 2023 • edited Loading

Codecov Report

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JanuszJakubiec left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as outdated.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JanuszJakubiec left a comment

Choose a reason for hiding this comment

JanuszJakubiec left a comment

Choose a reason for hiding this comment

mongoose-im commented Jul 14, 2023 • edited Loading

jacekwegr commented Jul 4, 2023 •

edited

Loading

codecov bot commented Jul 4, 2023 •

edited

Loading

mongoose-im commented Jul 14, 2023 •

edited

Loading