refactor: checks if the default avatar is cached to avoid creating du…

…plicates for different users
fallenbagel · Aug 26, 2024 · b46d247 · b46d247
1 parent c9ff802
commit b46d247
Show file tree

Hide file tree

Showing 7 changed files with 213 additions and 152 deletions.
diff --git a/server/routes/auth.ts b/server/routes/auth.ts
@@ -343,6 +343,14 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
                 }),
             userType: UserType.EMBY,
           });
+
+          if (
+            user.avatar.includes('https://gravatar.com') &&
+            user.avatar.includes('default=mm&size=200')
+          ) {
+            user.avatar = 'https://gravatar.com/avatar/?default=mm&size=200';
+          }
+
           break;
         case MediaServerType.JELLYFIN:
           settings.main.mediaServerType = MediaServerType.JELLYFIN;
@@ -361,6 +369,14 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
                 }),
             userType: UserType.JELLYFIN,
           });
+
+          if (
+            user.avatar.includes('https://gravatar.com') &&
+            user.avatar.includes('default=mm&size=200')
+          ) {
+            user.avatar = 'https://gravatar.com/avatar/?default=mm&size=200';
+          }
+
           break;
         default:
           throw new Error('select_server_type');
@@ -415,15 +431,23 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
         }
         user.avatar = avatar;
       } else {
-        const avatar = gravatarUrl(user.email || account.User.Name, {
+        let avatar = gravatarUrl(user.email || account.User.Name, {
           default: 'mm',
           size: 200,
         });
 
+        if (
+          avatar.includes('https://gravatar.com') &&
+          avatar.includes('default=mm&size=200')
+        ) {
+          avatar = 'https://gravatar.com/avatar/?default=mm&size=200';
+        }
+
         if (avatar !== user.avatar) {
           const avatarProxy = new ImageProxy('avatar', '');
           avatarProxy.clearCachedImage(user.avatar);
         }
+
         user.avatar = avatar;
       }
       user.jellyfinUsername = account.User.Name;
@@ -474,6 +498,13 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
             ? UserType.JELLYFIN
             : UserType.EMBY,
       });
+
+      if (
+        user.avatar.includes('https://gravatar.com') &&
+        user.avatar.includes('default=mm&size=200')
+      ) {
+        user.avatar = 'https://gravatar.com/avatar/?default=mm&size=200';
+      }
       //initialize Jellyfin/Emby users with local login
       const passedExplicitPassword = body.password && body.password.length > 0;
       if (passedExplicitPassword) {

diff --git a/server/routes/avatarproxy.ts b/server/routes/avatarproxy.ts
@@ -7,8 +7,16 @@ const router = Router();
 const avatarImageProxy = new ImageProxy('avatar', '');
 // Proxy avatar images
 router.get('/*', async (req, res) => {
-  const imagePath = req.url.startsWith('/') ? req.url.slice(1) : req.url;
+  let imagePath = req.url.startsWith('/') ? req.url.slice(1) : req.url;
+
   try {
+    if (
+      imagePath.includes('https://gravatar.com') &&
+      imagePath.includes('default=mm&size=200')
+    ) {
+      imagePath = 'https://gravatar.com/avatar/?default=mm&size=200';
+    }
+
     const imageData = await avatarImageProxy.getImage(imagePath);
 
     res.writeHead(200, {

diff --git a/server/routes/user/index.ts b/server/routes/user/index.ts
@@ -121,7 +121,14 @@ router.post(
       }
 
       const passedExplicitPassword = body.password && body.password.length > 0;
-      const avatar = gravatarUrl(email, { default: 'mm', size: 200 });
+      let avatar = gravatarUrl(email, { default: 'mm', size: 200 });
+
+      if (
+        avatar.includes('https://gravatar.com') &&
+        avatar.includes('default=mm&size=200')
+      ) {
+        avatar = 'https://gravatar.com/avatar/?default=mm&size=200';
+      }
 
       if (
         !passedExplicitPassword &&
@@ -553,6 +560,13 @@ router.post(
             userType: UserType.JELLYFIN,
           });
 
+          if (
+            newUser.avatar.includes('https://gravatar.com') &&
+            newUser.avatar.includes('default=mm&size=200')
+          ) {
+            newUser.avatar = 'https://gravatar.com/avatar/?default=mm&size=200';
+          }
+
           await userRepository.save(newUser);
           createdUsers.push(newUser);
         }

diff --git a/src/components/IssueDetails/index.tsx b/src/components/IssueDetails/index.tsx
@@ -28,7 +28,6 @@ import type Issue from '@server/entity/Issue';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
 import { Field, Form, Formik } from 'formik';
-import Image from 'next/image';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
 import { useState } from 'react';
@@ -264,8 +263,9 @@ const IssueDetails = () => {
           </div>
           <h1>
             <Link
-              href={`/${issueData.media.mediaType === MediaType.MOVIE ? 'movie' : 'tv'
-                }/${data.id}`}
+              href={`/${
+                issueData.media.mediaType === MediaType.MOVIE ? 'movie' : 'tv'
+              }/${data.id}`}
               className="hover:underline"
             >
               {title}
@@ -302,7 +302,7 @@ const IssueDetails = () => {
                 <FormattedRelativeTime
                   value={Math.floor(
                     (new Date(issueData.createdAt).getTime() - Date.now()) /
-                    1000
+                      1000
                   )}
                   updateIntervalInSeconds={1}
                   numeric="auto"
@@ -367,7 +367,7 @@ const IssueDetails = () => {
                   <FormattedRelativeTime
                     value={Math.floor(
                       (new Date(issueData.updatedAt).getTime() - Date.now()) /
-                      1000
+                        1000
                     )}
                     updateIntervalInSeconds={1}
                     numeric="auto"
@@ -388,16 +388,16 @@ const IssueDetails = () => {
                   <PlayIcon />
                   <span>
                     {settings.currentSettings.mediaServerType ===
-                      MediaServerType.EMBY
+                    MediaServerType.EMBY
                       ? intl.formatMessage(messages.playonplex, {
-                        mediaServerName: 'Emby',
-                      })
+                          mediaServerName: 'Emby',
+                        })
                       : settings.currentSettings.mediaServerType ===
                         MediaServerType.PLEX
-                        ? intl.formatMessage(messages.playonplex, {
+                      ? intl.formatMessage(messages.playonplex, {
                           mediaServerName: 'Plex',
                         })
-                        : intl.formatMessage(messages.playonplex, {
+                      : intl.formatMessage(messages.playonplex, {
                           mediaServerName: 'Jellyfin',
                         })}
                   </span>
@@ -436,16 +436,16 @@ const IssueDetails = () => {
                   <PlayIcon />
                   <span>
                     {settings.currentSettings.mediaServerType ===
-                      MediaServerType.EMBY
+                    MediaServerType.EMBY
                       ? intl.formatMessage(messages.play4konplex, {
-                        mediaServerName: 'Emby',
-                      })
+                          mediaServerName: 'Emby',
+                        })
                       : settings.currentSettings.mediaServerType ===
                         MediaServerType.PLEX
-                        ? intl.formatMessage(messages.play4konplex, {
+                      ? intl.formatMessage(messages.play4konplex, {
                           mediaServerName: 'Plex',
                         })
-                        : intl.formatMessage(messages.play4konplex, {
+                      : intl.formatMessage(messages.play4konplex, {
                           mediaServerName: 'Jellyfin',
                         })}
                   </span>
@@ -530,52 +530,52 @@ const IssueDetails = () => {
                         <div className="mt-4 flex items-center justify-end space-x-2">
                           {(hasPermission(Permission.MANAGE_ISSUES) ||
                             belongsToUser) && (
-                              <>
-                                {issueData.status === IssueStatus.OPEN ? (
-                                  <Button
-                                    type="button"
-                                    buttonType="danger"
-                                    onClick={async () => {
-                                      await updateIssueStatus('resolved');
+                            <>
+                              {issueData.status === IssueStatus.OPEN ? (
+                                <Button
+                                  type="button"
+                                  buttonType="danger"
+                                  onClick={async () => {
+                                    await updateIssueStatus('resolved');
 
-                                      if (values.message) {
-                                        handleSubmit();
-                                      }
-                                    }}
-                                  >
-                                    <CheckCircleIcon />
-                                    <span>
-                                      {intl.formatMessage(
-                                        values.message
-                                          ? messages.closeissueandcomment
-                                          : messages.closeissue
-                                      )}
-                                    </span>
-                                  </Button>
-                                ) : (
-                                  <Button
-                                    type="button"
-                                    buttonType="default"
-                                    onClick={async () => {
-                                      await updateIssueStatus('open');
+                                    if (values.message) {
+                                      handleSubmit();
+                                    }
+                                  }}
+                                >
+                                  <CheckCircleIcon />
+                                  <span>
+                                    {intl.formatMessage(
+                                      values.message
+                                        ? messages.closeissueandcomment
+                                        : messages.closeissue
+                                    )}
+                                  </span>
+                                </Button>
+                              ) : (
+                                <Button
+                                  type="button"
+                                  buttonType="default"
+                                  onClick={async () => {
+                                    await updateIssueStatus('open');
 
-                                      if (values.message) {
-                                        handleSubmit();
-                                      }
-                                    }}
-                                  >
-                                    <ArrowPathIcon />
-                                    <span>
-                                      {intl.formatMessage(
-                                        values.message
-                                          ? messages.reopenissueandcomment
-                                          : messages.reopenissue
-                                      )}
-                                    </span>
-                                  </Button>
-                                )}
-                              </>
-                            )}
+                                    if (values.message) {
+                                      handleSubmit();
+                                    }
+                                  }}
+                                >
+                                  <ArrowPathIcon />
+                                  <span>
+                                    {intl.formatMessage(
+                                      values.message
+                                        ? messages.reopenissueandcomment
+                                        : messages.reopenissue
+                                    )}
+                                  </span>
+                                </Button>
+                              )}
+                            </>
+                          )}
                           <Button
                             type="submit"
                             buttonType="primary"
@@ -641,7 +641,7 @@ const IssueDetails = () => {
                 <FormattedRelativeTime
                   value={Math.floor(
                     (new Date(issueData.updatedAt).getTime() - Date.now()) /
-                    1000
+                      1000
                   )}
                   updateIntervalInSeconds={1}
                   numeric="auto"
@@ -662,16 +662,16 @@ const IssueDetails = () => {
                 <PlayIcon />
                 <span>
                   {settings.currentSettings.mediaServerType ===
-                    MediaServerType.EMBY
+                  MediaServerType.EMBY
                     ? intl.formatMessage(messages.playonplex, {
-                      mediaServerName: 'Emby',
-                    })
+                        mediaServerName: 'Emby',
+                      })
                     : settings.currentSettings.mediaServerType ===
                       MediaServerType.PLEX
-                      ? intl.formatMessage(messages.playonplex, {
+                    ? intl.formatMessage(messages.playonplex, {
                         mediaServerName: 'Plex',
                       })
-                      : intl.formatMessage(messages.playonplex, {
+                    : intl.formatMessage(messages.playonplex, {
                         mediaServerName: 'Jellyfin',
                       })}
                 </span>
@@ -709,16 +709,16 @@ const IssueDetails = () => {
                 <PlayIcon />
                 <span>
                   {settings.currentSettings.mediaServerType ===
-                    MediaServerType.EMBY
+                  MediaServerType.EMBY
                     ? intl.formatMessage(messages.play4konplex, {
-                      mediaServerName: 'Emby',
-                    })
+                        mediaServerName: 'Emby',
+                      })
                     : settings.currentSettings.mediaServerType ===
                       MediaServerType.PLEX
-                      ? intl.formatMessage(messages.play4konplex, {
+                    ? intl.formatMessage(messages.play4konplex, {
                         mediaServerName: 'Plex',
                       })
-                      : intl.formatMessage(messages.play4konplex, {
+                    : intl.formatMessage(messages.play4konplex, {
                         mediaServerName: 'Jellyfin',
                       })}
                 </span>