DebaucheryLibrarian
/
traxxx
2
1
Fork 1
Code Issues 37 Pull Requests 1 Releases Wiki Activity

Fixed new profiles not being assigned avatars appropriately.

This commit is contained in:
DebaucheryLibrarian 2024-10-30 00:42:27 +01:00
parent 5edf781da7
commit df820e6e71
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/actors.js
View File

@ -528,15 +528,23 @@ async function curateProfile(profile, actor) {
}
}
async function insertProfiles(newProfiles) {
if (newProfiles.length > 0) {
const entries = await bulkInsert('actors_profiles', newProfiles);
logger.info(`Saved ${newProfiles.length} actor profiles`);
return entries;
}
return [];
}
async function upsertProfiles(profiles) {
const newProfileEntries = profiles.filter((profile) => !profile.update).map((profile) => curateProfileEntry(profile)).filter(Boolean);
const updatingProfileEntries = profiles.filter((profile) => profile.update).map((profile) => curateProfileEntry(profile)).filter(Boolean);
if (newProfileEntries.length > 0) {
await bulkInsert('actors_profiles', newProfileEntries);
logger.info(`Saved ${newProfileEntries.length} actor profiles`);
}
const newProfiles = await insertProfiles(newProfileEntries);
if (argv.force && updatingProfileEntries.length > 0) {
const transaction = await knex.transaction();
@ -554,12 +562,24 @@ async function upsertProfiles(profiles) {
}
if (profiles.length > 0) {
await knex('actors_avatars')
.insert(profiles.filter((profile) => !!profile.avatarMediaId).map((profile) => ({
const newProfileIdMap = newProfiles.reduce((acc, profile) => {
if (!acc[profile.actor_id]) {
acc[profile.actor_id] = {};
}
acc[profile.actor_id][profile.entity_id] = profile.id;
return acc;
}, {});
const avatars = profiles.filter((profile) => !!profile.avatarMediaId).map((profile) => ({
actor_id: profile.actorId,
profile_id: profile.profileId,
profile_id: profile.profileId || newProfileIdMap[profile.actorId]?.[profile.entity?.id],
media_id: profile.avatarMediaId,
})))
}));
await knex('actors_avatars')
.insert(avatars)
.onConflict()
.ignore();
}