fixed minor problems

khjxiaogu · Aug 21, 2020 · d6f305b · d6f305b
1 parent 0a4d93b
commit d6f305b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.khjxiaogu</groupId>
 	<artifactId>MiraiSongPlugin</artifactId>
-	<version>0.0.4-STABLE</version>
+	<version>0.0.5-STABLE</version>
 	<name>MiraiSongPlugin</name>
 	<description>使用“#音乐 关键词”、“#Q音 关键词”、“#网易 关键词”进行点歌，</description>
 	<build>

diff --git a/src/main/java/com/khjxiaogu/MusicToVoice/MusicToVoice.java b/src/main/java/com/khjxiaogu/MusicToVoice/MusicToVoice.java
@@ -254,13 +254,15 @@ public void songToVoice(String musicURL, Consumer<? super InputStream> csm) {
 	public void onEnable() {
         this.getEventListener().subscribeAlways(GroupMessageEvent.class, event -> {
         		PlainText pt=event.getMessage().first(PlainText.Key);
+        		if(pt==null)
+        			return;
         		String[] args=pt.getContent().trim().split(" ");
         		Group eg=event.getGroup();
 				if (args[0].startsWith("#音乐")) {
 
 					String sn = null;
 					try {
-						sn = URLEncoder.encode(String.join(",", Arrays.copyOfRange(args, 1, args.length)), "UTF-8");
+						sn = URLEncoder.encode(String.join(" ", Arrays.copyOfRange(args, 1, args.length)), "UTF-8");
 					} catch (UnsupportedEncodingException ignored) {
 					}
 					String songname = sn;
@@ -276,7 +278,7 @@ public void onEnable() {
 				}else if (args[0].startsWith("#Q音")) {
 					String sn = null;
 					try {
-						sn = URLEncoder.encode(String.join(",", Arrays.copyOfRange(args, 1, args.length)), "UTF-8");
+						sn = URLEncoder.encode(String.join(" ", Arrays.copyOfRange(args, 1, args.length)), "UTF-8");
 					} catch (UnsupportedEncodingException ignored) {
 					}
 					String songname = sn;
@@ -288,7 +290,7 @@ public void onEnable() {
 				}else if (args[0].startsWith("#网易")) {
 					String sn = null;
 					try {
-						sn = URLEncoder.encode(String.join(",", Arrays.copyOfRange(args, 1, args.length)), "UTF-8");
+						sn = URLEncoder.encode(String.join(" ", Arrays.copyOfRange(args, 1, args.length)), "UTF-8");
 					} catch (UnsupportedEncodingException ignored) {
 					}
 					String songname = sn;