-import { Transaction } from 'sequelize'
-import { getServerActor } from '../../helpers/utils'
-import { VideoShareModel } from '../../models/video/video-share'
-import { sendUndoAnnounce, sendVideoAnnounce } from './send'
-import { getVideoAnnounceActivityPubUrl } from './url'
import * as Bluebird from 'bluebird'
+import { Transaction } from 'sequelize'
+import { getServerActor } from '@server/models/application/application'
+import { checkUrlsSameHost, getAPId } from '../../helpers/activitypub'
+import { logger, loggerTagsFactory } from '../../helpers/logger'
import { doRequest } from '../../helpers/requests'
-import { getOrCreateActorAndServerAndModel } from './actor'
-import { logger } from '../../helpers/logger'
import { CRAWL_REQUEST_CONCURRENCY } from '../../initializers/constants'
-import { checkUrlsSameHost, getAPId } from '../../helpers/activitypub'
-import { MChannelActorLight, MVideo, MVideoAccountLight, MVideoId } from '../../typings/models/video'
+import { VideoShareModel } from '../../models/video/video-share'
+import { MChannelActorLight, MVideo, MVideoAccountLight, MVideoId } from '../../types/models/video'
+import { getOrCreateActorAndServerAndModel } from './actor'
+import { sendUndoAnnounce, sendVideoAnnounce } from './send'
+import { getLocalVideoAnnounceActivityPubUrl } from './url'
+
+const lTags = loggerTagsFactory('share')
async function shareVideoByServerAndChannel (video: MVideoAccountLight, t: Transaction) {
if (!video.hasPrivacyForFederation()) return undefined
oldVideoChannel: MChannelActorLight,
t: Transaction
) {
- logger.info('Updating video channel of video %s: %s -> %s.', video.uuid, oldVideoChannel.name, video.VideoChannel.name)
+ logger.info(
+ 'Updating video channel of video %s: %s -> %s.', video.uuid, oldVideoChannel.name, video.VideoChannel.name,
+ lTags(video.uuid)
+ )
await undoShareByVideoChannel(video, oldVideoChannel, t)
async function shareByServer (video: MVideo, t: Transaction) {
const serverActor = await getServerActor()
- const serverShareUrl = getVideoAnnounceActivityPubUrl(serverActor, video)
+ const serverShareUrl = getLocalVideoAnnounceActivityPubUrl(serverActor, video)
const [ serverShare ] = await VideoShareModel.findOrCreate({
defaults: {
actorId: serverActor.id,
}
async function shareByVideoChannel (video: MVideoAccountLight, t: Transaction) {
- const videoChannelShareUrl = getVideoAnnounceActivityPubUrl(video.VideoChannel.Actor, video)
+ const videoChannelShareUrl = getLocalVideoAnnounceActivityPubUrl(video.VideoChannel.Actor, video)
const [ videoChannelShare ] = await VideoShareModel.findOrCreate({
defaults: {
actorId: video.VideoChannel.actorId,