Merge pull request #12109 from b3log/1.4.0-dev

Fix #12093

pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Description: Solo POM.
-    Version: 3.9.1.19, May 3, 2016
+    Version: 3.10.1.19, May 10, 2016
     Author: <a href="http://88250.b3log.org">Liang Ding</a>
     Author: <a href="http://www.annpeter.cn">Ann Peter</a>
 -->
@@ -116,6 +116,7 @@
         <qiniu.version>7.0.4.1</qiniu.version>
         <jetty.version>9.2.13.v20150730</jetty.version>
         <commons-cli.version>1.3.1</commons-cli.version>
+        <emoji-java.version>3.0.0</emoji-java.version>
         
         <!-- maven plugin -->
         <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
@@ -185,6 +186,18 @@
             <artifactId>markdownpapers-core</artifactId>
             <version>${markdownpapers-core.version}</version>
         </dependency>
+        
+        <dependency>
+            <groupId>com.vdurmont</groupId>
+            <artifactId>emoji-java</artifactId>
+            <version>${emoji-java.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.json</groupId>
+                    <artifactId>json</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
             
         <dependency>
             <groupId>com.qiniu</groupId>

src/main/java/org/b3log/solo/service/CommentMgmtService.java

@@ -45,6 +45,7 @@ import org.b3log.solo.repository.CommentRepository;
 import org.b3log.solo.repository.PageRepository;
 import org.b3log.solo.repository.UserRepository;
 import org.b3log.solo.util.Comments;
+import org.b3log.solo.util.Emotions;
 import org.b3log.solo.util.Markdowns;
 import org.b3log.solo.util.Thumbnails;
 import org.json.JSONException;
@@ -56,7 +57,7 @@ import org.jsoup.safety.Whitelist;
  * Comment management service.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.2.2.8, Apr 4, 2016
+ * @version 1.3.2.8, May 10, 2016
  * @since 0.3.5
  */
 @Service
@@ -359,6 +360,10 @@ public class CommentMgmtService {
             // content Markdown & XSS process 
             commentContent = Markdowns.toHTML(commentContent);
             commentContent = Jsoup.clean(commentContent, Whitelist.relaxed());
+
+            // Emoji
+            commentContent = Emotions.toAliases(commentContent);
+
             requestJSONObject.put(Comment.COMMENT_CONTENT, commentContent);
 
             return ret;

src/main/java/org/b3log/solo/service/CommentQueryService.java

@@ -39,6 +39,7 @@ import org.b3log.solo.model.Page;
 import org.b3log.solo.repository.ArticleRepository;
 import org.b3log.solo.repository.CommentRepository;
 import org.b3log.solo.repository.PageRepository;
+import org.b3log.solo.util.Emotions;
 import org.b3log.solo.util.Thumbnails;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -47,7 +48,7 @@ import org.json.JSONObject;
  * Comment query service.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.1.0.8, Apr 4, 2016
+ * @version 1.2.0.8, May 10, 2016
  * @since 0.3.5
  */
 @Service
@@ -190,6 +191,10 @@ public class CommentQueryService {
 
                 comment.put(Common.COMMENT_TITLE, title);
 
+                String commentContent = comment.optString(Comment.COMMENT_CONTENT);
+                commentContent = Emotions.convert(commentContent);
+                comment.put(Comment.COMMENT_CONTENT, commentContent);
+
                 comment.put(Comment.COMMENT_TIME, ((Date) comment.get(Comment.COMMENT_DATE)).getTime());
                 comment.remove(Comment.COMMENT_DATE);
             }
@@ -244,6 +249,10 @@ public class CommentQueryService {
                     comment.put(Common.IS_REPLY, true);
                 }
 
+                String commentContent = comment.optString(Comment.COMMENT_CONTENT);
+                commentContent = Emotions.convert(commentContent);
+                comment.put(Comment.COMMENT_CONTENT, commentContent);
+
                 ret.add(comment);
             }
 

src/main/resources/latke.properties

@@ -24,7 +24,7 @@
 # Browser visit protocol
 serverScheme=http
 # Browser visit domain name
-serverHost=localhost
+serverHost=192.168.20.8
 # Browser visit port, 80 as usual, THIS IS NOT SERVER LISTEN PORT!
 serverPort=8080
 

src/main/resources/local.properties

@@ -21,20 +21,20 @@
 #
 
 #### H2 runtime ####
-runtimeDatabase=H2
-jdbc.username=root
-jdbc.password=
-jdbc.driver=org.h2.Driver
-jdbc.URL=jdbc:h2:~/b3log_solo_h2/db
-jdbc.pool=h2
-
-#### MySQL runtime ####
-#runtimeDatabase=MYSQL
+#runtimeDatabase=H2
 #jdbc.username=root
 #jdbc.password=
-#jdbc.driver=com.mysql.jdbc.Driver
-#jdbc.URL=jdbc:mysql://localhost:3306/b3log?useUnicode=yes&characterEncoding=utf8
-#jdbc.pool=druid
+#jdbc.driver=org.h2.Driver
+#jdbc.URL=jdbc:h2:~/b3log_solo_h2/db
+#jdbc.pool=h2
+
+#### MySQL runtime ####
+runtimeDatabase=MYSQL
+jdbc.username=root
+jdbc.password=
+jdbc.driver=com.mysql.jdbc.Driver
+jdbc.URL=jdbc:mysql://localhost:3306/b3log?useUnicode=yes&characterEncoding=utf8
+jdbc.pool=druid
 
 # The minConnCnt MUST larger or equal to 3
 jdbc.minConnCnt=5

src/main/webapp/js/lib/emojify.js/css/basic/emojify.css

+.emoji {
+  width: 1.5em;
+  height: 1.5em;
+  display: inline-block;
+  margin-bottom: -0.25em;
+  background-size: contain;
+}

src/main/webapp/js/lib/emojify.js/css/basic/emojify.min.css

+.emoji{width:1.5em;height:1.5em;display:inline-block;margin-bottom:-.25em;background-size:contain}
\ No newline at end of file

src/main/webapp/js/lib/emojify.js/css/sprites/emojify-emoticons.css

+    .emoji {
+        background-image: url('../../images/sprites/emojify-emoticons.png');
+        display: inline-block;
+    }
+
+    @media (min--moz-device-pixel-ratio: 1.5), (-o-min-device-pixel-ratio: 3/2), (-webkit-min-device-pixel-ratio: 1.5), (min-device-pixel-ratio: 1.5), (min-resolution: 1.5dppx) {
+        .emoji {
+            background-image: url('../../images/sprites/emojify-emoticons@2x.png');
+            background-size: 180px 144px;
+        }
+    }
+
+    .emoji-broken_heart {
+        background-position: -38px -2px;
+        width: 32px;
+        height: 32px;
+    }
+
+    .emoji-confounded {
+        background-position: -110px -2px;
+        width: 32px;
+        height: 32px;
+    }
+
+    .emoji-flushed {
+        background-position: -2px -38px;
+        width: 32px;
+        height: 32px;
+    }
+
+    .emoji-frowning {
+        background-position: -38px -38px;
+        width: 32px;
+        height: 32px;
+    }
+
+    .emoji-grinning {
+        background-position: -74px -2px;
+        width: 32px;
+        height: 32px;
+    }
+
+    .emoji-heart {
+        background-position: -74px -38px;
+        width: 32px;
+        height: 32px;
+    }
+
+    .emoji-kissing_heart {
+        background-position: -2px -74px;
+        width: 32px;
+        height: 32px;
+    }
+
+    .emoji-mask {
+        background-position: -38px -74px;
+        width: 32px;
+        height: 32px;
+    }
+
+    .emoji-pensive {
+        background-position: -74px -74px;
+        width: 32px;
+        height: 32px;
+    }
+
+    .emoji-rage {
+        background-position: -2px -2px;
+        width: 32px;
+        height: 32px;
+    }
+
+    .emoji-relaxed {
+        background-position: -110px -38px;
+        width: 32px;
+        height: 32px;
+    }
+
+    .emoji-scream {
+        background-position: -110px -74px;
+        width: 32px;
+        height: 32px;
+    }
+
+    .emoji-smile {
+        background-position: -2px -110px;
+        width: 32px;
+        height: 32px;
+    }
+
+    .emoji-smirk {
+        background-position: -38px -110px;
+        width: 32px;
+        height: 32px;
+    }
+
+    .emoji-sob {
+        background-position: -74px -110px;
+        width: 32px;
+        height: 32px;
+    }
+
+    .emoji-stuck_out_tongue_closed_eyes {
+        background-position: -110px -110px;
+        width: 32px;
+        height: 32px;
+    }
+
+    .emoji-stuck_out_tongue_winking_eye {
+        background-position: -146px -2px;
+        width: 32px;
+        height: 32px;
+    }
+
+    .emoji-wink {
+        background-position: -146px -38px;
+        width: 32px;
+        height: 32px;
+    }
+

src/main/webapp/js/lib/emojify.js/css/sprites/emojify-emoticons.min.css

+.emoji{background-image:url(../../images/sprites/emojify-emoticons.png);display:inline-block}@media (min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:3/2),(-webkit-min-device-pixel-ratio:1.5),(min-device-pixel-ratio:1.5),(min-resolution:1.5dppx){.emoji{background-image:url(../../images/sprites/emojify-emoticons@2x.png);background-size:180px 144px}}.emoji-broken_heart{background-position:-38px -2px;width:32px;height:32px}.emoji-confounded{background-position:-110px -2px;width:32px;height:32px}.emoji-flushed{background-position:-2px -38px;width:32px;height:32px}.emoji-frowning{background-position:-38px -38px;width:32px;height:32px}.emoji-grinning{background-position:-74px -2px;width:32px;height:32px}.emoji-heart{background-position:-74px -38px;width:32px;height:32px}.emoji-kissing_heart{background-position:-2px -74px;width:32px;height:32px}.emoji-mask{background-position:-38px -74px;width:32px;height:32px}.emoji-pensive{background-position:-74px -74px;width:32px;height:32px}.emoji-rage{background-position:-2px -2px;width:32px;height:32px}.emoji-relaxed{background-position:-110px -38px;width:32px;height:32px}.emoji-scream{background-position:-110px -74px;width:32px;height:32px}.emoji-smile{background-position:-2px -110px;width:32px;height:32px}.emoji-smirk{background-position:-38px -110px;width:32px;height:32px}.emoji-sob{background-position:-74px -110px;width:32px;height:32px}.emoji-stuck_out_tongue_closed_eyes{background-position:-110px -110px;width:32px;height:32px}.emoji-stuck_out_tongue_winking_eye{background-position:-146px -2px;width:32px;height:32px}.emoji-wink{background-position:-146px -38px;width:32px;height:32px}
\ No newline at end of file