rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity Actions

Various fixes

Browse source
This commit is contained in:
calzoneman 2014-01-14 00:52:56 -06:00
parent 87f44b69e0
commit b1e6f696e8
7 changed files with 85 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/channel-new.js
View file

@ -11,6 +11,7 @@ var ChatCommand = require("./chatcommand");
var fs = require("fs");
var path = require("path");
var url = require("url");
var DEFAULT_FILTERS = [
new Filter("monospace", "`(.+?)`", "g", "<code>$1</code>"),
@ -889,8 +890,6 @@ Channel.prototype.sendBanlist = function (users) {
return;
}
console.log(banlist);
for (var i = 0; i < banlist.length; i++) {
bans.push({
id: banlist[i].id,
@ -1496,6 +1495,10 @@ Channel.prototype.addMedia = function (data, callback) {
media.pos = data.pos;
media.queueby = data.queueby;
media.temp = data.temp;
if (data.title && media.type === "cu") {
media.title = data.title;
}
var res = self.playlist.addMedia(media);
if (res.error) {
callback(res.error, null);
@ -1701,7 +1704,9 @@ Channel.prototype.handleQueuePlaylist = function (user, data) {
* Handles a user message to delete a playlist item
*/
Channel.prototype.handleDelete = function (user, data) {
if (!this.hasPermission(user, "playlistdelete")) {
var self = this;
if (!self.hasPermission(user, "playlistdelete")) {
return;
}
@ -1709,9 +1714,11 @@ Channel.prototype.handleDelete = function (user, data) {
return;
}
this.deleteMedia(data, function (err) {
if (!err) {
this.logger.log("### " + user.name + " deleted " + plitem.media.title);
var plitem = self.playlist.items.find(data);
self.deleteMedia(data, function (err) {
if (!err && plitem && plitem.media) {
self.logger.log("### " + user.name + " deleted " + plitem.media.title);
}
});
};

7
lib/user.js
View file

@ -265,6 +265,7 @@ User.prototype.initChannelCallbacks = function () {
});
wrapTypecheck("queue", function (data) {
console.log("queue", data);
self.channel.handleQueue(self, data);
});
@ -276,7 +277,7 @@ User.prototype.initChannelCallbacks = function () {
self.channel.handleMove(self, data);
});
wrapTypecheck("delete", function (data) {
wrap("delete", function (data) {
self.channel.handleDelete(self, data);
});
@ -284,8 +285,8 @@ User.prototype.initChannelCallbacks = function () {
self.channel.handleUncache(self, data);
});
wrapTypecheck("jumpto", function (data) {
self.channel.handleJump(self, data);
wrap("jumpTo", function (data) {
self.channel.handleJumpTo(self, data);
});
wrap("playNext", function () {