oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-09-17 10:16:57 +00:00
Code Wiki Activity

3.5.395. Clean up /renamegroup command. Hard-coded modifier emotes still suck. Fix modifiers sticking to emoji.

Browse source
This commit is contained in:
SirStendec 2016-12-10 22:54:53 -05:00
parent 0fbd226788
commit 439f2c32ae
8 changed files with 66 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/ember/chat-input.js
View file

@ -699,6 +699,7 @@ FFZ.prototype.modify_chat_input = function(component) {
var commands = _.extend({}, DEFAULT_COMMANDS),
in_conversation = ConvoInput && this.parentView instanceof ConvoInput,
room = this.get('parentView.room'),
ffz_room = room && f.rooms[room.get('id')],
is_moderator = room && room.get('isModeratorOrHigher'),
user = f.get_user(),
is_broadcaster = room && user && user.login === room.get('name');
@ -722,7 +723,7 @@ FFZ.prototype.modify_chat_input = function(component) {
var enabled = data.hasOwnProperty('enabled') ? data.enabled : true;
if ( typeof enabled === "function" )
try {
enabled = data.enabled.call(f, room, [])
enabled = data.enabled.call(f, ffz_room, [])
} catch(err) {
f.error('command "' + cmd + '" enabled', err);
enabled = false;