Skip to content

Commit 05a4dd1

Browse files
committed
feat. 进一步完善服务器点歌功能,完善语言文件
1 parent 1ccff0c commit 05a4dd1

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ loader_version=0.16.10
99
fabric_version=0.115.1+1.21.4
1010

1111
# Mod Properties
12-
mod_version=1.2.3
12+
mod_version=1.3.0
1313
maven_group=top.gregtao.concerto
1414
archives_base_name=Concerto-fabric

src/main/java/top/gregtao/concerto/http/qq/QQMusicApiClient.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public static int calculateGTK(String pSKey) {
191191
}
192192

193193
public static String getQQLoginTimestamp() {
194-
return String.valueOf(Math.floor(System.currentTimeMillis() * 1000));
194+
return String.valueOf((long) Math.floor(System.currentTimeMillis() * 1000));
195195
}
196196

197197
private final Pattern QQ_QRKEY_UPDATE_PATTERN = Pattern.compile("ptuiCB\\('([0-9]+)','0','([0-9a-zA-Z:/&=?_.%]*)'");
@@ -302,7 +302,9 @@ public Pair<ArrayList<Music>, PlaylistMetaData> getPlayList(String id) throws IO
302302
data = data.substring(13, data.length() - 1);
303303
JsonObject object = JsonUtil.from(data).getAsJsonArray("cdlist").get(0).getAsJsonObject();
304304
ArrayList<Music> musics = new ArrayList<>();
305-
object.get("songlist").getAsJsonArray().forEach(element -> musics.add(new QQMusic(element.getAsJsonObject(), 2)));
305+
object.get("songlist").getAsJsonArray().forEach(element -> {
306+
if (element.getAsJsonObject().has("songmid")) musics.add(new QQMusic(element.getAsJsonObject(), 2));
307+
});
306308
PlaylistMetaData metaData = new PlaylistMetaData(object.get("nickname").getAsString(), object.get("dissname").getAsString(), object.get("ctime").getAsString(), object.get("desc").getAsString());
307309
return Pair.of(musics, metaData);
308310
}

src/main/java/top/gregtao/concerto/http/qq/QQMusicUser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void updateLoginStatus() {
3939

4040
public List<QQMusicPlaylist> getUserPlaylists() {
4141
try {
42-
JsonObject object = QQMusicApiClient.parseJson(this.apiClient.openCApi().url("https://c.y.qq.com/rsc/fcgi-bin/fcg_get_profile_homepage.fcg?_=" + QQMusicApiClient.getQQLoginTimestamp() + "&cv=4747474&ct=20&format=json&inCharset=utf-8&outCharset=utf-8&notice=0&platform=yqq.json&uin=" + this.apiClient.getQQUin() + "&g_tk_new_20200303=" + this.apiClient.getQQLoginGTK() + "&mesh_devops=DevopsBase&cid=205360838&userid=0&reqfrom=1&reqtype=0")
42+
JsonObject object = QQMusicApiClient.parseJson(this.apiClient.openCApi().url("https://c.y.qq.com/rsc/fcgi-bin/fcg_get_profile_homepage.fcg?_=" + QQMusicApiClient.getQQLoginTimestamp() + "&cv=4747474&ct=20&format=json&inCharset=utf-8&outCharset=utf-8&notice=0&platform=yqq.json&uin=" + this.apiClient.getQQUin() + "&g_tk_new_20200303=" + this.apiClient.getQQLoginGTK() + "&g_tk=" + this.apiClient.getQQLoginGTK() + "&mesh_devops=DevopsBase&cid=205360838&userid=0&reqfrom=1&reqtype=0")
4343
.setFixedReferer("https://y.qq.com/").get());
4444
List<QQMusicPlaylist> playlists = new ArrayList<>();
4545
if (object != null) {

0 commit comments

Comments
 (0)