diff options
Diffstat (limited to 'src/mod_pubsub_odbc.erl')
| -rw-r--r-- | src/mod_pubsub_odbc.erl | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/src/mod_pubsub_odbc.erl b/src/mod_pubsub_odbc.erl index 4b9787821..8b32b83e2 100644 --- a/src/mod_pubsub_odbc.erl +++ b/src/mod_pubsub_odbc.erl @@ -74,8 +74,7 @@ on_user_offline/3, remove_user/2, disco_local_identity/5, disco_local_features/5, disco_local_items/5, disco_sm_identity/5, - disco_sm_features/5, disco_sm_items/5, - drop_pep_error/4]). + disco_sm_features/5, disco_sm_items/5]). %% exported iq handlers -export([iq_sm/3]). @@ -345,8 +344,6 @@ init([ServerHost, Opts]) -> ?MODULE, disco_sm_features, 75), ejabberd_hooks:add(disco_sm_items, ServerHost, ?MODULE, disco_sm_items, 75), - ejabberd_hooks:add(c2s_filter_packet_in, ServerHost, ?MODULE, - drop_pep_error, 75), gen_iq_handler:add_iq_handler(ejabberd_sm, ServerHost, ?NS_PUBSUB, ?MODULE, iq_sm, IQDisc), gen_iq_handler:add_iq_handler(ejabberd_sm, ServerHost, @@ -942,33 +939,6 @@ unsubscribe_user(Entity, Owner) -> end). %% ------- -%% packet receive hook handling function -%% - -drop_pep_error(#xmlel{name = <<"message">>, attrs = Attrs} = Packet, _JID, From, - #jid{lresource = <<"">>} = To) -> - case xml:get_attr_s(<<"type">>, Attrs) of - <<"error">> -> - case xml:get_subtag(Packet, <<"event">>) of - #xmlel{attrs = EventAttrs} -> - case xml:get_attr_s(<<"xmlns">>, EventAttrs) of - ?NS_PUBSUB_EVENT -> - ?DEBUG("Dropping PEP error message from ~s to ~s", - [jlib:jid_to_string(From), - jlib:jid_to_string(To)]), - drop; - _ -> - Packet - end; - false -> - Packet - end; - _ -> - Packet - end; -drop_pep_error(Acc, _JID, _From, _To) -> Acc. - -%% ------- %% user remove hook handling function %% @@ -1108,8 +1078,6 @@ terminate(_Reason, ?MODULE, disco_sm_features, 75), ejabberd_hooks:delete(disco_sm_items, ServerHost, ?MODULE, disco_sm_items, 75), - ejabberd_hooks:delete(c2s_filter_packet_in, ServerHost, - ?MODULE, drop_pep_error, 75), gen_iq_handler:remove_iq_handler(ejabberd_sm, ServerHost, ?NS_PUBSUB), gen_iq_handler:remove_iq_handler(ejabberd_sm, |