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

Merge branch 'nightly' into python3

Browse source 
# Conflicts:
#	plexpy/webserve.py
This commit is contained in:
JonnyWong16 2020-01-20 20:55:30 -08:00
commit b39ac866f2
12 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plexpy/notifiers.py
View file

@ -3366,7 +3366,7 @@ class TELEGRAM(Notifier):
if len(text) > 1024:
data['disable_notification'] = True
else:
data['caption'] = text
data['caption'] = text.encode('utf-8')
r = self.make_request('https://api.telegram.org/bot{}/sendPhoto'.format(self.config['bot_token']),
data=data, files=files)
@ -3374,7 +3374,7 @@ class TELEGRAM(Notifier):
if not data.pop('disable_notification', None):
return r
data['text'] = text
data['text'] = (text[:4093] + (text[4093:] and '...')).encode('utf-8')
if self.config['disable_web_preview']:
data['disable_web_page_preview'] = True