moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix minor issues with emote rename

This commit is contained in:
Xaekai 2017-05-16 19:15:12 -07:00
parent 8e3ce4e1c3
commit 8434d20826
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/channel/emotes.js
View File

@ -168,12 +168,11 @@ EmoteModule.prototype.handleRenameEmote = function (user, data) {
return;
}
this.emotes.renameEmote(Object.assign({}, f));
var chan = this.channel;
chan.broadcastAll("renameEmote", f);
chan.logger.log(`[mod] ${user.getName()} renamed emote: ${f.old} -> ${f.name}`);
// Doing this after the broadcast because this function deletes the "old" prop
this.emotes.renameEmote(f);
};
EmoteModule.prototype.handleUpdateEmote = function (user, data) {

4
www/js/callbacks.js
View File

@ -1039,6 +1039,7 @@ Callbacks = {
// But wasn't bad before: Add it to bad list
if(!badBefore){
CHANNEL.badEmotes.push(data);
delete CHANNEL.emoteMap[oldName];
}
// Was bad before too: Update
else {
@ -1060,7 +1061,10 @@ Callbacks = {
break;
}
}
} else {
delete CHANNEL.emoteMap[oldName];
}
CHANNEL.emoteMap[data.name] = data;
}
EMOTELIST.handleChange();

2
www/js/util.js
View File

@ -3146,7 +3146,7 @@ CSEmoteList.prototype.loadPage = function (page) {
if(val === emote.name){ return }
// Emote name already exists
if( CHANNEL.emotes.filter((emote)=>{ return emote.name === val }).length ){
if( CHANNEL.emotes.filter(function(emote){ return emote.name === val }).length ){
/*
* Since we are already in a modal
* and Bootstrap doesn't have supermodals