Skip to content

Commit 8d34145

Browse files
committed
Move isSoftRemoved check into name tracker
1 parent aa08072 commit 8d34145

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

app/lib/frontend/handlers/custom_api.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Future<shelf.Response> apiPackageNamesHandler(shelf.Request request) async {
7979
final bytes = await cache.packageNamesDataJsonGz().get(() async {
8080
final packageNames = await nameTracker.getVisiblePackageNames();
8181
return gzip.encode(jsonUtf8Encoder.convert({
82-
'packages': packageNames.where((p) => !isSoftRemoved(p)).toList(),
82+
'packages': packageNames,
8383
// pagination is off for now
8484
'nextUrl': null,
8585
}));

app/lib/package/name_tracker.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import 'package:clock/clock.dart';
88
import 'package:gcloud/service_scope.dart' as ss;
99
import 'package:logging/logging.dart';
1010
import 'package:meta/meta.dart';
11+
import 'package:pub_dev/package/overrides.dart';
1112
import 'package:pub_package_reader/pub_package_reader.dart';
1213

1314
import '../shared/datastore.dart';
@@ -51,7 +52,7 @@ class TrackedPackage {
5152
updated: p.updated!,
5253
latestVersion: p.latestVersion!,
5354
lastPublished: p.lastVersionPublished!,
54-
isVisible: p.isVisible,
55+
isVisible: p.isVisible && !isSoftRemoved(p.name!),
5556
);
5657

5758
@visibleForTesting
@@ -125,7 +126,7 @@ class NameTracker {
125126

126127
/// Get the names of all visible packages.
127128
///
128-
/// Packages that are _withdrawn_ are not listed here.
129+
/// Packages that are _moderated_ or _soft removed_ are NOT listed here.
129130
/// Packages that are _unlisted_ or _discontinued_ are **included in this list**.
130131
///
131132
/// If it is called before the first scan was done, it will wait for

0 commit comments

Comments
 (0)