mirror of
https://activitypub.software/TransFem-org/Sharkey
synced 2024-11-26 16:03:02 +00:00
Merge pull request #1387 from akihikodaki/duplicate
Always deduplicate Activity Streams objects by id
This commit is contained in:
commit
507159916d
1 changed files with 28 additions and 28 deletions
|
@ -105,36 +105,36 @@ class Creator {
|
|||
const collection = await parentResolver.resolveCollection(value);
|
||||
|
||||
return collection.object.map(async element => {
|
||||
if (typeof element === 'string') {
|
||||
try {
|
||||
await Promise.all([
|
||||
DriveFile.findOne({ 'metadata.uri': element }).then(file => {
|
||||
if (file === null) {
|
||||
return;
|
||||
}
|
||||
const uri = element.id || element;
|
||||
|
||||
throw {
|
||||
$ref: 'driveFile.files',
|
||||
$id: file._id
|
||||
};
|
||||
}, () => {}),
|
||||
Post.findOne({ uri: element }).then(post => {
|
||||
if (post === null) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
await Promise.all([
|
||||
DriveFile.findOne({ 'metadata.uri': uri }).then(file => {
|
||||
if (file === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
throw {
|
||||
$ref: 'posts',
|
||||
$id: post._id
|
||||
};
|
||||
}, () => {})
|
||||
]);
|
||||
} catch (object) {
|
||||
return {
|
||||
resolver: collection.resolver,
|
||||
object
|
||||
};
|
||||
}
|
||||
throw {
|
||||
$ref: 'driveFile.files',
|
||||
$id: file._id
|
||||
};
|
||||
}, () => {}),
|
||||
Post.findOne({ uri }).then(post => {
|
||||
if (post === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
throw {
|
||||
$ref: 'posts',
|
||||
$id: post._id
|
||||
};
|
||||
}, () => {})
|
||||
]);
|
||||
} catch (object) {
|
||||
return {
|
||||
resolver: collection.resolver,
|
||||
object
|
||||
};
|
||||
}
|
||||
|
||||
const { resolver, object } = await collection.resolver.resolveOne(element);
|
||||
|
|
Loading…
Reference in a new issue