Initial mixer implementation

This commit is contained in:
Calvin Montgomery 2018-08-26 22:02:36 -07:00
parent f19efdb859
commit db48104b80
9 changed files with 76 additions and 16 deletions

View file

@ -56,6 +56,8 @@ function formatURL(data) {
return "https://clips.twitch.tv/" + data.id;
case "cm":
return data.id;
case "mx":
return "https://mixer.com/" + data.meta.mixer.channelToken;
default:
return "#";
}
@ -1399,6 +1401,13 @@ function parseMediaLink(url) {
};
}
if ((m = url.match(/\bmixer\.com\/([\w-]+)/))) {
return {
id: m[1],
type: "mx"
};
}
/* Shorthand URIs */
// So we still trim DailyMotion URLs
if((m = url.match(/^dm:([^\?&#_]+)/))) {
@ -3237,6 +3246,8 @@ function stopQueueSpinner(data) {
// the same as the URL "ID" from the user)
if (data && data.type === "us") {
data = { id: data.title.match(/Ustream.tv - (.*)/)[1] };
} else if (data && data.type === "mx") {
data = { id: data.meta.mixer.channelToken };
}
var shouldRemove = (data !== null &&