Images Part 1 and Part 2

src/main/java/com/google/codeu/data/Datastore.java

@@ -43,7 +43,9 @@ public void storeMessage(Message message) {
     messageEntity.setProperty("text", message.getText());
     messageEntity.setProperty("timestamp", message.getTimestamp());
     messageEntity.setProperty("recipient", message.getRecipient());
-
+    if(message.getImageUrl() != null) {
+    	  messageEntity.setProperty("imageUrl", message.getImageUrl());
+    	}
     datastore.put(messageEntity);
   }
 
@@ -58,8 +60,8 @@ public List<Message> messageConverter(PreparedQuery results) {
         String recipient = (String) entity.getProperty("recipient");
         String text = (String) entity.getProperty("text");
         long timestamp = (long) entity.getProperty("timestamp");
-
-        Message message = new Message(id, user, text, timestamp, recipient);
+        String imageUrl = (String) entity.getProperty("imageUrl");
+        Message message = new Message(id, user, text, timestamp, recipient,  imageUrl);
         messages.add(message);
       } catch (Exception e) {
         System.err.println("Error reading message.");

src/main/java/com/google/codeu/data/Message.java

@@ -26,21 +26,25 @@ public class Message {
   private String text;
   private long timestamp;
   private String recipient;
+  private String imageUrl;
+  private int positiveVote = 0;
+  private int negativeVote = 0;
 
   /**
    * Constructs a new {@link Message} posted by {@code user} with {@code text} content to a {@code
    * recipient}. Generates a random ID and uses the current system time for the creation time.
    */
   public Message(String user, String text, String recipient) {
-    this(UUID.randomUUID(), user, text, System.currentTimeMillis(), recipient);
+    this(UUID.randomUUID(), user, text, System.currentTimeMillis(), recipient, "none");
   }
 
-  public Message(UUID id, String user, String text, long timestamp, String recipient) {
+  public Message(UUID id, String user, String text, long timestamp, String recipient, String imageUrl) {
     this.id = id;
     this.user = user;
     this.text = text;
     this.timestamp = timestamp;
     this.recipient = recipient;
+    this.imageUrl = imageUrl;
   }
 
   public UUID getId() {
@@ -62,4 +66,41 @@ public long getTimestamp() {
   public String getRecipient() {
     return recipient;
   }
+
+public void setImageUrl(String imageUrl) {
+	this.imageUrl = imageUrl;
+}
+
+public Object getImageUrl() {
+	// TODO Auto-generated method stub
+	return imageUrl;
+}
+
+public int getNegativeVote() {
+	return negativeVote;
+}
+
+public void setNegativeVote(int negativeVote) {
+	this.negativeVote = negativeVote;
+}
+
+public void incrementNegativeVote() {
+	this.negativeVote++;
+}
+
+public int getPositiveVote() {
+	return positiveVote;
+}
+
+public void setPositiveVote(int positiveVote) {
+	this.positiveVote = positiveVote;
+}
+
+public void incrementPositiveVote() {
+	this.positiveVote++;
+}
+
+public int getMessageScore() {
+	return this.positiveVote-this.negativeVote;
+}
 }

src/main/java/com/google/codeu/servlets/ImageUploadUrlServlet.java

@@ -0,0 +1,26 @@
+package com.google.codeu.servlets;
+
+import com.google.appengine.api.blobstore.BlobstoreService;
+import com.google.appengine.api.blobstore.BlobstoreServiceFactory;
+import java.io.IOException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Provides access to a URL that allows a user to upload an image to Blobstore.
+ */
+@WebServlet("/image-upload-url")
+public class ImageUploadUrlServlet extends HttpServlet {
+
+  @Override
+  public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+    BlobstoreService blobstoreService = BlobstoreServiceFactory.getBlobstoreService();
+    String uploadUrl = blobstoreService.createUploadUrl("/messages") ;
+
+    response.setContentType("text/html");
+    response.getOutputStream().println(uploadUrl);
+  }
+}

src/main/java/com/google/codeu/servlets/MessageServlet.java

@@ -16,13 +16,21 @@
 
 package com.google.codeu.servlets;
 
+import com.google.appengine.api.blobstore.BlobKey;
+import com.google.appengine.api.blobstore.BlobstoreService;
+import com.google.appengine.api.blobstore.BlobstoreServiceFactory;
+import com.google.appengine.api.images.ImagesServiceFactory;
+import com.google.appengine.api.images.ImagesServicePb.ImagesService;
+import com.google.appengine.api.images.ServingUrlOptions;
 import com.google.appengine.api.users.UserService;
 import com.google.appengine.api.users.UserServiceFactory;
 import com.google.codeu.data.Datastore;
 import com.google.codeu.data.Message;
 import com.google.gson.Gson;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
+
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -80,8 +88,24 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
     String recipient = request.getParameter("recipient");
     System.out.println("print recipient:");
     System.out.println(recipient);
-
-    Message message = new Message(user, text, recipient);
+
+    String regex = "(https?://\\S+\\.(png|jpg))";
+    String replacement = "<img src=\"$1\" />";
+    String textWithImagesReplaced = text.replaceAll(regex, replacement);
+
+    Message message = new Message(user, textWithImagesReplaced, recipient);
+    BlobstoreService blobstoreService = BlobstoreServiceFactory.getBlobstoreService();
+    Map<String, List<BlobKey>> blobs = blobstoreService.getUploads(request);
+    List<BlobKey> blobKeys = blobs.get("image");
+
+    if(blobKeys != null && !blobKeys.isEmpty()) {
+        BlobKey blobKey = blobKeys.get(0);
+        com.google.appengine.api.images.ImagesService imagesService = ImagesServiceFactory.getImagesService();
+        ServingUrlOptions options = ServingUrlOptions.Builder.withBlobKey(blobKey);
+        String imageUrl = imagesService.getServingUrl(options);
+        message.setImageUrl(imageUrl);
+      }
+
     datastore.storeMessage(message);
 
     response.sendRedirect("/user-page.html?user=" + recipient);

src/main/webapp/css/user-page.css

@@ -44,4 +44,13 @@
    user is not logged in or viewing their own page. */
 .hidden {
   display: none;
+}
+
+/* Use this to ensure that the message is completely
+	displayed on one page */
+
+.message-body img {
+  display: block;
+  margin-top: 25px;
+  max-width: 75%;
 }

src/main/webapp/js/user-page-loader.js

@@ -47,6 +47,33 @@ function showMessageFormIfLoggedIn() {
 	      });
 	}
 
+/**
+ * Shows the message form if the user is logged in and viewing their own page.
+ */
+function showMessageFormIfViewingSelf() {
+  fetch('/login-status')
+      .then((response) => {
+        return response.json();
+      })
+      .then((loginStatus) => {
+        if (loginStatus.isLoggedIn &&
+            loginStatus.username == parameterUsername) {
+          fetchImageUploadUrlAndShowForm();
+        }
+      });
+}
+
+function fetchImageUploadUrlAndShowForm() {
+  fetch('/image-upload-url')
+      .then((response) => {
+        return response.text();
+      })
+      .then((imageUploadUrl) => {
+        const messageForm = document.getElementById('message-form');
+        messageForm.action = imageUploadUrl;
+        messageForm.classList.remove('hidden');
+      });
+}
 
 /** Fetches messages and add them to the page. */
 function fetchMessages() {
@@ -89,13 +116,18 @@ function buildMessageDiv(message) {
   messageDiv.appendChild(headerDiv);
   messageDiv.appendChild(bodyDiv);
 
+  if(message.imageUrl){
+  	bodyDiv.innerHTML += '<br/>';
+  	bodyDiv.innerHTML += '<img src="' + message.imageUrl + '" />';
+  }
   return messageDiv;
 }
 
 /** Fetches data and populates the UI of the page. */
 function buildUI() {
   setPageTitle();
-  showMessageFormIfLoggedIn();
+  //showMessageFormIfLoggedIn();
+  showMessageFormIfViewingSelf()
   fetchMessages();
   fetchAboutMe();
 }

src/main/webapp/user-page.html

@@ -31,11 +31,14 @@
     </nav>
     <h1 id="page-title">User Page</h1>
 
-    <form id="message-form" action="/messages" method="POST" class="hidden">
+    <form id="message-form" action="/messages" method="POST" class="hidden" enctype="multipart/form-data">
       Enter a new message:
       <br/>
       <textarea name="text" id="message-input"></textarea>
       <br/>
+      Add an image to your message:
+  	  <input type="file" name="image">
+  	  <br/>
       <input type="submit" value="Submit">
     </form>
     <hr/>