applications/tg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge github.com:vysheng/tg

Browse Source
This commit is contained in:
V V 2016-03-23 14:42:53 +03:00
commit 6547c0b21b
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -5,6 +5,7 @@ compiler:
- clang - clang
install: install:
- sudo apt-get update
- sudo apt-get install libconfig8-dev - sudo apt-get install libconfig8-dev
- sudo apt-get install libreadline6-dev - sudo apt-get install libreadline6-dev
- sudo apt-get install libssl-dev - sudo apt-get install libssl-dev
@ -17,3 +18,4 @@ script:
- git submodule update --init --recursive - git submodule update --init --recursive
- ./configure - ./configure
- make - make

18
json-tg.c
View File

@ -36,11 +36,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) { void json_pack_user (json_t *res, tgl_peer_t *P) {
if (P->user.first_name) { if (P->user.first_name) {
assert (json_object_set (res, "first_name", json_string (P->user.first_name)) >= 0); 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) { if (P->user.last_name) {
assert (json_object_set (res, "last_name", json_string (P->user.last_name)) >= 0); assert (json_object_set (res, "last_name", json_string (P->user.last_name)) >= 0);
} }
@ -470,12 +482,6 @@ json_t *json_pack_read (struct tgl_message *M) {
return res; 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 *json_pack_user_status (struct tgl_user *U) {
json_t *res = json_object (); json_t *res = json_object ();
assert (json_object_set (res, "user", json_pack_peer (U->id)) >= 0); assert (json_object_set (res, "user", json_pack_peer (U->id)) >= 0);