tobast/glowingbear-mainbox
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request from glowing-bear/fixinitialhighlight

Browse source 
Fix initial query notifications
This commit is contained in:
Tor Hveem 2014-05-08 00:16:08 +02:00
commit 47c9b38d75
2 changed files with 4 additions and 5 deletions

4
js/glowingbear.js
View file

@ -133,8 +133,8 @@ weechat.factory('handlers', ['$rootScope', 'models', 'plugins', function($rootSc
var buffer = models.getBuffer(l.buffer); var buffer = models.getBuffer(l.buffer);
// 1 is message // 1 is message
buffer.unread += l.count[1]; buffer.unread += l.count[1];
// 2 is ? // 2 is private
buffer.unread += l.count[2]; buffer.notification += l.count[2];
// 3 is highlight // 3 is highlight
buffer.notification += l.count[3]; buffer.notification += l.count[3];
/* Since there is unread messages, we can guess /* Since there is unread messages, we can guess

5
js/models.js
View file

@ -15,7 +15,6 @@ models.service('models', ['$rootScope', '$filter', function($rootScope, $filter)
var title = message.title; var title = message.title;
var number = message.number; var number = message.number;
var pointer = message.pointers[0]; var pointer = message.pointers[0];
var local_variables = message.local_vars;
var notify = 3; // Default 3 == message var notify = 3; // Default 3 == message
var lines = []; var lines = [];
var requestedLines = 0; var requestedLines = 0;
@ -28,7 +27,8 @@ models.service('models', ['$rootScope', '$filter', function($rootScope, $filter)
var unread = 0; var unread = 0;
var lastSeen = -1; var lastSeen = -1;
var serverSortKey = fullName.replace(/^irc.server.(\w+)/, "irc.$1"); var serverSortKey = fullName.replace(/^irc.server.(\w+)/, "irc.$1");
var indent = (fullName.match(/^irc./) && !fullName.match(/^irc.server./)); var type = message.local_variables.type;
var indent = (['channel', 'private'].indexOf(type) >= 0);
// Buffer opened message does not include notify level // Buffer opened message does not include notify level
if (message.notify !== undefined) { if (message.notify !== undefined) {
@ -223,7 +223,6 @@ models.service('models', ['$rootScope', '$filter', function($rootScope, $filter)
lastSeen: lastSeen, lastSeen: lastSeen,
unread: unread, unread: unread,
notification: notification, notification: notification,
localvars: local_variables,
notify: notify, notify: notify,
nicklist: nicklist, nicklist: nicklist,
addNick: addNick, addNick: addNick,