From d8553faa4939889fa7b7ef7329aa474a81cbbdb9 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 23 Nov 2017 14:37:00 +0100 Subject: Better follows tests --- server/lib/activitypub/process/process-undo.ts | 8 ++++---- server/lib/activitypub/send/send-undo.ts | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'server/lib/activitypub') diff --git a/server/lib/activitypub/process/process-undo.ts b/server/lib/activitypub/process/process-undo.ts index caa835714..9fe066c01 100644 --- a/server/lib/activitypub/process/process-undo.ts +++ b/server/lib/activitypub/process/process-undo.ts @@ -1,10 +1,10 @@ -import { ActivityCreate, ActivityFollow, ActivityLike, ActivityUndo } from '../../../../shared/models/activitypub/activity' +import { ActivityFollow, ActivityLike, ActivityUndo } from '../../../../shared/models/activitypub/activity' +import { DislikeObject } from '../../../../shared/models/activitypub/objects/dislike-object' +import { retryTransactionWrapper } from '../../../helpers/database-utils' import { logger } from '../../../helpers/logger' import { database as db } from '../../../initializers' -import { retryTransactionWrapper } from '../../../helpers/database-utils' -import { DislikeObject } from '../../../../shared/models/activitypub/objects/dislike-object' -import { sendUndoLikeToVideoFollowers } from '../send/send-undo' import { sendUndoDislikeToVideoFollowers } from '../index' +import { sendUndoLikeToVideoFollowers } from '../send/send-undo' async function processUndoActivity (activity: ActivityUndo) { const activityToUndo = activity.object diff --git a/server/lib/activitypub/send/send-undo.ts b/server/lib/activitypub/send/send-undo.ts index 53fddd0cb..8f46a051e 100644 --- a/server/lib/activitypub/send/send-undo.ts +++ b/server/lib/activitypub/send/send-undo.ts @@ -1,14 +1,14 @@ import { Transaction } from 'sequelize' import { ActivityCreate, ActivityFollow, ActivityLike, ActivityUndo } from '../../../../shared/models/activitypub/activity' +import { getServerAccount } from '../../../helpers/utils' import { AccountInstance } from '../../../models' import { AccountFollowInstance } from '../../../models/account/account-follow-interface' +import { VideoInstance } from '../../../models/video/video-interface' +import { getAccountFollowActivityPubUrl, getUndoActivityPubUrl, getVideoDislikeActivityPubUrl, getVideoLikeActivityPubUrl } from '../url' import { broadcastToFollowers, getAccountsToForwardVideoAction, unicastTo } from './misc' +import { createActivityData, createDislikeActivityData } from './send-create' import { followActivityData } from './send-follow' -import { getAccountFollowActivityPubUrl, getUndoActivityPubUrl, getVideoDislikeActivityPubUrl, getVideoLikeActivityPubUrl } from '../url' -import { VideoInstance } from '../../../models/video/video-interface' import { likeActivityData } from './send-like' -import { createActivityData, createDislikeActivityData } from './send-create' -import { getServerAccount } from '../../../helpers/utils' async function sendUndoFollow (accountFollow: AccountFollowInstance, t: Transaction) { const me = accountFollow.AccountFollower @@ -75,7 +75,6 @@ async function sendUndoDislikeToVideoFollowers (byAccount: AccountInstance, vide return broadcastToFollowers(data, serverAccount, accountsToForwardView, t, followersException) } - // --------------------------------------------------------------------------- export { -- cgit v1.2.3