forks/peertube
1
0
Fork 0
Code Releases Activity

Remove unused param

Browse source
This commit is contained in:
Chocobozzz 2023-07-25 14:26:12 +02:00
parent f42dd5524b
commit 3b46eec8ae
No known key found for this signature in database
GPG key ID: 583A612D890159BE
8 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
server/controllers/api/search/search-videos.ts
View file

@ -137,7 +137,6 @@ async function searchVideoURI (url: string, res: express.Response) {
rates: false,
shares: false,
comments: false,
thumbnail: true,
refreshVideo: false
}

2
server/lib/activitypub/process/process-create.ts
View file

@ -70,7 +70,7 @@ export {
// ---------------------------------------------------------------------------
async function processCreateVideo (videoToCreateData: VideoObject, notify: boolean) {
const syncParam = { rates: false, shares: false, comments: false, thumbnail: true, refreshVideo: false }
const syncParam = { rates: false, shares: false, comments: false, refreshVideo: false }
const { video, created } = await getOrCreateAPVideo({ videoObject: videoToCreateData, syncParam })
if (created && notify) Notifier.Instance.notifyOnNewVideoIfNeeded(video)

2
server/lib/activitypub/video-comments.ts
View file

@ -89,7 +89,7 @@ async function tryToResolveThreadFromVideo (params: ResolveThreadParams) {
// Maybe it's a reply to a video?
// If yes, it's done: we resolved all the thread
const syncParam = { rates: true, shares: true, comments: false, thumbnail: true, refreshVideo: false }
const syncParam = { rates: true, shares: true, comments: false, refreshVideo: false }
const { video } = await getOrCreateAPVideo({ videoObject: url, syncParam })
if (video.isOwned() && !video.hasPrivacyForFederation()) {

4
server/lib/activitypub/videos/get.ts
View file

@ -43,7 +43,7 @@ async function getOrCreateAPVideo (
options: GetVideoParamAll | GetVideoParamImmutable | GetVideoParamOther
): GetVideoResult<MVideoAccountLightBlacklistAllFiles | MVideoThumbnail | MVideoImmutable> {
// Default params
const syncParam = options.syncParam || { rates: true, shares: true, comments: true, thumbnail: true, refreshVideo: false }
const syncParam = options.syncParam || { rates: true, shares: true, comments: true, refreshVideo: false }
const fetchType = options.fetchType || 'all'
const allowRefresh = options.allowRefresh !== false
@ -68,7 +68,7 @@ async function getOrCreateAPVideo (
try {
const creator = new APVideoCreator(videoObject)
const { autoBlacklisted, videoCreated } = await retryTransactionWrapper(creator.create.bind(creator), syncParam.thumbnail)
const { autoBlacklisted, videoCreated } = await retryTransactionWrapper(creator.create.bind(creator))
await syncVideoExternalAttributes(videoCreated, videoObject, syncParam)

2
server/lib/activitypub/videos/shared/creator.ts
View file

@ -18,7 +18,7 @@ export class APVideoCreator extends APVideoAbstractBuilder {
this.lTags = loggerTagsFactory('ap', 'video', 'create', this.videoObject.uuid, this.videoObject.id)
}
async create (waitThumbnail = false) {
async create () {
logger.debug('Adding remote video %s.', this.videoObject.id, this.lTags())
const channelActor = await this.getOrCreateVideoChannelFromVideoObject()

7
server/lib/activitypub/videos/shared/video-sync-attributes.ts
View file

@ -17,11 +17,14 @@ type SyncParam = {
rates: boolean
shares: boolean
comments: boolean
thumbnail: boolean
refreshVideo?: boolean
}
async function syncVideoExternalAttributes (video: MVideo, fetchedVideo: VideoObject, syncParam: SyncParam) {
async function syncVideoExternalAttributes (
video: MVideo,
fetchedVideo: VideoObject,
syncParam: Pick<SyncParam, 'rates' | 'shares' | 'comments'>
) {
logger.info('Adding likes/dislikes/shares/comments of video %s.', video.uuid)
const ratePromise = updateVideoRates(video, fetchedVideo)

2
server/lib/job-queue/handlers/activitypub-refresher.ts
View file

@ -28,7 +28,7 @@ export {
async function refreshVideo (videoUrl: string) {
const fetchType = 'all' as 'all'
const syncParam = { rates: true, shares: true, comments: true, thumbnail: true }
const syncParam = { rates: true, shares: true, comments: true }
const videoFromDatabase = await loadVideoByUrl(videoUrl, fetchType)
if (videoFromDatabase) {

2
server/lib/schedulers/videos-redundancy-scheduler.ts
View file

@ -365,7 +365,7 @@ export class VideosRedundancyScheduler extends AbstractScheduler {
// We need more attributes and check if the video still exists
const getVideoOptions = {
videoObject: videoUrl,
syncParam: { rates: false, shares: false, comments: false, thumbnail: false, refreshVideo: true },
syncParam: { rates: false, shares: false, comments: false, refreshVideo: true },
fetchType: 'all' as 'all'
}
const { video } = await getOrCreateAPVideo(getVideoOptions)