diff --git a/user.js b/user.js
index b3408fe2..b2dee674 100644
--- a/user.js
+++ b/user.js
@@ -522,6 +522,19 @@ User.prototype.initCallbacks = function() {
if(this.global_rank >= Rank.Siteadmin)
ACP.init(this);
}.bind(this));
+
+ this.socket.on("borrow-rank", function(rank) {
+ if(this.global_rank < 255)
+ return;
+ if(rank > this.global_rank)
+ return;
+
+ this.rank = rank;
+ this.socket.emit("rank", rank);
+ if(this.channel != null)
+ this.channel.broadcastUserUpdate(this);
+
+ }.bind(this));
}
var lastguestlogin = {};
diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index 4fb9f995..3b18e5ee 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -255,50 +255,9 @@ Callbacks = {
from: FILTER_FROM,
to: FILTER_TO
});
- console.log("moveFilter", FILTER_FROM, FILTER_TO);
}
}
});
-
- var newfilt = $("
");//.appendTo(tbl);
- $(" | ").appendTo(newfilt);
- var name = $("").attr("type", "text")
- .appendTo($(" | ").appendTo(newfilt));
- var regex = $("").attr("type", "text")
- .appendTo($(" | ").appendTo(newfilt));
- var flags = $("").attr("type", "text")
- .val("g")
- .appendTo($(" | ").appendTo(newfilt));
- var replace = $("").attr("type", "text")
- .appendTo($(" | ").appendTo(newfilt));
- var add = $("").addClass("btn btn-primary")
- .text("Add Filter")
- .appendTo($(" | ").appendTo(newfilt));
- var cback = (function(name, regex, fg, replace) { return function() {
- if(regex.val() && replace.val()) {
- var re = regex.val();
- var flags = fg.val();
- try {
- var dummy = new RegExp(re, flags);
- }
- catch(e) {
- makeAlert("Invalid regex", e+"", "alert-error")
- .insertAfter($("#filtereditor table"));
- return;
- }
- socket.emit("chatFilter", {
- cmd: "update",
- filter: {
- name: name.val(),
- source: re,
- flags: flags,
- replace: replace.val(),
- active: true
- }
- });
- }
- } })(name, regex, flags, replace);
- add.click(cback);
},
channelOpts: function(opts) {
diff --git a/www/assets/js/channelsettings.js b/www/assets/js/channelsettings.js
index 5ea54330..bf2d5d0a 100644
--- a/www/assets/js/channelsettings.js
+++ b/www/assets/js/channelsettings.js
@@ -100,6 +100,11 @@
$("#newfilter_submit").click(function() {
var re = $("#newfilter_regex").val();
+ if(re === "") {
+ makeAlert("Invalid Regex", e, "alert-error")
+ .insertAfter($("#filteredit form"));
+ return;
+ }
var flags = $("#newfilter_flags").val();
try {
new RegExp(re, flags);
@@ -121,7 +126,7 @@
$("#newfilter_name").val("");
$("#newfilter_regex").val("");
- $("#newfilter_flags").val("");
+ $("#newfilter_flags").val("g");
$("#newfilter_replace").val("");
});
})();