Major fixes and improvements

.gitignore

@@ -19,3 +19,8 @@ debian/telegram-cli/*
 debian/telegram-cli.debhelper.log
 debian/telegram-cli.substvars
 __pycache__
+rpm/BUILD
+rpm/BUILDROOT
+rpm/RPMS
+rpm/SRPMS
+rpm/SOURCES

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "tgl"]
 	path = tgl
-	url = https://github.com/vysheng/tgl.git
+	url = https://github.com/kenorb-contrib/tgl.git

.travis.yml

@@ -4,18 +4,25 @@ compiler:
   - gcc
   - clang
 
-install:
- - sudo apt-get update
- - sudo apt-get install libconfig8-dev
- - sudo apt-get install libreadline6-dev
- - sudo apt-get install libssl-dev
- - sudo apt-get install liblua5.2-dev lua5.2
- - sudo apt-get install python-dev python
- - sudo apt-get install libevent-dev
- - sudo apt-get install libjansson-dev
+addons:
+  apt:
+    packages:
+    - libconfig8-dev
+    - libreadline6-dev
+    - libssl-dev
+    - liblua5.2-dev
+    - lua5.2
+    - python-dev
+    - python
+    - libevent-dev
+    - libjansson-dev
+
+sudo: false
+
+git:
+  depth: 10
 
 script:
   - git submodule update --init --recursive
   - ./configure
-  - make
-
+  - make

CHANGELOG

@@ -1,3 +1,7 @@
+1.3.4
+* set config directory with key -X
+* TGL-2.0.3
+
 1.3.3
 * support for sending custom keyboard 
 * fixed contact_search

Makefile.in

@@ -1,14 +1,19 @@
 srcdir=@srcdir@
 
+TARGET_OS=$(shell uname -s)
 CFLAGS=@CFLAGS@
 LDFLAGS=@LDFLAGS@ @OPENSSL_LDFLAGS@
 CPPFLAGS=@CPPFLAGS@ @OPENSSL_INCLUDES@
 DEFS=@DEFS@
-COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Werror -Wextra -Wno-missing-field-initializers -Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer -ggdb -Wno-unused-parameter -fPIC
+COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Wextra -Wno-missing-field-initializers -Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer -ggdb -Wno-unused-parameter -fPIC -Wno-unused-function -Wno-builtin-memcpy-chk-size
 EXTRA_LIBS=@LIBS@ @EXTRA_LIBS@ @OPENSSL_LIBS@
-LOCAL_LDFLAGS=-rdynamic -ggdb -levent ${EXTRA_LIBS} -ldl -lpthread -lutil
+LOCAL_LDFLAGS=-rdynamic -ggdb -levent ${EXTRA_LIBS} -lpthread -lutil
 LINK_FLAGS=${LDFLAGS} ${LOCAL_LDFLAGS}
 
+ifneq (${TARGET_OS}, FreeBSD)
+	LOCAL_LDFLAGS += -ldl
+endif
+
 DEP=dep
 AUTO=auto
 EXE=bin
@@ -23,6 +28,10 @@ TG_OBJECTS=${OBJ}/main.o ${OBJ}/loop.o ${OBJ}/interface.o ${OBJ}/lua-tg.o ${OBJ}
 INCLUDE=-I. -I${srcdir} -I${srcdir}/tgl
 CC=@CC@
 
+PREFIX?=/usr/local
+INSTALL_BIN=$(PREFIX)/bin
+INSTALL=install
+
 .SUFFIXES:
 
 .SUFFIXES: .c .h .o
@@ -56,3 +65,7 @@ clean:
 distclean:
 	rm -rf ${DIR_LIST} config.h config.log config.status
 
+install: all
+	@mkdir -p $(DESTDIR)/$(INSTALL_BIN)
+	$(INSTALL) bin/telegram-cli $(DESTDIR)/$(INSTALL_BIN)
+	rm -rf ${DIR_LIST} config.log config.status > /dev/null || echo "all clean"

Makefile.tgl

@@ -8,6 +8,8 @@ GENERATE_OBJECTS=${OBJ}/generate.o
 TGL_COMMON_OBJECTS=${OBJ}/tools.o ${OBJ}/crypto/rand_openssl.o ${OBJ}/crypto/rand_altern.o ${OBJ}/crypto/err_openssl.o ${OBJ}/crypto/err_altern.o
 TGL_OBJ_C=${GENERATE_OBJECTS} ${TGL_COMMON_OBJECTS} ${TGL_OBJECTS} ${TLD_OBJECTS}
 
+AR?=ar
+
 .SUFFIXES:
 
 .SUFFIXES: .c .h .o
@@ -26,7 +28,7 @@ ${TGL_OBJECTS_AUTO}: ${OBJ}/auto/%.o: ${AUTO}/%.c | create_dirs
 #	${CC} ${INCLUDE} ${COMPILE_FLAGS} -iquote ${srcdir}/tgl -c -MP -MD -MF ${DEP}/auto/auto.d -MQ ${OBJ}/auto/auto.o -o $@ $<
 
 ${LIB}/libtgl.a: ${TGL_OBJECTS} ${TGL_COMMON_OBJECTS} ${TGL_OBJECTS_AUTO}
-	rm -f $@ && ar ruv $@ $^
+	rm -f $@ && ${AR} ruv $@ $^
 
 ${EXE}/generate: ${GENERATE_OBJECTS} ${TGL_COMMON_OBJECTS}
 	${CC} ${GENERATE_OBJECTS} ${TGL_COMMON_OBJECTS} ${LINK_FLAGS} -o $@

README-Cygwin.md

@@ -1,57 +1,76 @@
-### Installation on Windows
-To use telegram-cli in Windows, you should compile with Cygwin which has POSIX API functionality.
-
-Install [Cygwin](https://www.cygwin.com/) and cygwin's package manager, [apt-cyg](https://github.com/transcode-open/apt-cyg).
-
-In Cygwin Terminal, install compiler and tools :
-
-     apt-cyg install cygwin32-gcc-core cygwin32-gcc-g++ gcc-core gcc-g++ make wget patch diffutils grep tar gzip
-
-Now you have a compiler, but no libraries. You need readline, openssl, libconfig, liblua, python and libjansson to use telegram-cli's full functionality.
-
-
-Then Clone GitHub Repository in Cygwin Terminal
-
-     git clone --recursive https://github.com/vysheng/tg.git
-
-
-In Cygwin Terminal, type: 
-
-     apt-cyg install libevent-devel openssl-devel libreadline-devel lua-devel python3
-(Install package 'python' to use Python 2.7, or install package 'python3' to use Python 3)
-
-libconfig and libjansson is not in cygwin's package, so you should compile yourself.
-
-Compile libconfig
-
-     wget http://www.hyperrealm.com/libconfig/libconfig-1.5.tar.gz
-     tar xvf libconfig-1.5.tar.gz && cd libconfig-1.5
-     ./configure
-     make && make install && cd ..
-
-Compile libjansson
-
-     wget http://www.digip.org/jansson/releases/jansson-2.7.tar.gz
-     tar xvf jansson-2.7.tar.gz && cd jansson-2.7
-     ./configure
-     make && make install && cd ..
-
-Then, go to tg directory then generate Makefile.
-
-     cd tg
-     ./configure
-
-We need to patch Makefile and loop.c to compile in cygwin. Download this [patch](https://gist.github.com/ied206/d774a445f36004d263ab) then untar. Then, patch in tg directory.
-
-     patch -p1 < telegram-cli-cygwin.patch
-
-Then
-     make
-
-After compile is done, **telegram-cli.exe** will be generated in **bin** directory.
-
-To run telegram-cli, type
-
-     bin/telegram-cli -k tg-server.pub
-
-**Caution**: A binary compiled with Cygwin should be run in Cygwin Terminal.
+### Installation on Windows
+To use telegram-cli in Windows, you should compile with Cygwin which has POSIX API functionality.
+
+Install [Cygwin](https://www.cygwin.com/).
+
+In Cygwin Terminal, install cygwin's package manager, apt-cyg, as per apt-cyg's [project page](https://github.com/transcode-open/apt-cyg):
+
+     lynx -source rawgit.com/transcode-open/apt-cyg/master/apt-cyg > apt-cyg
+     install apt-cyg /bin
+
+Then install compiler and tools: if you're on the **32-bit** version of cygwin,
+
+     apt-cyg install gcc-core gcc-g++ gcc-core gcc-g++ make wget patch diffutils grep tar gzip autoconf automake libtool git zlib-devel
+
+Whereas on the **64-bit** version,
+
+     apt-cyg install cygwin32-gcc-core cygwin32-gcc-g++ gcc-core gcc-g++ make wget patch diffutils grep tar gzip zlib-devel
+
+You need libraries *readline*, *openssl*, *libconfig*, *liblua*, *python* and *libjansson* to use telegram-cli's full functionality.
+
+Clone this project's GitHub Repository in Cygwin Terminal
+
+     git clone --recursive https://github.com/vysheng/tg.git
+
+Then type: 
+
+     apt-cyg install libevent-devel openssl-devel libreadline-devel lua-devel python3
+
+(Install package 'python' to use Python 2.7, or install package 'python3' to use Python 3)
+
+libconfig and libjansson are not included in the cygwin package, so you should compile them yourself.
+
+Compile libconfig:
+
+     wget https://github.com/hyperrealm/libconfig/archive/v1.7.2.tar.gz
+     mv v1.7.2.tar.gz libconfig-1.7.2.tar.gz
+     tar xvf libconfig-1.7.2.tar.gz && cd libconfig-1.7.2
+     autoreconf
+     ./configure
+     make && make install && cd ..
+
+Compile libjansson:
+
+     wget http://www.digip.org/jansson/releases/jansson-2.7.tar.gz
+     tar xvf jansson-2.7.tar.gz && cd jansson-2.7
+     ./configure
+     make && make install && cd ..
+
+Then, change to the tg directory and generate the Makefile.
+
+     cd tg
+     ./configure
+
+In case `configure` fails, it might be because of the CRLF line endings, so:
+
+     dos2unix -f configure
+
+And again,
+
+     ./configure
+
+We need to patch the Makefile and loop.c to compile properly in cygwin. The patch is included, so just type:
+
+     patch -p1 < telegram-cli-cygwin.patch
+
+Then,
+
+     make
+
+Once the compilation is complete, **telegram-cli.exe** will be found in the **bin** subdirectory.
+
+To run `telegram-cli`, type
+
+     bin/telegram-cli -k tg-server.pub
+
+**Caution**: A binary compiled with Cygwin should be run in Cygwin Terminal.

README-LUA

@@ -9,6 +9,7 @@ It should have several functions:
   on_our_id(our_id) - Informs about id of currently logged in user.
 
   on_msg_receive(msg) - it is called when we receive new msg (!! may be called before on_binlog_replay_end, than it is old msg).
+  on_msg_history(msg) - it is called when a msg from history is printed.
 
   on_user_update(user,what_changed) - updated info about user. what_changed is array of strings.
   on_chat_update(user,what_changed) - updated info about user. what_changed is array of strings.

README-PY.md

@@ -20,9 +20,11 @@ Assign python fuctions to the following tgl attributes to set callbacks from TG.
 |`tgl.on_get_difference_end()`| This is called after first get_difference call. So we received all updates after last client execute.|
 |`tgl.on_our_id(our_id)`|Informs about id of currently logged in user.|
 |`tgl.on_msg_receive(msg)`| This is called when we receive new `tgl.Msg` object (*may be called before on_binlog_replay_end, than it is old msg*).|
+|`tgl.on_msg_history(msg)`| This is called when we receive a `tgl.Msg` object from a history printing.|
 |`tgl.on_user_update(peer, what_changed)`|updated info about user. peer is a `tgl.Peer` object representing the user, and what_changed is array of strings.|
 |`tgl.on_chat_update(peer, what_changed)`|updated info about chat. peer is a `tgl.Peer` object representing the chat, and what_changed is array of strings.|
 |`tgl.on_secret_chat_update(peer, what_changed)`|updated info about secret chat. peer is a `tgl.Peer` object representing the secret chat, and  what_changed is array of strings.|
+|`tgl.on_loop()` | This is called every now and then.|
 
 Python Callback Signatures
 =========================
@@ -32,7 +34,7 @@ As mentioned, all methods and functions have callbacks. The following are the di
 |----- | ------------------ | ------------|
 |empty_cb|`(success)`|This just indicated the success of the call. All other callback types have this as well.|
 |contact_list_cb|`(success, peer_list)`|`peer_list` is a list of `tgl.Peer` objects|
-|dialog_list_cb|`(success, dialog_list)`|`dialog_list` is a list of dicts, with keys: 'peer': `tgl.Peer`, 'message': `tgl.Msg`|
+|dialog_list_cb|`(success, dialog_list)`|`dialog_list` is a list of dicts, with keys: 'peer': `tgl.Peer`, 'unread': `bool( Determine whether has unread message)`|
 |msg_cb|`(success, msg)`|`msg` is a `tgl.Msg`|
 |msg_list_cb|`(success, msg_list)`|`msg_list` is a list of `tgl.Msg` objects|
 |file_cb|`(success, file_path)`|`file_path` is a string with an absolute path|
@@ -57,6 +59,7 @@ All of these functions are accessed by importing the `tgl` module.
 |`tgl.set_profile_photo (file_path)`|Sets avatar to image found at `file_path`, no checking on the file.|`empty_cb`|
 |`tgl.create_secret_chat (user)`|Creates secret chat with user, callback recommended to get new peer for the secret chat.|`secret_chat_cb`|
 |`tgl.create_group_chat (peer_list, name)`|`peer_list` contains users to create group with, must be more than 1 peer.|`empty_cb`|
+|`tgl.delete_msg (msg_id)`|Deletes the message from the local history.|`empty_cb`|
 |`tgl.restore_msg (msg_id)`|Restore a deleted message by message id.|`empty_cb`|
 |`tgl.status_online ()`|Sets status as online|`empty_cb`|
 |`tgl.status_offline ()`|Sets status as offline|`empty_cb`|
@@ -100,20 +103,20 @@ Peer
 |`peer.chat_del_user (user)`|Removes `user`(`tgl.Peer`) from the group. The calling peer must be of type `tgl.PEER_CHAT`|`empty_cb`|
 |`peer.mark_read ()`|Marks the dialog with the peer as read. This cannot be done on message level.|`empty_cb`|
 |`peer.msg_search (text, callback)`|Get all messages that match the search text with the peer. *requires callback*|`msg_list_cb`|
-|`peer.get_history (offset, limit, callback)`|Get all messages with the peer. `offset` specifies what message to start at, and `limit` specifies how many messages to retrieve. See example below for one method to get the entire history. *requires callback*|`msg_list_cb`|
+|`peer.history (offset, limit, callback)`|Get all messages with the peer. `offset` specifies what message to start at, and `limit` specifies how many messages to retrieve. See example below for one method to get the entire history. *requires callback*|`msg_list_cb`|
 |`peer.info ()`|Gets peer info.|`peer_cb`|
 
-Example usage for `peer.get_history`:
+Example usage for `peer.history`:
 ```
 from functools import partial
 history = []
 # Get all the history, 100 msgs at a time
-peer.get_history(0, 100, partial(history_callback, 100, peer))
+peer.history(0, 100, partial(history_callback, 100, peer))
 
-def history_callback(msg_count, peer, success, msgs)
+def history_callback(msg_count, peer, success, msgs):
     history.extend(msgs)
     if len(msgs) == msg_count:
-        peer.get_history(len(history), msg_count, partial(history_callback, msg_count, peer))
+        peer.history(len(history), msg_count, partial(history_callback, msg_count, peer))
 ```
 
 Msg
@@ -172,4 +175,3 @@ Msg
 |`msg.load_audio(callback)`|Saves the media and returns the path to the file in the callback. *requires callback*|`file_cb`|
 |`msg.load_document(callback)`|Saves the media and returns the path to the file in the callback. *requires callback*|`file_cb`|
 |`msg.load_document_thumb(callback)`|Saves the media and returns the path to the file in the callback. *requires callback*|`file_cb`|
-|`msg.delete_msg ()`|Deletes the message from the local history|`empty_cb`|

README.es

@@ -1,4 +1,4 @@
-## Telegram messenger CLI [![Build Status](https://travis-ci.org/vysheng/tg.png)](https://travis-ci.org/vysheng/tg)
+## Telegram messenger CLI [![Build Status](https://travis-ci.org/kenorb-contrig/tg.png)](https://travis-ci.org/kenorb-contrig/tg)
 
 !!!! May be outdated. Please refer to english README as more actual. 
 
@@ -15,11 +15,11 @@ La documentación del protocolo MTproto está disponible aquí: http://core.tele
 
 Clona el Repositorio GitHub
 
-    $ git clone https://github.com/vysheng/tg.git && cd tg
+    $ git clone --recursive https://github.com/kenorb-contrig/tg.git && cd tg
 
 o descarga y descomprime el zip
 
-    $ wget https://github.com/vysheng/tg/archive/master.zip -O tg-master.zip
+    $ wget https://github.com/kenorb-contrig/tg/archive/master.zip -O tg-master.zip
     $ unzip tg-master.zip && cd tg-master
 
 #### Linux