jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XEP-0363: Add a domain argument to discover an upload service on a specific domain.

Browse Source
This commit is contained in:
Emmanuel Gil Peyrot 2018-10-27 22:50:41 +02:00
parent d4d542b741
commit a29a29227a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slixmpp/plugins/xep_0363/http_upload.py
View File

@ -67,8 +67,9 @@ class XEP_0363(BasePlugin):
def _handle_request(self, iq): def _handle_request(self, iq):
self.xmpp.event('http_upload_request', iq) self.xmpp.event('http_upload_request', iq)
async def find_upload_service(self, timeout=None, timeout_callback=None): async def find_upload_service(self, domain=None, timeout=None, timeout_callback=None):
results = await self.xmpp['xep_0030'].get_info_from_domain( results = await self.xmpp['xep_0030'].get_info_from_domain(
domain=domain,
timeout=timeout, timeout_callback=timeout_callback) timeout=timeout, timeout_callback=timeout_callback)
for info in results: for info in results:
@ -90,11 +91,12 @@ class XEP_0363(BasePlugin):
timeout_callback=timeout_callback) timeout_callback=timeout_callback)
async def upload_file(self, filename, size=None, content_type=None, *, async def upload_file(self, filename, size=None, content_type=None, *,
input_file=None, ifrom=None, timeout=None, input_file=None, ifrom=None, domain=None, timeout=None,
callback=None, timeout_callback=None): callback=None, timeout_callback=None):
''' Helper function which does all of the uploading process. ''' ''' Helper function which does all of the uploading process. '''
if self.upload_service is None: if self.upload_service is None:
info_iq = await self.find_upload_service( info_iq = await self.find_upload_service(
domain=domain,
timeout=timeout, timeout_callback=timeout_callback) timeout=timeout, timeout_callback=timeout_callback)
if info_iq is None: if info_iq is None:
raise UploadServiceNotFound() raise UploadServiceNotFound()