Simpler visibility/is-moderated check. (#8772)

Author: isoos

app/lib/frontend/handlers/package.dart

@@ -300,17 +300,12 @@ Future<shelf.Response> _handlePackagePage({
 
   if (cachedPage == null) {
     final package = await packageBackend.lookupPackage(packageName);
-    if (package == null || !package.isVisible) {
-      if (package?.isModerated ?? false) {
-        final content = renderModeratedPackagePage(packageName);
-        return htmlResponse(content, status: 404);
-      }
-      if (await packageBackend.isPackageModerated(packageName)) {
-        final content = renderModeratedPackagePage(packageName);
-        return htmlResponse(content, status: 404);
-      } else {
-        return formattedNotFoundHandler(request);
-      }
+    if (package == null) {
+      return formattedNotFoundHandler(request);
+    }
+    if (package.isNotVisible) {
+      final content = renderModeratedPackagePage(packageName);
+      return htmlResponse(content, status: 404);
     }
     final serviceSw = Stopwatch()..start();
     final PackagePageData data;

app/lib/package/backend.dart

@@ -110,18 +110,6 @@ class PackageBackend {
     }))!;
   }
 
-  /// Whether the package has been deleted and a [ModeratedPackage] entity exists for it.
-  Future<bool> isPackageModerated(String package) async {
-    return (await cache.packageModerated(package).get(() async {
-      final visible = await isPackageVisible(package);
-      if (visible) {
-        return false;
-      }
-      final p = await lookupModeratedPackage(package);
-      return p != null;
-    }))!;
-  }
-
   Stream<Package> allPackages() => db.query<Package>().run();
 
   Stream<String> allPackageNames() {
@@ -1783,7 +1771,6 @@ api.PackagePublisherInfo _asPackagePublisherInfo(Package p) =>
 Future<void> purgePackageCache(String package) async {
   await Future.wait([
     cache.packageVisible(package).purge(),
-    cache.packageModerated(package).purge(),
     cache.packageData(package).purge(),
     cache.packageDataGz(package).purge(),
     cache.packageLatestVersion(package).purge(),

app/lib/shared/redis_cache.dart

@@ -130,16 +130,6 @@ class CachePatterns {
         decode: (d) => d as bool,
       ))[package];
 
-  Entry<bool> packageModerated(String package) => _cache
-      .withPrefix('package-moderated/')
-      .withTTL(Duration(days: 7))
-      .withCodec(utf8)
-      .withCodec(json)
-      .withCodec(wrapAsCodec(
-        encode: (bool value) => value,
-        decode: (d) => d as bool,
-      ))[package];
-
   Entry<List<int>> packageData(String package) => _cache
       .withPrefix('api-package-data-by-uri/')
       .withTTL(Duration(minutes: 10))['$package'];