Merge branch 'current' into disable-metadata

src/modules/pageRender/elements.js

@@ -68,17 +68,19 @@ export function popup(obj) {
     }
     return `
     ${obj.standalone ? `<div id="popup-${obj.name}" class="popup center${!obj.buttonOnly ? " box": ''}${classes.length > 0 ? ' ' + classes.join(' ') : ''}">` : ''}
-        <div id="popup-header" class="popup-header${!obj.buttonOnly ? " glass-bkg": ''}">
+        <div id="popup-header" class="popup-header">
             <div id="popup-header-contents">
                 ${obj.buttonOnly ? obj.header.emoji : ``}
                 ${obj.header.aboveTitle ? `<a id="popup-above-title" target="_blank" href="${obj.header.aboveTitle.url}">${obj.header.aboveTitle.text}</a>` : ''}
                 ${obj.header.title ? `<div id="popup-title">${obj.header.title}</div>` : ''}
                 ${obj.header.subtitle ? `<div id="popup-subtitle">${obj.header.subtitle}</div>` : ''}
             </div>
+            ${!obj.buttonOnly ? `<div class="glass-bkg alone"></div>`: ''}
         </div>
         <div id="popup-content" class="popup-content-inner">
             ${body}${obj.buttonOnly ? `<button id="close-error" class="switch" onclick="popup('${obj.name}', 0)">${obj.buttonText}</button>` : ''}
         </div>
+        ${classes.includes("small") ? `<div class="glass-bkg small"></div>`: ''}
     ${obj.standalone ? `</div>` : ''}`
 }
 
@@ -97,14 +99,18 @@ export function multiPagePopup(obj) {
     return `
     <div id="popup-${obj.name}" class="popup center box scrollable">
         <div id="popup-content">
-        ${obj.header ? `<div id="popup-header" class="popup-header glass-bkg">
+        ${obj.header ? `<div id="popup-header" class="popup-header">
             <div id="popup-header-contents">
                 ${obj.header.aboveTitle ? `<a id="popup-above-title" target="_blank" href="${obj.header.aboveTitle.url}">${obj.header.aboveTitle.text}</a>` : ''}
                 ${obj.header.title ? `<div id="popup-title">${obj.header.title}</div>` : ''}
                 ${obj.header.subtitle ? `<div id="popup-subtitle">${obj.header.subtitle}</div>` : ''}
             </div>
+            <div class="glass-bkg alone"></div>
         </div>` : ''}${tabContent}</div>
-        <div id="popup-tabs" class="switches popup-tabs glass-bkg"><div class="switches popup-tabs-child">${tabs}</div></div>
+        <div id="popup-tabs" class="switches popup-tabs">
+            <div class="switches popup-tabs-child">${tabs}</div>
+            <div class="glass-bkg alone"></div>
+        </div>
     </div>`
 }
 export function collapsibleList(arr) {
@@ -136,15 +142,19 @@ export function popupWithBottomButtons(obj) {
     return `
     <div id="popup-${obj.name}" class="popup center box scrollable">
         <div id="popup-content">
-       ${obj.header ? `<div id="popup-header" class="popup-header glass-bkg">
+       ${obj.header ? `<div id="popup-header" class="popup-header">
             <div id="popup-header-contents">
                 ${obj.header.aboveTitle ? `<a id="popup-above-title" target="_blank" href="${obj.header.aboveTitle.url}">${obj.header.aboveTitle.text}</a>` : ''}
                 ${obj.header.title ? `<div id="popup-title">${obj.header.title}</div>` : ''}
                 ${obj.header.subtitle ? `<div id="popup-subtitle">${obj.header.subtitle}</div>` : ''}
                 ${obj.header.explanation ? `<div class="explanation">${obj.header.explanation}</div>` : ''}
             </div>
+            <div class="glass-bkg alone"></div>
         </div>` : ''}${obj.content}</div>
-        <div id="popup-tabs" class="switches popup-tabs glass-bkg"><div id="picker-buttons" class="switches popup-tabs-child">${tabs}</div></div>
+        <div id="popup-tabs" class="switches popup-tabs">
+            <div id="picker-buttons" class="switches popup-tabs-child">${tabs}</div>
+            <div class="glass-bkg alone"></div>
+        </div>
     </div>`
 }
 export function socialLink(emji, name, handle, url) {
@@ -205,7 +215,9 @@ export function celebrationsEmoji() {
 }
 export function urgentNotice(obj) {
     if (obj.visible) {
-        return `<div id="urgent-notice" class="urgent-notice explanation" onclick="${obj.action}">${emoji(obj.emoji, 18)} ${obj.text}</div>`
+        return `<div id="urgent-notice" class="urgent-notice explanation">` +
+            `<span class="urgent-text" onclick="${obj.action}">${emoji(obj.emoji, 18)} ${obj.text}</span>` +
+        `</div>`
     }
     return ``
 }

src/modules/pageRender/page.js

@@ -469,7 +469,7 @@ export default function(obj) {
                 name: "download",
                 standalone: true,
                 buttonOnly: true,
-                classes: ["small", "glass-bkg"],
+                classes: ["small"],
                 header: {
                     closeAria: t('AccessibilityGoBack'),
                     emoji: emoji("🐱", 78, 1, 1),
@@ -490,7 +490,7 @@ export default function(obj) {
                 name: "error",
                 standalone: true,
                 buttonOnly: true,
-                classes: ["small", "glass-bkg"],
+                classes: ["small"],
                 header: {
                     closeAria: t('AccessibilityGoBack'),
                     title: t('TitlePopupError'),
@@ -503,10 +503,10 @@ export default function(obj) {
         <div id="popup-backdrop" onclick="hideAllPopups()"></div>
         <div id="home" style="visibility:hidden">
             ${urgentNotice({
-                emoji: "🔗",
-                text: t("UrgentFeatureUpdate71"),
+                emoji: "💖",
+                text: t("UrgentThanks"),
                 visible: true,
-                action: "popup('about', 1, 'changelog')"
+                action: "popup('about', 1, 'donate')"
             })}
             <div id="cobalt-main-box" class="center">
                 <div id="logo">${t("AppTitleCobalt")}</div>

src/modules/processing/hostOverrides.js

@@ -3,10 +3,16 @@ export default function (inHost, inURL) {
     let url = String(inURL);
 
     switch(host) {
+        case "youtube":
+            if (url.startsWith("https://youtube.com/live/") || url.startsWith("https://www.youtube.com/live/")) {
+                url = url.split("?")[0].replace("www.", "");
+                url = `https://youtube.com/watch?v=${url.replace("https://youtube.com/live/", "")}`
+            }
+            break;
         case "youtu":
             if (url.startsWith("https://youtu.be/")) {
                 host = "youtube";
-                url = `https://youtube.com/watch?v=${url.replace("https://youtu.be/", "")}`;
+                url = `https://youtube.com/watch?v=${url.replace("https://youtu.be/", "")}`
             }
             break;
         case "vxtwitter":

src/modules/stream/types.js

@@ -16,7 +16,8 @@ export async function streamDefault(streamInfo, res) {
         res.setHeader('Content-disposition', `attachment; filename="${streamInfo.isAudioOnly ? `${streamInfo.filename}.${streamInfo.audioFormat}` : regFilename}"`);
 
         const { body: stream, headers } = await request(streamInfo.urls, {
-            headers: { 'user-agent': genericUserAgent }
+            headers: { 'user-agent': genericUserAgent },
+            maxRedirections: 16
         });
 
         res.setHeader('content-type', headers['content-type']);
@@ -33,7 +34,9 @@ export async function streamLiveRender(streamInfo, res) {
     try {
         if (streamInfo.urls.length !== 2) return fail(res);
 
-        let { body: audio } = await request(streamInfo.urls[1]);
+        let { body: audio } = await request(streamInfo.urls[1], {
+            maxRedirections: 16
+        });
 
         let format = streamInfo.filename.split('.')[streamInfo.filename.split('.').length - 1],
         args = [