-import { ActivityFollow, ActivityLike, ActivityUndo } from '../../../../shared/models/activitypub/activity'
-import { DislikeObject } from '../../../../shared/models/activitypub/objects/dislike-object'
+import { ActivityAnnounce, ActivityFollow, ActivityLike, ActivityUndo } from '../../../../shared/models/activitypub'
+import { DislikeObject } from '../../../../shared/models/activitypub/objects'
+import { getActorUrl } from '../../../helpers/activitypub'
import { retryTransactionWrapper } from '../../../helpers/database-utils'
import { logger } from '../../../helpers/logger'
-import { database as db } from '../../../initializers'
-import { sendUndoDislikeToVideoFollowers } from '../index'
-import { sendUndoLikeToVideoFollowers } from '../send/send-undo'
+import { sequelizeTypescript } from '../../../initializers'
+import { AccountModel } from '../../../models/account/account'
+import { AccountVideoRateModel } from '../../../models/account/account-video-rate'
+import { ActorModel } from '../../../models/activitypub/actor'
+import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
+import { forwardVideoRelatedActivity } from '../send/utils'
+import { getOrCreateAccountAndVideoAndChannel } from '../videos'
+import { VideoShareModel } from '../../../models/video/video-share'
async function processUndoActivity (activity: ActivityUndo) {
const activityToUndo = activity.object
+ const actorUrl = getActorUrl(activity.actor)
+
if (activityToUndo.type === 'Like') {
- return processUndoLike(activity.actor, activityToUndo)
+ return retryTransactionWrapper(processUndoLike, actorUrl, activity)
} else if (activityToUndo.type === 'Create' && activityToUndo.object.type === 'Dislike') {
- return processUndoDislike(activity.actor, activityToUndo.object)
+ return retryTransactionWrapper(processUndoDislike, actorUrl, activity)
} else if (activityToUndo.type === 'Follow') {
- return processUndoFollow(activity.actor, activityToUndo)
+ return retryTransactionWrapper(processUndoFollow, actorUrl, activityToUndo)
+ } else if (activityToUndo.type === 'Announce') {
+ return retryTransactionWrapper(processUndoAnnounce, actorUrl, activityToUndo)
}
logger.warn('Unknown activity object type %s -> %s when undo activity.', activityToUndo.type, { activity: activity.id })
// ---------------------------------------------------------------------------
-function processUndoLike (actor: string, likeActivity: ActivityLike) {
- const options = {
- arguments: [ actor, likeActivity ],
- errorMessage: 'Cannot undo like with many retries.'
- }
-
- return retryTransactionWrapper(undoLike, options)
-}
+async function processUndoLike (actorUrl: string, activity: ActivityUndo) {
+ const likeActivity = activity.object as ActivityLike
-function undoLike (actor: string, likeActivity: ActivityLike) {
- return db.sequelize.transaction(async t => {
- const byAccount = await db.Account.loadByUrl(actor, t)
- if (!byAccount) throw new Error('Unknown account ' + actor)
+ const { video } = await getOrCreateAccountAndVideoAndChannel(likeActivity.object)
- const video = await db.Video.loadByUrlAndPopulateAccount(likeActivity.object)
- if (!video) throw new Error('Unknown video ' + likeActivity.actor)
+ return sequelizeTypescript.transaction(async t => {
+ const byAccount = await AccountModel.loadByUrl(actorUrl, t)
+ if (!byAccount) throw new Error('Unknown account ' + actorUrl)
- const rate = await db.AccountVideoRate.load(byAccount.id, video.id, t)
+ const rate = await AccountVideoRateModel.load(byAccount.id, video.id, t)
if (!rate) throw new Error(`Unknown rate by account ${byAccount.id} for video ${video.id}.`)
await rate.destroy({ transaction: t })
- await video.decrement('likes')
+ await video.decrement('likes', { transaction: t })
- if (video.isOwned()) await sendUndoLikeToVideoFollowers(byAccount, video, t)
+ if (video.isOwned()) {
+ // Don't resend the activity to the sender
+ const exceptions = [ byAccount.Actor ]
+
+ await forwardVideoRelatedActivity(activity, t, exceptions, video)
+ }
})
}
-function processUndoDislike (actor: string, dislikeCreateActivity: DislikeObject) {
- const options = {
- arguments: [ actor, dislikeCreateActivity ],
- errorMessage: 'Cannot undo dislike with many retries.'
- }
-
- return retryTransactionWrapper(undoDislike, options)
-}
+async function processUndoDislike (actorUrl: string, activity: ActivityUndo) {
+ const dislike = activity.object.object as DislikeObject
-function undoDislike (actor: string, dislike: DislikeObject) {
- return db.sequelize.transaction(async t => {
- const byAccount = await db.Account.loadByUrl(actor, t)
- if (!byAccount) throw new Error('Unknown account ' + actor)
+ const { video } = await getOrCreateAccountAndVideoAndChannel(dislike.object)
- const video = await db.Video.loadByUrlAndPopulateAccount(dislike.object)
- if (!video) throw new Error('Unknown video ' + dislike.actor)
+ return sequelizeTypescript.transaction(async t => {
+ const byAccount = await AccountModel.loadByUrl(actorUrl, t)
+ if (!byAccount) throw new Error('Unknown account ' + actorUrl)
- const rate = await db.AccountVideoRate.load(byAccount.id, video.id, t)
+ const rate = await AccountVideoRateModel.load(byAccount.id, video.id, t)
if (!rate) throw new Error(`Unknown rate by account ${byAccount.id} for video ${video.id}.`)
await rate.destroy({ transaction: t })
- await video.decrement('dislikes')
+ await video.decrement('dislikes', { transaction: t })
- if (video.isOwned()) await sendUndoDislikeToVideoFollowers(byAccount, video, t)
+ if (video.isOwned()) {
+ // Don't resend the activity to the sender
+ const exceptions = [ byAccount.Actor ]
+
+ await forwardVideoRelatedActivity(activity, t, exceptions, video)
+ }
})
}
-function processUndoFollow (actor: string, followActivity: ActivityFollow) {
- const options = {
- arguments: [ actor, followActivity ],
- errorMessage: 'Cannot undo follow with many retries.'
- }
+function processUndoFollow (actorUrl: string, followActivity: ActivityFollow) {
+ return sequelizeTypescript.transaction(async t => {
+ const follower = await ActorModel.loadByUrl(actorUrl, t)
+ const following = await ActorModel.loadByUrl(followActivity.object, t)
+ const actorFollow = await ActorFollowModel.loadByActorAndTarget(follower.id, following.id, t)
+
+ if (!actorFollow) throw new Error(`'Unknown actor follow ${follower.id} -> ${following.id}.`)
+
+ await actorFollow.destroy({ transaction: t })
- return retryTransactionWrapper(undoFollow, options)
+ return undefined
+ })
}
-function undoFollow (actor: string, followActivity: ActivityFollow) {
- return db.sequelize.transaction(async t => {
- const follower = await db.Account.loadByUrl(actor, t)
- const following = await db.Account.loadByUrl(followActivity.object, t)
- const accountFollow = await db.AccountFollow.loadByAccountAndTarget(follower.id, following.id, t)
+function processUndoAnnounce (actorUrl: string, announceActivity: ActivityAnnounce) {
+ return sequelizeTypescript.transaction(async t => {
+ const byAccount = await AccountModel.loadByUrl(actorUrl, t)
+ if (!byAccount) throw new Error('Unknown account ' + actorUrl)
- if (!accountFollow) throw new Error(`'Unknown account follow ${follower.id} -> ${following.id}.`)
+ const share = await VideoShareModel.loadByUrl(announceActivity.id, t)
+ if (!share) throw new Error(`'Unknown video share ${announceActivity.id}.`)
- await accountFollow.destroy({ transaction: t })
+ await share.destroy({ transaction: t })
- return undefined
+ if (share.Video.isOwned()) {
+ // Don't resend the activity to the sender
+ const exceptions = [ byAccount.Actor ]
+
+ await forwardVideoRelatedActivity(announceActivity, t, exceptions, share.Video)
+ }
})
}
projects / github / Chocobozzz / PeerTube.git / blobdiff