✨ Use Gravatar for pictures

Author: AnandChowdhary

package.json

@@ -26,6 +26,7 @@
     "@types/jest": "^24.0.12",
     "@types/jsonwebtoken": "^8.3.2",
     "@types/marked": "^0.6.5",
+    "@types/md5": "^2.1.33",
     "@types/mustache": "^0.8.32",
     "@types/mysql": "^2.15.6",
     "@types/node": "^12.0.0",
@@ -56,6 +57,7 @@
     "jsonwebtoken": "^8.5.1",
     "marked": "^0.6.2",
     "maxmind": "^3.0.3",
+    "md5": "^2.2.1",
     "mustache": "^3.0.1",
     "mysql": "^2.17.1",
     "node-cache": "^4.2.0",

src/crud/user.ts

@@ -19,8 +19,9 @@ import {
   NotificationEmails,
   CacheCategories
 } from "../interfaces/enum";
-import { getEmailObject } from "./email";
+import { getEmailObject, getEmail } from "./email";
 import { cachedQuery, deleteItemFromCache } from "../helpers/cache";
+import md5 from "md5";
 
 /**
  * Get a list of all users
@@ -90,6 +91,17 @@ export const getUserByEmail = async (email: string, secureOrigin = false) => {
 export const updateUser = async (id: number, user: KeyValue) => {
   user.updatedAt = dateToDateTime(new Date());
   user = removeReadOnlyValues(user);
+  if (user.primaryEmail) {
+    const originalUser = await getUser(id);
+    if ((originalUser.profilePicture || "").includes("ui-avatars.com")) {
+      const emailDetails = await getEmail(user.primaryEmail);
+      user.profilePicture = `https://www.gravatar.com/avatar/${md5(
+        emailDetails.email
+      )}?d=${encodeURIComponent(
+        `https://ui-avatars.com/api/?bold=true&name=${user.name}`
+      )}`;
+    }
+  }
   deleteItemFromCache(CacheCategories.USER, id);
   deleteItemFromCache(CacheCategories.USER_EMAILS, id);
   return await query(`UPDATE users SET ${setValues(user)} WHERE id = ?`, [

src/helpers/cache.ts

@@ -55,13 +55,9 @@ export const cachedQuery = async (
   values?: (string | number | boolean | Date | undefined)[]
 ) => {
   const cachedItem = getItemFromCache(category, item);
-  if (cachedItem) {
-    console.log("Returned from cache");
-    return cachedItem;
-  }
+  if (cachedItem) return cachedItem;
   const databaseItem = await query(queryString, values);
   if (databaseItem) {
-    console.log("Returned from database");
     storeItemInCache(category, item, databaseItem);
     return databaseItem;
   }

yarn.lock

@@ -564,6 +564,13 @@
   resolved "https://registry.yarnpkg.com/@types/marked/-/marked-0.6.5.tgz#3cf2a56ef615dad24aaf99784ef90a9eba4e29d8"
   integrity sha512-6kBKf64aVfx93UJrcyEZ+OBM5nGv4RLsI6sR1Ar34bpgvGVRoyTgpxn4ZmtxOM5aDTAaaznYuYUH8bUX3Nk3YA==
 
+"@types/md5@^2.1.33":
+  version "2.1.33"
+  resolved "https://registry.yarnpkg.com/@types/md5/-/md5-2.1.33.tgz#8c8dba30df4ad0e92296424f08c4898dd808e8df"
+  integrity sha512-8+X960EtKLoSblhauxLKy3zzotagjoj3Jt1Tx9oaxUdZEPIBl+mkrUz6PNKpzJgkrKSN9YgkWTA29c0KnLshmA==
+  dependencies:
+    "@types/node" "*"
+
 "@types/mime@*":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d"
@@ -1180,6 +1187,11 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+charenc@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
+  integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
+
 charm@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/charm/-/charm-0.1.2.tgz#06c21eed1a1b06aeb67553cdc53e23274bac2296"
@@ -1448,6 +1460,11 @@ cross-spawn@^6.0.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+crypt@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
+  integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
+
 crypto-random-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
@@ -2684,7 +2701,7 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-buffer@^1.1.5:
+is-buffer@^1.1.5, is-buffer@~1.1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
@@ -3713,6 +3730,15 @@ maxmind@^3.0.3:
   dependencies:
     tiny-lru "6.0.1"
 
+md5@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
+  integrity sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=
+  dependencies:
+    charenc "~0.0.1"
+    crypt "~0.0.1"
+    is-buffer "~1.1.1"
+
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"