bug fixes

packages/hydrooj/src/entry/common.ts

@@ -2,7 +2,6 @@
 /* eslint-disable no-await-in-loop */
 import '../lib/index';
 
-import os from 'os';
 import path from 'path';
 import fs from 'fs-extra';
 import yaml from 'js-yaml';

packages/hydrooj/src/handler/home.ts

@@ -181,7 +181,6 @@ export class HomeHandler extends Handler {
 class HomeSecurityHandler extends Handler {
     @requireSudo
     async get() {
-        const geoip = this.ctx.get('geoip');
         // TODO(iceboy): pagination? or limit session count for uid?
         const sessions = await token.getSessionListByUid(this.user._id);
         for (const session of sessions) {
@@ -189,7 +188,7 @@ class HomeSecurityHandler extends Handler {
             session._id = md5(session._id);
             const ua = session.updateUa || session.createUa;
             if (ua) session.updateUaInfo = UAParser(ua);
-            session.updateGeoip = geoip?.lookup?.(
+            session.updateGeoip = this.ctx.geoip?.lookup?.(
                 session.updateIp || session.createIp,
                 this.translate('geoip_locale'),
             );
@@ -202,7 +201,7 @@ class HomeSecurityHandler extends Handler {
                 'credentialID', 'name', 'credentialType', 'credentialDeviceType',
                 'authenticatorAttachment', 'regat', 'fmt',
             ])),
-            geoipProvider: geoip?.provider,
+            geoipProvider: this.ctx.geoip?.provider,
         };
     }
 
@@ -610,6 +609,7 @@ class HomeMessagesConnectionHandler extends ConnectionHandler {
     }
 }
 
+export const inject = { geoip: { required: false } };
 export function apply(ctx: Context) {
     ctx.Route('homepage', '/', HomeHandler);
     ctx.Route('home_security', '/home/security', HomeSecurityHandler, PRIV.PRIV_USER_PROFILE);

packages/hydrooj/src/lib/i18n.ts

@@ -16,6 +16,7 @@ declare module '../service/bus' {
 class I18nService extends Service {
     constructor(ctx: Context) {
         super(ctx, 'i18n');
+        this.translate = this.translate.bind(this);
         this.load('ja', { __flag: '🇯🇵', __id: 'ja', __langname: '日本語' });
     }