diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2022-09-16 12:39:13 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2022-09-16 12:39:13 +0200 |
| commit | 9e9904c79d85a2d9c403e92a63177a90924c44d0 (patch) | |
| tree | 136dcbcf6b1940dfb0d1bf1db2d7c6a5d5947846 /src/mod_roster.erl | |
| parent | Container: Support ERL_DIST_PORT (diff) | |
| parent | Adapt to change of mix_annotate type to boolean in roster_query (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
Diffstat (limited to 'src/mod_roster.erl')
| -rw-r--r-- | src/mod_roster.erl | 3 |
1 files changed, 1 insertions, 2 deletions
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 |