From 085680ebb3494c6bf9cb2642806b62f961960c6e Mon Sep 17 00:00:00 2001 From: Sebastien Date: Tue, 20 Nov 2018 19:37:28 +0200 Subject: [PATCH 1/2] Add Youtube Search, text and RestAPI --- src/main/java/net/Broken/Commands/Code.java | 68 +++++++++++++++++++ .../java/net/Broken/Commands/YtSearch.java | 65 ++++++++++++++++++ src/main/java/net/Broken/MainBot.java | 6 -- .../Broken/RestApi/MusicWebAPIController.java | 38 ++++++++++- .../net/Broken/Tools/EmbedMessageUtils.java | 11 +++ .../java/net/Broken/audio/TrackScheduler.java | 3 +- .../Broken/audio/Youtube/SearchResult.java | 21 ++++++ .../Broken/audio/Youtube/YoutubeTools.java | 65 ++++++++++++------ src/main/resources/templates/music.html | 3 + 9 files changed, 248 insertions(+), 32 deletions(-) create mode 100644 src/main/java/net/Broken/Commands/Code.java create mode 100644 src/main/java/net/Broken/Commands/YtSearch.java create mode 100644 src/main/java/net/Broken/audio/Youtube/SearchResult.java diff --git a/src/main/java/net/Broken/Commands/Code.java b/src/main/java/net/Broken/Commands/Code.java new file mode 100644 index 0000000..55da096 --- /dev/null +++ b/src/main/java/net/Broken/Commands/Code.java @@ -0,0 +1,68 @@ +package net.Broken.Commands; + +import groovy.lang.Binding; +import groovy.lang.GroovyShell; +import net.Broken.Commande; +import net.dv8tion.jda.core.EmbedBuilder; +import net.dv8tion.jda.core.events.message.MessageReceivedEvent; + +import java.awt.*; + +public class Code implements Commande { + @Override + public void action(String[] args, MessageReceivedEvent event) { + StringBuilder stringBuilder = new StringBuilder(); + for(String arg : args){ + stringBuilder.append(arg); + stringBuilder.append(" "); + } + + Binding binding = new Binding(); + binding.setVariable("event", event); + GroovyShell shell = new GroovyShell(binding); + EmbedBuilder builder; + try{ + Object value = shell.evaluate(stringBuilder.toString()); + StringBuilder stringResult = new StringBuilder(); + + if(value.getClass().isArray()){ + Object[] array = (Object[]) value; + for(Object obj : array){ + if(stringResult.length() < 1800){ + stringResult.append(obj.toString()).append("\n\n"); + } + else{ + stringResult.append("\n..."); + break; + } + + } + }else{ + stringResult.append(value.toString()); + } + builder = new EmbedBuilder().setColor(Color.orange).setTitle(":hammer_pick: Compilation Successful :hammer_pick:").setDescription("```java\n" + stringResult.toString() + "```"); + }catch (Exception ex){ + builder = new EmbedBuilder().setColor(Color.red).setTitle(":x: Compilation Failed :x:").setDescription("```java\n" + ex.toString() + "```"); + } + + + event.getChannel().sendMessage(builder.build()).queue(); + + + } + + @Override + public boolean isPrivateUsable() { + return true; + } + + @Override + public boolean isAdminCmd() { + return true; + } + + @Override + public boolean isNSFW() { + return false; + } +} diff --git a/src/main/java/net/Broken/Commands/YtSearch.java b/src/main/java/net/Broken/Commands/YtSearch.java new file mode 100644 index 0000000..9c6232c --- /dev/null +++ b/src/main/java/net/Broken/Commands/YtSearch.java @@ -0,0 +1,65 @@ +package net.Broken.Commands; + +import com.google.api.client.googleapis.json.GoogleJsonResponseException; +import net.Broken.Commande; +import net.Broken.MainBot; +import net.Broken.Tools.EmbedMessageUtils; +import net.Broken.Tools.MessageTimeOut; +import net.Broken.audio.Youtube.SearchResult; +import net.Broken.audio.Youtube.YoutubeTools; +import net.dv8tion.jda.core.EmbedBuilder; +import net.dv8tion.jda.core.entities.Message; +import net.dv8tion.jda.core.entities.MessageEmbed; +import net.dv8tion.jda.core.events.message.MessageReceivedEvent; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.io.IOException; +import java.util.ArrayList; + +public class YtSearch implements Commande { + + private Logger logger = LogManager.getLogger(); + + @Override + public void action(String[] args, MessageReceivedEvent event) { + YoutubeTools youtubeT = YoutubeTools.getInstance(); + + if(args.length < 1){ + logger.info("YtSearch: Missing args, user: " + event.getAuthor().getName()); + Message message = event.getChannel().sendMessage(EmbedMessageUtils.buildStandar(EmbedMessageUtils.getError("Missing search query!"))).complete(); + new MessageTimeOut(MainBot.messageTimeOut, message, event.getMessage()).start(); + }else { + try { + ArrayList result = youtubeT.search(args[0], 5); + for(SearchResult item : result){ + event.getChannel().sendMessage(EmbedMessageUtils.searchResult(item)).queue(); + } + + } catch (GoogleJsonResponseException e) { + logger.error("There was a service error: " + e.getDetails().getCode() + " : " + e.getDetails().getMessage()); + event.getChannel().sendMessage(EmbedMessageUtils.getInternalError()).queue(); + } catch (IOException t) { + logger.catching(t); + event.getChannel().sendMessage(EmbedMessageUtils.getInternalError()).queue(); + } + } + + + } + + @Override + public boolean isPrivateUsable() { + return false; + } + + @Override + public boolean isAdminCmd() { + return false; + } + + @Override + public boolean isNSFW() { + return false; + } +} diff --git a/src/main/java/net/Broken/MainBot.java b/src/main/java/net/Broken/MainBot.java index a51a750..44529e3 100644 --- a/src/main/java/net/Broken/MainBot.java +++ b/src/main/java/net/Broken/MainBot.java @@ -1,20 +1,15 @@ package net.Broken; -import net.Broken.RestApi.ApiCommandLoader; import net.Broken.Tools.Command.CommandParser; import net.Broken.Tools.EmbedMessageUtils; import net.Broken.Tools.MessageTimeOut; import net.Broken.Tools.PrivateMessage; import net.Broken.Tools.UserSpamUtils; -import net.Broken.audio.Youtube.YoutubeTools; -import net.dv8tion.jda.core.AccountType; import net.dv8tion.jda.core.JDA; -import net.dv8tion.jda.core.JDABuilder; import net.dv8tion.jda.core.Permission; import net.dv8tion.jda.core.entities.ChannelType; import net.dv8tion.jda.core.entities.Member; import net.dv8tion.jda.core.entities.Message; -import net.dv8tion.jda.core.entities.User; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -24,7 +19,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.stereotype.Controller; -import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/net/Broken/RestApi/MusicWebAPIController.java b/src/main/java/net/Broken/RestApi/MusicWebAPIController.java index 687fa97..88fbe5e 100644 --- a/src/main/java/net/Broken/RestApi/MusicWebAPIController.java +++ b/src/main/java/net/Broken/RestApi/MusicWebAPIController.java @@ -1,5 +1,6 @@ package net.Broken.RestApi; +import com.google.api.client.googleapis.json.GoogleJsonResponseException; import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; import com.sedmelluq.discord.lavaplayer.track.AudioTrack; import net.Broken.Commands.Music; @@ -7,10 +8,13 @@ import net.Broken.DB.Entity.UserEntity; import net.Broken.DB.Repository.UserRepository; import net.Broken.MainBot; import net.Broken.RestApi.Data.*; +import net.Broken.Tools.EmbedMessageUtils; import net.Broken.Tools.UserManager.Exceptions.UnknownTokenException; import net.Broken.Tools.UserManager.UserUtils; import net.Broken.audio.AudioM; import net.Broken.audio.FindGeneral; +import net.Broken.audio.Youtube.SearchResult; +import net.Broken.audio.Youtube.YoutubeTools; import net.dv8tion.jda.core.entities.Guild; import net.dv8tion.jda.core.entities.VoiceChannel; import org.apache.logging.log4j.LogManager; @@ -21,6 +25,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -44,7 +49,7 @@ public class MusicWebAPIController { @RequestMapping("/currentMusicInfo") - public ResponseEntity getCurrentM(@RequestParam(value = "guild") String guildId){ + public ResponseEntity getCurrentM(@RequestParam(value = "guild") String guildId){ //TODO security issue ???!!! Guild guild = MainBot.jda.getGuildById(guildId); if(guild == null ){ logger.warn("Request whit no guild!"); @@ -72,7 +77,7 @@ public class MusicWebAPIController { } @RequestMapping("/getPlaylist") - public ResponseEntity getPlaylist(@RequestParam(value = "guild") String guildId){ + public ResponseEntity getPlaylist(@RequestParam(value = "guild") String guildId){ //TODO security issue ???!!! Guild guild = MainBot.jda.getGuildById(guildId); if(guild == null ){ logger.warn("Request whit no guild!"); @@ -127,7 +132,7 @@ public class MusicWebAPIController { } @RequestMapping(value = "/getChanel", method = RequestMethod.GET) - public ResponseEntity> getChanel(@RequestParam(value = "guild") String guildId){ + public ResponseEntity> getChanel(@RequestParam(value = "guild") String guildId){ //TODO security issue ???!!! Guild guild = MainBot.jda.getGuildById(guildId); if(guild == null ){ logger.warn("Request whit no guild!"); @@ -143,6 +148,33 @@ public class MusicWebAPIController { return new ResponseEntity<>(temp, HttpStatus.OK); } + @RequestMapping(value = "/search", method = RequestMethod.GET) + public ResponseEntity> search(@CookieValue("token") String token, @RequestParam(value = "query") String query ){ + if(token != null) { + try { + UserEntity user = userUtils.getUserWithApiToken(userRepository, token); + YoutubeTools youtubeTools = YoutubeTools.getInstance(); + ArrayList result = youtubeTools.search(query, 25); + return new ResponseEntity<>(result, HttpStatus.OK); + + }catch (UnknownTokenException e){ + logger.warn("Search without token!"); + return new ResponseEntity<>( HttpStatus.UNAUTHORIZED); + } catch (GoogleJsonResponseException e) { + logger.error("There was a service error: " + e.getDetails().getCode() + " : " + e.getDetails().getMessage()); + return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR); + } catch (IOException e) { + logger.catching(e); + return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR); + + } + }else{ + logger.warn("Search without token!"); + return new ResponseEntity<>( HttpStatus.UNAUTHORIZED); + + } + } + } diff --git a/src/main/java/net/Broken/Tools/EmbedMessageUtils.java b/src/main/java/net/Broken/Tools/EmbedMessageUtils.java index 1d8a385..5890837 100644 --- a/src/main/java/net/Broken/Tools/EmbedMessageUtils.java +++ b/src/main/java/net/Broken/Tools/EmbedMessageUtils.java @@ -2,6 +2,7 @@ package net.Broken.Tools; import net.Broken.DB.Entity.GuildPreferenceEntity; import net.Broken.MainBot; +import net.Broken.audio.Youtube.SearchResult; import net.dv8tion.jda.core.EmbedBuilder; import net.dv8tion.jda.core.entities.Member; import net.dv8tion.jda.core.entities.MessageEmbed; @@ -123,6 +124,16 @@ public class EmbedMessageUtils { return buildStandar(messageB); } + public static MessageEmbed searchResult(SearchResult result){ + EmbedBuilder builder = new EmbedBuilder() + .setColor(Color.CYAN) + .setTitle(result.title) + .setImage(result.imageUrl) + .addField("URL:","https://www.youtube.com/watch?v="+result.id,false) + .addField("Chanel:", result.channelTittle, false); + return buildStandar(builder); + } + diff --git a/src/main/java/net/Broken/audio/TrackScheduler.java b/src/main/java/net/Broken/audio/TrackScheduler.java index a2bbe88..4de5cfe 100644 --- a/src/main/java/net/Broken/audio/TrackScheduler.java +++ b/src/main/java/net/Broken/audio/TrackScheduler.java @@ -13,6 +13,7 @@ import net.dv8tion.jda.core.entities.Guild; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.concurrent.BlockingDeque; @@ -190,7 +191,7 @@ public class TrackScheduler extends AudioEventAdapter { } catch (GoogleJsonResponseException e) { logger.error("There was a service error: " + e.getDetails().getCode() + " : " + e.getDetails().getMessage()); - } catch (Throwable t) { + } catch (IOException t) { logger.catching(t); } diff --git a/src/main/java/net/Broken/audio/Youtube/SearchResult.java b/src/main/java/net/Broken/audio/Youtube/SearchResult.java new file mode 100644 index 0000000..c62b241 --- /dev/null +++ b/src/main/java/net/Broken/audio/Youtube/SearchResult.java @@ -0,0 +1,21 @@ +package net.Broken.audio.Youtube; + +public class SearchResult { + public String id; + public String title; + public String description; + public String publishedAt; + public String channelId; + public String channelTittle; + public String imageUrl; + + public SearchResult(com.google.api.services.youtube.model.SearchResult result){ + id = result.getId().getVideoId(); + title = result.getSnippet().getTitle(); + description = result.getSnippet().getDescription(); + publishedAt = result.getSnippet().getPublishedAt().toString(); + channelId = result.getSnippet().getChannelId(); + channelTittle = result.getSnippet().getChannelTitle(); + imageUrl = result.getSnippet().getThumbnails().getDefault().getUrl(); + } +} diff --git a/src/main/java/net/Broken/audio/Youtube/YoutubeTools.java b/src/main/java/net/Broken/audio/Youtube/YoutubeTools.java index 4d52a61..64d8254 100644 --- a/src/main/java/net/Broken/audio/Youtube/YoutubeTools.java +++ b/src/main/java/net/Broken/audio/Youtube/YoutubeTools.java @@ -1,14 +1,10 @@ package net.Broken.audio.Youtube; -import com.google.api.client.googleapis.json.GoogleJsonResponseException; -import com.google.api.client.http.HttpRequest; -import com.google.api.client.http.HttpRequestInitializer; import com.google.api.client.http.javanet.NetHttpTransport; import com.google.api.client.json.jackson2.JacksonFactory; import com.google.api.services.youtube.YouTube; import com.google.api.services.youtube.model.SearchListResponse; import com.google.api.services.youtube.model.SearchResult; -import net.dv8tion.jda.core.entities.Guild; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -19,31 +15,35 @@ import java.util.HashMap; public class YoutubeTools { private Logger logger = LogManager.getLogger(); + private String apiKey = System.getenv("GOOGLE_API_KEY"); + private static YoutubeTools INSTANCE; - private static YoutubeTools INSTANCE ; - - private YoutubeTools(){ + private YoutubeTools() { } - public static YoutubeTools getInstance(){ - if(INSTANCE == null) + public static YoutubeTools getInstance() { + if (INSTANCE == null) INSTANCE = new YoutubeTools(); return INSTANCE; } - public String getRelatedVideo(String videoId, ArrayList history) throws IOException, GoogleJsonResponseException, Throwable { + private YouTube getYoutubeService() { -// YouTube youtube = getYouTubeService(); - - YouTube.Builder builder = new YouTube.Builder(new NetHttpTransport(), new JacksonFactory(), new HttpRequestInitializer() { - public void initialize(HttpRequest request) throws IOException { - } + YouTube.Builder builder = new YouTube.Builder(new NetHttpTransport(), new JacksonFactory(), request -> { }); - builder.setApplicationName("youtube-cmdline-search-sample"); - YouTube youtube = builder.build(); + builder.setApplicationName("BotDiscord"); + return builder.build(); + + } + + + public String getRelatedVideo(String videoId, ArrayList history) throws IOException { + + + YouTube youtube = getYoutubeService(); HashMap parameters = new HashMap<>(); @@ -60,15 +60,14 @@ public class YoutubeTools { searchListRelatedVideosRequest.setType(parameters.get("type")); } - searchListRelatedVideosRequest.setKey(System.getenv("GOOGLE_API_KEY")); + searchListRelatedVideosRequest.setKey(apiKey); SearchListResponse response = searchListRelatedVideosRequest.execute(); - for(SearchResult item : response.getItems()){ - if(!history.contains(item.getId().getVideoId())){ + for (SearchResult item : response.getItems()) { + if (!history.contains(item.getId().getVideoId())) { return item.getId().getVideoId(); - } - else + } else logger.debug("ID already on history"); } @@ -76,4 +75,26 @@ public class YoutubeTools { return response.getItems().get(0).getId().getVideoId(); } + + + public ArrayList search(String query, long max) throws IOException { + YouTube youTube = getYoutubeService(); + YouTube.Search.List searchList = youTube.search().list("snippet"); + searchList.setType("video"); + searchList.setSafeSearch("none"); + searchList.setMaxResults(max); + searchList.setQ(query); + searchList.setKey(apiKey); + searchList.setOrder("relevance"); + + SearchListResponse response = searchList.execute(); + ArrayList finalResult = new ArrayList<>(); + for(SearchResult item : response.getItems()){ + logger.debug(item.getSnippet().getTitle()); + finalResult.add(new net.Broken.audio.Youtube.SearchResult(item)); + } + + return finalResult; + + } } diff --git a/src/main/resources/templates/music.html b/src/main/resources/templates/music.html index cc8c5d7..360e1b0 100644 --- a/src/main/resources/templates/music.html +++ b/src/main/resources/templates/music.html @@ -19,6 +19,9 @@ + + +
...
From a2fff0db98b8b802c8fbb0ed6f3634dbcc053349 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Thu, 22 Nov 2018 00:57:32 +0200 Subject: [PATCH 2/2] Add direct search on web page to add music --- .../net/Broken/Tools/EmbedMessageUtils.java | 2 + .../Broken/audio/Youtube/SearchResult.java | 4 +- .../Broken/audio/Youtube/YoutubeTools.java | 73 +++++++- src/main/resources/static/css/style.css | 3 +- src/main/resources/static/js/music.js | 157 ++++++++++++++--- src/main/resources/templates/music.html | 161 ++++++++++++------ 6 files changed, 320 insertions(+), 80 deletions(-) diff --git a/src/main/java/net/Broken/Tools/EmbedMessageUtils.java b/src/main/java/net/Broken/Tools/EmbedMessageUtils.java index 5890837..9139eee 100644 --- a/src/main/java/net/Broken/Tools/EmbedMessageUtils.java +++ b/src/main/java/net/Broken/Tools/EmbedMessageUtils.java @@ -3,6 +3,7 @@ package net.Broken.Tools; import net.Broken.DB.Entity.GuildPreferenceEntity; import net.Broken.MainBot; import net.Broken.audio.Youtube.SearchResult; +import net.Broken.audio.Youtube.YoutubeTools; import net.dv8tion.jda.core.EmbedBuilder; import net.dv8tion.jda.core.entities.Member; import net.dv8tion.jda.core.entities.MessageEmbed; @@ -129,6 +130,7 @@ public class EmbedMessageUtils { .setColor(Color.CYAN) .setTitle(result.title) .setImage(result.imageUrl) + .addField("Duration: ", YoutubeTools.getInstance().ytTimeToString(result.duration), false) .addField("URL:","https://www.youtube.com/watch?v="+result.id,false) .addField("Chanel:", result.channelTittle, false); return buildStandar(builder); diff --git a/src/main/java/net/Broken/audio/Youtube/SearchResult.java b/src/main/java/net/Broken/audio/Youtube/SearchResult.java index c62b241..1a36538 100644 --- a/src/main/java/net/Broken/audio/Youtube/SearchResult.java +++ b/src/main/java/net/Broken/audio/Youtube/SearchResult.java @@ -8,8 +8,9 @@ public class SearchResult { public String channelId; public String channelTittle; public String imageUrl; + public String duration; - public SearchResult(com.google.api.services.youtube.model.SearchResult result){ + public SearchResult(com.google.api.services.youtube.model.SearchResult result, String duration){ id = result.getId().getVideoId(); title = result.getSnippet().getTitle(); description = result.getSnippet().getDescription(); @@ -17,5 +18,6 @@ public class SearchResult { channelId = result.getSnippet().getChannelId(); channelTittle = result.getSnippet().getChannelTitle(); imageUrl = result.getSnippet().getThumbnails().getDefault().getUrl(); + this.duration = duration; } } diff --git a/src/main/java/net/Broken/audio/Youtube/YoutubeTools.java b/src/main/java/net/Broken/audio/Youtube/YoutubeTools.java index 64d8254..12c3e78 100644 --- a/src/main/java/net/Broken/audio/Youtube/YoutubeTools.java +++ b/src/main/java/net/Broken/audio/Youtube/YoutubeTools.java @@ -5,6 +5,8 @@ import com.google.api.client.json.jackson2.JacksonFactory; import com.google.api.services.youtube.YouTube; import com.google.api.services.youtube.model.SearchListResponse; import com.google.api.services.youtube.model.SearchResult; +import com.google.api.services.youtube.model.Video; +import com.google.api.services.youtube.model.VideoListResponse; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -12,6 +14,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; +import static org.hibernate.engine.jdbc.Size.LobMultiplier.M; + public class YoutubeTools { private Logger logger = LogManager.getLogger(); @@ -88,13 +92,80 @@ public class YoutubeTools { searchList.setOrder("relevance"); SearchListResponse response = searchList.execute(); + + StringBuilder idString = new StringBuilder(); + for(SearchResult item : response.getItems()){ + idString.append(item.getId().getVideoId()).append(","); + } + + + HashMap videoHashMap = new HashMap<>(); + YouTube.Videos.List video = youTube.videos().list("contentDetails"); + video.setId(idString.toString()); + video.setKey(apiKey); + VideoListResponse videoResponse = video.execute(); + for(Video item : videoResponse.getItems()){ + videoHashMap.put(item.getId(), item); + } ArrayList finalResult = new ArrayList<>(); for(SearchResult item : response.getItems()){ logger.debug(item.getSnippet().getTitle()); - finalResult.add(new net.Broken.audio.Youtube.SearchResult(item)); + finalResult.add(new net.Broken.audio.Youtube.SearchResult(item, videoHashMap.get(item.getId().getVideoId()).getContentDetails().getDuration())); } + + + + return finalResult; } + + + public String ytTimeToString(String time){ + int hours; + int minutes; + int seconds; + if(time.equals("PT0S")) + return ":red_circle: LIVE"; + + time = time.replace("PT",""); + if(time.contains("H")) { + + String matched = time.substring(0, time.indexOf("H")+1); + time = time.replace(matched,""); + hours = Integer.parseInt(matched.replace("H", "")); + } + else + hours = 0; + logger.debug(time); + + if(time.contains("M")) { + + String matched = time.substring(0, time.indexOf("M")+1); + time = time.replace(matched,""); + minutes = Integer.parseInt(matched.replace("M", "")); + } + else + minutes = 0; + logger.debug(time); + if(time.contains("S")) { + + String matched = time.substring(0, time.indexOf("S")+1); + time = time.replace(matched,""); + seconds = Integer.parseInt(matched.replace("S", "")); + } + else + seconds = 0; + logger.debug(time); + + String hoursStr = (hours < 10) ? "0" + hours : String.valueOf(hours); + String minutesStr = (minutes < 10) ? "0" + minutes : String.valueOf(minutes); + String secondsStr = (seconds < 10) ? "0" + seconds : String.valueOf(seconds); + if (hours > 0) + return hoursStr + ":" + minutesStr + ":" + secondsStr; + else + return minutesStr + ":" + secondsStr; + + } } diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css index f6d371e..c421fc8 100644 --- a/src/main/resources/static/css/style.css +++ b/src/main/resources/static/css/style.css @@ -7,4 +7,5 @@ .collapsible-body{ padding: 0px; -} \ No newline at end of file +} + diff --git a/src/main/resources/static/js/music.js b/src/main/resources/static/js/music.js index 031abc3..452b343 100644 --- a/src/main/resources/static/js/music.js +++ b/src/main/resources/static/js/music.js @@ -15,7 +15,7 @@ var loadingFlag = false; var guild; $(document).ready(function () { - if (Cookies.get('guild') != undefined) { + if (Cookies.get('guild') !== undefined) { guild = Cookies.get('guild'); btn_play = $('#btn_play'); @@ -28,7 +28,8 @@ $(document).ready(function () { switchAutoFlow = $("#autoflow"); setInterval("getCurentMusic()", 1000); - $('#modalAdd').modal(); + + M.Modal.init($('#modalAdd').get(0)); $('#modal_current_info').modal(); @@ -75,7 +76,7 @@ function getCurentMusic() { $('#btn_info').addClass("determinate").removeClass("indeterminate"); } $('#music_progress').width("0%"); - if (Cookies.get('token') != undefined) { + if (Cookies.get('token') !== undefined) { disableBtn(btn_stop); disableBtn(btn_info); enableBtn(btn_add); @@ -298,7 +299,7 @@ function updateControl(data) { } $('#music_progress').width(percent + "%"); - if (Cookies.get('token') != undefined) { + if (Cookies.get('token') !== undefined) { enableBtn(btn_play); enableBtn(btn_stop); enableBtn(btn_info); @@ -327,7 +328,7 @@ function updateControl(data) { function sendCommand(command) { modal_loading.modal('open'); - console.log(command); + // console.log(command); $.ajax({ type: "POST", dataType: 'json', @@ -343,13 +344,19 @@ function sendCommand(command) { }).fail(function (data) { console.log(data); - alert(data.responseJSON.Message); modal_loading.modal('close'); if (data.responseJSON.error === "token") { Cookies.remove('token'); Cookies.remove('name'); location.reload(); } + else{ + M.toast({ + html: " warning Command fail!", + classes: 'red', + displayLength: 99999999 + }); + } }); } @@ -358,18 +365,116 @@ function comparePlaylist(list1, list2) { return false; } - if (list1.length != list2.length) { + if (list1.length !== list2.length) { return false; } for (var i = 0; i++; i < list1.length) { - if (list1[i].uri != list2[i].uri) + if (list1[i].uri !== list2[i].uri) return false } return true; } + + +function search() { + let query = $('#input_search').val(); + let list = $("#search_result"); + let load = $("#search_load"); + disableBtn($('#btn_search')); + // list.addClass("hide"); + list.removeClass("scale-in"); + load.removeClass("hide"); + load.addClass("scale-in"); + + $.get("/api/music/search?query=" + query, (data) => { + // console.log(data); + list.empty(); + data.forEach((item)=>{ + + let html = + "
  • " + + " \"\"" + + " "+item["title"]+"" + + "

    "+item["channelTittle"]+ " ║ "+ item["publishedAt"].substr(0, item["publishedAt"].indexOf('T'))+"
    " + ytTimeToTime(item["duration"]) + + "

    " + + " add_circle_outline" + + "
    • " + + ""; + + + + list.append(html) + }); + + $(".add-btn-list").click(addListClick); + // list.removeClass("hide"); + + load.removeClass("scale-in"); + load.addClass("hide"); + list.addClass("scale-in"); + enableBtn($('#btn_search')); + + + }); + + +} + + +function addListClick(event){ + let button; + if(event.target.nodeName === "I"){ + button = event.target.parentNode; + } + else + button = event.target; + button.classList.add("scale-out"); + + let command = { + command: "ADD", + url: button.id, + playlistLimit: $('#limit_range').val(), + onHead: !$('#bottom').is(':checked') + }; + sendCommand(command); +} + +function ytTimeToTime(duration) { + let hours; + let minutes; + let seconds; + if(duration === "PT0S") + return "🔴 LIVE"; + if(duration.includes("H")) + hours = parseInt(duration.match(/\d*H/)[0].replace("H",""), 10); + else + hours = 0; + + if(duration.includes("M")) + minutes = parseInt(duration.match(/\d*M/)[0].replace("M",""), 10); + else + minutes = 0; + + if(duration.includes("S")) + seconds = parseInt(duration.match(/\d*S/)[0].replace("S",""), 10); + else + seconds = 0; + + hours = (hours < 10) ? "0" + hours : hours; + minutes = (minutes < 10) ? "0" + minutes : minutes; + seconds = (seconds < 10) ? "0" + seconds : seconds; + if (hours > 0) + return hours + ":" + minutes + ":" + seconds; + else + return minutes + ":" + seconds; +} + + + + function msToTime(duration) { var milliseconds = parseInt((duration % 1000) / 100) , seconds = parseInt((duration / 1000) % 60) @@ -403,6 +508,8 @@ function listeners() { }); + $('#btn_search').click(search); + $('#btn_next').click(function () { sendCommand({command: "NEXT"}); }); @@ -419,6 +526,26 @@ function listeners() { } }); + $('#input_search').on("input", function () { + if ($('#input_search').val() == "") { + disableBtn($('#btn_search')); + } + else { + enableBtn($('#btn_search')); + } + }); + + $('#add_btn').click(function () { + if ($('#input_search').val() == "") { + disableBtn($('#btn_search')); + } + else { + enableBtn($('#btn_search')); + } + }); + + + $('#modalChanels').change(function () { if ($('#btn_ok_channel').hasClass("disabled")) { $('#btn_ok_channel').removeClass("disabled"); @@ -432,18 +559,6 @@ function listeners() { sendCommand(command); }); - $('#btn_add').click(function () { - console.log(!$('#bottom').is(':checked')); - var command = { - command: "ADD", - url: $('#input_link').val(), - playlistLimit: $('#limit_range').val(), - onHead: !$('#bottom').is(':checked') - }; - $('#input_link').val(''); - sendCommand(command); - }); - $('#btn_ok_channel').click(function () { var command = { @@ -458,7 +573,7 @@ function listeners() { }); switchAutoFlow.click(function () { - console.log(switchAutoFlow.is(':checked')) + // console.log(switchAutoFlow.is(':checked')); if (switchAutoFlow.is(':checked')) { sendCommand({command: 'AUTOFLOWON'}) } diff --git a/src/main/resources/templates/music.html b/src/main/resources/templates/music.html index 360e1b0..b645aca 100644 --- a/src/main/resources/templates/music.html +++ b/src/main/resources/templates/music.html @@ -10,10 +10,42 @@ - - + + + @@ -89,60 +121,7 @@ add_circle_outline - -
    -
    -
    -

    Add Music

    -
    -
    -
    - - - -
    -
    -
    -
    - Playlist Limit -
    -
    -
    -

    - -

    -
    -
    -
    - Add on -
    -
    -
    -
    -

    - -

    -

    - -

    -
    -
    -
    -
    -
    -
    - Cancel - - Add -
    -
    @@ -198,6 +177,74 @@
    + +
    +
    +
    +

    Add Music

    +
    +
    + +
    +
    +
    + + + +
    +
    + +
    +
    + +
    +
    +
    + +
    +
    +
      + +
    + + + + + +
    +
    +
    +
    +
    + + + + + + + Close +
    +
    + + + +
    - +