Don't propagate core messages to other notification providers.
This commit is contained in:
1 parent
c62c6664ce
commit
bb6e1e2909
3 files changed
+12
-3
No files matched your search
@@ -17,7 +17,7 @@ class Notification(Provider):
|
|||||||
listen_to = [
|
listen_to = [
|
||||||
'renamer.after', 'movie.snatched',
|
'renamer.after', 'movie.snatched',
|
||||||
'updater.available', 'updater.updated',
|
'updater.available', 'updater.updated',
|
||||||
'core.message',
|
'core.message.important',
|
||||||
]
|
]
|
||||||
dont_listen_to = []
|
dont_listen_to = []
|
||||||
|
|
||||||
|
|||||||
@@ -21,6 +21,12 @@ class CoreNotifier(Notification):
|
|||||||
|
|
||||||
m_lock = None
|
m_lock = None
|
||||||
|
|
||||||
|
listen_to = [
|
||||||
|
'renamer.after', 'movie.snatched',
|
||||||
|
'updater.available', 'updater.updated',
|
||||||
|
'core.message', 'core.message.important',
|
||||||
|
]
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
super(CoreNotifier, self).__init__()
|
super(CoreNotifier, self).__init__()
|
||||||
|
|
||||||
@@ -121,7 +127,10 @@ class CoreNotifier(Notification):
|
|||||||
|
|
||||||
for message in messages:
|
for message in messages:
|
||||||
if message.get('time') > last_check:
|
if message.get('time') > last_check:
|
||||||
fireEvent('core.message', message = message.get('message'), data = message)
|
message['sticky'] = True # Always sticky core messages
|
||||||
|
|
||||||
|
message_type = 'core.message.important' if message.get('important') else 'core.message'
|
||||||
|
fireEvent(message_type, message = message.get('message'), data = message)
|
||||||
|
|
||||||
if last_check < message.get('time'):
|
if last_check < message.get('time'):
|
||||||
last_check = message.get('time')
|
last_check = message.get('time')
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ var NotificationBase = new Class({
|
|||||||
, 'top');
|
, 'top');
|
||||||
self.notifications.include(result);
|
self.notifications.include(result);
|
||||||
|
|
||||||
if(result.data.important !== undefined && !result.read){
|
if((result.data.important !== undefined || result.data.sticky !== undefined) && !result.read){
|
||||||
var sticky = true
|
var sticky = true
|
||||||
App.fireEvent('message', [result.message, sticky, result])
|
App.fireEvent('message', [result.message, sticky, result])
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user