yannik/tg4xmpp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

send image url as OOB

Browse Source
This commit is contained in:
adnidor
2019-03-10 20:32:21 +01:00
parent 98460f4bb4
commit 9bf947fc80
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
xmpp_tg/mtproto.py
View File

@@ -55,7 +55,7 @@ class TelegramGateClient(TelegramClient):
self._del_pts = 0 self._del_pts = 0
def xmpp_update_handler(self, update_obj): def tg_update_handler(self, update_obj):
""" """
Main function: Telegram update handler. Main function: Telegram update handler.
@@ -102,6 +102,7 @@ class TelegramGateClient(TelegramClient):
msg = '' msg = ''
fwd_from = '' fwd_from = ''
mid = update_obj.message.id mid = update_obj.message.id
oob_url = None
# detect message type # detect message type
@@ -151,14 +152,14 @@ class TelegramGateClient(TelegramClient):
# message media # # message media #
if update_obj.message.media: if update_obj.message.media:
msg = '{} {}'.format(msg, self._process_media_msg(update_obj.message.media)) msg, oob_url = '{} {}'.format(msg, self._process_media_msg(update_obj.message.media))
# edited # # edited #
if update_obj.message.edit_date: if update_obj.message.edit_date:
msg = '[Edited] {}'.format(msg) msg = '[Edited] {}'.format(msg)
# send message # # send message #
self.xmpp_send_message(prefix + str(cid), mbody ='[MSG {}] {}{}'.format(mid, fwd_from, msg)) self.xmpp_send_message(prefix + str(cid), mbody ='[MSG {}] {}{}'.format(mid, fwd_from, msg), oob_url=oob_url)
# delivery report # delivery report
if is_supergroup: if is_supergroup:
@@ -184,12 +185,17 @@ class TelegramGateClient(TelegramClient):
print('Exception occurs!') print('Exception occurs!')
print(traceback.format_exc()) print(traceback.format_exc())
def xmpp_send_message(self, mfrom, mbody): def xmpp_send_message(self, mfrom, mbody, oob_url=None):
tg_from = int(mfrom[1:]) tg_from = int(mfrom[1:])
if not tg_from in self.xmpp_gate.tg_dialogs[self.jid]['users'] and not tg_from in self.xmpp_gate.tg_dialogs[self.jid]['groups'] and not tg_from in self.xmpp_gate.tg_dialogs[self.jid]['supergroups']: # new contact appeared if not tg_from in self.xmpp_gate.tg_dialogs[self.jid]['users']\
and not tg_from in self.xmpp_gate.tg_dialogs[self.jid]['groups']\
and not tg_from in self.xmpp_gate.tg_dialogs[self.jid]['supergroups']: # new contact appeared
self.xmpp_gate.tg_process_dialogs( self.jid ) self.xmpp_gate.tg_process_dialogs( self.jid )
self.xmpp_gate.send_message( mto=self.jid, mfrom=mfrom + '@' + self.xmpp_gate.config['jid'], mtype='chat', mbody=mbody) message = self.xmpp_gate.make_message( mto=self.jid, mfrom=mfrom + '@' + self.xmpp_gate.config['jid'], mtype='chat', mbody=mbody)
if oob_url is not None:
message['oob']['url'] = oob_url
message.send()
def generate_media_link(self, media): def generate_media_link(self, media):
""" """
@@ -270,6 +276,7 @@ class TelegramGateClient(TelegramClient):
:return: :return:
""" """
msg = '' msg = ''
url = None
if type(media) is MessageMediaDocument: # document if type(media) is MessageMediaDocument: # document
attributes = media.document.attributes attributes = media.document.attributes
@@ -321,6 +328,7 @@ class TelegramGateClient(TelegramClient):
elif type(media) is MessageMediaPhoto: # photo (jpg) elif type(media) is MessageMediaPhoto: # photo (jpg)
g_link = self.generate_media_link(media) g_link = self.generate_media_link(media)
msg = g_link['link'] msg = g_link['link']
url = g_link['link']
self._media_queue.put({'media': media, 'file': g_link['name']}) self._media_queue.put({'media': media, 'file': g_link['name']})
@@ -338,7 +346,7 @@ class TelegramGateClient(TelegramClient):
if type(media) is MessageMediaVenue: if type(media) is MessageMediaVenue:
msg = '[Title: {}|Address: {}|Provider: {}] {}'.format(media.title, media.address, media.provider, msg) msg = '[Title: {}|Address: {}|Provider: {}] {}'.format(media.title, media.address, media.provider, msg)
return msg return msg,url
def _process_info_msg(self, message, peer): def _process_info_msg(self, message, peer):
""" """

2
xmpp_tg/xmpp.py
View File

@@ -397,7 +397,7 @@ class XMPPTelegram(ComponentXMPP):
self.tg_process_dialogs(jid, sync_roster = False) self.tg_process_dialogs(jid, sync_roster = False)
# Register Telegrap updates handler # Register Telegrap updates handler
self.tg_connections[jid].add_update_handler(self.tg_connections[jid].xmpp_update_handler) self.tg_connections[jid].add_update_handler(self.tg_connections[jid].tg_update_handler)
def roster_exchange(self, tojid, contacts): def roster_exchange(self, tojid, contacts):