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

Verify color hex code for Discord and Slack

Browse source
This commit is contained in:
JonnyWong16 2017-01-30 19:16:05 -08:00
parent 304c2429bb
commit 4dce0ec015
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
plexpy/notifiers.py
View file

@ -22,6 +22,7 @@ from email.mime.text import MIMEText
import email.utils import email.utils
from httplib import HTTPSConnection from httplib import HTTPSConnection
import os import os
import re
import requests import requests
import shlex import shlex
import smtplib import smtplib
@ -838,9 +839,13 @@ class DISCORD(Notifier):
attachment = {'title': title attachment = {'title': title
} }
if self.config['color'] and self.config['color'].startswith('#'):
hex = self.config['color'].lstrip('#') if self.config['color']:
attachment['color'] = helpers.hex_to_int(hex) hex_match = re.match(r'^#([0-9a-fA-F]{3}){1,2}$', self.config['color'])
if hex_match:
hex = hex_match.group(0).lstrip('#')
hex = ''.join(h * 2 for h in hex) if len(hex) == 3 else hex
attachment['color'] = helpers.hex_to_int(hex)
if self.config['incl_thumbnail']: if self.config['incl_thumbnail']:
attachment['thumbnail'] = {'url': poster_url} attachment['thumbnail'] = {'url': poster_url}
@ -2507,7 +2512,7 @@ class SLACK(Notifier):
'thumb_url': poster_url 'thumb_url': poster_url
} }
if self.config['color'] and self.config['color'].startswith('#'): if self.config['color'] and re.match(r'^#(?:[0-9a-fA-F]{3}){1,2}$', self.config['color']):
attachment['color'] = self.config['color'] attachment['color'] = self.config['color']
if self.config['incl_description'] or media_type in ('artist', 'album', 'track'): if self.config['incl_description'] or media_type in ('artist', 'album', 'track'):