diff options
Diffstat (limited to 'src/pubsub_subscription.erl')
| -rw-r--r-- | src/pubsub_subscription.erl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/pubsub_subscription.erl b/src/pubsub_subscription.erl index de1a363db..f2c962257 100644 --- a/src/pubsub_subscription.erl +++ b/src/pubsub_subscription.erl @@ -211,13 +211,11 @@ val_xfield(digest_frequency = Opt, [Val]) -> {error, xmpp:err_not_acceptable(ErrTxt, ?MYLANG)} end; val_xfield(expire = Opt, [Val]) -> - case jlib:datetime_string_to_timestamp(Val) of - undefined -> + try xmpp_util:decode_timestamp(Val) + catch _:{bad_timestamp, _} -> Txt = <<"Value of '~s' should be datetime string">>, ErrTxt = iolist_to_binary(io_lib:format(Txt, [Opt])), - {error, xmpp:err_not_acceptable(ErrTxt, ?MYLANG)}; - Timestamp -> - Timestamp + {error, xmpp:err_not_acceptable(ErrTxt, ?MYLANG)} end; val_xfield(include_body = Opt, [Val]) -> xopt_to_bool(Opt, Val); val_xfield(show_values, Vals) -> Vals; |