mirror of
https://github.com/Spengreb/sync.git
synced 2026-05-13 19:22:05 +00:00
Merge branch 'calzoneman:3.0' into 3.0
This commit is contained in:
commit
917b227ff5
4 changed files with 2704 additions and 7119 deletions
9808
package-lock.json
generated
9808
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
|
@ -2,14 +2,14 @@
|
|||
"author": "Calvin Montgomery",
|
||||
"name": "CyTube",
|
||||
"description": "Online media synchronizer and chat",
|
||||
"version": "3.86.0",
|
||||
"version": "3.86.1",
|
||||
"repository": {
|
||||
"url": "http://github.com/calzoneman/sync"
|
||||
},
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@calzoneman/jsli": "^2.0.1",
|
||||
"@cytube/mediaquery": "github:CyTube/mediaquery#564d0c4615e80f72722b0f68ac81f837a4c5fc81",
|
||||
"@cytube/mediaquery": "github:CyTube/mediaquery#52a635d45f38785bdb26e842c9f2bb505bc37a1c",
|
||||
"bcrypt": "^5.0.1",
|
||||
"bluebird": "^3.7.2",
|
||||
"body-parser": "^1.20.1",
|
||||
|
|
|
|||
|
|
@ -305,7 +305,10 @@ module.exports.saveUserPlaylist = function (pl, username, plname, callback) {
|
|||
codec: pl[i].media.meta.codec,
|
||||
bitrate: pl[i].media.meta.bitrate,
|
||||
scuri: pl[i].media.meta.scuri,
|
||||
embed: pl[i].media.meta.embed
|
||||
embed: pl[i].media.meta.embed,
|
||||
direct: pl[i].media.meta.direct,
|
||||
textTracks: pl[i].media.meta.textTracks,
|
||||
audioTracks: pl[i].media.meta.audioTracks
|
||||
}
|
||||
};
|
||||
time += pl[i].media.seconds || 0;
|
||||
|
|
|
|||
|
|
@ -441,7 +441,9 @@ module.exports = {
|
|||
codec: media.meta.codec,
|
||||
scuri: media.meta.scuri,
|
||||
embed: media.meta.embed,
|
||||
direct: media.meta.direct
|
||||
direct: media.meta.direct,
|
||||
textTracks: media.meta.textTracks,
|
||||
audioTracks: media.meta.audioTracks
|
||||
});
|
||||
|
||||
db.query("INSERT INTO `channel_libraries` " +
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue