Skip to content

Commit

Permalink
bugfixes
Browse files Browse the repository at this point in the history
  • Loading branch information
night committed May 17, 2017
1 parent 9a98a17 commit 27b9a0e
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "BetterTTV",
"author": "Night",
"version": "7.0.5",
"version": "7.0.6",
"description": "BetterTTV enhances Twitch with new features, bug fixes, and reduced clutter.",
"main": "betterttv.js",
"scripts": {
Expand Down Expand Up @@ -36,7 +36,7 @@
"lodash.debounce": "^4.0.8",
"lodash.throttle": "^4.1.1",
"msgpack-lite": "^0.1.26",
"raven-js": "^3.14.2",
"raven-js": "^3.15.0",
"request": "^2.81.0",
"require-globify": "^1.4.1",
"resizable": "^1.2.0",
Expand Down
8 changes: 7 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
'InvalidAccessError',
'wrapped(betterttv)',
'Access is denied.',
'container.className.match is not a function',
'this exception cannot be caught',
'Wrong length!',
/^<anonymous> in/,
/^null$/,
/^undefined$/,
Expand All @@ -30,9 +33,12 @@
'tipsy is undefined',
'draggable is not a function',
'draggable is undefined',
'jQuery is not a function',
// Emote Menu
'Getter already exists.',
'Cannot read property \'setChannelName\' of undefined',
'l is undefined'
'.getTime is not a function',
'`callback` must be a function.'
],
whitelistUrls: [
/betterttv\.js/,
Expand Down
6 changes: 4 additions & 2 deletions src/modules/chat_deleted_messages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,10 @@ function onClearChat(name, tags) {

// Remove messages in the delayed message queue
const chatComponent = twitch.getEmberView($(CHAT_EMBER).attr('id'));
const filtered = chatComponent.room.delayedMessages.filter(msg => msg.from !== name);
chatComponent.room.set('delayedMessages', filtered);
if (chatComponent && chatComponent.room) {
const filtered = chatComponent.room.delayedMessages.filter(msg => msg.from !== name);
chatComponent.room.set('delayedMessages', filtered);
}

// this is a gross hack to show timeout messages without us having to implement them
const currentChat = twitch.getCurrentChat();
Expand Down
2 changes: 1 addition & 1 deletion src/utils/twitch.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function formatUser(data) {
}

function lookup(...args) {
return window.App.__container__.lookup(...args);
return window.App ? window.App.__container__.lookup(...args) : null;
}

let currentUser;
Expand Down

0 comments on commit 27b9a0e

Please sign in to comment.