From 5f799fe1a1396d8ffddf4686310493afaf1a6702 Mon Sep 17 00:00:00 2001 From: Calvin Montgomery Date: Thu, 12 Aug 2021 19:46:47 -0700 Subject: [PATCH] Disable soundcloud lookup due to #916 --- NEWS.md | 12 ++++++ package.json | 2 +- src/get-info.js | 100 +++--------------------------------------------- 3 files changed, 18 insertions(+), 96 deletions(-) diff --git a/NEWS.md b/NEWS.md index 11e820b9..3fa094cc 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,15 @@ +2021-08-12 +========== + +Due to changes in Soundcloud's authorization scheme, support has been dropped +from core due to requiring each server owner to register an API key (which is +currently impossible as they have not accepted new API key registrations for +*years*). + +If you happen to already have an API key registered, or if Soundcloud reopens +registration at some point in the future, feel free to reach out to me for +patches to reintroduce support for it. + 2020-08-21 ========== diff --git a/package.json b/package.json index 25c8c5a2..2fb79217 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Calvin Montgomery", "name": "CyTube", "description": "Online media synchronizer and chat", - "version": "3.79.0", + "version": "3.80.0", "repository": { "url": "http://github.com/calzoneman/sync" }, diff --git a/src/get-info.js b/src/get-info.js index 52253faf..967d4f56 100644 --- a/src/get-info.js +++ b/src/get-info.js @@ -204,102 +204,12 @@ var Getters = { }); }, - /* soundcloud.com */ + /* soundcloud.com - see https://github.com/calzoneman/sync/issues/916 */ sc: function (id, callback) { - /* TODO: require server owners to register their own API key, put in config */ - const SC_CLIENT = "2e0c82ab5a020f3a7509318146128abd"; - - var m = id.match(/([\w-/.:]+)/); - if (m) { - id = m[1]; - } else { - callback("Invalid ID", null); - return; - } - - var options = { - host: "api.soundcloud.com", - port: 443, - path: "/resolve.json?url=" + id + "&client_id=" + SC_CLIENT, - method: "GET", - dataType: "jsonp", - timeout: 1000 - }; - - urlRetrieve(https, options, function (status, data) { - switch (status) { - case 200: - case 302: - break; /* Request is OK, skip to handling data */ - case 400: - return callback("Invalid request", null); - case 403: - return callback("Private sound", null); - case 404: - return callback("Sound not found", null); - case 500: - case 503: - return callback("Service unavailable", null); - default: - return callback("HTTP " + status, null); - } - - var track = null; - try { - data = JSON.parse(data); - track = data.location; - } catch(e) { - callback(e, null); - return; - } - - var options2 = { - host: "api.soundcloud.com", - port: 443, - path: track, - method: "GET", - dataType: "jsonp", - timeout: 1000 - }; - - /** - * There has got to be a way to directly get the data I want without - * making two requests to Soundcloud...right? - * ...right? - */ - urlRetrieve(https, options2, function (status, data) { - switch (status) { - case 200: - break; /* Request is OK, skip to handling data */ - case 400: - return callback("Invalid request", null); - case 403: - return callback("Private sound", null); - case 404: - return callback("Sound not found", null); - case 500: - case 503: - return callback("Service unavailable", null); - default: - return callback("HTTP " + status, null); - } - - try { - data = JSON.parse(data); - var seconds = data.duration / 1000; - var title = data.title; - var meta = {}; - if (data.sharing === "private" && data.embeddable_by === "all") { - meta.scuri = data.uri; - } - var media = new Media(id, title, seconds, "sc", meta); - callback(false, media); - } catch(e) { - callback(e, null); - } - }); - - }); + callback( + "Soundcloud is not supported anymore due to requiring OAuth but not " + + "accepting new API key registrations." + ); }, /* livestream.com */