Extract gravatar URL fn (#2386)

src/lib/types/user.ts

@@ -1,5 +1,5 @@
-import gravatarUrl from 'gravatar-url';
 import Joi from 'joi';
+import { generateImageUrl } from '../util/generateImageUrl';
 
 export interface UserData {
     id: number;
@@ -79,10 +79,7 @@ export default class User implements IUser {
     }
 
     generateImageUrl(): string {
-        return gravatarUrl(this.email || this.username || '' + this.id, {
+        return generateImageUrl(this);
-            size: 42,
-            default: 'retro',
-        });
     }
 }
 

src/lib/util/generateImageUrl.ts

@@ -0,0 +1,11 @@
+import gravatarUrl from 'gravatar-url';
+
+export const generateImageUrl = (user: {
+    email: string;
+    username: string;
+    id: number;
+}): string =>
+    gravatarUrl(user.email || user.username || String(user.id), {
+        size: 42,
+        default: 'retro',
+    });