From a3f558fadfba47cbbd7ba374d270f3de356f8625 Mon Sep 17 00:00:00 2001
From: HF <hf@pixelplanet.fun>
Date: Wed, 14 Sep 2022 01:37:17 +0200
Subject: [PATCH] fix api/me

---
 src/core/me.js                   | 2 +-
 src/data/redis/client.js         | 7 ++++++-
 src/data/redis/lua/zmRankRev.lua | 5 +++--
 src/data/redis/ranks.js          | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/core/me.js b/src/core/me.js
index a292cc5..5a5b1ef 100644
--- a/src/core/me.js
+++ b/src/core/me.js
@@ -10,7 +10,7 @@ import chatProvider from './ChatProvider';
 
 
 export default async function getMe(user, lang = 'default') {
-  const userdata = user.getUserData();
+  const userdata = await user.getUserData();
   // sanitize data
   const {
     name, mailVerified,
diff --git a/src/data/redis/client.js b/src/data/redis/client.js
index 5749651..ae65d30 100644
--- a/src/data/redis/client.js
+++ b/src/data/redis/client.js
@@ -42,7 +42,12 @@ const scripts = {
         ...uids.map((a) => ((typeof a === 'string') ? a : a.toString())),
       ];
     },
-    transformReply(arr) { return arr.map((r) => Number(r)); },
+    transformReply(arr) {
+      return arr.map((r) => {
+        const rank = Number(r);
+        return rank || null;
+      });
+    },
   }),
 };
 
diff --git a/src/data/redis/lua/zmRankRev.lua b/src/data/redis/lua/zmRankRev.lua
index bafa13a..b446149 100644
--- a/src/data/redis/lua/zmRankRev.lua
+++ b/src/data/redis/lua/zmRankRev.lua
@@ -9,8 +9,9 @@ local ret = {}
 for c = 1,#ARGV do
   local rank = redis.call('zrevrank', KEYS[1], ARGV[c])
   if not rank then
-    rank = 0
+    ret[c] = 0
+  else
+    ret[c] = rank + 1
   end
-  ret[c] = rank
 end
 return ret
diff --git a/src/data/redis/ranks.js b/src/data/redis/ranks.js
index 9c54a5d..8a0774b 100644
--- a/src/data/redis/ranks.js
+++ b/src/data/redis/ranks.js
@@ -74,7 +74,7 @@ export async function getRanks(daily, start, amount) {
       [valueName]: ranks[i].score,
       [rankName]: i + 1,
       [oValueName]: oScores[i],
-      [oRankName]: oRanks[i] + 1,
+      [oRankName]: oRanks[i],
     };
     ret.push(uob);
   }