From bc733ddf0e40a854339ee9b1d922008473db4360 Mon Sep 17 00:00:00 2001
From: Ben Beauchamp <benbeauchamp7@gmail.com>
Date: Thu, 6 Feb 2025 18:36:22 -0600
Subject: [PATCH] refactor(blacklist): swap out some != and == for !s and _s

---
 server/job/blacklistedTagsProcessor.ts        | 36 +++++++-------
 src/components/Blacklist/index.tsx            | 49 +++++++++----------
 src/components/BlacklistBlock/index.tsx       |  4 +-
 src/components/BlacklistedTagsBadge/index.tsx |  2 +-
 4 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/server/job/blacklistedTagsProcessor.ts b/server/job/blacklistedTagsProcessor.ts
index 720120e4..eab46a1e 100644
--- a/server/job/blacklistedTagsProcessor.ts
+++ b/server/job/blacklistedTagsProcessor.ts
@@ -83,7 +83,7 @@ class BlacklistedTagProcessor implements RunnableScanner<StatusBase> {
 
     for (const type of [MediaType.MOVIE, MediaType.TV]) {
       const getDiscover =
-        type == MediaType.MOVIE ? tmdb.getDiscoverMovies : tmdb.getDiscoverTv;
+        type === MediaType.MOVIE ? tmdb.getDiscoverMovies : tmdb.getDiscoverTv;
 
       // Iterate for each tag
       for (const tag of blacklistedTagsArr) {
@@ -111,7 +111,7 @@ class BlacklistedTagProcessor implements RunnableScanner<StatusBase> {
           await new Promise((res) => setTimeout(res, TMDB_API_DELAY_MS));
 
           this.progress++;
-          if (page == 1 && response.total_pages <= queryMax) {
+          if (page === 1 && response.total_pages <= queryMax) {
             // We will finish the tag with less queries than expected, move progress accordingly
             this.progress += queryMax - response.total_pages;
             fixedSortMode = true;
@@ -135,33 +135,31 @@ class BlacklistedTagProcessor implements RunnableScanner<StatusBase> {
         where: { tmdbId: entry.id },
       });
 
-      if (blacklistEntry != null) {
+      if (blacklistEntry) {
         // Don't mark manual blacklists with tags
         // If media wasn't previously blacklisted for this tag, add the tag to the media's blacklist
         if (
-          blacklistEntry.blacklistedTags != null &&
+          blacklistEntry.blacklistedTags &&
           !blacklistEntry.blacklistedTags.includes(`,${keywordId},`)
         ) {
           await blacklistRepository.update(blacklistEntry.id, {
             blacklistedTags: `${blacklistEntry.blacklistedTags}${keywordId},`,
           });
         }
-
-        continue;
-      }
-
-      // Media wasn't previously blacklisted, add it to the blacklist
-      await Blacklist.addToBlacklist(
-        {
-          blacklistRequest: {
-            mediaType,
-            title: 'title' in entry ? entry.title : entry.name,
-            tmdbId: entry.id,
-            blacklistedTags: `,${keywordId},`,
+      } else {
+        // Media wasn't previously blacklisted, add it to the blacklist
+        await Blacklist.addToBlacklist(
+          {
+            blacklistRequest: {
+              mediaType,
+              title: 'title' in entry ? entry.title : entry.name,
+              tmdbId: entry.id,
+              blacklistedTags: `,${keywordId},`,
+            },
           },
-        },
-        em
-      );
+          em
+        );
+      }
     }
   }
 
diff --git a/src/components/Blacklist/index.tsx b/src/components/Blacklist/index.tsx
index e1dc8e01..ced5d15d 100644
--- a/src/components/Blacklist/index.tsx
+++ b/src/components/Blacklist/index.tsx
@@ -410,33 +410,32 @@ const BlacklistedItem = ({ item, revalidateList }: BlacklistedItemProps) => {
                       numeric="auto"
                     />
                   ),
-                  user:
-                    item.user != null ? (
-                      <Link href={`/users/${item.user.id}`}>
-                        <span className="group flex items-center truncate">
-                          <CachedImage
-                            type="avatar"
-                            src={item.user.avatar}
-                            alt=""
-                            className="avatar-sm ml-1.5"
-                            width={20}
-                            height={20}
-                            style={{ objectFit: 'cover' }}
-                          />
-                          <span className="ml-1 truncate text-sm font-semibold group-hover:text-white group-hover:underline">
-                            {item.user.displayName}
-                          </span>
+                  user: item.user ? (
+                    <Link href={`/users/${item.user.id}`}>
+                      <span className="group flex items-center truncate">
+                        <CachedImage
+                          type="avatar"
+                          src={item.user.avatar}
+                          alt=""
+                          className="avatar-sm ml-1.5"
+                          width={20}
+                          height={20}
+                          style={{ objectFit: 'cover' }}
+                        />
+                        <span className="ml-1 truncate text-sm font-semibold group-hover:text-white group-hover:underline">
+                          {item.user.displayName}
                         </span>
-                      </Link>
-                    ) : item.blacklistedTags ? (
-                      <span className="ml-1">
-                        <BlacklistedTagsBadge data={item} />
                       </span>
-                    ) : (
-                      <span className="ml-1 truncate text-sm font-semibold">
-                        ???
-                      </span>
-                    ),
+                    </Link>
+                  ) : item.blacklistedTags ? (
+                    <span className="ml-1">
+                      <BlacklistedTagsBadge data={item} />
+                    </span>
+                  ) : (
+                    <span className="ml-1 truncate text-sm font-semibold">
+                      ???
+                    </span>
+                  ),
                 })}
               </span>
             </div>
diff --git a/src/components/BlacklistBlock/index.tsx b/src/components/BlacklistBlock/index.tsx
index cabf3227..7b86faa4 100644
--- a/src/components/BlacklistBlock/index.tsx
+++ b/src/components/BlacklistBlock/index.tsx
@@ -79,7 +79,7 @@ const BlacklistBlock = ({
       <div className="flex items-center justify-between">
         <div className="mr-6 min-w-0 flex-1 flex-col items-center text-sm leading-5">
           <div className="white mb-1 flex flex-nowrap">
-            {data.user != null ? (
+            {data.user ? (
               <>
                 <Tooltip content={intl.formatMessage(messages.blacklistedby)}>
                   <UserIcon className="mr-1.5 h-5 w-5 min-w-0 flex-shrink-0" />
@@ -98,7 +98,7 @@ const BlacklistBlock = ({
                   </Link>
                 </span>
               </>
-            ) : data.blacklistedTags != null && data.blacklistedTags != '' ? (
+            ) : data.blacklistedTags ? (
               <>
                 <span className="w-40 truncate md:w-auto">
                   {intl.formatMessage(messages.blacklistedby)}:&nbsp;
diff --git a/src/components/BlacklistedTagsBadge/index.tsx b/src/components/BlacklistedTagsBadge/index.tsx
index 2c949154..df15af4d 100644
--- a/src/components/BlacklistedTagsBadge/index.tsx
+++ b/src/components/BlacklistedTagsBadge/index.tsx
@@ -21,7 +21,7 @@ const BlacklistedTagsBadge = ({ data }: BlacklistedTagsBadgeProps) => {
   const intl = useIntl();
 
   useEffect(() => {
-    if (data.blacklistedTags == null) {
+    if (!data.blacklistedTags) {
       return;
     }