boiii/traxxx
1
0
Fork 0
forked from DebaucheryLibrarian/traxxx
Code Issues Pull Requests Projects Releases Wiki Activity

Added prefer option for entity resolution. Merged migrations.

Browse Source
This commit is contained in:
DebaucheryLibrarian
2023-07-01 22:24:21 +02:00
parent 744bdb3170
commit a2331bc913
4 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/entities.js
View File

@@ -199,7 +199,7 @@ async function fetchIncludedEntities() {
return curatedNetworks;
}
async function fetchEntitiesBySlug(entitySlugs, sort = 'asc') {
async function fetchEntitiesBySlug(entitySlugs, prefer = 'channel') {
const entities = await knex.raw(`
WITH RECURSIVE entity_tree as (
SELECT to_jsonb(entities) as entity,
@@ -235,7 +235,7 @@ async function fetchEntitiesBySlug(entitySlugs, sort = 'asc') {
`, {
entitySlugs: entitySlugs.filter((slug) => !slug.includes('.')),
entityHosts: entitySlugs.filter((slug) => slug.includes('.')).map((hostname) => `%${hostname}%`),
sort: knex.raw(sort),
sort: knex.raw(prefer === 'channel' ? 'asc' : 'desc'),
});
// channel entity will overwrite network entity
@@ -262,7 +262,7 @@ async function fetchReleaseEntities(baseReleases) {
.filter(Boolean),
));
return fetchEntitiesBySlug(entitySlugs, 'desc');
return fetchEntitiesBySlug(entitySlugs, argv.prefer || 'network');
}
async function fetchEntity(entityId, type) {