Skip to content

feat: add Tweet and SimplifiedTweet to UserResolvable #72

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

Merged
merged 1 commit into from
Dec 8, 2021
Merged

feat: add Tweet and SimplifiedTweet to UserResolvable #72

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
7 changes: 6 additions & 1 deletion src/managers/UserManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ import {
UserUnfollowResponse,
UserUnmuteResponse,
User,
Tweet,
SimplifiedUser,
SimplifiedTweet,
} from '../structures';
import type { Client } from '../client';
import type { Tweet } from '../structures';
import type {
UserManagerFetchByUsernameResult,
UserManagerFetchResult,
Expand Down Expand Up @@ -69,6 +70,9 @@ export class UserManager extends BaseManager<Snowflake, UserResolvable, User> {
const user = super.resolve(userResolvable);
if (user) return user;
if (userResolvable instanceof SimplifiedUser) return super.resolve(userResolvable.id);
if (userResolvable instanceof Tweet || userResolvable instanceof SimplifiedTweet) {
return userResolvable.authorId ? super.resolve(userResolvable.authorId) : null;
}
return null;
}

Expand All @@ -81,6 +85,7 @@ export class UserManager extends BaseManager<Snowflake, UserResolvable, User> {
const userId = super.resolveId(userResolvable);
if (typeof userId === 'string') return userId;
if (userResolvable instanceof SimplifiedUser) return userResolvable.id;
if (userResolvable instanceof Tweet || userResolvable instanceof SimplifiedTweet) return userResolvable.authorId;
return null;
}

Expand Down
2 changes: 1 addition & 1 deletion src/typings/Types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export type UserManagerFetchResult<T extends FetchUserOptions | FetchUsersOption
export type UserManagerFetchByUsernameResult<T extends FetchUserByUsernameOptions | FetchUsersByUsernamesOptions> =
T extends FetchUserByUsernameOptions ? User : Collection<Snowflake, User>;

export type UserResolvable = User | SimplifiedUser | Snowflake;
export type UserResolvable = User | SimplifiedUser | Tweet | SimplifiedTweet | Snowflake;

export type TweetManagerFetchResult<T extends FetchTweetOptions | FetchTweetsOptions> = T extends FetchTweetOptions
? Tweet
Expand Down