Browse Source

Update server dependencies

pull/4724/head
Chocobozzz 6 days ago
parent
commit
c0d2eac332
No known key found for this signature in database GPG Key ID: 583A612D890159BE
5 changed files with 1059 additions and 1010 deletions
  1. +7
    -7
      package.json
  2. +4
    -2
      server/lib/redis.ts
  3. +2
    -1
      server/models/utils.ts
  4. +2
    -1
      server/models/video/video.ts
  5. +1044
    -999
      yarn.lock

+ 7
- 7
package.json View File

@@ -78,6 +78,7 @@
},
"dependencies": {
"@aws-sdk/client-s3": "^3.23.0",
"@babel/parser": "7.16.8",
"@peertube/http-signature": "^1.4.0",
"@uploadx/core": "^4.4.0",
"async": "^3.0.1",
@@ -98,13 +99,13 @@
"email-templates": "^8.0.3",
"execa": "^5.1.1",
"express": "^4.12.4",
"express-rate-limit": "^5.0.0",
"express-rate-limit": "^6.1.0",
"express-validator": "^6.4.0",
"flat": "^5.0.0",
"fluent-ffmpeg": "^2.1.0",
"fs-extra": "^10.0.0",
"got": "^11.8.2",
"helmet": "^4.1.0",
"helmet": "^5.0.1",
"hpagent": "^0.1.2",
"http-problem-details": "^0.1.5",
"ip-anonymize": "^0.1.0",
@@ -136,7 +137,7 @@
"redis": "^4.0.1",
"reflect-metadata": "^0.1.12",
"sanitize-html": "2.x",
"sequelize": "6.9.0",
"sequelize": "6.13.0",
"sequelize-typescript": "^2.0.0-beta.1",
"short-uuid": "^4.2.0",
"sitemap": "^7.0.0",
@@ -149,7 +150,7 @@
"validator": "^13.0.0",
"webfinger.js": "^2.6.6",
"webtorrent": "^1.0.0",
"winston": "3.3.3",
"winston": "3.4.0",
"ws": "^8.0.0"
},
"devDependencies": {
@@ -165,10 +166,9 @@
"@types/chai": "^4.0.4",
"@types/chai-json-schema": "^1.4.3",
"@types/chai-xml": "^0.3.1",
"@types/config": "^0.0.40",
"@types/config": "^0.0.41",
"@types/create-torrent": "^5.0.0",
"@types/express": "4.17.9",
"@types/express-rate-limit": "^5.0.0",
"@types/fluent-ffmpeg": "^2.1.16",
"@types/fs-extra": "^9.0.1",
"@types/lodash": "^4.14.64",
@@ -194,7 +194,7 @@
"chai": "^4.1.1",
"chai-json-schema": "^1.5.0",
"chai-xml": "^0.4.0",
"concurrently": "^6.0.0",
"concurrently": "^7.0.0",
"depcheck": "^1.4.2",
"eslint": "^8.0.0",
"eslint-config-standard-with-typescript": "^21.0.1",


+ 4
- 2
server/lib/redis.ts View File

@@ -365,8 +365,10 @@ class Redis {
return this.client.incr(this.prefix + key)
}

private exists (key: string) {
return this.client.exists(this.prefix + key)
private async exists (key: string) {
const result = await this.client.exists(this.prefix + key)

return result !== 0
}

private setExpiration (key: string, ms: number) {


+ 2
- 1
server/models/utils.ts View File

@@ -238,7 +238,8 @@ function searchAttribute (sourceField?: string, targetField?: string) {

return {
[targetField]: {
[Op.iLike]: `%${sourceField}%`
// FIXME: ts error
[Op.iLike as any]: `%${sourceField}%`
}
}
}


+ 2
- 1
server/models/video/video.ts View File

@@ -1488,7 +1488,8 @@ export class VideoModel extends Model<Partial<AttributesOnly<VideoModel>>> {
required: false,
where: {
startDate: {
[Op.gte]: new Date(new Date().getTime() - (24 * 3600 * 1000) * trendingDays)
// FIXME: ts error
[Op.gte as any]: new Date(new Date().getTime() - (24 * 3600 * 1000) * trendingDays)
}
}
}


+ 1044
- 999
yarn.lock
File diff suppressed because it is too large
View File


Loading…
Cancel
Save