github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-08 06:00:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed Hipchat emoticon checkbox to user definable string, since (plex) was a custom user emoticon.

Browse source
This commit is contained in:
aboron 2016-07-08 11:37:49 -04:00
parent e5bcd1f94e
commit b3cfcf660e
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plexpy/config.py
View file

@ -215,7 +215,7 @@ _CONFIG_DEFINITIONS = {
'HIPCHAT_URL': (str, 'Hipchat', ''), 'HIPCHAT_URL': (str, 'Hipchat', ''),
'HIPCHAT_COLOR': (str, 'Hipchat', 'green'), 'HIPCHAT_COLOR': (str, 'Hipchat', 'green'),
'HIPCHAT_INCL_SUBJECT': (int, 'Hipchat', 1), 'HIPCHAT_INCL_SUBJECT': (int, 'Hipchat', 1),
'HIPCHAT_INCL_EMOTICON': (int, 'Hipchat', 0), 'HIPCHAT_INCL_EMOTICON': (str, 'Hipchat', ''),
'HIPCHAT_ENABLED': (int, 'Hipchat', 0), 'HIPCHAT_ENABLED': (int, 'Hipchat', 0),
'HIPCHAT_ON_PLAY': (int, 'Hipchat', 0), 'HIPCHAT_ON_PLAY': (int, 'Hipchat', 0),
'HIPCHAT_ON_STOP': (int, 'Hipchat', 0), 'HIPCHAT_ON_STOP': (int, 'Hipchat', 0),

17
plexpy/notifiers.py
View file

@ -2767,7 +2767,7 @@ class HIPCHAT(object):
text = message.encode('utf-8') text = message.encode('utf-8')
if self.incl_emoticon: if self.incl_emoticon:
text = '(plex) ' + text text = self.incl_emoticon + ' ' + text
data = {'color': self.color, data = {'color': self.color,
'message': text, 'message': text,
@ -2820,18 +2820,19 @@ class HIPCHAT(object):
' may use any valid Hipchat message color value.', ' may use any valid Hipchat message color value.',
'input_type': 'text' 'input_type': 'text'
}, },
{'label': 'Prefix emoticon',
'value': self.incl_emoticon,
'name': 'hipchat_incl_emoticon',
'description': 'Include an emoticon tag at the beginning of all notifications.'
' Use a stock emoticon or create a custom emoticon'
' <a href="' + helpers.anon_url('https://www.hipchat.com/emoticons/') + '" target="_blank">here</a>.',
'input_type': 'text'
},
{'label': 'Include Subject Line', {'label': 'Include Subject Line',
'value': self.incl_subject, 'value': self.incl_subject,
'name': 'hipchat_incl_subject', 'name': 'hipchat_incl_subject',
'description': 'Include the subject line with the notifications.', 'description': 'Include the subject line with the notifications.',
'input_type': 'checkbox' 'input_type': 'checkbox'
},
{'label': 'Include (plex) emoticon',
'value': self.incl_emoticon,
'name': 'hipchat_incl_emoticon',
'description': 'Include (plex) emoticon tag at the beginning of all notifications.'
' Create a custom emoticon <a href="' + helpers.anon_url('https://www.hipchat.com/emoticons/') + '" target="_blank">here</a>.',
'input_type': 'checkbox'
} }
] ]