Implemented phone verification (only get) and 50 MiB file limit for nitro accounts

src/main/java/net/dv8tion/jda/core/entities/EntityBuilder.java

@@ -73,18 +73,25 @@ public SelfUser createSelfUser(JSONObject self)
             selfUser = new SelfUserImpl(id, api);
             api.setSelfUser(selfUser);
         }
+
         if (!api.getUserMap().containsKey(selfUser.getIdLong()))
-        {
             api.getUserMap().put(selfUser.getIdLong(), selfUser);
-        }
-        return (SelfUser) selfUser
-                .setVerified(self.getBoolean("verified"))
+
+        selfUser.setVerified(self.getBoolean("verified"))
                 .setMfaEnabled(self.getBoolean("mfa_enabled"))
-                .setEmail(!self.isNull("email") ? self.getString("email") : null)
                 .setName(self.getString("username"))
                 .setDiscriminator(self.getString("discriminator"))
                 .setAvatarId(self.isNull("avatar") ? null : self.getString("avatar"))
                 .setBot(self.has("bot") && self.getBoolean("bot"));
+
+        if (this.api.getAccountType() == AccountType.CLIENT)
+            selfUser
+                .setEmail(!self.isNull("email") ? self.getString("email") : null)
+                .setMobile(!self.isNull("mobile") ? self.getBoolean("mobile") : false)
+                .setNitro(!self.isNull("premium") ? self.getBoolean("premium") : false)
+                .setPhoneNumber(!self.isNull("phone") ? self.getString("phone") : null);
+
+        return selfUser;
     }
 
     public Game createGame(String name, String url, Game.GameType type)
@@ -989,7 +996,7 @@ public MessageEmbed createMessageEmbed(JSONObject messageEmbed)
                     imageJson.isNull("height") ? -1 : imageJson.getInt("height")));
         }
         else embed.setImage(null);
-        
+
         if (messageEmbed.has("footer"))
         {
             JSONObject footerJson = messageEmbed.getJSONObject("footer");
@@ -999,7 +1006,7 @@ public MessageEmbed createMessageEmbed(JSONObject messageEmbed)
                     footerJson.isNull("proxy_icon_url") ? null : footerJson.getString("proxy_icon_url")));
         }
         else embed.setFooter(null);
-        
+
         if (messageEmbed.has("fields"))
         {
             JSONArray fieldsJson = messageEmbed.getJSONArray("fields");
@@ -1016,7 +1023,7 @@ public MessageEmbed createMessageEmbed(JSONObject messageEmbed)
             embed.setFields(fields);
         }
         else embed.setFields(Collections.emptyList());
-        
+
         if (messageEmbed.has("video"))
         {
             JSONObject videoJson = messageEmbed.getJSONObject("video");

src/main/java/net/dv8tion/jda/core/entities/Message.java

@@ -63,7 +63,16 @@
  */
 public interface Message extends ISnowflake, Formattable
 {
-    int MAX_FILE_SIZE = 8 << 20; // 8mb
+    /**
+     * Useful constant for the max allowed file size for message attachments on normal accounts. Value: {@value #MAX_FILE_SIZE} Bytes (8 MiB)
+     */
+    int MAX_FILE_SIZE = 8 << 20; // 8 MiB
+
+    /**
+     * Useful constant for the max allowed file size for message attachments on nitro accounts. Value: {@value #MAX_FILE_SIZE_NITRO} Bytes (50 MiB)
+     */
+    int MAX_FILE_SIZE_NITRO = 50 << 20; // 50 MiB
+
     /**
      * A immutable list of all mentioned users. if no user was mentioned, this list is empty.
      * <br>In {@link net.dv8tion.jda.core.entities.PrivateChannel PrivateChannel's}, this always returns an empty List

src/main/java/net/dv8tion/jda/core/entities/MessageChannel.java

@@ -402,7 +402,7 @@ protected void handleResponse(Response response, Request<Message> request)
      *             <li>Provided {@code file} is null.</li>
      *             <li>Provided {@code file} does not exist.</li>
      *             <li>Provided {@code file} is unreadable.</li>
-     *             <li>Provided {@code file} is greater than 8MB.</li>
+     *             <li>Provided {@code file} is greater than 8 MiB on a normal or 50 MiB on a nitro account.</li>
      *             <li>Provided {@link net.dv8tion.jda.core.entities.Message Message} is not {@code null} <b>and</b>
      *                 contains a {@link net.dv8tion.jda.core.entities.MessageEmbed MessageEmbed} which
      *                 is not {@link net.dv8tion.jda.core.entities.MessageEmbed#isSendable(net.dv8tion.jda.core.AccountType) sendable}</li>
@@ -482,7 +482,7 @@ default RestAction<Message> sendFile(File file, Message message)
      *             <li>Provided {@code file} is null.</li>
      *             <li>Provided {@code file} does not exist.</li>
      *             <li>Provided {@code file} is unreadable.</li>
-     *             <li>Provided {@code file} is greater than 8MB.</li>
+     *             <li>Provided {@code file} is greater than 8 MiB on a normal or 50 MiB on a nitro account.</li>
      *             <li>Provided {@link net.dv8tion.jda.core.entities.Message Message} is not {@code null} <b>and</b>
      *                 contains a {@link net.dv8tion.jda.core.entities.MessageEmbed MessageEmbed} which
      *                 is not {@link net.dv8tion.jda.core.entities.MessageEmbed#isSendable(net.dv8tion.jda.core.AccountType) sendable}</li>
@@ -507,8 +507,8 @@ default RestAction<Message> sendFile(File file, String fileName, Message message
         Checks.notNull(file, "file");
         Checks.check(file.exists() && file.canRead(),
             "Provided file is either null, doesn't exist or is not readable!");
-        Checks.check(file.length() <= Message.MAX_FILE_SIZE,// TODO: deal with Discord Nitro allowing 50MB files.
-            "File is to big! Max file-size is 8MB");
+        Checks.check(file.length() <= getJDA().getSelfUser().getAllowedFileSize(),
+            "File is to big! Max file-size is 8 MiB for normal and 50 MiB for nitro users");
 
         Checks.notNull(fileName, "fileName");
 
@@ -638,7 +638,7 @@ protected void handleResponse(Response response, Request<Message> request)
      *
      * @throws java.lang.IllegalArgumentException
      *         <ul>
-     *             <li>If the provided filename is {@code null} or {@code empty} or the provided data is larger than 8MB.</li>
+     *             <li>If the provided filename is {@code null} or {@code empty} or the provided data is larger than 8 MiB on a normal or 50 MiB on a nitro account.</li>
      *             <li>If the provided {@link net.dv8tion.jda.core.entities.Message Message}
      *                 contains an {@link net.dv8tion.jda.core.entities.MessageEmbed MessageEmbed}
      *                 that is not {@link net.dv8tion.jda.core.entities.MessageEmbed#isSendable(net.dv8tion.jda.core.AccountType) sendable}</li>
@@ -660,11 +660,10 @@ protected void handleResponse(Response response, Request<Message> request)
     @CheckReturnValue
     default RestAction<Message> sendFile(byte[] data, String fileName, Message message)
     {
-        Checks.notNull(data, "file data[]");
+        Checks.notNull(data, "data");
         Checks.notNull(fileName, "fileName");
-
-        Checks.check(data.length <= Message.MAX_FILE_SIZE,   //8MB
-                "Provided data is too large! Max file-size is 8MB (%d)", Message.MAX_FILE_SIZE);
+        Checks.check(data.length <= getJDA().getSelfUser().getAllowedFileSize(),
+                "Provided data is too large! Max file-size is 8 MiB for normal and 50 MiB for nitro users");
 
         Route.CompiledRoute route = Route.Messages.SEND_MESSAGE.compile(getId());
         MultipartBody.Builder builder = new okhttp3.MultipartBody.Builder()

src/main/java/net/dv8tion/jda/core/entities/SelfUser.java

@@ -54,6 +54,54 @@ public interface SelfUser extends User
      */
     String getEmail() throws AccountTypeException;
 
+    /**
+     * Shows whether there has ever been a mobile app connected to this account.
+     * <br><b>NOTE:</b> this is a {@link net.dv8tion.jda.core.AccountType#CLIENT AccountType.CLIENT} method only!
+     *
+     * @throws AccountTypeException
+     *         If this method is called when {@link net.dv8tion.jda.core.JDA#getAccountType() JDA#getAccountType()} does not return
+     *         {@link net.dv8tion.jda.core.AccountType#CLIENT AccountType.CLIENT}. E.g: If the logged in account isn't a Client account!
+     *
+     * @return {@code true} if the account is linked with a mobile app, otherwise {@code false}
+     */
+    boolean isMobile() throws AccountTypeException;
+
+    /**
+     * The Discord Nitro status of this account.
+     * <br><b>NOTE:</b> this is a {@link net.dv8tion.jda.core.AccountType#CLIENT AccountType.CLIENT} method only!
+     *
+     * @throws AccountTypeException
+     *         If this method is called when {@link net.dv8tion.jda.core.JDA#getAccountType() JDA#getAccountType()} does not return
+     *         {@link net.dv8tion.jda.core.AccountType#CLIENT AccountType.CLIENT}. E.g: If the logged in account isn't a Client account!
+     *
+     * @return The Discord Nitro status of the currently logged in account.
+     */
+    boolean isNitro() throws AccountTypeException;
+
+    /**
+     * Used to get the phone number of the currently logged in account if a phone number has been attached to it.
+     * <br><b>NOTE:</b> this is a {@link net.dv8tion.jda.core.AccountType#CLIENT AccountType.CLIENT} method only!
+     *
+     * @throws AccountTypeException
+     *         If this method is called when {@link net.dv8tion.jda.core.JDA#getAccountType() JDA#getAccountType()} does not return
+     *         {@link net.dv8tion.jda.core.AccountType#CLIENT AccountType.CLIENT}. E.g: If the logged in account isn't a Client account!
+     *
+     * @return The phone of the currently logged in account or null if there's no number associated
+     */
+    String getPhoneNumber() throws AccountTypeException;
+
+    /**
+     * Returns the maximum size for files that can be uploaded with this account.
+     * <br>Returns {@value net.dv8tion.jda.core.entities.Message#MAX_FILE_SIZE} for bots and non-nitro client accounts
+     * and {@value net.dv8tion.jda.core.entities.Message#MAX_FILE_SIZE_NITRO} for client accounts with a active nitro subscription.
+     * 
+     * @return The maximum size for files that can be uploaded with this account
+     * 
+     * @see net.dv8tion.jda.core.entities.Message#MAX_FILE_SIZE
+     * @see net.dv8tion.jda.core.entities.Message#MAX_FILE_SIZE_NITRO
+     */
+    long getAllowedFileSize();
+
     /**
      * The {@link net.dv8tion.jda.core.managers.AccountManager AccountManager}
      * for the currently logged in account.
@@ -73,16 +121,4 @@ public interface SelfUser extends User
      * @return An AccountManagerUpdatable instance for the current account
      */
     AccountManagerUpdatable getManagerUpdatable();
-
-//    /**
-//     * Creates a OAuth invite-link used to invite bot-accounts.<br>
-//     * This is literally just a shortcut to
-//     * {@link net.dv8tion.jda.utils.ApplicationUtil#getAuthInvite(net.dv8tion.jda.JDA, net.dv8tion.jda.Permission...) ApplicationUtil.getAuthInvite(JDA, Permission...)}
-//     *
-//     * @param perms
-//     *      Possibly empty list of Permissions that should be requested via invite
-//     * @return
-//     *      The link used to invite the bot
-//     */
-//    String getAuthUrl(Permission... perms);
 }

src/main/java/net/dv8tion/jda/core/entities/impl/GuildImpl.java

@@ -516,20 +516,28 @@ public boolean checkVerification()
             return true;
         if(canSendVerification)
             return true;
+
+        if (api.getSelfUser().getPhoneNumber() != null)
+            return canSendVerification = true;
+
         switch (verificationLevel)
         {
+            case VERY_HIGH:
+                break; // we already checked for a verified phone number
             case HIGH:
-                if(ChronoUnit.MINUTES.between(getSelfMember().getJoinDate(), OffsetDateTime.now()) < 10)
+                if (ChronoUnit.MINUTES.between(getSelfMember().getJoinDate(), OffsetDateTime.now()) < 10)
                     break;
             case MEDIUM:
-                if(ChronoUnit.MINUTES.between(MiscUtil.getCreationTime(api.getSelfUser()), OffsetDateTime.now()) < 5)
+                if (ChronoUnit.MINUTES.between(MiscUtil.getCreationTime(api.getSelfUser()), OffsetDateTime.now()) < 5)
                     break;
             case LOW:
-                if(!api.getSelfUser().isVerified())
+                if (!api.getSelfUser().isVerified())
                     break;
             case NONE:
                 canSendVerification = true;
                 return true;
+            case UNKNOWN:
+                return true; // try and let discord decide
         }
         return false;
     }

src/main/java/net/dv8tion/jda/core/entities/impl/SelfUserImpl.java

@@ -16,6 +16,7 @@
 package net.dv8tion.jda.core.entities.impl;
 
 import net.dv8tion.jda.core.AccountType;
+import net.dv8tion.jda.core.entities.Message;
 import net.dv8tion.jda.core.entities.PrivateChannel;
 import net.dv8tion.jda.core.entities.SelfUser;
 import net.dv8tion.jda.core.exceptions.AccountTypeException;
@@ -34,6 +35,9 @@ public class SelfUserImpl extends UserImpl implements SelfUser
 
     //Client only
     private String email;
+    private String phoneNumber;
+    private boolean mobile;
+    private boolean nitro;
 
     public SelfUserImpl(long id, JDAImpl api)
     {
@@ -78,6 +82,39 @@ public String getEmail() throws AccountTypeException
         return email;
     }
 
+    @Override
+    public String getPhoneNumber() throws AccountTypeException
+    {
+        if (api.getAccountType() != AccountType.CLIENT)
+            throw new AccountTypeException(AccountType.CLIENT, "Phone number retrieval can only be done on CLIENT accounts!");
+        return this.phoneNumber;
+    }
+
+    @Override
+    public boolean isMobile() throws AccountTypeException
+    {
+        if (api.getAccountType() != AccountType.CLIENT)
+            throw new AccountTypeException(AccountType.CLIENT, "Mobile app retrieval can only be done on CLIENT accounts!");
+        return this.mobile;
+    }
+
+    @Override
+    public boolean isNitro() throws AccountTypeException
+    {
+        if (api.getAccountType() != AccountType.CLIENT)
+            throw new AccountTypeException(AccountType.CLIENT, "Nitro status retrieval can only be done on CLIENT accounts!");
+        return this.nitro;
+    }
+
+    @Override
+    public long getAllowedFileSize()
+    {
+        if (this.nitro) // by directly accessing the field we don't need to check the account type
+            return Message.MAX_FILE_SIZE_NITRO;
+        else
+            return Message.MAX_FILE_SIZE;
+    }
+
     @Override
     public AccountManager getManager()
     {
@@ -110,12 +147,6 @@ public AccountManagerUpdatable getManagerUpdatable()
         return mng;
     }
 
-//    @Override
-//    public String getAuthUrl(Permission... perms)
-//    {
-//        return ApplicationUtil.getAuthInvite(getJDA(), perms);
-//    }
-
     public SelfUserImpl setVerified(boolean verified)
     {
         this.verified = verified;
@@ -133,4 +164,22 @@ public SelfUserImpl setEmail(String email)
         this.email = email;
         return this;
     }
+
+    public SelfUserImpl setPhoneNumber(String phoneNumber)
+    {
+        this.phoneNumber = phoneNumber;
+        return this;
+    }
+
+    public SelfUserImpl setMobile(boolean mobile)
+    {
+        this.mobile = mobile;
+        return this;
+    }
+
+    public SelfUserImpl setNitro(boolean nitro)
+    {
+        this.nitro = nitro;
+        return this;
+    }
 }

src/main/java/net/dv8tion/jda/core/events/self/SelfUpdateMobileEvent.java

@@ -0,0 +1,44 @@
+/*
+ *     Copyright 2015-2017 Austin Keener & Michael Ritter & Florian Spieß
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dv8tion.jda.core.events.self;
+
+import net.dv8tion.jda.core.JDA;
+
+/**
+ * <b><u>SelfUpdateMobileEvent</u></b><br>
+ * Fired if you login to your discord account with a mobile device for the first time.<br>
+ */
+public class SelfUpdateMobileEvent extends GenericSelfUpdateEvent
+{
+    private final boolean wasMobile;
+
+    public SelfUpdateMobileEvent(JDA api, long responseNumber, boolean wasMobile)
+    {
+        super(api, responseNumber);
+        this.wasMobile = wasMobile;
+    }
+
+    /**
+     * Returns the old mobile status. <i>Should</i> always be {@code false}.
+     *
+     * @return The mobile status.
+     */
+    public boolean wasMobile()
+    {
+        return wasMobile;
+    }
+}