Skip to content

Commit

Permalink
🐛 fix: Temp patch broken music player
Browse files Browse the repository at this point in the history
  • Loading branch information
YuzuZensai committed Jun 15, 2024
1 parent d6de8d5 commit d35216b
Show file tree
Hide file tree
Showing 19 changed files with 1,021 additions and 199 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

/build
/configs
/temp

# compiled output
/dist
Expand Down
373 changes: 187 additions & 186 deletions locales/en.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"validator": "^13.12.0",
"vrchat": "^1.17.6",
"winston": "^3.13.0",
"yt-dlp-wrap": "^2.3.12",
"zlib-sync": "^0.1.9"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/discord/Developer/Debug.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
import { makeInfoEmbed, makeErrorEmbed, sendHybridInteractionMessageResponse } from '../../utils/DiscordMessage';

import DiscordMusicPlayer from '../../providers/DiscordMusicPlayer';
import DiscordMusicPlayer from '../../providers/DiscordMusicPlayerTempFix';
import Users from '../../services/Users';
import Cache from '../../providers/Cache';

Expand Down
2 changes: 1 addition & 1 deletion src/discord/Developer/VRChatLogin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
makeSuccessEmbed
} from '../../utils/DiscordMessage';

import DiscordMusicPlayer from '../../providers/DiscordMusicPlayer';
import DiscordMusicPlayer from '../../providers/DiscordMusicPlayerTempFix';
import Users from '../../services/Users';
import Cache from '../../providers/Cache';
import VRChatAPI from '../../providers/VRChatAPI';
Expand Down
2 changes: 1 addition & 1 deletion src/discord/MusicPlayer/Join.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import DiscordMusicPlayer, {
DiscordMusicPlayerInstance,
DiscordMusicPlayerLoopMode,
TrackUtils
} from '../../providers/DiscordMusicPlayer';
} from '../../providers/DiscordMusicPlayerTempFix';

import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
import Locale from '../../services/Locale';
Expand Down
2 changes: 1 addition & 1 deletion src/discord/MusicPlayer/Leave.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { I18n } from 'i18n';
import { Message, CommandInteraction } from 'discord.js';

import DiscordMusicPlayer from '../../providers/DiscordMusicPlayer';
import DiscordMusicPlayer from '../../providers/DiscordMusicPlayerTempFix';
import Locale from '../../services/Locale';

import { makeSuccessEmbed, makeErrorEmbed, sendHybridInteractionMessageResponse } from '../../utils/DiscordMessage';
Expand Down
2 changes: 1 addition & 1 deletion src/discord/MusicPlayer/Loop.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { I18n } from 'i18n';
import { Message, CommandInteraction } from 'discord.js';

import DiscordMusicPlayer, { DiscordMusicPlayerLoopMode } from '../../providers/DiscordMusicPlayer';
import DiscordMusicPlayer, { DiscordMusicPlayerLoopMode } from '../../providers/DiscordMusicPlayerTempFix';
import Locale from '../../services/Locale';

import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
Expand Down
2 changes: 1 addition & 1 deletion src/discord/MusicPlayer/NowPlaying.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { I18n } from 'i18n';
import { SpotifyTrack, YouTubeVideo } from 'play-dl';

import DiscordProvider from '../../providers/Discord';
import DiscordMusicPlayer, { TrackUtils, ValidTracks } from '../../providers/DiscordMusicPlayer';
import DiscordMusicPlayer, { TrackUtils, ValidTracks } from '../../providers/DiscordMusicPlayerTempFix';
import Locale from '../../services/Locale';

import { makeErrorEmbed, makeInfoEmbed, sendHybridInteractionMessageResponse } from '../../utils/DiscordMessage';
Expand Down
2 changes: 1 addition & 1 deletion src/discord/MusicPlayer/Pause.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Message, CommandInteraction, Interaction } from 'discord.js';
import { I18n } from 'i18n';

import DiscordMusicPlayer from '../../providers/DiscordMusicPlayer';
import DiscordMusicPlayer from '../../providers/DiscordMusicPlayerTempFix';
import Locale from '../../services/Locale';

import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
Expand Down
14 changes: 13 additions & 1 deletion src/discord/MusicPlayer/Play.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { I18n } from 'i18n';
import { joinVoiceChannelProcedure } from './Join';

import DiscordProvider from '../../providers/Discord';
import DiscordMusicPlayer, { TrackUtils, ValidTracks } from '../../providers/DiscordMusicPlayer';
import DiscordMusicPlayer, { TrackUtils, ValidTracks } from '../../providers/DiscordMusicPlayerTempFix';
import Locale from '../../services/Locale';

import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
Expand Down Expand Up @@ -92,6 +92,12 @@ const EMBEDS = {
description: errorMessage,
user: data.getUser()
});
},
TOO_LONG: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: locale.__('musicplayer_play.too_long'),
user: data.getUser()
});
}
};
export default class Play extends DiscordModule {
Expand Down Expand Up @@ -455,6 +461,12 @@ export default class Play extends DiscordModule {
}
instance.addTrackToQueue(result[0]);

// Max 1 hour
if (result[0].durationInSec > 3600)
return await sendHybridInteractionMessageResponse(data, {
embeds: [EMBEDS.TOO_LONG(data, locale)]
});

if (result.length > 1) {
// TODO: Find a better logic than this
// If the first result title is exact match with the query or first title contains half the space of the query, it's probably a sentence
Expand Down
14 changes: 13 additions & 1 deletion src/discord/MusicPlayer/PlayMy.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { I18n } from 'i18n';
import { Message, CommandInteraction, ActivityType, ActionRowBuilder, ButtonBuilder, ButtonStyle } from 'discord.js';

import DiscordMusicPlayer, { TrackUtils, ValidTracks } from '../../providers/DiscordMusicPlayer';
import DiscordMusicPlayer, { TrackUtils, ValidTracks } from '../../providers/DiscordMusicPlayerTempFix';
import Locale from '../../services/Locale';

import { makeSuccessEmbed, makeErrorEmbed, sendHybridInteractionMessageResponse } from '../../utils/DiscordMessage';
Expand Down Expand Up @@ -41,6 +41,12 @@ const EMBEDS = {
embed.setImage(TrackUtils.getHighestResolutionThumbnail(thumbnails).url);

return embed;
},
TOO_LONG: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: locale.__('musicplayer_playmy.too_long'),
user: data.getUser()
});
}
};

Expand Down Expand Up @@ -109,6 +115,12 @@ export default class PlayMy extends DiscordModule {
if (!result) continue;
instance.addTrackToQueue(result[0]);

// Max 1 hour
if (result[0].durationInSec > 3600)
return await sendHybridInteractionMessageResponse(data, {
embeds: [EMBEDS.TOO_LONG(data, locale)]
});

let row;
if (result.length > 1) {
// TODO: Find a better logic than this
Expand Down
2 changes: 1 addition & 1 deletion src/discord/MusicPlayer/Queue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import DiscordMusicPlayer, {
DiscordMusicPlayerInstance,
DiscordMusicPlayerLoopMode,
TrackUtils
} from '../../providers/DiscordMusicPlayer';
} from '../../providers/DiscordMusicPlayerTempFix';
import Locale from '../../services/Locale';

import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
Expand Down
2 changes: 1 addition & 1 deletion src/discord/MusicPlayer/Resume.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Message, CommandInteraction, Interaction } from 'discord.js';
import { I18n } from 'i18n';

import DiscordMusicPlayer from '../../providers/DiscordMusicPlayer';
import DiscordMusicPlayer from '../../providers/DiscordMusicPlayerTempFix';

import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
import {
Expand Down
2 changes: 1 addition & 1 deletion src/discord/MusicPlayer/Search.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { I18n } from 'i18n';

import { joinVoiceChannelProcedure } from './Join';

import DiscordMusicPlayer, { TrackUtils, ValidTracks } from '../../providers/DiscordMusicPlayer';
import DiscordMusicPlayer, { TrackUtils, ValidTracks } from '../../providers/DiscordMusicPlayerTempFix';
import Locale from '../../services/Locale';

import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
Expand Down
2 changes: 1 addition & 1 deletion src/discord/MusicPlayer/Skip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModu
import { Message, CommandInteraction } from 'discord.js';
import { makeSuccessEmbed, makeErrorEmbed, sendHybridInteractionMessageResponse } from '../../utils/DiscordMessage';

import DiscordMusicPlayer from '../../providers/DiscordMusicPlayer';
import DiscordMusicPlayer from '../../providers/DiscordMusicPlayerTempFix';
import { I18n } from 'i18n';
import Locale from '../../services/Locale';

Expand Down
7 changes: 7 additions & 0 deletions src/providers/Configuration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@ class Configuration {
if (!fs.existsSync(dir)) {
fs.mkdirSync(dir);
}

// TODO: Temp folder
const tempdir = path.join(process.cwd(), 'temp/');
if (!fs.existsSync(tempdir)) {
fs.mkdirSync(tempdir);
}

this.copyExampleIfNotExists('Ping.json');
this.copyExampleIfNotExists('ServiceAnnouncement.json');

Expand Down
Loading

0 comments on commit d35216b

Please sign in to comment.