Skip to content

Commit

Permalink
Merge pull request #315 from Mega-Mewthree/patch-3
Browse files Browse the repository at this point in the history
Fix #303, Try 3
  • Loading branch information
Jiiks authored Mar 16, 2019
2 parents 5cb4bc1 + 98d9a30 commit d09dc5a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion client/src/builtin/Emotes/EmoteModule.js
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ export default new class EmoteModule extends BuiltinModule {
Logger.log('EmoteModule', ['Sending message', MessageActions, args, orig]);

const emoteAsImage = Settings.getSetting('emotes', 'default', 'emoteasimage').value &&
(DiscordApi.currentChannel.type === 'DM' || DiscordApi.currentChannel.checkPermissions(DiscordApi.modules.DiscordPermissions.ATTACH_FILES));
(DiscordApi.currentChannel.type === 'DM' || DiscordApi.currentChannel.type === 'GROUP_DM' || DiscordApi.currentChannel.checkPermissions(DiscordApi.modules.DiscordPermissions.ATTACH_FILES));

if (!emoteAsImage || content.split(' ').length > 1) {
args[1].content = args[1].content.split(' ').map(word => {
Expand Down

0 comments on commit d09dc5a

Please sign in to comment.