Merge pull request #204 from weseek/master

release v2.2.2

CHANGES.md

@@ -1,6 +1,11 @@
 CHANGES
 ========
 
+## 2.2.2
+
+* Improvement: Replace emojify.js with emojione
+* Fix: Update `lastLoginAt` when login is success
+
 ## 2.2.1
 
 * Feature: Duplicate page

lib/routes/login-passport.js

@@ -12,6 +12,14 @@ module.exports = function(crowi, app) {
    * @param {*} res
    */
   const loginSuccess = (req, res, user) => {
+    // update lastLoginAt
+    user.updateLastLoginAt(new Date(), (err, userData) => {
+      if (err) {
+        console.log(`updateLastLoginAt dumps error: ${err}`);
+        debug(`updateLastLoginAt dumps error: ${err}`);
+      }
+    });
+
     var jumpTo = req.session.jumpTo;
     if (jumpTo) {
       req.session.jumpTo = null;

lib/routes/login.js

@@ -24,6 +24,15 @@ module.exports = function(crowi, app) {
   };
   var loginSuccess = function(req, res, userData) {
     req.user = req.session.user = userData;
+
+    // update lastLoginAt
+    userData.updateLastLoginAt(new Date(), (err, uData) => {
+      if (err) {
+        console.log(`updateLastLoginAt dumps error: ${err}`);
+        debug(`updateLastLoginAt dumps error: ${err}`);
+      }
+    });
+
     if (!userData.password) {
       return res.redirect('/me/password');
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "crowi-plus",
-  "version": "2.2.1-RC",
+  "version": "2.2.2-RC",
   "description": "Enhanced Crowi",
   "tags": [
     "wiki",
@@ -71,8 +71,8 @@
     "debug": "^3.1.0",
     "diff": "^3.3.0",
     "diff2html": "^2.3.0",
-    "elasticsearch": "^13.2.0",
-    "emojify.js": "^1.1.0",
+    "elasticsearch": "^14.0.0",
+    "emojione": "^3.1.2",
     "env-cmd": "^7.0.0",
     "escape-string-regexp": "^1.0.5",
     "express": "^4.16.1",

resource/css/_wiki.scss

@@ -144,7 +144,7 @@ div.body {
     border: none;
   }
 
-  img.emoji {
+  img.emojione {
     width: 1.1em;
     margin: 1px;
     border: none;

resource/js/util/PostProcessor/Emoji.js

@@ -1,15 +1,8 @@
-import emojify from 'emojify.js';
+import emojione from 'emojione';
 
 export default class Emoji {
 
-  constructor() {
-    // see https://github.com/Ranks/emojify.js/issues/123
-    emojify.setConfig({
-      img_dir: 'https://github.global.ssl.fastly.net/images/icons/emoji/',
-    });
-  }
-
   process(markdown) {
-    return emojify.replace(markdown);
+    return emojione.shortnameToImage(markdown);
   }
 }

yarn.lock

@@ -1872,9 +1872,9 @@ ejs@^2.5.6:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
 
-elasticsearch@^13.2.0:
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/elasticsearch/-/elasticsearch-13.3.1.tgz#c530aea9afb17ea91c3d0a56f1f111ba49bc9239"
+elasticsearch@^14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/elasticsearch/-/elasticsearch-14.0.0.tgz#560317ca87121a73c0895818ae291f5553857bda"
   dependencies:
     agentkeepalive "^2.2.0"
     chalk "^1.0.0"
@@ -1899,9 +1899,9 @@ elliptic@^6.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.0"
 
-emojify.js@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/emojify.js/-/emojify.js-1.1.0.tgz#079fff223307c9007f570785e8e4935d5c398beb"
+emojione@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/emojione/-/emojione-3.1.2.tgz#991e30c80db4b1cf15eacb257620a7edce9c6ef4"
 
 emojis-list@^2.0.0:
   version "2.1.0"