@@ -113,7 +113,7 @@ encode_error(ErrMsg, OrigFrom, OrigTo, OrigPacket, Acc) ->
113
113
decode_message (# xmlel { attrs = Attrs , children = Children }) ->
114
114
decode_message_by_type (Attrs , Children ).
115
115
116
- -spec decode_message_by_type (exml :attrs (), Children :: [jlib : xmlch ()]) ->
116
+ -spec decode_message_by_type (exml :attrs (), Children :: [exml : child ()]) ->
117
117
{ok , msg ()} | {error , bad_request } | ignore .
118
118
decode_message_by_type (#{<<" type" >> := <<" groupchat" >>} = Attrs , Children ) ->
119
119
{ok , # msg { children = Children , id = ensure_id (Attrs ) }};
@@ -196,12 +196,12 @@ decode_iq(_, _) ->
196
196
197
197
% % ------------------ Parsers ------------------
198
198
199
- -spec parse_config (Els :: [jlib : xmlch ()]) -> {ok , mod_muc_light_room_config :binary_kv ()}
199
+ -spec parse_config (Els :: [exml : child ()]) -> {ok , mod_muc_light_room_config :binary_kv ()}
200
200
| {error , bad_request ()}.
201
201
parse_config (Els ) ->
202
202
parse_config (Els , []).
203
203
204
- -spec parse_config (Els :: [jlib : xmlch ()], ConfigAcc :: mod_muc_light_room_config :binary_kv ()) ->
204
+ -spec parse_config (Els :: [exml : child ()], ConfigAcc :: mod_muc_light_room_config :binary_kv ()) ->
205
205
{ok , mod_muc_light_room_config :binary_kv ()} | {error , bad_request ()}.
206
206
parse_config ([], ConfigAcc ) ->
207
207
{ok , ConfigAcc };
@@ -213,12 +213,12 @@ parse_config([#xmlel{ name = Key, children = [ #xmlcdata{ content = Value } ] }
213
213
parse_config ([_ | REls ], ConfigAcc ) ->
214
214
parse_config (REls , ConfigAcc ).
215
215
216
- -spec parse_aff_users (Els :: [jlib : xmlch ()]) ->
216
+ -spec parse_aff_users (Els :: [exml : child ()]) ->
217
217
{ok , aff_users ()} | {error , bad_request ()}.
218
218
parse_aff_users (Els ) ->
219
219
parse_aff_users (Els , []).
220
220
221
- -spec parse_aff_users (Els :: [jlib : xmlch ()], AffUsersAcc :: aff_users ()) ->
221
+ -spec parse_aff_users (Els :: [exml : child ()], AffUsersAcc :: aff_users ()) ->
222
222
{ok , aff_users ()} | {error , bad_request ()}.
223
223
parse_aff_users ([], AffUsersAcc ) ->
224
224
{ok , AffUsersAcc };
@@ -233,11 +233,11 @@ parse_aff_users([#xmlel{ name = <<"user">>, attrs = #{<<"affiliation">> := AffBi
233
233
parse_aff_users (_ , _ ) ->
234
234
{error , {bad_request , <<" Failed to parse affiliations" >>}}.
235
235
236
- -spec parse_blocking_list (Els :: [jlib : xmlch ()]) -> {ok , [blocking_item ()]} | {error , bad_request }.
236
+ -spec parse_blocking_list (Els :: [exml : child ()]) -> {ok , [blocking_item ()]} | {error , bad_request }.
237
237
parse_blocking_list (ItemsEls ) ->
238
238
parse_blocking_list (ItemsEls , []).
239
239
240
- -spec parse_blocking_list (Els :: [jlib : xmlch ()], ItemsAcc :: [blocking_item ()]) ->
240
+ -spec parse_blocking_list (Els :: [exml : child ()], ItemsAcc :: [blocking_item ()]) ->
241
241
{ok , [blocking_item ()]} | {error , bad_request }.
242
242
parse_blocking_list ([], ItemsAcc ) ->
243
243
{ok , ItemsAcc };
@@ -421,12 +421,12 @@ kv_to_el({Key, Value}) ->
421
421
kv_to_el (Key , Value ) ->
422
422
# xmlel { name = Key , children = [# xmlcdata { content = Value }] }.
423
423
424
- -spec msg_envelope (XMLNS :: binary (), Children :: [jlib : xmlch ()]) -> [exml :element ()].
424
+ -spec msg_envelope (XMLNS :: binary (), Children :: [exml : child ()]) -> [exml :element ()].
425
425
msg_envelope (XMLNS , Children ) ->
426
426
[ # xmlel { name = <<" x" >>, attrs = #{<<" xmlns" >> => XMLNS }, children = Children },
427
427
# xmlel { name = <<" body" >> } ].
428
428
429
- -spec inject_prev_version (IQChildren :: [jlib : xmlch ()], PrevVersion :: binary ()) -> [jlib : xmlch ()].
429
+ -spec inject_prev_version (IQChildren :: [exml : child ()], PrevVersion :: binary ()) -> [exml : child ()].
430
430
inject_prev_version ([# xmlel { name = <<" x" >>, attrs = #{<<" xmlns" >> := ? NS_MUC_LIGHT_AFFILIATIONS },
431
431
children = Items } = XEl | REls ], PrevVersion ) ->
432
432
[XEl # xmlel { children = [kv_to_el (<<" prev-version" >>, PrevVersion ) | Items ] } | REls ];
@@ -435,7 +435,7 @@ inject_prev_version([El | REls], PrevVersion) ->
435
435
436
436
-spec bcast_aff_messages (From :: jid :jid (), OldAffUsers :: aff_users (),
437
437
NewAffUsers :: aff_users (), Attrs :: exml :attrs (),
438
- VersionEl :: exml :element (), Children :: [jlib : xmlch ()],
438
+ VersionEl :: exml :element (), Children :: [exml : child ()],
439
439
HandleFun :: mod_muc_light_codec_backend :encoded_packet_handler ()) -> ok .
440
440
bcast_aff_messages (_ , [], [], _ , _ , _ , _ ) ->
441
441
ok ;
@@ -465,7 +465,7 @@ msg_to_leaving_user(From, {ToU, ToS} = User, Attrs, HandleFun) ->
465
465
msg_to_aff_user (From , ToU , ToS , Attrs , NotifForLeaving , HandleFun ).
466
466
467
467
-spec msg_to_aff_user (From :: jid :jid (), ToU :: jid :luser (), ToS :: jid :lserver (),
468
- Attrs :: exml :attrs (), Children :: [jlib : xmlch ()],
468
+ Attrs :: exml :attrs (), Children :: [exml : child ()],
469
469
HandleFun :: mod_muc_light_codec_backend :encoded_packet_handler ()) -> ok .
470
470
msg_to_aff_user (From , ToU , ToS , Attrs , Children , HandleFun ) ->
471
471
To = jid :make_noprep (ToU , ToS , <<>>),
@@ -482,7 +482,7 @@ jids_from_room_with_resource(RoomJID, Resource) ->
482
482
{From , FromBin }.
483
483
484
484
-spec make_iq_result (FromBin :: binary (), ToBin :: binary (), ID :: binary (),
485
- XMLNS :: binary (), Els :: [jlib : xmlch ()] | undefined ) -> exml :element ().
485
+ XMLNS :: binary (), Els :: [exml : child ()] | undefined ) -> exml :element ().
486
486
make_iq_result (FromBin , ToBin , ID , XMLNS , Els ) ->
487
487
Attrs = #{<<" from" >> => FromBin ,
488
488
<<" to" >> => ToBin ,
@@ -491,7 +491,7 @@ make_iq_result(FromBin, ToBin, ID, XMLNS, Els) ->
491
491
Query = make_query_el (XMLNS , Els ),
492
492
# xmlel { name = <<" iq" >>, attrs = Attrs , children = Query }.
493
493
494
- -spec make_query_el (binary (), [jlib : xmlch ()] | undefined ) -> [exml :element ()].
494
+ -spec make_query_el (binary (), [exml : child ()] | undefined ) -> [exml :element ()].
495
495
make_query_el (_ , undefined ) ->
496
496
[];
497
497
make_query_el (XMLNS , Els ) ->
0 commit comments