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

Check MUC domain in mod_mam_muc #3936

Merged
merged 2 commits into from
Jan 27, 2023
Merged

Conversation

jacekwegr
Copy link
Contributor

@jacekwegr jacekwegr commented Jan 24, 2023

This PR adds checking for the MUC domain when archiving messages. Previously, when mod_mam_muc was enabled for muc it also stored messages for muc_light domains that belonged to the same host type and vice versa. The MUC domain is now checked in the handler that archive messages.

@mongoose-im

This comment was marked as outdated.

@codecov
Copy link

codecov bot commented Jan 24, 2023

Codecov Report

Base: 83.19% // Head: 83.19% // Decreases project coverage by -0.01% ⚠️

Coverage data is based on head (917f30f) compared to base (dda03c1).
Patch coverage: 100.00% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3936      +/-   ##
==========================================
- Coverage   83.19%   83.19%   -0.01%     
==========================================
  Files         534      534              
  Lines       34114    34118       +4     
==========================================
+ Hits        28380    28383       +3     
- Misses       5734     5735       +1     
Impacted Files Coverage Δ
src/mam/mod_mam_muc.erl 75.46% <100.00%> (+0.57%) ⬆️
src/mam/mod_mam_utils.erl 89.96% <100.00%> (+0.09%) ⬆️
src/ejabberd.erl 55.00% <0.00%> (-5.00%) ⬇️
src/pubsub/node_pep.erl 77.77% <0.00%> (-1.86%) ⬇️
src/rdbms/mongoose_rdbms.erl 65.26% <0.00%> (-1.06%) ⬇️
src/domain/mongoose_domain_loader.erl 89.28% <0.00%> (-0.90%) ⬇️
src/ejabberd_c2s.erl 88.95% <0.00%> (-0.30%) ⬇️
src/mod_muc_log.erl 62.82% <0.00%> (ø)
src/mod_roster.erl 79.13% <0.00%> (+0.23%) ⬆️
... and 4 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

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

@jacekwegr jacekwegr force-pushed the check-muc-domain-in-mod-mam-muc branch from 0eb160f to e00ed75 Compare January 24, 2023 15:59
@mongoose-im

This comment was marked as outdated.

@jacekwegr jacekwegr force-pushed the check-muc-domain-in-mod-mam-muc branch from e00ed75 to c61862c Compare January 25, 2023 09:51
@mongoose-im

This comment was marked as outdated.

@jacekwegr jacekwegr force-pushed the check-muc-domain-in-mod-mam-muc branch from c61862c to d4356dc Compare January 25, 2023 10:04
@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@jacekwegr jacekwegr marked this pull request as ready for review January 25, 2023 13:17
Copy link
Member

@chrzaszcz chrzaszcz left a comment

Choose a reason for hiding this comment

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

I added some comments

src/mam/mod_mam_utils.erl Outdated Show resolved Hide resolved
src/mam/mod_mam_utils.erl Outdated Show resolved Hide resolved
big_tests/tests/graphql_muc_SUITE.erl Outdated Show resolved Hide resolved
big_tests/tests/graphql_muc_SUITE.erl Outdated Show resolved Hide resolved
@jacekwegr jacekwegr force-pushed the check-muc-domain-in-mod-mam-muc branch from 6665364 to a4d005d Compare January 26, 2023 13:15
@mongoose-im

This comment was marked as outdated.

@jacekwegr jacekwegr force-pushed the check-muc-domain-in-mod-mam-muc branch from a4d005d to 917f30f Compare January 26, 2023 14:05
@mongoose-im
Copy link
Collaborator

mongoose-im commented Jan 26, 2023

small_tests_24 / small_tests / 917f30f
Reports root / small


small_tests_25 / small_tests / 917f30f
Reports root / small


ldap_mnesia_24 / ldap_mnesia / 917f30f
Reports root/ big
OK: 2225 / Failed: 0 / User-skipped: 825 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 917f30f
Reports root/ big
OK: 4179 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 917f30f
Reports root/ big
OK: 4179 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


dynamic_domains_mysql_redis_25 / mysql_redis / 917f30f
Reports root/ big
OK: 4153 / Failed: 0 / User-skipped: 114 / Auto-skipped: 0


ldap_mnesia_25 / ldap_mnesia / 917f30f
Reports root/ big
OK: 2225 / Failed: 0 / User-skipped: 825 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 917f30f
Reports root/ big
OK: 4176 / Failed: 0 / User-skipped: 91 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / 917f30f
Reports root/ big
OK: 4555 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


internal_mnesia_25 / internal_mnesia / 917f30f
Reports root/ big
OK: 2367 / Failed: 0 / User-skipped: 683 / Auto-skipped: 0


elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / 917f30f
Reports root/ big
OK: 2727 / Failed: 0 / User-skipped: 662 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / 917f30f
Reports root/ big
OK: 2565 / Failed: 0 / User-skipped: 654 / Auto-skipped: 0


pgsql_mnesia_25 / pgsql_mnesia / 917f30f
Reports root/ big
OK: 4555 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


mysql_redis_25 / mysql_redis / 917f30f
Reports root/ big
OK: 4541 / Failed: 0 / User-skipped: 111 / Auto-skipped: 0


mssql_mnesia_25 / odbc_mssql_mnesia / 917f30f
Reports root/ big
OK: 4552 / Failed: 0 / User-skipped: 100 / Auto-skipped: 0

Copy link
Member

@chrzaszcz chrzaszcz left a comment

Choose a reason for hiding this comment

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

Looks good 👍

@chrzaszcz chrzaszcz merged commit 2cb96fd into master Jan 27, 2023
@chrzaszcz chrzaszcz deleted the check-muc-domain-in-mod-mam-muc branch January 27, 2023 08:24
@jacekwegr jacekwegr added this to the 6.1.0 milestone Apr 26, 2023
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.

3 participants