added get guilds/request guilds and request users

gradle.properties

@@ -1,5 +1,5 @@
 kotlin.code.style=official
-version= 1.0.5-SNAPSHOT
+version= 1.0.5
 
 jvmVersion = 1.8.10
 pluginAllOpenVersion = 1.8.10

src/main/kotlin/io/github/ydwk/yde/YDE.kt

@@ -151,6 +151,13 @@ interface YDE {
      */
     fun requestUser(id: String): CompletableFuture<User> = requestUser(id.toLong())
 
+    /**
+     * Requests all the users the bot can see.
+     *
+     * @return The [CompletableFuture] object.
+     */
+    fun requestUsers(): CompletableFuture<List<User>>
+
     /**
      * Requests a guild using its id.
      *
@@ -167,6 +174,13 @@ interface YDE {
      */
     fun requestGuild(guildId: String): CompletableFuture<Guild> = requestGuild(guildId.toLong())
 
+    /**
+     * Requests all the guilds the bot is in.
+     *
+     * @return The [CompletableFuture] object.
+     */
+    fun requestGuilds(): CompletableFuture<List<Guild>>
+
     /**
      * Gets a guild by its id.
      *
@@ -183,6 +197,13 @@ interface YDE {
      */
     fun getGuildById(id: String): Guild?
 
+    /**
+     * Gets all the guilds the bot is in.
+     *
+     * @return A list of [Guild] objects.
+     */
+    fun getGuilds(): List<Guild>
+
     /**
      * Gets a channel by its id.
      *
@@ -301,29 +322,6 @@ interface YDE {
     fun requestGuildChannels(guildId: String): CompletableFuture<List<GuildChannel>> =
         requestGuildChannels(guildId.toLong())
 
-    /**
-     * The entity builder.
-     *
-     * @return The [EntityBuilder] object.
-     */
-    @get:Incubating val entityBuilder: EntityBuilder
-
-    /** Adds or removes slash commands */
-    val slashBuilder: ISlashCommandBuilder
-
-    /** Adds or removes user commands. */
-    val userCommandBuilder: IUserCommandBuilder
-
-    /** Adds or removes message commands. */
-    val messageCommandBuilder: IMessageCommandBuilder
-
-    /**
-     * Used to build embeds.
-     *
-     * @return The [EmbedBuilder] object.
-     */
-    val embedBuilder: EmbedBuilder
-
     /** Sets the guild ids for guild commands */
     fun setGuildIds(vararg guildIds: String)
 
@@ -385,6 +383,29 @@ interface YDE {
      */
     val bot: Bot?
 
+    /**
+     * The entity builder.
+     *
+     * @return The [EntityBuilder] object.
+     */
+    @get:Incubating val entityBuilder: EntityBuilder
+
+    /** Adds or removes slash commands */
+    val slashBuilder: ISlashCommandBuilder
+
+    /** Adds or removes user commands. */
+    val userCommandBuilder: IUserCommandBuilder
+
+    /** Adds or removes message commands. */
+    val messageCommandBuilder: IMessageCommandBuilder
+
+    /**
+     * Used to build embeds.
+     *
+     * @return The [EmbedBuilder] object.
+     */
+    val embedBuilder: EmbedBuilder
+
     /**
      * Overrides the custom to string method.
      *

src/main/kotlin/io/github/ydwk/yde/impl/YDEImpl.kt

@@ -61,12 +61,12 @@ open class YDEImpl(
     open var applicationId: String? = null,
     protected open val client: OkHttpClient,
     protected open var guildIdList: MutableList<String> = mutableListOf(),
-    open override val githubRepositoryUrl: String,
-    open override val wrapperVersion: String,
+    override val githubRepositoryUrl: String,
+    override val wrapperVersion: String,
 ) : YDE {
     val logger: Logger = LoggerFactory.getLogger(YDEImpl::class.java)
 
-    protected val allowedCache: MutableSet<CacheIds> = mutableSetOf()
+    private val allowedCache: MutableSet<CacheIds> = mutableSetOf()
     val cache: Cache = PerpetualCache(allowedCache)
     val memberCache: MemberCache = MemberCacheImpl(allowedCache)
 
@@ -128,6 +128,14 @@ open class YDEImpl(
         }
     }
 
+    override fun requestUsers(): CompletableFuture<List<User>> {
+        return this.restApiManager.get(EndPoint.UserEndpoint.GET_USERS).execute { it ->
+            val jsonBody = it.jsonBody
+            jsonBody?.map { UserImpl(it, it["id"].asLong(), this) }
+                ?: throw IllegalStateException("json body is null")
+        }
+    }
+
     override fun requestGuild(guildId: Long): CompletableFuture<Guild> {
         return this.restApiManager
             .get(EndPoint.GuildEndpoint.GET_GUILD, guildId.toString())
@@ -141,10 +149,22 @@ open class YDEImpl(
             }
     }
 
+    override fun requestGuilds(): CompletableFuture<List<Guild>> {
+        return this.restApiManager.get(EndPoint.GuildEndpoint.GET_GUILDS).execute { it ->
+            val jsonBody = it.jsonBody
+            jsonBody?.map { GuildImpl(this, it, it["id"].asLong()) }
+                ?: throw IllegalStateException("json body is null")
+        }
+    }
+
     override fun getGuildById(id: String): Guild? {
         return cache[id, CacheIds.GUILD] as Guild?
     }
 
+    override fun getGuilds(): List<Guild> {
+        return cache.values(CacheIds.GUILD).map { it as Guild }
+    }
+
     override fun getChannelById(id: Long): Channel? {
         return cache[id.toString(), CacheIds.CHANNEL] as Channel?
     }

src/main/kotlin/io/github/ydwk/yde/rest/EndPoint.kt

@@ -74,6 +74,7 @@ open class EndPoint {
         GET_AUDIT_LOGS("/guilds/%s/audit-logs"),
         GET_MEMBERS("/guilds/%s/members"),
         GET_GUILD("/guilds/%s"),
+        GET_GUILDS("/guilds"),
         GET_GUILD_CHANNELS("/guilds/%s/channels"),
         GET_MEMBER("/guilds/%s/members/%s"),
         CREATE_GUILD("/guilds"),
@@ -89,7 +90,8 @@ open class EndPoint {
 
     enum class UserEndpoint(private val endPoint: String) : IEnumEndpoint {
         CREATE_DM("/users/@me/channels"),
-        GET_USER("/users/%s");
+        GET_USER("/users/%s"),
+        GET_USERS("/users");
 
         override fun getEndpoint(): String {
             return endPoint