From c52ddd7512d2ecca8021500a2378d71a003f5b94 Mon Sep 17 00:00:00 2001
From: undefined <masnn0@outlook.com>
Date: Thu, 2 Jul 2020 13:32:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=20hydro-dev/geoip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hydro/handler/home.js        | 7 ++++++-
 hydro/service/server.js      | 1 +
 templates/home_security.html | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/hydro/handler/home.js b/hydro/handler/home.js
index 18061c0dd..995dfbd6e 100644
--- a/hydro/handler/home.js
+++ b/hydro/handler/home.js
@@ -125,7 +125,12 @@ class HomeSecurityHandler extends Handler {
             session.isCurrent = session._id === this.session._id;
             session._id = md5(session._id);
             if (useragent) session.updateUa = useragent.parse(session.updateUa || session.createUa || '');
-            if (geoip) session.updateGeoip = geoip.lookup(session.updateIp || session.createIp);
+            if (geoip) {
+                session.updateGeoip = geoip.lookup(
+                    session.updateIp || session.createIp,
+                    this.translate('geoip_locale'),
+                );
+            }
         }
         this.response.template = 'home_security.html';
         this.response.body = { sessions, geoipProvider: (geoip || {}).provider };
diff --git a/hydro/service/server.js b/hydro/service/server.js
index 7817fb844..4012d3a66 100644
--- a/hydro/service/server.js
+++ b/hydro/service/server.js
@@ -367,6 +367,7 @@ class Handler {
     }
 
     async onerror(error) {
+        if (!error.msg) error.msg = () => error.message;
         console.error(error.msg(), error.params);
         console.error(error.stack);
         this.response.status = error instanceof UserFacingError ? error.code : 500;
diff --git a/templates/home_security.html b/templates/home_security.html
index 580b91a49..61c379cf6 100644
--- a/templates/home_security.html
+++ b/templates/home_security.html
@@ -94,7 +94,7 @@
               </div>
               <div class="media__body medium typo">
                 <p>{{ _('Last Update At') }}: {{ datetimeSpan(session.updateAt)|safe }}</p>
-                <p>{{ _('Location') }}: {{ _(session.updateGeoip) }} ({{ session.updateIp }})</p>
+                <p>{{ _('Location') }}: {{ _(session.updateGeoip.display) }} ({{ session.updateIp }})</p>
                 <p>{{ _('Operating System') }}: {{ session.updateUa.os }}</p>
                 <p>{{ _('Browser') }}: {{ session.updateUa.name }} {{ session.updateUa.version }}</p>
                 <!-- {{ _('User-Agent') }}: {{ session['update_ua']['str'] }} -->