Merge remote-tracking branch 'origin' into ip-session-age

src/channel/playlist.js

@@ -675,7 +675,7 @@ PlaylistModule.prototype.handlePlayNext = function (user) {
         title = this.current.media.title;
     }
 
-    this.channel.logger.log("[playlist] " + user.getName() + " skipped" + title);
+    this.channel.logger.log("[playlist] " + user.getName() + " skipped " + title);
     this._playNext();
 };
 

src/config.js

@@ -120,6 +120,9 @@ var defaults = {
     "service-socket": {
         enabled: false,
         socket: "service.sock"
+    },
+    "google-drive": {
+        "html5-hack-enabled": false
     }
 };
 

src/get-info.js

@@ -12,6 +12,7 @@ var YouTube = require("cytube-mediaquery/lib/provider/youtube");
 var Vimeo = require("cytube-mediaquery/lib/provider/vimeo");
 var Vidme = require("cytube-mediaquery/lib/provider/vidme");
 var Streamable = require("cytube-mediaquery/lib/provider/streamable");
+var GoogleDrive = require("cytube-mediaquery/lib/provider/googledrive");
 
 /*
  * Preference map of quality => youtube formats.
@@ -458,6 +459,13 @@ var Getters = {
         callback(false, media);
     },
 
+    /* HLS stream */
+    hl: function (id, callback) {
+        var title = "Livestream";
+        var media = new Media(id, title, "--:--", "hl");
+        callback(false, media);
+    },
+
     /* imgur.com albums */
     im: function (id, callback) {
         /**
@@ -493,6 +501,7 @@ var Getters = {
 
     /* google docs */
     gd: function (id, callback) {
+        GoogleDrive.setHTML5HackEnabled(Config.get("google-drive.html5-hack-enabled"));
         var data = {
             type: "googledrive",
             kind: "single",

src/media.js

@@ -38,7 +38,8 @@ Media.prototype = {
                 bitrate: this.meta.bitrate,
                 scuri: this.meta.scuri,
                 embed: this.meta.embed,
-                gdrive_subtitles: this.meta.gdrive_subtitles
+                gdrive_subtitles: this.meta.gdrive_subtitles,
+                html5hack: this.meta.html5hack
             }
         };
     },

src/utilities.js

@@ -119,7 +119,7 @@
             });
         }
 
-        return result.join(":"); 
+        return result.join(":");
     },
 
     root.formatTime = function (sec) {
@@ -242,6 +242,8 @@
                 return id;
             case "hb":
                 return "http://hitbox.tv/" + id;
+            case "hl":
+                return id;
             case "sb":
                 return "https://streamable.com/" + id;
             default:
@@ -259,6 +261,7 @@
             case "im":
             case "jw":
             case "hb":
+            case "hl":
                 return true;
             default:
                 return false;
@@ -294,8 +297,6 @@
             var accumulator = "";
 
             parts = parts.map(function (segment, i) {
-                if (i < 2) return segment;
-
                 var part = iphash(accumulator + segment + i, 3);
                 accumulator += segment;
                 return part;
@@ -311,8 +312,6 @@
             var accumulator = "";
 
             parts = parts.map(function (segment, i) {
-                if (i < 2) return segment;
-
                 var part = iphash(accumulator + segment + i, 4);
                 accumulator += segment;
                 return part;

src/web/pug.js

@@ -36,6 +36,9 @@ function getBaseUrl(res) {
  * Renders and serves a pug template
  */
 function sendPug(res, view, locals) {
+    if (!locals) {
+        locals = {};
+    }
     locals.loggedIn = locals.loggedIn || !!res.user;
     locals.loginName = locals.loginName || res.user ? res.user.name : false;
     locals.superadmin = locals.superadmin || res.user ? res.user.global_rank >= 255 : false;

src/web/routes/google_drive_userscript.js

@@ -0,0 +1,7 @@
+import { sendPug } from '../pug';
+
+export default function initialize(app) {
+    app.get('/google_drive_userscript', (req, res) => {
+        return sendPug(res, 'google_drive_userscript')
+    });
+}

src/web/webserver.js

@@ -178,6 +178,7 @@ module.exports = {
         require('./account').init(app);
         require('./acp').init(app);
         require('../google2vtt').attach(app);
+        require('./routes/google_drive_userscript')(app);
         app.use(serveStatic(path.join(__dirname, '..', '..', 'www'), {
             maxAge: webConfig.getCacheTTL()
         }));