mirror of
https://github.com/FrankerFaceZ/FrankerFaceZ.git
synced 2025-07-24 11:38:30 +00:00
4.0.0-rc20.2
* Fixed: In-Line Chat Actions appearing when Visibilty: Mod Icons is set to True while in a channel where the user is not a moderator. * Fixed: When looking up badge data and data has not been pulled from chat yet, try pulling data from chat immediately.
This commit is contained in:
parent
76c2831882
commit
a64b3cff45
4 changed files with 18 additions and 1 deletions
|
@ -149,7 +149,7 @@ ${typeof x[1] === 'string' ? x[1] : JSON.stringify(x[1], null, 4)}`
|
||||||
FrankerFaceZ.Logger = Logger;
|
FrankerFaceZ.Logger = Logger;
|
||||||
|
|
||||||
const VER = FrankerFaceZ.version_info = {
|
const VER = FrankerFaceZ.version_info = {
|
||||||
major: 4, minor: 0, revision: 0, extra: '-rc20.1',
|
major: 4, minor: 0, revision: 0, extra: '-rc20.2',
|
||||||
commit: __git_commit__,
|
commit: __git_commit__,
|
||||||
build: __webpack_hash__,
|
build: __webpack_hash__,
|
||||||
toString: () =>
|
toString: () =>
|
||||||
|
|
|
@ -434,6 +434,9 @@ export default class Actions extends Module {
|
||||||
const current_level = this.getUserLevel(current_room, current_user),
|
const current_level = this.getUserLevel(current_room, current_user),
|
||||||
msg_level = this.getUserLevel(current_room, msg.user);
|
msg_level = this.getUserLevel(current_room, msg.user);
|
||||||
|
|
||||||
|
if ( current_level < 3 )
|
||||||
|
mod_icons = false;
|
||||||
|
|
||||||
const chat = this.resolve('site.chat');
|
const chat = this.resolve('site.chat');
|
||||||
|
|
||||||
for(const data of this.parent.context.get('chat.actions.inline')) {
|
for(const data of this.parent.context.get('chat.actions.inline')) {
|
||||||
|
|
|
@ -632,6 +632,12 @@ export default class Badges extends Module {
|
||||||
const room = this.parent.getRoom(room_id, room_login, true);
|
const room = this.parent.getRoom(room_id, room_login, true);
|
||||||
let b;
|
let b;
|
||||||
|
|
||||||
|
if ( (room && ! room.badges) || ! this.twitch_badges ) {
|
||||||
|
const chat = this.resolve('site.chat');
|
||||||
|
if ( chat && chat.tryUpdateBadges )
|
||||||
|
chat.tryUpdateBadges();
|
||||||
|
}
|
||||||
|
|
||||||
if ( room ) {
|
if ( room ) {
|
||||||
const versions = room.badges && room.badges[badge];
|
const versions = room.badges && room.badges[badge];
|
||||||
b = versions && versions[version];
|
b = versions && versions[version];
|
||||||
|
|
|
@ -604,6 +604,14 @@ export default class ChatHook extends Module {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
tryUpdateBadges() {
|
||||||
|
this.log.debug('Trying to update badge data from the chat container.');
|
||||||
|
const inst = this.ChatContainer.first;
|
||||||
|
if ( inst )
|
||||||
|
this.containerUpdated(inst, inst.props);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
closeRoomPicker(inst) { // eslint-disable-line class-methods-use-this
|
closeRoomPicker(inst) { // eslint-disable-line class-methods-use-this
|
||||||
inst.closeRoomPicker();
|
inst.closeRoomPicker();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue