diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2022-09-16 13:39:13 +0300 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2022-09-16 13:39:13 +0300 |
| commit | 9e9904c79d85a2d9c403e92a63177a90924c44d0 (patch) | |
| tree | 136dcbcf6b1940dfb0d1bf1db2d7c6a5d5947846 | |
| parent | 5ee1dc9e8d80d52ec9f3dd3f043dfdd4c90c303a (diff) | |
| parent | 14882342befd4a3f66edc868922b7badaf9e16ed (diff) | |
Merge remote-tracking branch 'processone/pr/3905'
* processone/pr/3905:
Adapt to change of mix_annotate type to boolean in roster_query
Adapt to renaming of 'participant-id' from mix_roster_channel record
Update xmpp module
| -rw-r--r-- | mix.exs | 2 | ||||
| -rw-r--r-- | rebar.config | 2 | ||||
| -rw-r--r-- | src/mod_mix_pam.erl | 4 | ||||
| -rw-r--r-- | src/mod_roster.erl | 3 |
4 files changed, 5 insertions, 6 deletions
@@ -114,7 +114,7 @@ defmodule Ejabberd.MixProject do {:p1_utils, "~> 1.0"}, {:pkix, "~> 1.0"}, {:stringprep, ">= 1.0.26"}, - {:xmpp, git: "https://github.com/processone/xmpp.git", ref: "cdda2bea2df0b4ed40fbd854f6f1bf21c6b7a8c5", override: true}, + {:xmpp, git: "https://github.com/processone/xmpp.git", ref: "62325549cced01b12878d79286311ae62fe0fc4f", override: true}, {:yconf, "~> 1.0"}] ++ cond_deps() end diff --git a/rebar.config b/rebar.config index d25c31ca2..bde90d50b 100644 --- a/rebar.config +++ b/rebar.config @@ -70,7 +70,7 @@ {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.28"}}}, {if_var_true, stun, {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.2.2"}}}}, - {xmpp, ".*", {git, "https://github.com/processone/xmpp", "cdda2bea2df0b4ed40fbd854f6f1bf21c6b7a8c5"}}, + {xmpp, ".*", {git, "https://github.com/processone/xmpp", "62325549cced01b12878d79286311ae62fe0fc4f"}}, {yconf, ".*", {git, "https://github.com/processone/yconf", {tag, "1.0.13"}}} ]}. diff --git a/src/mod_mix_pam.erl b/src/mod_mix_pam.erl index 379ab3930..7bd6f2a71 100644 --- a/src/mod_mix_pam.erl +++ b/src/mod_mix_pam.erl @@ -226,7 +226,7 @@ get_mix_roster_items(Acc, {LUser, LServer}) -> subscription = both, ask = undefined, groups = [<<"Channels">>], - mix_channel = #mix_roster_channel{'participant-id' = Id} + mix_channel = #mix_roster_channel{participant_id = Id} } end, Channels); _ -> @@ -311,7 +311,7 @@ process_join_result(#iq{from = #jid{} = Channel, subscription = none, ask = undefined, groups = [], - mix_channel = #mix_roster_channel{'participant-id' = ID} + mix_channel = #mix_roster_channel{participant_id = ID} }), % send IQ result ChanID = make_channel_id(Channel, ID), diff --git a/src/mod_roster.erl b/src/mod_roster.erl index fdf9de9f4..b6cf771f0 100644 --- a/src/mod_roster.erl +++ b/src/mod_roster.erl @@ -273,10 +273,9 @@ write_roster_version(LUser, LServer, InTransaction) -> %% - the roster version from client don't match current version. -spec process_iq_get(iq()) -> iq(). process_iq_get(#iq{to = To, from = From, - sub_els = [#roster_query{ver = RequestedVersion, mix_annotate = MixAnnotate}]} = IQ) -> + sub_els = [#roster_query{ver = RequestedVersion, mix_annotate = MixEnabled}]} = IQ) -> LUser = To#jid.luser, LServer = To#jid.lserver, - MixEnabled = MixAnnotate == #mix_roster_annotate{}, {ItemsToSend, VersionToSend} = case {mod_roster_opt:versioning(LServer), mod_roster_opt:store_current_id(LServer)} of |