Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Remove some FIXME

Chocobozzzd68dfe349aef
diff --git a/apps/peertube-cli/src/peertube-redundancy.ts b/apps/peertube-cli/src/peertube-redundancy.ts
index 289f8947bf..3cfab61991 100644
--- a/apps/peertube-cli/src/peertube-redundancy.ts
+++ b/apps/peertube-cli/src/peertube-redundancy.ts
@@ -99,7 +99,6 @@ async function listRedundanciesCLI (options: CommonProgramOptions & { target: Vi
if (target === 'remote-videos') {
const tmp = streamingPlaylists.reduce((a, b) => a + b.size, 0)
- // FIXME: don't use external dependency to stringify bytes: we already have the functions in the client
totalSize = bytes(tmp)
}
diff --git a/apps/peertube-runner/src/server/server.ts b/apps/peertube-runner/src/server/server.ts
index 096ab899dd..ddb25e0ce5 100644
--- a/apps/peertube-runner/src/server/server.ts
+++ b/apps/peertube-runner/src/server/server.ts
@@ -280,15 +280,12 @@ export class RunnerServer {
version: process.env.PACKAGE_VERSION
})
- // FIXME: remove in PeerTube v8: jobTypes has been introduced in PeerTube v7, so do the filter here too
- const filtered = availableJobs.filter(j => isJobSupported(j, this.enabledJobs))
-
- if (filtered.length === 0) {
+ if (availableJobs.length === 0) {
logger.debug(`No job available on ${server.url} for runner ${server.runnerName}`)
return undefined
}
- return filtered[0]
+ return availableJobs[0]
}
private async tryToExecuteJobAsync (server: PeerTubeServer, jobToAccept: { uuid: string }) {
diff --git a/packages/models/src/redundancy/video-redundancy.model.ts b/packages/models/src/redundancy/video-redundancy.model.ts
index 01b1272d40..a2ef034a9a 100644
--- a/packages/models/src/redundancy/video-redundancy.model.ts
+++ b/packages/models/src/redundancy/video-redundancy.model.ts
@@ -5,9 +5,6 @@ export interface VideoRedundancy {
uuid: string
redundancies: {
- // FIXME: remove in v8
- files: []
-
streamingPlaylists: RedundancyInformation[]
}
}
diff --git a/server/core/controllers/activitypub/outbox.ts b/server/core/controllers/activitypub/outbox.ts
index 525f9214bf..224888ba1c 100644
--- a/server/core/controllers/activitypub/outbox.ts
+++ b/server/core/controllers/activitypub/outbox.ts
@@ -71,9 +71,7 @@ async function buildActivities (actor: MActorLight, start: number, count: number
activities.push(announceActivity)
} else {
- // FIXME: only use the video URL to reduce load. Breaks compat with PeerTube < 6.0.0
- const videoObject = await video.toActivityPubObject()
- const createActivity = buildCreateActivity(video.url, byActor, videoObject, createActivityAudience)
+ const createActivity = buildCreateActivity(video.url, byActor, video.url, createActivityAudience)
activities.push(createActivity)
}
diff --git a/server/core/lib/job-queue/job-queue.ts b/server/core/lib/job-queue/job-queue.ts
index e3b4b89419..356516f152 100644
--- a/server/core/lib/job-queue/job-queue.ts
+++ b/server/core/lib/job-queue/job-queue.ts
@@ -445,10 +445,7 @@ class JobQueue {
continue
}
- let jobs = await queue.getJobs(states, 0, start + count, asc)
-
- // FIXME: we have sometimes undefined values https://github.com/taskforcesh/bullmq/issues/248
- jobs = jobs.filter(j => !!j)
+ const jobs = await queue.getJobs(states, 0, start + count, asc)
results = results.concat(jobs)
}
diff --git a/server/core/models/redundancy/video-redundancy.ts b/server/core/models/redundancy/video-redundancy.ts
index c62072c7ca..824536b599 100644
--- a/server/core/models/redundancy/video-redundancy.ts
+++ b/server/core/models/redundancy/video-redundancy.ts
@@ -564,7 +564,6 @@ export class VideoRedundancyModel extends SequelizeModel<VideoRedundancyModel> {
uuid: video.uuid,
redundancies: {
- files: [],
streamingPlaylists: streamingPlaylistsRedundancies
}
}