Skip to content

Update getTagList() #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
fe5hua wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Update getTagList() #252

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a435f6c
Update getTagList()
fe5hua Jul 25, 2024
ad59def
Update getTagList() edit
fe5hua Jul 25, 2024
a1e0273
Update getTagList() edit
fe5hua Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions src/module/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,28 +725,24 @@ export function getTagList(document) {
return game.pbta.tagList;
}
const { general = "[]", actor: actorTags = {}, item: itemTags = {} } = game.settings.get("pbta", "tagConfig") ?? {};
const { general: moduleGeneral = "[]", actor: moduleActorTags = {}, item: moduleItemTags = {} } = game.pbta.tagConfigOverride ?? {};
const { general: moduleGeneral = "[]", actor: moduleActorTags = "[]", item: moduleItemTags = "[]" } = game.pbta.tagConfigOverride ?? {};
const generalTags = parseTags(general);
const generalModuleTags = parseTags(moduleGeneral);
// @todo remove deprecated tags in a future version.
const deprecatedTags = getDeprecatedTagList();
const tagNames = [...generalTags, ...generalModuleTags, ...deprecatedTags];
if (document.collectionName === "actors") {
const allActorTags = parseTags(actorTags.all);
const typeTags = parseTags(actorTags?.[document.type]);

const allModuleActorTags = parseTags(moduleActorTags.all);
const moduleTypeTags = parseTags(moduleActorTags?.[document.type]);
const allModuleActorTags = parseTags(moduleActorTags);

tagNames.push(...allActorTags, ...typeTags, ...allModuleActorTags, ...moduleTypeTags);
tagNames.push(...allActorTags, ...allModuleActorTags);
} else if (document.collectionName === "items") {
const allItemTags = parseTags(itemTags.all);
const typeTags = parseTags(itemTags?.[document.type]);

const allModuleItemTags = parseTags(moduleItemTags.all);
const moduleTypeTags = parseTags(moduleItemTags?.[document.type]);
const allModuleItemTags = parseTags(moduleItemTags);

tagNames.push(...allItemTags, ...typeTags, ...allModuleItemTags, ...moduleTypeTags);
tagNames.push(...allItemTags, ...allModuleItemTags);
}
tagNames.sort((a, b) => a.value.localeCompare(b.value, undefined, { sensitivity: "base" }));
game.pbta.tagList = tagNames;
Expand Down