From 4f686d512dedec4282e54d02ddb8042a7db3f794 Mon Sep 17 00:00:00 2001
From: Tor Hveem <tor@hveem.no>
Date: Sat, 28 Nov 2015 12:22:56 +0100
Subject: [PATCH] Request nicklist using ptr instead of fullname
---
js/connection.js | 7 +++++--
js/glowingbear.js | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/js/connection.js b/js/connection.js
index b39027f..4ea55ce 100644
--- a/js/connection.js
+++ b/js/connection.js
@@ -282,10 +282,13 @@ weechat.factory('connection',
};
var requestNicklist = function(bufferId, callback) {
- bufferId = bufferId || null;
+ // Prevent requesting nicklist for all buffers if bufferId is invalid
+ if (!bufferId) {
+ return;
+ }
ngWebsockets.send(
weeChat.Protocol.formatNicklist({
- buffer: bufferId
+ buffer: "0x"+bufferId
})
).then(function(nicklist) {
handlers.handleNicklist(nicklist);
diff --git a/js/glowingbear.js b/js/glowingbear.js
index c0b746a..0c209c3 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -168,7 +168,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
// Send a request for the nicklist if it hasn't been loaded yet
if (!ab.nicklistRequested()) {
- connection.requestNicklist(ab.fullName, function() {
+ connection.requestNicklist(ab.id, function() {
$scope.showNicklist = $scope.updateShowNicklist();
// Scroll after nicklist has been loaded, as it may break long lines
$rootScope.scrollWithBuffer(true);