Merge branch 'master' into feat/sass-import-deprecation

Author: parlough

CHANGELOG.md

@@ -3,6 +3,9 @@ AppEngine version, listed here to ease deployment and troubleshooting.
 
 ## Next Release (replace with git tag when deployed)
 
+## `20241022t092400-all`
+ * Bumped runtimeVersion to `2024.10.21`.
+
 ## `20241017t095600-all`
  * Bumped runtimeVersion to `2024.10.15`.
  * Upgraded pana to `0.22.13`.

app/lib/admin/backend.dart

@@ -929,4 +929,16 @@ class AdminBackend {
       _logger.info('Deleting moderated user: ${user.userId}');
     }
   }
+
+  /// Whether the [ModerationCase] has been appealed by [email] already.
+  Future<bool> isModerationCaseAppealedByEmail({
+    required String caseId,
+    required String email,
+  }) async {
+    final query = dbService.query<ModerationCase>()
+      ..filter('appealedCaseId =', caseId);
+    final list = await query.run().toList();
+    final emails = list.map((mc) => mc.reporterEmail).toSet();
+    return emails.contains(email);
+  }
 }

app/test/service/download_counts/fake_download_counts.dart renamed to app/lib/fake/backend/fake_download_counts.dart

@@ -167,7 +167,11 @@ Future<ResolvedDocUrlVersion> _resolveDocUrlVersion(
     }
 
     // Select the closest version (may be the same as version) that has a finished analysis.
-    final closest = await taskBackend.closestFinishedVersion(package, version);
+    final closest = await taskBackend.closestFinishedVersion(
+      package,
+      version,
+      preferDocsCompleted: true,
+    );
     return ResolvedDocUrlVersion(
       version: closest ?? version,
       urlSegment: closest ?? version,

app/lib/frontend/handlers/documentation.dart

@@ -9,6 +9,7 @@ import '../../shared/cookie_utils.dart';
 const _publicFlags = <String>{
   'dark',
   'search-completion',
+  'download-counts',
 };
 
 const _allFlags = <String>{
@@ -89,6 +90,8 @@ class ExperimentalFlags {
   bool get isDarkModeEnabled => isEnabled('dark');
   bool get isDarkModeDefault => isEnabled('dark-as-default');
 
+  bool get showDownloadCounts => isEnabled('download-counts');
+
   String encodedAsCookie() => _enabled.join(':');
 
   @override

app/lib/frontend/handlers/experimental.dart

@@ -206,6 +206,17 @@ Future<Message> processReportPageHandler(
 
   final isAppeal = form.caseId != null;
 
+  if (isAppeal) {
+    final appealExists = await adminBackend.isModerationCaseAppealedByEmail(
+      caseId: form.caseId!,
+      email: userEmail!,
+    );
+    if (appealExists) {
+      throw InvalidInputException(
+          'You have previously appealed this incident, we are unable to accept another appeal.');
+    }
+  }
+
   bool isSubjectOwner = false;
   if (user != null) {
     if (subject.isPackage) {

app/lib/frontend/handlers/report.dart

@@ -135,11 +135,14 @@ d.Node? _nameMatches(SearchForm form, List<String>? matches) {
       : 'Matching package ${singular ? 'name' : 'names'}: ';
 
   return d.p(children: [
-    d.b(text: nameMatchLabel),
+    d.text(nameMatchLabel),
     ...matches.expandIndexed((i, name) {
       return [
         if (i > 0) d.text(', '),
-        d.code(child: d.a(href: urls.pkgPageUrl(name), text: name)),
+        d.a(
+          href: urls.pkgPageUrl(name),
+          child: d.b(text: name),
+        ),
       ];
     }),
   ]);

app/lib/frontend/templates/listing.dart

@@ -197,6 +197,7 @@ d.Node labeledScoresNodeFromPackageView(PackageView view, {String? version}) {
     likeCount: view.likes,
     grantedPubPoints: view.grantedPubPoints,
     popularity: view.popularity,
+    thirtyDaysDownloads: view.thirtyDaysDownloadCounts,
   );
 }
 

app/lib/frontend/templates/package_misc.dart

@@ -208,6 +208,9 @@ Iterable<d.Node> _appeal(
           '(source repositories, screenshots, logs, bug tracker entries, etc) '
           'consider uploading these and sharing a link.',
     ),
+    d.p(
+      child: d.b(text: 'You can appeal at most once per case.'),
+    ),
     if (!(sessionData?.isAuthenticated ?? false))
       d.fragment([
         d.p(text: 'Contact information:'),

app/lib/frontend/templates/report.dart

@@ -20,7 +20,8 @@ d.Node packageListingNode({
 }) {
   final innerContent = d.fragment([
     listingInfo,
-    if (nameMatches != null) nameMatches,
+    if (nameMatches != null)
+      d.div(classes: ['listing-highlight-block'], child: nameMatches),
     packageList,
     if (pagination != null) pagination,
     d.markdown('Check our help page for details on '