w0zard/sync
1
0
Fork 0
mirror of https://github.com/Spengreb/sync.git synced 2026-05-14 03:32:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'calzoneman:3.0' into 3.0

Browse source
This commit is contained in:
Spengreb 2026-03-18 23:17:04 +01:00 • committed by GitHub
commit 917b227ff5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 2704 additions and 7119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9810
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

4
package.json
View file

@ -2,14 +2,14 @@
"author": "Calvin Montgomery", "author": "Calvin Montgomery",
"name": "CyTube", "name": "CyTube",
"description": "Online media synchronizer and chat", "description": "Online media synchronizer and chat",
"version": "3.86.0", "version": "3.86.1",
"repository": { "repository": {
"url": "http://github.com/calzoneman/sync" "url": "http://github.com/calzoneman/sync"
}, },
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@calzoneman/jsli": "^2.0.1", "@calzoneman/jsli": "^2.0.1",
"@cytube/mediaquery": "github:CyTube/mediaquery#564d0c4615e80f72722b0f68ac81f837a4c5fc81", "@cytube/mediaquery": "github:CyTube/mediaquery#52a635d45f38785bdb26e842c9f2bb505bc37a1c",
"bcrypt": "^5.0.1", "bcrypt": "^5.0.1",
"bluebird": "^3.7.2", "bluebird": "^3.7.2",
"body-parser": "^1.20.1", "body-parser": "^1.20.1",

5
src/database.js
View file

@ -305,7 +305,10 @@ module.exports.saveUserPlaylist = function (pl, username, plname, callback) {
codec: pl[i].media.meta.codec, codec: pl[i].media.meta.codec,
bitrate: pl[i].media.meta.bitrate, bitrate: pl[i].media.meta.bitrate,
scuri: pl[i].media.meta.scuri, 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; time += pl[i].media.seconds || 0;

4
src/database/channels.js
View file

@ -441,7 +441,9 @@ module.exports = {
codec: media.meta.codec, codec: media.meta.codec,
scuri: media.meta.scuri, scuri: media.meta.scuri,
embed: media.meta.embed, 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` " + db.query("INSERT INTO `channel_libraries` " +