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

restructure

Browse Source
This commit is contained in:
adnidor
2019-02-27 03:12:55 +01:00
parent 282ced3fe6
commit 7d2ba56450
1 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xmpp_tg/xmpp.py
View File

@@ -4,6 +4,7 @@ import logging, traceback, pprint
from sleekxmpp.componentxmpp import ComponentXMPP from sleekxmpp.componentxmpp import ComponentXMPP
from sleekxmpp import Presence, Message from sleekxmpp import Presence, Message
from sleekxmpp.exceptions import XMPPError
from telethon.tl.functions.messages import GetDialogsRequest, SendMessageRequest, SendMediaRequest, EditMessageRequest, DeleteMessagesRequest, ImportChatInviteRequest, GetFullChatRequest, AddChatUserRequest, DeleteChatUserRequest, CreateChatRequest, DeleteHistoryRequest from telethon.tl.functions.messages import GetDialogsRequest, SendMessageRequest, SendMediaRequest, EditMessageRequest, DeleteMessagesRequest, ImportChatInviteRequest, GetFullChatRequest, AddChatUserRequest, DeleteChatUserRequest, CreateChatRequest, DeleteHistoryRequest
from telethon.tl.functions.account import UpdateStatusRequest, GetAuthorizationsRequest, UpdateProfileRequest, UpdateUsernameRequest from telethon.tl.functions.account import UpdateStatusRequest, GetAuthorizationsRequest, UpdateProfileRequest, UpdateUsernameRequest
@@ -125,10 +126,14 @@ class XMPPTelegram(ComponentXMPP):
self.gate_reply_message(iq, 'Error.') self.gate_reply_message(iq, 'Error.')
else: # -- normal message -- else: # -- normal message --
self.send_tg_message(iq)
def send_tg_message(self, iq):
jid = iq['from'].bare
try: try:
tg_id = int(iq['to'].node[1:]) tg_id = int(iq['to'].node[1:])
except ValueError: except ValueError:
self.gate_reply_message(iq, 'Invalid JID') raise XMPPError(text="Invalid Telegram-ID")
tg_peer = None tg_peer = None
msg = iq['body'] msg = iq['body']
reply_mid = None reply_mid = None
@@ -173,7 +178,6 @@ class XMPPTelegram(ComponentXMPP):
self.tg_dialogs[jid]['messages'][tg_id] = {'id': msg_id, 'body': msg} self.tg_dialogs[jid]['messages'][tg_id] = {'id': msg_id, 'body': msg}
#self.send_message(mto=iq['from'], mfrom=iq['to'], mtype='chat', mbody='[Your MID:{}]'.format(msg_id)) #self.send_message(mto=iq['from'], mfrom=iq['to'], mtype='chat', mbody='[Your MID:{}]'.format(msg_id))
def event_presence_unsub(self, presence): def event_presence_unsub(self, presence):
return return