Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions src/classes/ServerMember.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
DataBanCreate,
DataMemberEdit,
MemberCompositeKey,
Role,

Check warning on line 5 in src/classes/ServerMember.ts

View workflow job for this annotation

GitHub Actions / build

'Role' is defined but never used. Allowed unused vars must match /^_/u
} from "stoat-api";

import type { ServerMemberCollection } from "../collections/ServerMemberCollection.js";
Expand Down Expand Up @@ -94,6 +94,13 @@
return this.#collection.getUnderlyingObject(key(this.id)).avatar;
}

/**
* Pronouns
*/
get pronouns(): string | undefined {
return this.#collection.getUnderlyingObject(key(this.id)).pronouns;
}

/**
* List of role IDs
*/
Expand Down
7 changes: 7 additions & 0 deletions src/classes/User.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,13 @@ export class User {
return this.#collection.getUnderlyingObject(this.id).avatar;
}

/**
* Pronouns
*/
get pronouns(): string | undefined {
return this.#collection.getUnderlyingObject(this.id).pronouns;
}

/**
* Badges
*/
Expand Down
6 changes: 6 additions & 0 deletions src/events/v1.ts
Original file line number Diff line number Diff line change
Expand Up @@ -798,6 +798,9 @@ export async function handleEvent(
case "Timeout":
changes["timeout"] = undefined;
break;
case "Pronouns":
changes["pronouns"] = undefined;
break;
}
}
}
Expand Down Expand Up @@ -869,6 +872,9 @@ export async function handleEvent(
text: undefined,
};
break;
case "Pronouns":
changes["pronouns"] = undefined;
break;
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/hydration/serverMember.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export type HydratedServerMember = {
joinedAt: Date;
nickname?: string;
avatar?: File;
pronouns?: string;
roles: string[];
timeout?: Date;
};
Expand All @@ -28,6 +29,7 @@ export const serverMemberHydration: Hydrate<
joinedAt: (member) => new Date(member.joined_at),
nickname: (member) => member.nickname!,
avatar: (member, ctx) => new File(ctx as Client, member.avatar!),
pronouns: (member) => member.pronouns!,
roles: (member) => member.roles,
timeout: (member) => new Date(member.timeout!),
},
Expand Down
2 changes: 2 additions & 0 deletions src/hydration/user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export type HydratedUser = {
flags: UserFlags;

avatar?: File;
pronouns?: string;
status?: UserStatus;
bot?: BotInformation;
};
Expand All @@ -49,6 +50,7 @@ export const userHydration: Hydrate<APIUser, HydratedUser> = {
flags: (user) => user.flags!,

avatar: (user, ctx) => new File(ctx as Client, user.avatar!),
pronouns: (user) => user.pronouns,
status: (user) => user.status!,
bot: (user) => user.bot!,
},
Expand Down
Loading