OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix process abuse transactions

pull/3782/head
Chocobozzz 2021-02-25 15:55:31 +01:00
parent e7812bf091
commit a77c7327a2
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/lib/activitypub/process/process-flag.ts
View File

@ -49,13 +49,12 @@ async function processCreateAbuse (activity: ActivityCreate | ActivityFlag, byAc
logger.debug('Reporting remote abuse for object %s.', uri)
await sequelizeTypescript.transaction(async t => {
const video = await VideoModel.loadByUrlAndPopulateAccount(uri)
const video = await VideoModel.loadByUrlAndPopulateAccount(uri, t)
let videoComment: MCommentOwnerVideo
let flaggedAccount: MAccountDefault
if (!video) videoComment = await VideoCommentModel.loadByUrlAndPopulateAccountAndVideo(uri)
if (!videoComment) flaggedAccount = await AccountModel.loadByUrl(uri)
if (!video) videoComment = await VideoCommentModel.loadByUrlAndPopulateAccountAndVideo(uri, t)
if (!videoComment) flaggedAccount = await AccountModel.loadByUrl(uri, t)
if (!video && !videoComment && !flaggedAccount) {
logger.warn('Cannot flag unknown entity %s.', object)

22
server/lib/oauth-model.ts
View File

@ -1,20 +1,20 @@
import * as express from 'express'
import { AccessDeniedError } from 'oauth2-server'
import { logger } from '../helpers/logger'
import { UserModel } from '../models/account/user'
import { OAuthClientModel } from '../models/oauth/oauth-client'
import { OAuthTokenModel } from '../models/oauth/oauth-token'
import { LRU_CACHE, OAUTH_LIFETIME } from '../initializers/constants'
import { Transaction } from 'sequelize'
import { CONFIG } from '../initializers/config'
import * as LRUCache from 'lru-cache'
import { AccessDeniedError } from 'oauth2-server'
import { Transaction } from 'sequelize'
import { PluginManager } from '@server/lib/plugins/plugin-manager'
import { ActorModel } from '@server/models/activitypub/actor'
import { MOAuthTokenUser } from '@server/types/models/oauth/oauth-token'
import { MUser } from '@server/types/models/user/user'
import { UserAdminFlag } from '@shared/models/users/user-flag.model'
import { createUserAccountAndChannelAndPlaylist } from './user'
import { UserRole } from '@shared/models/users/user-role'
import { PluginManager } from '@server/lib/plugins/plugin-manager'
import { ActorModel } from '@server/models/activitypub/actor'
import { logger } from '../helpers/logger'
import { CONFIG } from '../initializers/config'
import { LRU_CACHE } from '../initializers/constants'
import { UserModel } from '../models/account/user'
import { OAuthClientModel } from '../models/oauth/oauth-client'
import { OAuthTokenModel } from '../models/oauth/oauth-token'
import { createUserAccountAndChannelAndPlaylist } from './user'
type TokenInfo = { accessToken: string, refreshToken: string, accessTokenExpiresAt: Date, refreshTokenExpiresAt: Date }