karaolidis/fbchat
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add ability to specify urls relative to www.facebook.com

Browse Source
This commit is contained in:
Mads Marquart
2019-06-29 20:05:16 +02:00
parent bb2afe8e40
commit f97d36b41f
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fbchat/_client.py
View File

@@ -131,7 +131,10 @@ class Client(object):
def _get(self, url, query=None, fix_request=False, as_json=False, error_retries=3): def _get(self, url, query=None, fix_request=False, as_json=False, error_retries=3):
payload = self._generatePayload(query) payload = self._generatePayload(query)
r = self._session.get( r = self._session.get(
url, headers=self._header, params=payload, verify=self.ssl_verify prefix_url(url),
headers=self._header,
params=payload,
verify=self.ssl_verify,
) )
if not fix_request: if not fix_request:
return r return r
@@ -159,7 +162,7 @@ class Client(object):
): ):
payload = self._generatePayload(query) payload = self._generatePayload(query)
r = self._session.post( r = self._session.post(
url, headers=self._header, data=payload, verify=self.ssl_verify prefix_url(url), headers=self._header, data=payload, verify=self.ssl_verify
) )
if not fix_request: if not fix_request:
return r return r
@@ -183,7 +186,7 @@ class Client(object):
def _cleanGet(self, url, query=None, allow_redirects=True): def _cleanGet(self, url, query=None, allow_redirects=True):
return self._session.get( return self._session.get(
url, prefix_url(url),
headers=self._header, headers=self._header,
params=query, params=query,
verify=self.ssl_verify, verify=self.ssl_verify,
@@ -193,7 +196,7 @@ class Client(object):
def _cleanPost(self, url, query=None): def _cleanPost(self, url, query=None):
self._req_counter += 1 self._req_counter += 1
return self._session.post( return self._session.post(
url, headers=self._header, data=query, verify=self.ssl_verify prefix_url(url), headers=self._header, data=query, verify=self.ssl_verify
) )
def _postFile( def _postFile(
@@ -211,7 +214,11 @@ class Client(object):
(i, self._header[i]) for i in self._header if i != "Content-Type" (i, self._header[i]) for i in self._header if i != "Content-Type"
) )
r = self._session.post( r = self._session.post(
url, headers=headers, data=payload, files=files, verify=self.ssl_verify prefix_url(url),
headers=headers,
data=payload,
files=files,
verify=self.ssl_verify,
) )
if not fix_request: if not fix_request:
return r return r

6
fbchat/_util.py
View File

@@ -315,3 +315,9 @@ def get_url_parameters(url, *args):
def get_url_parameter(url, param): def get_url_parameter(url, param):
return get_url_parameters(url, param)[0] return get_url_parameters(url, param)[0]
def prefix_url(url):
if url.startswith("/"):
return "https://www.facebook.com" + url
return url