Merge remote-tracking branch 'origin/master'

Author: Shengaero

examples/src/main/java/com/jagrosh/jdautilities/examples/command/AboutCommand.java

@@ -86,8 +86,16 @@ protected void execute(CommandEvent event) {
         builder.setAuthor("All about " + event.getSelfUser().getName() + "!", null, event.getSelfUser().getAvatarUrl());
         boolean join = !(event.getClient().getServerInvite() == null || event.getClient().getServerInvite().isEmpty());
         boolean inv = !oauthLink.isEmpty();
-        String invline = "\n" + (join ? "Join my server [`here`](" + event.getClient().getServerInvite() + ")" : (inv ? "Please " : "")) + (inv ? (join ? ", or " : "") + "[`invite`](" + oauthLink + ") me to your server" : "") + "!";
-        StringBuilder descr = new StringBuilder("Hello! I am **" + event.getSelfUser().getName() + "**, " + description + "\nI " + (IS_AUTHOR ? "was written in Java" : "am owned") + " by **" + event.getJDA().getUserById(event.getClient().getOwnerId()).getName() + "** using " + JDAUtilitiesInfo.AUTHOR + "'s [Commands Extension](" + JDAUtilitiesInfo.GITHUB + ") (" + JDAUtilitiesInfo.VERSION + ") and the " + "[JDA library](https://github.com/DV8FromTheWorld/JDA) (" + JDAInfo.VERSION + ")" + "\nType `" + event.getClient().getTextualPrefix() + event.getClient().getHelpWord() + "` to see my commands!" + (join || inv ? invline : "") + "\n\nSome of my features include: ```css");
+        String invline = "\n" + (join ? "Join my server [`here`](" + event.getClient().getServerInvite() + ")" : (inv ? "Please " : "")) 
+                + (inv ? (join ? ", or " : "") + "[`invite`](" + oauthLink + ") me to your server" : "") + "!";
+        String author = event.getJDA().getUserById(event.getClient().getOwnerId())==null ? "<@" + event.getClient().getOwnerId()+">" 
+                : event.getJDA().getUserById(event.getClient().getOwnerId()).getName();
+        StringBuilder descr = new StringBuilder().append("Hello! I am **").append(event.getSelfUser().getName()).append("**, ")
+                .append(description).append("\nI ").append(IS_AUTHOR ? "was written in Java" : "am owned").append(" by **")
+                .append(author).append("** using " + JDAUtilitiesInfo.AUTHOR + "'s [Commands Extension](" + JDAUtilitiesInfo.GITHUB + ") (")
+                .append(JDAUtilitiesInfo.VERSION).append(") and the [JDA library](https://github.com/DV8FromTheWorld/JDA) (")
+                .append(JDAInfo.VERSION).append(")\nType `").append(event.getClient().getTextualPrefix()).append(event.getClient().getHelpWord())
+                .append("` to see my commands!").append(join || inv ? invline : "").append("\n\nSome of my features include: ```css");
         for (String feature : features)
             descr.append("\n").append(event.getClient().getSuccess().startsWith("<") ? REPLACEMENT_ICON : event.getClient().getSuccess()).append(" ").append(feature);
         descr.append(" ```");
@@ -100,7 +108,8 @@ protected void execute(CommandEvent event) {
         }
         else
         {
-            builder.addField("Stats", (event.getClient()).getTotalGuilds() + " Servers\nShard " + (event.getJDA().getShardInfo().getShardId() + 1) + "/" + event.getJDA().getShardInfo().getShardTotal(), true);
+            builder.addField("Stats", (event.getClient()).getTotalGuilds() + " Servers\nShard " + (event.getJDA().getShardInfo().getShardId() + 1) 
+                    + "/" + event.getJDA().getShardInfo().getShardTotal(), true);
             builder.addField("This shard", event.getJDA().getUsers().size() + " Users\n" + event.getJDA().getGuilds().size() + " Servers", true);
             builder.addField("", event.getJDA().getTextChannels().size() + " Text Channels\n" + event.getJDA().getVoiceChannels().size() + " Voice Channels", true);
         }