Merge 363c514a3b1b8a2d05703dc17ad5c82beb10671b into bd1fca498ef63809a3a7a9e8867a8c20219bafbb

Client/Client.iml

@@ -5,14 +5,20 @@
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.6" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.6" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.4" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp:okhttp:2.7.5" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.6.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.4" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.squareup.okhttp3:mockwebserver:3.10.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.squareup.okhttp3:okhttp:3.10.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.bouncycastle:bcprov-jdk15on:1.50" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
   </component>
 </module>

Client/pom.xml

@@ -11,5 +11,21 @@
 
     <artifactId>Client</artifactId>
 
+    <dependencies>
+        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.9.4</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.squareup.okhttp/okhttp -->
+        <dependency>
+            <groupId>com.squareup.okhttp</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>2.7.5</version>
+        </dependency>
+    </dependencies>
+
+
 
 </project>

Client/src/main/java/DMGetter.java

@@ -0,0 +1,14 @@
+public class DMGetter implements Runnable{
+    private User user;
+    private YouAreEll webber;
+
+    public DMGetter(User user, YouAreEll webber) {
+        this.user = user;
+        this.webber = webber;
+    }
+
+    public void run() {
+        String results = webber.get_DMs(user);
+        SimpleShell.prettyPrintMessages(results);
+    }
+}

Client/src/main/java/DMScraper.java

@@ -0,0 +1,53 @@
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+public class DMScraper implements Runnable{
+    private ArrayList<Message> messageList;
+    private User user;
+    private YouAreEll webber;
+
+    public DMScraper(User user, YouAreEll webber) {
+        this.user = user;
+        this.webber = webber;
+    }
+
+    public void run() {
+        this.messageList = new ArrayList<Message>();
+        ObjectMapper objectMapper = new ObjectMapper();
+        Message[] incoming = new Message[0];
+        String scrape;
+        while (true){
+            waitN(5000);
+            scrape = webber.get_DMs(user);
+            waitN(100);
+            try {
+                incoming = objectMapper.readValue(scrape, Message[].class);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            for (Message message:incoming) {
+                if (newMessageCheck(message)){
+                    System.out.println("New DM!\n" + message.getFromid() + " says: " + message.getMessage());
+                    this.messageList.add(message);
+                }
+            }
+        }
+    }
+
+    private void waitN(int i) {
+        try {
+            Thread.sleep(i);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private boolean newMessageCheck(Message newMessage){
+        for (Message message:this.messageList) {
+            if (message.getSequence().equals(newMessage.getSequence())) return false;
+        }
+        return true;
+    }
+}

Client/src/main/java/IDGetter.java

@@ -0,0 +1,23 @@
+public class IDGetter implements Runnable{
+    private User user;
+    private YouAreEll webber;
+
+    public IDGetter(User user, YouAreEll webber) {
+        this.user = user;
+        this.webber = webber;
+    }
+
+    public void run() {
+        String results = webber.get_ids(user);
+        simulateLag();
+        SimpleShell.prettyPrintUsers(results);
+    }
+
+    private void simulateLag() {
+        try {
+            Thread.sleep(10000);
+        } catch (InterruptedException e){
+            e.printStackTrace();
+        }
+    }
+}

Client/src/main/java/Logger.java

@@ -0,0 +1,19 @@
+//import java.util.logging.Level;
+//
+//public class Logger {
+//
+//    // Creation & retrieval methods:
+//    public static Logger getRootLogger();
+//    public static Logger getLogger(String name);
+//
+//    // printing methods:
+//    public void trace(Object message);
+//    public void debug(Object message);
+//    public void info(Object message);
+//    public void warn(Object message);
+//    public void error(Object message);
+//    public void fatal(Object message);
+//
+//    // generic printing method:
+//    public void log(Level l, Object message);
+//}

Client/src/main/java/Message.java

@@ -0,0 +1,49 @@
+public class Message {
+    private String sequence;
+    private String timestamp;
+    private String fromid;
+    private String toid;
+    private String message;
+
+    public Message(){ }
+
+    public Message(String fromid, String toid, String message) {
+        this.sequence = "-";
+        this.timestamp = "2018-03-21T01:00:00.0Z";
+        this.fromid = fromid;
+        this.toid = toid;
+        this.message = message;
+    }
+
+    public String getSequence() {
+        return sequence;
+    }
+
+    public String getTimestamp() {
+        return timestamp;
+    }
+
+    public String getFromid() {
+        return fromid;
+    }
+
+    public void setFromid(String fromid) {
+        this.fromid = fromid;
+    }
+
+    public String getToid() {
+        return toid;
+    }
+
+    public void setToid(String toid) {
+        this.toid = toid;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

Client/src/main/java/MessageLogger.java

@@ -0,0 +1,23 @@
+public class MessageLogger implements Runnable{
+    private User user;
+    private YouAreEll webber;
+
+    public MessageLogger(User user, YouAreEll webber) {
+        this.user = user;
+        this.webber = webber;
+    }
+
+    public void run() {
+        String results = webber.get_messages(user);
+        simulateLag();
+        SimpleShell.prettyPrintMessages(results);
+    }
+
+    private void simulateLag() {
+        try {
+            Thread.sleep(10000);
+        } catch (InterruptedException e){
+            e.printStackTrace();
+        }
+    }
+}

Client/src/main/java/MessageScraper.java

@@ -0,0 +1,53 @@
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+public class MessageScraper implements Runnable{
+    private ArrayList<Message> messageList;
+    private User user;
+    private YouAreEll webber;
+
+    public MessageScraper(User user, YouAreEll webber) {
+        this.user = user;
+        this.webber = webber;
+    }
+
+    public void run() {
+        this.messageList = new ArrayList<Message>();
+        ObjectMapper objectMapper = new ObjectMapper();
+        Message[] incoming = new Message[0];
+        String scrape;
+        while (true){
+            waitN(4000);
+            scrape = webber.get_messages(user);
+            waitN(100);
+            try {
+                incoming = objectMapper.readValue(scrape, Message[].class);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            for (Message message:incoming) {
+                if (newMessageCheck(message)){
+                    System.out.println("New Message!\n" + message.getFromid() + " says: " + message.getMessage());
+                    this.messageList.add(message);
+                }
+            }
+        }
+    }
+
+    private void waitN(int i) {
+        try {
+            Thread.sleep(i);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private boolean newMessageCheck(Message newMessage){
+        for (Message message:this.messageList) {
+            if (message.getSequence().equals(newMessage.getSequence())) return false;
+        }
+        return true;
+    }
+}

Client/src/main/java/MessageSender.java

@@ -0,0 +1,46 @@
+import java.util.List;
+
+public class MessageSender implements Runnable{
+    private List<String> list;
+    private User user;
+    private YouAreEll webber;
+    private Message message;
+    private String sentence = "";
+
+    public MessageSender(List<String> list, User user, YouAreEll webber) {
+        this.list = list;
+        this.user = user;
+        this.webber = webber;
+    }
+
+    public void run() {
+        buildSentence();
+        buildMessage();
+        String results = webber.send_message(message);
+        simulateLag();
+        SimpleShell.prettyPrintMessage(results);
+    }
+
+    private void simulateLag() {
+        try {
+            Thread.sleep(10000);
+        } catch (InterruptedException e){
+            e.printStackTrace();
+        }
+    }
+
+    private void buildMessage() {
+        if (list.get(1).equalsIgnoreCase("group")){
+            message = new Message(user.getGithub(), "", sentence);
+        } else {
+            message = new Message(user.getGithub(), list.get(1), sentence);
+        }
+    }
+
+    private void buildSentence() {
+        for (int i = 2; i < list.size(); i++) {
+            sentence += list.get(i) + " ";
+        }
+        sentence = sentence.substring(0, sentence.length()-1);
+    }
+}

Client/src/main/java/SimpleShell.java

@@ -1,3 +1,6 @@
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.log4j.*;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -7,11 +10,48 @@ import java.util.List;
 
 public class SimpleShell {
 
+    private static final Logger logger = LogManager.getLogger(SimpleShell.class);
 
-    public static void prettyPrint(String output) {
-        // yep, make an effort to format things nicely, eh?
-        System.out.println(output);
+    public static void prettyPrintUsers(String output) {
+        ObjectMapper mapper = new ObjectMapper();
+        User[] users = null;
+        try {
+            users = mapper.readValue(output, User[].class);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        for (User user:users){
+            System.out.println("Name: " + user.getName() + " Github: " + user.getGithub() + "\n-----------------------------------------");
+        }
     }
+
+    public static void prettyPrintMessages(String output) {
+        ObjectMapper mapper = new ObjectMapper();
+        Message[] messages = null;
+        try {
+            messages = mapper.readValue(output, Message[].class);
+        } catch (IOException e) {
+            logger.trace("Pretty Print Message exception");
+            e.printStackTrace();
+        }
+        for (Message message:messages){
+            if (message.getToid().equals("")) System.out.println(message.getFromid() + ": " + message.getMessage() + "\n-----------------------------------------");
+            else System.out.println(message.getFromid() + " says to " + message.getToid() + ": " + message.getMessage() + "\n-----------------------------------------");
+        }
+    }
+
+    public static void prettyPrintMessage(String output) {
+        ObjectMapper mapper = new ObjectMapper();
+        Message message = null;
+        try {
+            message = mapper.readValue(output, Message.class);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        if (message.getToid().equals("")) System.out.println(message.getFromid() + ": " + message.getMessage() + "\n-----------------------------------------");
+        else System.out.println(message.getFromid() + " says to " + message.getToid() + ": " + message.getMessage() + "\n-----------------------------------------");
+    }
+
     public static void main(String[] args) throws java.io.IOException {
 
         YouAreEll webber = new YouAreEll();
@@ -22,6 +62,16 @@ public class SimpleShell {
         ProcessBuilder pb = new ProcessBuilder();
         List<String> history = new ArrayList<String>();
         int index = 0;
+        System.out.println("your name is? ");
+        String name = console.readLine();
+        System.out.println("your github id is? ");
+        String githubID = console.readLine();
+        User user = new User(name, githubID);
+        System.out.println(user.getName() + " " + user.getGithub());
+        Thread dmscrapeThread = new Thread(new DMScraper(user, webber));
+        dmscrapeThread.start();
+        Thread globalScrapeThread = new Thread(new MessageScraper(user, webber));
+        globalScrapeThread.start();
         //we break out with <ctrl c>
         while (true) {
             //read what the user enters
@@ -60,19 +110,31 @@ public class SimpleShell {
 
                 // ids
                 if (list.contains("ids")) {
-                    String results = webber.get_ids();
-                    SimpleShell.prettyPrint(results);
+                    Thread thread = new Thread(new IDGetter(user, webber));
+                    thread.start();
                     continue;
                 }
 
                 // messages
                 if (list.contains("messages")) {
-                    String results = webber.get_messages();
-                    SimpleShell.prettyPrint(results);
+                    Thread thread = new Thread(new MessageLogger(user, webber));
+                    thread.start();
                     continue;
                 }
                 // you need to add a bunch more.
 
+                if (list.contains("dms")) {
+                    Thread thread = new Thread(new DMGetter(user, webber));
+                    thread.start();
+                    continue;
+                }
+
+                if (list.contains("send")) {
+                    Thread thread = new Thread(new MessageSender(list, user, webber));
+                    thread.start();
+                    continue;
+                }
+
                 //!! command returns the last command in history
                 if (list.get(list.size() - 1).equals("!!")) {
                     pb.command(history.get(history.size() - 2));

Client/src/main/java/URLCall.java

@@ -0,0 +1,9 @@
+public class URLCall {
+    String mainurl;
+    String method;
+    String jpayload;
+
+    public URLCall(String m){
+
+    }
+}

Client/src/main/java/User.java

@@ -0,0 +1,36 @@
+public class User {
+    private String name;
+    private String github;
+    private String userid;
+
+    public User(){}
+
+    public User(String name, String github) {
+        this.name = name;
+        this.github = github;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getGithub() {
+        return github;
+    }
+
+    public void setGithub(String github) {
+        this.github = github;
+    }
+
+    public String getUserid() {
+        return userid;
+    }
+
+    public void setUserid(String userid) {
+        this.userid = userid;
+    }
+}

Client/src/main/java/YouAreEll.java

@@ -1,4 +1,16 @@
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.squareup.okhttp.*;
+import sun.rmi.runtime.Log;
+
+import javax.swing.text.html.parser.Entity;
+import java.awt.*;
+import java.io.IOException;
+
 public class YouAreEll {
+    private String base = "http://zipcode.rocks:8085";
+    private static final MediaType json = MediaType.parse("application/json; charset=utf-8");
+    private OkHttpClient okClient = new OkHttpClient();
 
     YouAreEll() {
     }
@@ -6,18 +18,60 @@ public class YouAreEll {
     public static void main(String[] args) {
         YouAreEll urlhandler = new YouAreEll();
         System.out.println(urlhandler.MakeURLCall("/ids", "GET", ""));
-        System.out.println(urlhandler.MakeURLCall("/messages", "GET", ""));
     }
 
-    public String get_ids() {
-        return MakeURLCall("/ids", "GET", "");
+    public String get_ids(User user) {
+        ObjectMapper objectMapper = new ObjectMapper();
+        try {
+            return MakeURLCall("/ids", "GET", objectMapper.writeValueAsString(user));
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public String get_DMs(User user){
+        return MakeURLCall("/ids/" + user.getGithub() + "/messages", "GET", "");
     }
 
-    public String get_messages() {
+    public String get_messages(User user) {
         return MakeURLCall("/messages", "GET", "");
     }
 
+    public String send_message(Message message) {
+        ObjectMapper mapper = new ObjectMapper();
+        String jpayload = null;
+        try {
+            jpayload = mapper.writeValueAsString(message);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        return MakeURLCall("/ids/" + message.getFromid() + "/messages" , "POST", jpayload);
+    }
+
     public String MakeURLCall(String mainurl, String method, String jpayload) {
+        //System.out.println(jpayload);
+        String fullUrl = base + mainurl;
+        Request request = null;
+        if (method.equalsIgnoreCase("get")){
+            request = new Request.Builder()
+                    .url(fullUrl).get().build();
+        } else if (method.equalsIgnoreCase("post")){
+            request = new Request.Builder()
+                    .url(fullUrl).post(RequestBody.create(json, jpayload))
+                    .build();
+        }
+        try {
+            Response response = okClient.newCall(request).execute();
+            return response.body().string();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
         return "nada";
     }
 }
+
+//jpayload = "{\n" +
+//        "\"name\":\"pat\",\n" +
+//        "\"github\": \"patglavin\"\n" +
+//        "}";

YouAreEll.iml

@@ -8,8 +8,15 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.6" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.6" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.4" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.squareup.okhttp3:mockwebserver:3.10.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.squareup.okhttp3:okhttp:3.10.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.squareup.okio:okio:1.14.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.bouncycastle:bcprov-jdk15on:1.50" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
   </component>
 </module>

pom.xml

@@ -13,10 +13,23 @@
     </modules>
 
     <dependencies>
+        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.8.6</version>
+            <version>2.9.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>mockwebserver</artifactId>
+            <version>3.10.0</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/log4j/log4j -->
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
         </dependency>
     </dependencies>
 </project>