Skip to content
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

Jump to bottom

Implement retrieveThreadMember #1919

Merged
merged 8 commits into from
Dec 24, 2021
Merged

Implement retrieveThreadMember #1919

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d92dfeb
Implemented retrieveThreadMember
Tais993 Nov 30, 2021
0dba31d
Added the forgotten `@CheckReturnValue`
Tais993 Nov 30, 2021
a0ac8de
Removal of empty lines
Tais993 Dec 3, 2021
15b4f3d
Took care of nullability annotations and null checks.
Tais993 Dec 7, 2021
802302f
Replaced another Jetbrains annotations with it's javax variant
Tais993 Dec 7, 2021
51c35be
Add docs
Tais993 Dec 16, 2021
4d1ab1d
Removed GatewayIntent import + used full qualifier in docs
Tais993 Dec 16, 2021
0931843
Apply suggestions from code review
MinnDevelopment Dec 19, 2021
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
26 changes: 26 additions & 0 deletions src/main/java/net/dv8tion/jda/api/entities/ThreadChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import net.dv8tion.jda.api.requests.RestAction;
import net.dv8tion.jda.api.utils.MiscUtil;
import net.dv8tion.jda.internal.utils.Checks;
import org.jetbrains.annotations.NotNull;

import javax.annotation.CheckReturnValue;
import javax.annotation.Nonnull;
Expand Down Expand Up @@ -101,6 +102,31 @@ default ThreadMember getThreadMemberById(String id)
@Nullable
ThreadMember getThreadMemberById(long id);

@NotNull
Tais993 marked this conversation as resolved.
Show resolved Hide resolved
@CheckReturnValue
default RestAction<ThreadMember> retrieveThreadMember(Member member)
Tais993 marked this conversation as resolved.
Show resolved Hide resolved
{
return retrieveThreadMemberById(member.getId());
Tais993 marked this conversation as resolved.
Show resolved Hide resolved
}

@NotNull
@CheckReturnValue
default RestAction<ThreadMember> retrieveThreadMember(User user)
{
return retrieveThreadMemberById(user.getId());
}

@NotNull
@CheckReturnValue
default RestAction<ThreadMember> retrieveThreadMemberById(String id)
{
return retrieveThreadMemberById(MiscUtil.parseSnowflake(id));
}

@NotNull
@CheckReturnValue
RestAction<ThreadMember> retrieveThreadMemberById(long id);

@CheckReturnValue
RestAction<List<ThreadMember>> retrieveThreadMembers();

Expand Down
24 changes: 22 additions & 2 deletions src/main/java/net/dv8tion/jda/internal/entities/ThreadChannelImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,15 @@
import net.dv8tion.jda.api.utils.cache.CacheView;
import net.dv8tion.jda.api.utils.data.DataArray;
import net.dv8tion.jda.api.utils.data.DataObject;
import net.dv8tion.jda.internal.JDAImpl;
import net.dv8tion.jda.internal.entities.mixin.channel.middleman.GuildMessageChannelMixin;
import net.dv8tion.jda.internal.managers.channel.concrete.ThreadChannelManagerImpl;
import net.dv8tion.jda.internal.requests.DeferredRestAction;
import net.dv8tion.jda.internal.requests.RestActionImpl;
import net.dv8tion.jda.internal.requests.Route;
import net.dv8tion.jda.internal.utils.Checks;
import net.dv8tion.jda.internal.utils.Helpers;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import javax.annotation.Nonnull;
Expand All @@ -37,8 +40,8 @@
import java.util.LinkedList;
import java.util.List;

public class ThreadChannelImpl extends AbstractGuildChannelImpl<ThreadChannelImpl> implements
ThreadChannel,
public class ThreadChannelImpl extends AbstractGuildChannelImpl<ThreadChannelImpl> implements
ThreadChannel,
GuildMessageChannelMixin<ThreadChannelImpl>
{
private final ChannelType type;
Expand Down Expand Up @@ -135,6 +138,23 @@ public ThreadMember getThreadMemberById(long id)
return threadMembers.get(id);
}

@NotNull
@Override
public RestAction<ThreadMember> retrieveThreadMemberById(long id)
{
JDAImpl jda = (JDAImpl) getJDA();

Tais993 marked this conversation as resolved.
Show resolved Hide resolved
return new DeferredRestAction<>(jda, ThreadMember.class,
() -> getThreadMemberById(id),
() -> {
Route.CompiledRoute route = Route.Channels.GET_THREAD_MEMBER.compile(getId(), Long.toUnsignedString(id));
return new RestActionImpl<>(jda, route, (resp, req) -> {

Tais993 marked this conversation as resolved.
Show resolved Hide resolved
return jda.getEntityBuilder().createThreadMember(getGuild(), this, resp.getObject());
});
});
}

@Override
public RestAction<List<ThreadMember>> retrieveThreadMembers()
{
Expand Down