From 681b8e790055c557533183b31b48774bb98fdc0b Mon Sep 17 00:00:00 2001 From: Marcelo Fuentes Date: Mon, 2 Nov 2015 21:05:23 -0300 Subject: [PATCH] use str_format_time function on user_info command --- json-tg.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/json-tg.c b/json-tg.c index fece57f..57e33c8 100644 --- a/json-tg.c +++ b/json-tg.c @@ -32,11 +32,23 @@ void json_pack_peer_type (json_t *res, tgl_peer_id_t id) { } } +int str_format_time(long when, char* string) +{ + struct tm *tm = localtime ((void *)&when); + return sprintf (string, "%04d-%02d-%02d %02d:%02d:%02d", tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec); +} void json_pack_user (json_t *res, tgl_peer_t *P) { if (P->user.first_name) { assert (json_object_set (res, "first_name", json_string (P->user.first_name)) >= 0); } + + if (P->user.status.when) { + static char s[20]; + str_format_time(P->user.status.when, s); + assert (json_object_set (res, "when", json_string (s)) >= 0); + } + if (P->user.last_name) { assert (json_object_set (res, "last_name", json_string (P->user.last_name)) >= 0); } @@ -436,12 +448,6 @@ json_t *json_pack_read (struct tgl_message *M) { return res; } -int str_format_time(long when, char* string) -{ - struct tm *tm = localtime ((void *)&when); - return sprintf (string, "%04d-%02d-%02d %02d:%02d:%02d", tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec); -} - json_t *json_pack_user_status (struct tgl_user *U) { json_t *res = json_object (); assert (json_object_set (res, "user", json_pack_peer (U->id)) >= 0);