diff --git a/.idea/artifacts/vylionbot_jar.xml b/.idea/artifacts/geiserpbot_jar.xml similarity index 61% rename from .idea/artifacts/vylionbot_jar.xml rename to .idea/artifacts/geiserpbot_jar.xml index a417da8..953448b 100644 --- a/.idea/artifacts/vylionbot_jar.xml +++ b/.idea/artifacts/geiserpbot_jar.xml @@ -1,7 +1,7 @@ - - $PROJECT_DIR$/out/artifacts/vylionbot_jar - + + $PROJECT_DIR$/out/artifacts/geiserpbot_jar + diff --git a/src/elements/messages/PrivateMessage.java b/src/elements/messages/PrivateMessage.java index f2a9d09..a3512f6 100644 --- a/src/elements/messages/PrivateMessage.java +++ b/src/elements/messages/PrivateMessage.java @@ -11,6 +11,29 @@ public class PrivateMessage extends Message { public PrivateMessage(JSONObject message) { super(message); + + fullName = message.getJSONObject("from").getString("first_name"); + uid = message.getJSONObject("from").getInt("id"); + + //Check for user last name + if (message.getJSONObject("from").has("last_name")) + fullName += " " + message.getJSONObject("from").getString("last_name"); + + //Check for user username + if (message.getJSONObject("from").has("username")) + userName = message.getJSONObject("from").getString("username"); + else userName = null; + + //Get group chat name + if (message.getJSONObject("chat").has("title")) + chatName = message.getJSONObject("chat").getString("title"); + else chatName = null; + + if (message.has("text")) + text = message.getString("text"); + else text = null; + + consoleLog = message.toString(); } @Override