diff options
| author | HAMANO Tsukasa <hamano@cuspy.org> | 2016-01-23 17:56:12 +0900 |
|---|---|---|
| committer | HAMANO Tsukasa <hamano@cuspy.org> | 2016-01-23 17:58:10 +0900 |
| commit | 5a85b0fb52bb0d00699d568cfd05c4adb876cf39 (patch) | |
| tree | 515b415e9b67a7dc5ccbe0e295239790c46df832 /src/jlib.erl | |
| parent | Add missing ref key (diff) | |
rename timestamp function #917
Diffstat (limited to 'src/jlib.erl')
| -rw-r--r-- | src/jlib.erl | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/jlib.erl b/src/jlib.erl index cb46c591..61aaf690 100644 --- a/src/jlib.erl +++ b/src/jlib.erl @@ -45,7 +45,7 @@ iq_to_xml/1, parse_xdata_submit/1, is_standalone_chat_state/1, add_delay_info/3, add_delay_info/4, - timestamp_to_iso/1, timestamp_to_iso/2, + timestamp_to_legacy/1, timestamp_to_iso_basic/1, timestamp_to_iso/2, now_to_utc_string/1, now_to_local_string/1, datetime_string_to_timestamp/1, term_to_base64/1, base64_to_term/1, @@ -612,6 +612,9 @@ create_delay_tag(DateTime, Host, Desc) when is_binary(Host) -> %% Minutes = integer() -spec timestamp_to_iso(calendar:datetime(), tz()) -> {binary(), binary()}. +%% This is the XEP-0082 date and time format +%% http://xmpp.org/extensions/xep-0082.html + timestamp_to_iso({{Year, Month, Day}, {Hour, Minute, Second}}, Timezone) -> @@ -632,13 +635,22 @@ timestamp_to_iso({{Year, Month, Day}, end, {iolist_to_binary(Timestamp_string), iolist_to_binary(Timezone_string)}. --spec timestamp_to_iso(calendar:datetime()) -> binary(). -timestamp_to_iso({{Year, Month, Day}, +-spec timestamp_to_legacy(calendar:datetime()) -> binary(). +%% This is the jabber legacy format +%% http://xmpp.org/extensions/xep-0091.html#time +timestamp_to_legacy({{Year, Month, Day}, {Hour, Minute, Second}}) -> iolist_to_binary(io_lib:format("~4..0B~2..0B~2..0BT~2..0B:~2..0B:~2..0B", [Year, Month, Day, Hour, Minute, Second])). +-spec timestamp_to_iso_basic(calendar:datetime()) -> binary(). +%% This is the ISO 8601 basic bormat +timestamp_to_iso_basic({{Year, Month, Day}, + {Hour, Minute, Second}}) -> + iolist_to_binary(io_lib:format("~4..0B~2..0B~2..0BT~2..0B~2..0B~2..0B", + [Year, Month, Day, Hour, Minute, Second])). + -spec now_to_utc_string(erlang:timestamp()) -> binary(). now_to_utc_string({MegaSecs, Secs, MicroSecs}) -> |