From 6275522cc9977bcb30309684f66919012c5db427 Mon Sep 17 00:00:00 2001
From: nawta <wes904@icloud.com>
Date: Wed, 26 Aug 2020 11:51:49 +0900
Subject: [PATCH 1/6] add friendlist.html, modified dir path

---
 src/main/resources/templates/chat.html       |  2 +-
 src/main/resources/templates/emologlist.html | 11 ++--
 src/main/resources/templates/friendlist.html | 57 ++++++++++++++++++++
 3 files changed, 64 insertions(+), 6 deletions(-)
 create mode 100644 src/main/resources/templates/friendlist.html
diff --git a/src/main/resources/templates/chat.html b/src/main/resources/templates/chat.html
index d2c89a0..39ac675 100644
--- a/src/main/resources/templates/chat.html
+++ b/src/main/resources/templates/chat.html
@@ -12,7 +12,7 @@
   <div class="header">
     <ul class="header_ul">
       <li>
-        <a href="emologlist.html"> <img th:src="@{../static/images/arrow_left_24.png}" alt="backbutton"></a>
+        <a href="emologlist.html"> <img th:src="@{/images/arrow_left_24.png}" alt="backbutton"></a>
       </li>
       <li>
         <div class="friend-name">
diff --git a/src/main/resources/templates/emologlist.html b/src/main/resources/templates/emologlist.html
index 3d43151..e1aa9cd 100644
--- a/src/main/resources/templates/emologlist.html
+++ b/src/main/resources/templates/emologlist.html
@@ -23,12 +23,13 @@
 
           <!-- 本当はjava でデータを取ってきてすべて表示　例を書く-->
          <ul>
-            <li><a href="chat.html">
+            <li>
               <p class="emolog-date">8月18日<p>
-              <!--相手のエモログの表示-->
-              <p class="emoji">&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;</p>
-              <img src="../static/images/arrow.png" alt="emolog_arrow">
-              </a>
+                <a href="chat.html">
+                    <!--相手のエモログの表示-->
+                    <div class="emoji" th:object="${}"><p th:utext = "*{}"></p></div>
+                    <img src="../static/images/arrow.png" alt="emolog_arrow">
+                </a>
             </li>
             <li>
               <p class="emolog-date">8月17日<p>
diff --git a/src/main/resources/templates/friendlist.html b/src/main/resources/templates/friendlist.html
new file mode 100644
index 0000000..a6f9409
--- /dev/null
+++ b/src/main/resources/templates/friendlist.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title>Friendlist</title>
+</head>
+<body>
+<div id="wrap"><!-- メインコンテンツ-->
+    <div class="content">
+        <!-- 日ごとのエモログの一覧を表示-->
+        <div class="emolog-list">
+
+            <!-- 本当はjava でデータを取ってきてすべて表示　例を書く-->
+            <ul>
+                <li>
+                    <p class="person" th:text="${user}"><p>
+                    <a href="chat.html">
+                        <!--相手のエモログの表示-->
+                        <div class="emoji" th:object="${}"><p th:utext = "*{}"></p></div>
+        <img src="../static/images/arrow.png" alt="emolog_arrow">
+        </a>
+        </li>
+        <li>
+            <p class="emolog-date">8月17日<p>
+            <!--相手のエモログの表示-->
+            <p class="emoji">&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;</p>
+            <img src="../static/images/arrow.png" alt="emolog_arrow">
+        </li>
+        <li>
+            <p class="emolog-date">8月16日<p>
+            <!--相手のエモログの表示-->
+            <p class="emoji">&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;</p>
+            <img src="../static/images/arrow.png" alt="emolog_arrow">
+        </li>
+        <li>
+            <p class="emolog-date">8月15日<p>
+            <!--相手のエモログの表示-->
+            <p class="emoji">&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;</p>
+            <img src="../static/images/arrow.png" alt="emolog_arrow">
+        </li>
+        </ul>
+    </div>
+
+    <!-- ナビゲーションバーを表示-->
+    <nav class="global-nav">
+        <li><a href="home.html">Home</a></li>
+        <li><a href="friendlist.html">Talk</a></li>
+        <li><a href="setting.html">Setting</a></li>
+    </nav>
+</div>
+</div>
+<!--<footer>
+  <small>(C)2020 Midori-no-tsume</small>
+</footer>-->
+
+</body>
+</html>
\ No newline at end of file

From e57e9985b4dbfc725c2daef990ead4c1a1c50603 Mon Sep 17 00:00:00 2001
From: nawta <wes904@icloud.com>
Date: Wed, 26 Aug 2020 12:39:38 +0900
Subject: [PATCH 2/6] fix bugs on SQL query

---
 demo.iml                                          |  3 ++-
 docker/pg/1-createTable.sql                       | 12 ++++++++++--
 .../example/demo/controller/EmologController.java |  3 ++-
 .../example/demo/controller/HtmlController.java   | 15 +++++++++++++++
 src/main/resources/templates/emologlist.html      |  2 +-
 src/main/resources/templates/friendlist.html      |  6 +++---
 src/main/resources/templates/index.html           | 11 +++++++++++
 7 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/com/example/demo/controller/HtmlController.java
 create mode 100644 src/main/resources/templates/index.html

diff --git a/demo.iml b/demo.iml
index b88d9d8..caafeac 100644
--- a/demo.iml
+++ b/demo.iml
@@ -41,6 +41,8 @@
     <orderEntry type="library" name="twitter4j-core-4.0.7" level="project" />
     <orderEntry type="library" name="twitter4j-examples-4.0.7" level="project" />
     <orderEntry type="library" name="twitter4j-stream-4.0.7" level="project" />
+    <orderEntry type="library" name="Maven: com.vdurmont:emoji-java:4.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20170516" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:2.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.2.RELEASE" level="project" />
@@ -177,6 +179,5 @@
     <orderEntry type="library" name="Maven: org.seasar.doma:doma:2.18.0" level="project" />
     <orderEntry type="library" name="Maven: com.vdurmont:emoji-java:4.0.0" level="project" />
     <orderEntry type="library" name="Maven: org.json:json:20170516" level="project" />
-
   </component>
 </module>
\ No newline at end of file
diff --git a/docker/pg/1-createTable.sql b/docker/pg/1-createTable.sql
index 142a796..da079af 100644
--- a/docker/pg/1-createTable.sql
+++ b/docker/pg/1-createTable.sql
@@ -55,7 +55,15 @@ insert into users(name, mail, filterlevel) values
   ('pinapple.chocomint', 'hogehogehoge@hoge.com', 3)
 ;
 
-insert into emolog(userid, friendid, name, latestemolog)
-values (1, 2, 'hoge', 'emojihoge')
+insert into friend(userid, friendid, name, latestemolog)
+values (1, 2, 'hoge', 'emojihoge'),
+values (2, 1, 'chinkokun', ':smile:'),
+values (1, 3, 'kim jyoung-un', ':sad:')
 ;
 
+insert into emolog(userid, friendid, create_at, contents)
+values (1, 2, current_timestamp, ':mountain:'),
+values (2, 1, current_timestamp, ':hotel:'),
+values (1, 3, current_timestamp, ':fuck:'),
+values (3, 1, current_timestamp, ':space:')
+;
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/controller/EmologController.java b/src/main/java/com/example/demo/controller/EmologController.java
index 2bb44b4..0262256 100644
--- a/src/main/java/com/example/demo/controller/EmologController.java
+++ b/src/main/java/com/example/demo/controller/EmologController.java
@@ -4,6 +4,7 @@
 import com.example.demo.entity.Sample;
 import com.example.demo.service.EmologService;
 import com.example.demo.service.SampleService;
+import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -15,7 +16,7 @@
 import java.util.List;
 
 
-@RestController
+@Controller
 @RequestMapping(path = "/emologlist")
 public class EmologController {
 
diff --git a/src/main/java/com/example/demo/controller/HtmlController.java b/src/main/java/com/example/demo/controller/HtmlController.java
new file mode 100644
index 0000000..960037e
--- /dev/null
+++ b/src/main/java/com/example/demo/controller/HtmlController.java
@@ -0,0 +1,15 @@
+package com.example.demo.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+
+@Controller
+@RequestMapping(path = "/")
+public class HtmlController {
+    @RequestMapping(path = "/", method = RequestMethod.GET)
+    public String index() {
+        return "friendlist";
+    }
+}
diff --git a/src/main/resources/templates/emologlist.html b/src/main/resources/templates/emologlist.html
index e1aa9cd..b58b746 100644
--- a/src/main/resources/templates/emologlist.html
+++ b/src/main/resources/templates/emologlist.html
@@ -27,7 +27,7 @@
               <p class="emolog-date">8月18日<p>
                 <a href="chat.html">
                     <!--相手のエモログの表示-->
-                    <div class="emoji" th:object="${}"><p th:utext = "*{}"></p></div>
+                    <div class="emoji" th:object="${emologs}"><p th:utext = "*{contents}"></p></div>
                     <img src="../static/images/arrow.png" alt="emolog_arrow">
                 </a>
             </li>
diff --git a/src/main/resources/templates/friendlist.html b/src/main/resources/templates/friendlist.html
index a6f9409..b008333 100644
--- a/src/main/resources/templates/friendlist.html
+++ b/src/main/resources/templates/friendlist.html
@@ -13,10 +13,10 @@
             <!-- 本当はjava でデータを取ってきてすべて表示　例を書く-->
             <ul>
                 <li>
-                    <p class="person" th:text="${user}"><p>
-                    <a href="chat.html">
+                    <p class="person">unkokun<p>
+                    <a href="/emologlist/1/2">
                         <!--相手のエモログの表示-->
-                        <div class="emoji" th:object="${}"><p th:utext = "*{}"></p></div>
+                        <div class="emoji" >hogeeee</div>
         <img src="../static/images/arrow.png" alt="emolog_arrow">
         </a>
         </li>
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
new file mode 100644
index 0000000..fa962cc
--- /dev/null
+++ b/src/main/resources/templates/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>index</title>
+</head>
+<body>
+
+
+</body>
+</html>
\ No newline at end of file

From 8b8eb91f2ff11807c5299011dafc44ebf1293f26 Mon Sep 17 00:00:00 2001
From: nawta <wes904@icloud.com>
Date: Wed, 26 Aug 2020 14:07:07 +0900
Subject: [PATCH 3/6] wowowo

---
 src/main/resources/static/css/style.css      | 76 +++++++++++++++++---
 src/main/resources/templates/emologlist.html | 30 ++------
 2 files changed, 71 insertions(+), 35 deletions(-)

diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css
index 0272a3f..427a9ad 100644
--- a/src/main/resources/static/css/style.css
+++ b/src/main/resources/static/css/style.css
@@ -71,6 +71,39 @@ a:hover {
   height: 100%;
   background-color: #fffacd;
 }
+
+.global-nav {
+  height: 10%;
+  width: 100%;
+
+  width: 960px;
+  margin: 0 auto;
+  position: fixed;
+  bottom: 0;
+}
+
+.global-nav li{
+  background-color: #f0f8ff;
+  width: 33%;
+  float: left;
+  margin: 5px 1px;
+  text-align: center;
+  font-size: 20px;
+  list-style: none;
+  font-family: 'Bitter',serif;
+}
+
+.global-nav li a{
+  padding: 5px 5%;
+}
+
+
+.global-nav li a:hover{
+  border-bottom: 2px solid;
+  padding-bottom: 3px;
+  text-decoration: none;
+}
+
 /* chat.html 部分*/
 
 .friend-name {
@@ -81,11 +114,11 @@ ul.header_ul{
   width: 100%;
 }
 ul.header_ul li{
-    display: inline-block;
-    vertical-align:middle;
-    margin: 0;
-    padding: 0;
-    width: 45%;
+  display: inline-block;
+  vertical-align:middle;
+  margin: 0;
+  padding: 0;
+  width: 45%;
 }
 
 .emolog {
@@ -109,16 +142,16 @@ ul.header_ul li{
 }
 
 .emolog_ul {
-    width: 100%;
+  width: 100%;
 
 }
 
 .emolog_ul li {
-    text-align: center;
-    display: inline-block;
-    vertical-align:middle;
-    margin: 0;
-    padding: 0;
+  text-align: center;
+  display: inline-block;
+  vertical-align:middle;
+  margin: 0;
+  padding: 0;
 }
 .emolog_ul li.emolog-date-cover {
   vertical-align:top;
@@ -144,3 +177,24 @@ ul.header_ul li{
   font-size: 20px;
   font-family: 'Bitter',serif;
 }
+
+/* emologlist.html*/
+.emolog-list {
+  height: 90%;
+  background-color: #f5f5f5;
+  overflow:  auto;
+}
+.emolog-list li {
+  border-bottom: solid 1px #000000;
+  list-style: none;
+  text-align: center;
+}
+.emolog-date {
+  float:  left;
+  text-align: left;
+  margin: 5px 5px 0 0;
+  font-size: 18px;
+  font-family: 'Bitter',serif;
+}
+
+/* emologlist.html 終わり*/
diff --git a/src/main/resources/templates/emologlist.html b/src/main/resources/templates/emologlist.html
index b58b746..7cc47b5 100644
--- a/src/main/resources/templates/emologlist.html
+++ b/src/main/resources/templates/emologlist.html
@@ -22,34 +22,16 @@
        <div class="emolog-list">
 
           <!-- 本当はjava でデータを取ってきてすべて表示　例を書く-->
-         <ul>
-            <li>
-              <p class="emolog-date">8月18日<p>
+         <ul th:each = "emolog : ${emologs}">
+             <div th:object="${emolog}">
+             <p class="emolog-date" th:text="*{create_at}"></p>
                 <a href="chat.html">
                     <!--相手のエモログの表示-->
-                    <div class="emoji" th:object="${emologs}"><p th:utext = "*{contents}"></p></div>
+                    <div class="emoji" ><p th:utext = "*{contents}"></p></div>
                     <img src="../static/images/arrow.png" alt="emolog_arrow">
                 </a>
-            </li>
-            <li>
-              <p class="emolog-date">8月17日<p>
-              <!--相手のエモログの表示-->
-              <p class="emoji">&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;</p>
-              <img src="../static/images/arrow.png" alt="emolog_arrow">
-            </li>
-            <li>
-              <p class="emolog-date">8月16日<p>
-              <!--相手のエモログの表示-->
-              <p class="emoji">&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;</p>
-              <img src="../static/images/arrow.png" alt="emolog_arrow">
-            </li>
-            <li>
-              <p class="emolog-date">8月15日<p>
-              <!--相手のエモログの表示-->
-              <p class="emoji">&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;</p>
-              <img src="../static/images/arrow.png" alt="emolog_arrow">
-            </li>
-          </ul>
+             </div>
+         </ul>
        </div>
 
        <!-- ナビゲーションバーを表示-->

From da79a7a9d44dd9db82c794bc989b8328f38675e2 Mon Sep 17 00:00:00 2001
From: nawta <wes904@icloud.com>
Date: Wed, 26 Aug 2020 15:00:57 +0900
Subject: [PATCH 4/6] comprehensive plans on script

---
 docker/pg/1-createTable.sql                   | 18 ++++----
 .../demo/controller/HtmlController.java       | 26 +++++++++++
 .../demo/controller/ViewController.java       | 46 +++++++++++++++++--
 src/main/resources/templates/index.html       |  3 +-
 4 files changed, 79 insertions(+), 14 deletions(-)

diff --git a/docker/pg/1-createTable.sql b/docker/pg/1-createTable.sql
index da079af..65e6b99 100644
--- a/docker/pg/1-createTable.sql
+++ b/docker/pg/1-createTable.sql
@@ -55,15 +55,15 @@ insert into users(name, mail, filterlevel) values
   ('pinapple.chocomint', 'hogehogehoge@hoge.com', 3)
 ;
 
-insert into friend(userid, friendid, name, latestemolog)
-values (1, 2, 'hoge', 'emojihoge'),
-values (2, 1, 'chinkokun', ':smile:'),
-values (1, 3, 'kim jyoung-un', ':sad:')
+insert into friend(userid, friendid, name, latestemolog) values
+ (1, 2, 'hoge', 'emojihoge'),
+ (2, 1, 'chinkokun', ':smile:'),
+ (1, 3, 'kim jyoung-un', ':sad:')
 ;
 
-insert into emolog(userid, friendid, create_at, contents)
-values (1, 2, current_timestamp, ':mountain:'),
-values (2, 1, current_timestamp, ':hotel:'),
-values (1, 3, current_timestamp, ':fuck:'),
-values (3, 1, current_timestamp, ':space:')
+insert into emolog(userid, friendid, create_at, contents) values
+ (1, 2, current_timestamp, ':mountain:'),
+ (2, 1, current_timestamp, ':hotel:'),
+ (1, 3, current_timestamp, ':fuck:'),
+ (3, 1, current_timestamp, ':space:')
 ;
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/controller/HtmlController.java b/src/main/java/com/example/demo/controller/HtmlController.java
index 960037e..66fa789 100644
--- a/src/main/java/com/example/demo/controller/HtmlController.java
+++ b/src/main/java/com/example/demo/controller/HtmlController.java
@@ -1,8 +1,13 @@
 package com.example.demo.controller;
 
+import com.vdurmont.emoji.EmojiParser;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import twitter4j.TwitterException;
+
+import java.util.ArrayList;
+import java.util.List;
 
 
 @Controller
@@ -10,6 +15,27 @@
 public class HtmlController {
     @RequestMapping(path = "/", method = RequestMethod.GET)
     public String index() {
+        return "index";
+    }
+
+    @RequestMapping(path = "/enter", method = RequestMethod.GET)
+    public String crawling() throws Exception {
+
+        List<String> keyword_tweets = new ArrayList<String>();
+        List<String> keyword_images = new ArrayList<String>();
+
+        keyword_tweets = ViewController.get_NLU_keywords("CNN", 100000);
+        keyword_images = ViewController.get_image_keywords("CNN", 100000);
+
+        // TODO: ここでDBアクセスかなんかlook upする??。
+
+        // 文字列整形の方
+
+
+        // で、:hoge:みたいなんが得られたらEmologにパースして、それをaddAttributeする.
+
+        //TODO: ここで得られたemologをdbに登録する…
+
         return "friendlist";
     }
 }
diff --git a/src/main/java/com/example/demo/controller/ViewController.java b/src/main/java/com/example/demo/controller/ViewController.java
index 0db0510..c629ada 100644
--- a/src/main/java/com/example/demo/controller/ViewController.java
+++ b/src/main/java/com/example/demo/controller/ViewController.java
@@ -28,6 +28,7 @@ public class ViewController {
     @Autowired
     JdbcTemplate jdbcTemplate;
 
+
     @RequestMapping(path = "/users", method = RequestMethod.GET)
     public String index() {
         List<Map<String, Object>> list;
@@ -94,7 +95,7 @@ public List<String> collect_image_keywords_from_tweets(
 
     // コントローラは関数として呼び出すのはキツイっぽいのでとりま関数として取り出してる。。
     //TODO: TwitterControllerやNLUControllerから共通部分を分離して別クラスとして保持。
-    private QueryResult search_user(String username, long tweet_id) throws TwitterException {
+    private static QueryResult search_user(String username, long tweet_id) throws TwitterException {
         // 初期化
         Twitter twitter = new TwitterFactory().getInstance();
         Query query = new Query();
@@ -106,7 +107,7 @@ private QueryResult search_user(String username, long tweet_id) throws TwitterEx
         return twitter.search(query);
     }
 
-    private String NLU(String text) {
+    private static String NLU(String text) {
         IamAuthenticator authenticator = new IamAuthenticator("fVfaYMA7tCh4zInWBhTBb5t69xQryK7ObKl42nampynG");
         NaturalLanguageUnderstanding naturalLanguageUnderstanding = new NaturalLanguageUnderstanding("2019-07-12", authenticator);
         naturalLanguageUnderstanding.setServiceUrl("https://api.jp-tok.natural-language-understanding.watson.cloud.ibm.com/instances/ac3df365-93f6-4255-beb8-620d66041251");
@@ -140,7 +141,7 @@ private String NLU(String text) {
     }
 
 
-    private String ImageProcessing(String url) throws FileNotFoundException {
+    private static String ImageProcessing(String url) throws FileNotFoundException {
 
         IamAuthenticator authenticator = new IamAuthenticator("8nwN0eKp7eZ73So4DLdPndp_yv-vtlI27pN1wK2TjVg1");
         VisualRecognition visualRecognition = new VisualRecognition("2019-07-12", authenticator);
@@ -161,4 +162,43 @@ private String ImageProcessing(String url) throws FileNotFoundException {
 
     }
 
+    //関数もおいちゃえ
+    public static List<String> get_NLU_keywords(String username, long tweet_id) throws TwitterException {
+        QueryResult result = search_user(username, tweet_id);
+        ArrayList<String> NLU_results = new ArrayList<>();
+
+        for (Status status : result.getTweets()) {
+            String tmp = NLU(status.getText());
+            if(tmp != null) {
+//                System.out.println(tmp);
+                NLU_results.add(tmp);
+            }
+        }
+
+        return NLU_results;
+        //TODO: 整形する必要あるかも？
+    }
+
+
+    public static List<String> get_image_keywords(String username, long tweet_id) throws Exception {
+        QueryResult result = search_user(username, tweet_id);
+        ArrayList<String> imageprocessing_results = new ArrayList<>();
+
+        for (Status status : result.getTweets()) {
+            if(status.getMediaEntities().length > 0) {
+//                System.out.println(status.getMediaEntities()[0].getMediaURL());
+
+                String tmp = ImageProcessing(status.getMediaEntities()[0].getMediaURL());
+                if (tmp != null) {
+//                    System.out.println(tmp);
+                    imageprocessing_results.add(tmp);
+                }
+            }
+        }
+
+        return imageprocessing_results;
+//                ["call center", "people", "newsreader"]みたいなんがくる。
+
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index fa962cc..183fa7c 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -5,7 +5,6 @@
     <title>index</title>
 </head>
 <body>
-
-
+<a href="/enter">ENTER!!</a>
 </body>
 </html>
\ No newline at end of file

From dc5b6009e9c394bb796862345833c9dc0ca8d7a9 Mon Sep 17 00:00:00 2001
From: nawta <wes904@icloud.com>
Date: Wed, 26 Aug 2020 17:29:25 +0900
Subject: [PATCH 5/6] =?UTF-8?q?=E5=BF=97=E5=8D=8A=E3=81=B0=E3=81=AB?=
 =?UTF-8?q?=E3=81=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/pg/1-createTable.sql                   |   4 +--
 .../demo/controller/HtmlController.java       |  30 +++++++++++++++---
 src/main/resources/templates/emologlist.html  |   8 +++--
 src/main/resources/templates/friendlist.html  |   3 +-
 .../demo/controller/ViewController.class      | Bin 10447 -> 11048 bytes
 5 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/docker/pg/1-createTable.sql b/docker/pg/1-createTable.sql
index 65e6b99..90a132d 100644
--- a/docker/pg/1-createTable.sql
+++ b/docker/pg/1-createTable.sql
@@ -57,13 +57,13 @@ insert into users(name, mail, filterlevel) values
 
 insert into friend(userid, friendid, name, latestemolog) values
  (1, 2, 'hoge', 'emojihoge'),
- (2, 1, 'chinkokun', ':smile:'),
+ (2, 1, 'Trump', ':smile:'),
  (1, 3, 'kim jyoung-un', ':sad:')
 ;
 
 insert into emolog(userid, friendid, create_at, contents) values
  (1, 2, current_timestamp, ':mountain:'),
  (2, 1, current_timestamp, ':hotel:'),
- (1, 3, current_timestamp, ':fuck:'),
+ (1, 3, current_timestamp, ':gorilla:'),
  (3, 1, current_timestamp, ':space:')
 ;
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/controller/HtmlController.java b/src/main/java/com/example/demo/controller/HtmlController.java
index 66fa789..ab825e4 100644
--- a/src/main/java/com/example/demo/controller/HtmlController.java
+++ b/src/main/java/com/example/demo/controller/HtmlController.java
@@ -1,5 +1,7 @@
 package com.example.demo.controller;
 
+import com.vdurmont.emoji.EmojiManager;
+import org.springframework.ui.ModelMap;
 import com.vdurmont.emoji.EmojiParser;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,7 +21,9 @@ public String index() {
     }
 
     @RequestMapping(path = "/enter", method = RequestMethod.GET)
-    public String crawling() throws Exception {
+    public String crawling(
+            ModelMap modelMap
+    ) throws Exception {
 
         List<String> keyword_tweets = new ArrayList<String>();
         List<String> keyword_images = new ArrayList<String>();
@@ -27,15 +31,33 @@ public String crawling() throws Exception {
         keyword_tweets = ViewController.get_NLU_keywords("CNN", 100000);
         keyword_images = ViewController.get_image_keywords("CNN", 100000);
 
-        // TODO: ここでDBアクセスかなんかlook upする??。
+        List<String> emojiList = new ArrayList<String>();
 
-        // 文字列整形の方
+        // TODO: ここでDBアクセスかなんかlook upする??。->つかささんのやつくっつける。
 
+        // 文字列整形の方(テキトーに::をつける方)
+        for( String keyword : keyword_tweets){
+            try{
+                String tmp = EmojiManager.getForAlias(":" + keyword + ":").getUnicode();
+                emojiList.add(tmp);
+            }
+            catch (NullPointerException ignored){}
+        }
 
-        // で、:hoge:みたいなんが得られたらEmologにパースして、それをaddAttributeする.
+        for( String keyword : keyword_images){
+            try{
+                String tmp = EmojiManager.getForAlias(":" + keyword + ":").getUnicode();
+                emojiList.add(tmp);
+            }
+            catch (NullPointerException ignored){}
+        }
+
+        // で、:hoge:みたいなんが得られたらEmologにパースして、それをaddAttributeする.->取り出せん。
+//        modelMap.addAttribute("emologs", emojiList);
 
         //TODO: ここで得られたemologをdbに登録する…
 
+
         return "friendlist";
     }
 }
diff --git a/src/main/resources/templates/emologlist.html b/src/main/resources/templates/emologlist.html
index 7cc47b5..b530c50 100644
--- a/src/main/resources/templates/emologlist.html
+++ b/src/main/resources/templates/emologlist.html
@@ -23,11 +23,13 @@
 
           <!-- 本当はjava でデータを取ってきてすべて表示　例を書く-->
          <ul th:each = "emolog : ${emologs}">
-             <div th:object="${emolog}">
-             <p class="emolog-date" th:text="*{create_at}"></p>
+<!--             <div th:object="${emolog}">-->
+<!--             <p class="emolog-date" th:text="*{create_at}"></p>-->
+             <p class="emolog-date" th:text="${emolog}"></p>
                 <a href="chat.html">
                     <!--相手のエモログの表示-->
-                    <div class="emoji" ><p th:utext = "*{contents}"></p></div>
+<!--                    <div class="emoji" ><p th:utext = "*{contents}"></p></div>-->
+                    <div class="emoji" ><p th:utext = "*{emolog}"></p></div>
                     <img src="../static/images/arrow.png" alt="emolog_arrow">
                 </a>
              </div>
diff --git a/src/main/resources/templates/friendlist.html b/src/main/resources/templates/friendlist.html
index b008333..fe14abf 100644
--- a/src/main/resources/templates/friendlist.html
+++ b/src/main/resources/templates/friendlist.html
@@ -13,10 +13,11 @@
             <!-- 本当はjava でデータを取ってきてすべて表示　例を書く-->
             <ul>
                 <li>
+<!--                    <div th:object="${emologs}">-->
                     <p class="person">unkokun<p>
                     <a href="/emologlist/1/2">
                         <!--相手のエモログの表示-->
-                        <div class="emoji" >hogeeee</div>
+                        <div class="emoji">hogehoge</div>
         <img src="../static/images/arrow.png" alt="emolog_arrow">
         </a>
         </li>
diff --git a/target/classes/com/example/demo/controller/ViewController.class b/target/classes/com/example/demo/controller/ViewController.class
index 93d81be241cb8c638b82e5d1cd9991212d3ceaf0..8a9be357823cf33a37ebefadcfccec997ba43123 100644
GIT binary patch
delta 3075
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
TM`b??`$y(`IsZ@m`}2PRb_iDP

delta 2529
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
L@%>-(|8L#}`Tg)4


From 63445874e6136886f50d6fc34130a7cd0e183437 Mon Sep 17 00:00:00 2001
From: nawta <wes904@icloud.com>
Date: Wed, 26 Aug 2020 17:46:48 +0900
Subject: [PATCH 6/6] add explanations

---
 .../demo/controller/HtmlController.java       | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/example/demo/controller/HtmlController.java b/src/main/java/com/example/demo/controller/HtmlController.java
index ab825e4..66994ac 100644
--- a/src/main/java/com/example/demo/controller/HtmlController.java
+++ b/src/main/java/com/example/demo/controller/HtmlController.java
@@ -38,7 +38,7 @@ public String crawling(
         // 文字列整形の方(テキトーに::をつける方)
         for( String keyword : keyword_tweets){
             try{
-                String tmp = EmojiManager.getForAlias(":" + keyword + ":").getUnicode();
+                String tmp = EmojiParser.parseToHtmlDecimal(":" + keyword + ":");
                 emojiList.add(tmp);
             }
             catch (NullPointerException ignored){}
@@ -46,16 +46,27 @@ public String crawling(
 
         for( String keyword : keyword_images){
             try{
-                String tmp = EmojiManager.getForAlias(":" + keyword + ":").getUnicode();
+                String tmp = EmojiParser.parseToHtmlDecimal(":" + keyword + ":");
                 emojiList.add(tmp);
             }
             catch (NullPointerException ignored){}
         }
 
-        // で、:hoge:みたいなんが得られたらEmologにパースして、それをaddAttributeする.->取り出せん。
+        // で、:hoge:みたいなんが得られたらEmologにパースして、それをaddAttributeする.->データがdbに入っていないとThymeleaf側で取り出せん模様。
 //        modelMap.addAttribute("emologs", emojiList);
 
-        //TODO: ここで得られたemologをdbに登録する…
+
+        // emojiList : ["&#128515", "&#128515", "&#128515"] みたいな感じ。
+        // emojiListから一つの文字列に直す。
+        String emolog = String.join("", emojiList);
+
+
+        //TODO: ここで得られたemologをdbに登録する処理…
+        // emolog(userid, friendid, create_at, contents)
+        // userid = 1, friendid = 2, create_at = TIMESTAMP??, contents = emolog
+
+
+
 
 
         return "friendlist";
