Skip to content

Return pseuds as an array instead of a joined string #203

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

Open
Revan0809 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Return pseuds as an array instead of a joined string #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions src/users/getters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ export const getUserProfileName = ($userProfile: UserProfile) => {
return $userProfile(".user.profile .header h2").text().trim();
};

const PSEUD_SUFFIX = ", ";
export const getUserProfilePseuds = ($userProfile: UserProfile) => {
const pseuds = $userProfile("dd.pseuds a");
const pseudsArray: string[] = [];
Expand All @@ -29,7 +28,7 @@ export const getUserProfilePseuds = ($userProfile: UserProfile) => {
pseudsArray.push(decodeURI(pseud));
});
}
return pseudsArray.join(PSEUD_SUFFIX);
return pseudsArray;
};

//Trim the results to only the date:
Expand Down
1 change: 0 additions & 1 deletion src/users/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ export const getUser = async ({
return {
// We use this because capitalization might be different
username: getUserProfileName(profilePage),
// TODO: this should really be an array
pseuds: getUserProfilePseuds(profilePage),
id: getUserProfileId(profilePage),
joined: getUserProfileJoined(profilePage),
Expand Down
2 changes: 1 addition & 1 deletion tests/user.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ describe("User/data", () => {
username: "astolat",
id: 8,
url: "https://archiveofourown.org/users/astolat/profile",
pseuds: "astolat, shalott, the lady of shalott",
pseuds: ["astolat", "shalott", "the lady of shalott"],
joined: "2008-09-13",
} satisfies Partial<User>);
});
Expand Down
2 changes: 1 addition & 1 deletion types/entities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export interface TagSearchResultSummary {
export interface User {
id: ArchiveId;
username: string;
pseuds: string;
pseuds: string[];
url: string;
shortUrl: string;
icon: string;
Expand Down
5 changes: 3 additions & 2 deletions types/zod/generated/schemas.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ export const tagSchema = z.object({
subTags: z.array(z.object({
tagName: z.string(),
parentSubTag: z.string().nullable()
}))
})),
tagsWithSameMeaning: z.array(z.string())
});

export const tagSearchTypeSchema = z.union([z.literal("fandom"), z.literal("character"), z.literal("relationship"), z.literal("freeform"), z.literal("any")]);
Expand Down Expand Up @@ -56,7 +57,7 @@ export const tagSearchResultSummarySchema = z.object({
export const userSchema = z.object({
id: archiveIdSchema,
username: z.string(),
pseuds: z.string(),
pseuds: z.array(z.string()),
url: z.string(),
shortUrl: z.string(),
icon: z.string(),
Expand Down
Loading