github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-15 01:32:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Update Facebook Graph API version

Browse source
This commit is contained in:
JonnyWong16 2018-03-16 15:39:41 -07:00
parent 8407f27fed
commit d045fd5834
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/facebook/__init__.py
View file

@ -45,7 +45,8 @@ __version__ = version.__version__
FACEBOOK_GRAPH_URL = "https://graph.facebook.com/"
FACEBOOK_OAUTH_DIALOG_URL = "https://www.facebook.com/dialog/oauth?"
VALID_API_VERSIONS = ["2.3", "2.4", "2.5", "2.6", "2.7", "2.8", "2.9"]
VALID_API_VERSIONS = [
"2.5", "2.6", "2.7", "2.8", "2.9", "2.10", "2.11", "2.12"]
VALID_SEARCH_TYPES = ["page", "event", "group", "place", "placetopic", "user"]
@ -89,7 +90,7 @@ class GraphAPI(object):
self.session = session or requests.Session()
if version:
version_regex = re.compile("^\d\.\d$")
version_regex = re.compile("^\d\.\d{1,2}$")
match = version_regex.search(str(version))
if match is not None:
if str(version) not in VALID_API_VERSIONS:
@ -229,7 +230,7 @@ class GraphAPI(object):
try:
headers = response.headers
version = headers["facebook-api-version"].replace("v", "")
return float(version)
return str(version)
except Exception:
raise GraphAPIError("API version number not available")
@ -369,24 +370,24 @@ class GraphAPIError(Exception):
self.code = None
try:
self.type = result["error_code"]
except:
except (KeyError, TypeError):
self.type = ""
# OAuth 2.0 Draft 10
try:
self.message = result["error_description"]
except:
except (KeyError, TypeError):
# OAuth 2.0 Draft 00
try:
self.message = result["error"]["message"]
self.code = result["error"].get("code")
if not self.type:
self.type = result["error"].get("type", "")
except:
except (KeyError, TypeError):
# REST server style
try:
self.message = result["error_msg"]
except:
except (KeyError, TypeError):
self.message = result
Exception.__init__(self, self.message)

6
plexpy/notifiers.py
View file

@ -1453,7 +1453,7 @@ class FACEBOOK(Notifier):
try:
# Request user access token
api = facebook.GraphAPI(version='2.5')
api = facebook.GraphAPI(version='2.12')
response = api.get_access_token_from_code(code=code,
redirect_uri=redirect_uri + '/facebookStep2',
app_id=app_id,
@ -1461,7 +1461,7 @@ class FACEBOOK(Notifier):
access_token = response['access_token']
# Request extended user access token
api = facebook.GraphAPI(access_token=access_token, version='2.5')
api = facebook.GraphAPI(access_token=access_token, version='2.12')
response = api.extend_access_token(app_id=app_id,
app_secret=app_secret)
@ -1479,7 +1479,7 @@ class FACEBOOK(Notifier):
def _post_facebook(self, **data):
if self.config['group_id']:
api = facebook.GraphAPI(access_token=self.config['access_token'], version='2.5')
api = facebook.GraphAPI(access_token=self.config['access_token'], version='2.12')
try:
api.put_object(parent_object=self.config['group_id'], connection_name='feed', **data)