pull/128/head
Chocobozzz 2017-11-24 15:00:10 +01:00
parent 652b30564c
commit df1966c9b4
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
4 changed files with 7 additions and 5 deletions

View File

@ -29,7 +29,7 @@ async function forwardActivity (
if (uris.length === 0) {
logger.info('0 followers for %s, no forwarding.', toAccountFollowers.map(a => a.id).join(', '))
return
return undefined
}
logger.debug('Creating forwarding job.', { uris })
@ -52,7 +52,7 @@ async function broadcastToFollowers (
const uris = await computeFollowerUris(toAccountFollowers, followersException)
if (uris.length === 0) {
logger.info('0 followers for %s, no broadcasting.', toAccountFollowers.map(a => a.id).join(', '))
return
return undefined
}
logger.debug('Creating broadcast job.', { uris })

View File

@ -50,7 +50,7 @@ async function computeBody (payload: ActivityPubHttpPayload) {
if (!accountSignature) throw new Error('Unknown signature account id.')
body = await buildSignedActivity(accountSignature, payload.body)
}
return body
}

View File

@ -984,6 +984,7 @@ loadByUUIDOrURL = function (uuid: string, url: string, t?: Sequelize.Transaction
loadAndPopulateAccountAndServerAndTags = function (id: number) {
const options = {
order: [ [ Video['sequelize'].models.Tag, 'name', 'ASC' ] ],
include: [
{
model: Video['sequelize'].models.VideoChannel,
@ -1012,6 +1013,7 @@ loadAndPopulateAccountAndServerAndTags = function (id: number) {
loadByUUIDAndPopulateAccountAndServerAndTags = function (uuid: string) {
const options = {
order: [ [ Video['sequelize'].models.Tag, 'name', 'ASC' ] ],
where: {
uuid
},

View File

@ -605,7 +605,7 @@ describe('Test a single server', function () {
expect(video.serverHost).to.equal('localhost:9001')
expect(video.account).to.equal('root')
expect(video.isLocal).to.be.true
expect(video.tags).to.deep.equal([ 'tag1', 'tag2', 'supertag' ])
expect(video.tags).to.deep.equal([ 'supertag', 'tag1', 'tag2' ])
expect(dateIsValid(video.createdAt)).to.be.true
expect(dateIsValid(video.updatedAt)).to.be.true
@ -645,7 +645,7 @@ describe('Test a single server', function () {
expect(video.serverHost).to.equal('localhost:9001')
expect(video.account).to.equal('root')
expect(video.isLocal).to.be.true
expect(video.tags).to.deep.equal([ 'tag1', 'tag2', 'supertag' ])
expect(video.tags).to.deep.equal([ 'supertag', 'tag1', 'tag2' ])
expect(dateIsValid(video.createdAt)).to.be.true
expect(dateIsValid(video.updatedAt)).to.be.true