Skip to content

Commit 5410814

Browse files
authored
Remove isBlocked-related admin operations. (#8357)
1 parent e5889f7 commit 5410814

File tree

16 files changed

+16
-354
lines changed

16 files changed

+16
-354
lines changed

app/lib/admin/actions/actions.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import 'package_reservation_delete.dart';
2727
import 'package_reservation_list.dart';
2828
import 'package_version_info.dart';
2929
import 'package_version_retraction.dart';
30-
import 'publisher_block.dart';
3130
import 'publisher_create.dart';
3231
import 'publisher_delete.dart';
3332
import 'publisher_info.dart';
@@ -114,7 +113,6 @@ final class AdminAction {
114113
packageReservationList,
115114
packageVersionInfo,
116115
packageVersionRetraction,
117-
publisherBlock,
118116
publisherCreate,
119117
publisherDelete,
120118
publisherInfo,

app/lib/admin/actions/publisher_block.dart

Lines changed: 0 additions & 62 deletions
This file was deleted.

app/lib/admin/backend.dart

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,11 @@ import '../shared/versions.dart';
3535
import '../task/backend.dart';
3636
import 'actions/actions.dart' show AdminAction;
3737
import 'tools/delete_all_staging.dart';
38-
import 'tools/list_package_blocked.dart';
3938
import 'tools/list_tools.dart';
4039
import 'tools/notify_service.dart';
4140
import 'tools/package_publisher.dart';
4241
import 'tools/publisher_member.dart';
4342
import 'tools/recent_uploaders.dart';
44-
import 'tools/set_package_blocked.dart';
45-
import 'tools/set_user_blocked.dart';
4643
import 'tools/user_merger.dart';
4744

4845
final _logger = Logger('pub.admin.backend');
@@ -59,14 +56,11 @@ typedef Tool = Future<String> Function(List<String> args);
5956

6057
final Map<String, Tool> availableTools = {
6158
'delete-all-staging': executeDeleteAllStaging,
62-
'list-package-blocked': executeListPackageBlocked,
6359
'notify-service': executeNotifyService,
6460
'package-publisher': executeSetPackagePublisher,
6561
'recent-uploaders': executeRecentUploaders,
6662
'publisher-member': executePublisherMember,
6763
'publisher-invite-member': executePublisherInviteMember,
68-
'set-package-blocked': executeSetPackageBlocked,
69-
'set-user-blocked': executeSetUserBlocked,
7064
'user-merger': executeUserMergerTool,
7165
'list-tools': executeListTools,
7266
};

app/lib/admin/tools/list_package_blocked.dart

Lines changed: 0 additions & 27 deletions
This file was deleted.

app/lib/admin/tools/set_package_blocked.dart

Lines changed: 0 additions & 107 deletions
This file was deleted.

app/lib/admin/tools/set_user_blocked.dart

Lines changed: 0 additions & 50 deletions
This file was deleted.

app/lib/package/models.dart

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -413,16 +413,6 @@ class Package extends db.ExpandoModel<String> {
413413
);
414414
}
415415

416-
void updateIsBlocked({
417-
required bool isBlocked,
418-
String? reason,
419-
}) {
420-
this.isBlocked = isBlocked;
421-
blockedReason = reason;
422-
blocked = isBlocked ? clock.now().toUtc() : null;
423-
updated = clock.now().toUtc();
424-
}
425-
426416
void updateIsModerated({
427417
required bool isModerated,
428418
}) {

app/lib/publisher/models.dart

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,6 @@ class Publisher extends db.ExpandoModel<String> {
9191
isModerated = false;
9292
}
9393

94-
/// Clears most properties on the entity and sets the [isBlocked] flag.
95-
void markForBlocked() {
96-
isBlocked = true;
97-
isAbandoned = true;
98-
contactEmail = null;
99-
description = '';
100-
updated = clock.now().toUtc();
101-
}
102-
10394
/// Whether the publisher has a displayable description.
10495
bool get hasDescription => description != null && description!.isNotEmpty;
10596

app/test/admin/api_test.dart

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -712,26 +712,6 @@ void main() {
712712
expect(rs3.isRetracted, v4.isRetracted);
713713
});
714714
});
715-
716-
group('block user', () {
717-
setupTestsWithAdminTokenIssues(
718-
(client) => client.adminExecuteTool(
719-
'set-user-blocked',
720-
721-
),
722-
);
723-
724-
testWithProfile('block and unblock user', fn: () async {
725-
final client = createPubApiClient(authToken: siteAdminToken);
726-
await client.adminExecuteTool('set-user-blocked', '[email protected]/true');
727-
final user = await accountBackend.lookupUserByEmail('[email protected]');
728-
expect(user.isBlocked, true);
729-
await client.adminExecuteTool(
730-
'set-user-blocked', '${user.userId}/false');
731-
final user2 = await accountBackend.lookupUserByEmail('[email protected]');
732-
expect(user2.isBlocked, false);
733-
});
734-
});
735715
});
736716
}
737717

app/test/frontend/handlers/custom_api_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ void main() {
147147
},
148148
);
149149
final p = await packageBackend.lookupPackage('neon');
150-
p!.updateIsBlocked(isBlocked: true, reason: 'spam');
150+
p!.updateIsModerated(isModerated: true);
151151
expect(p.isVisible, isFalse);
152152
await dbService.commit(inserts: [p]);
153153
await nameTracker.reloadFromDatastore();
@@ -163,7 +163,7 @@ void main() {
163163
);
164164

165165
// reverting to make sure integrity check is passing
166-
p.updateIsBlocked(isBlocked: false);
166+
p.updateIsModerated(isModerated: false);
167167
await dbService.commit(inserts: [p]);
168168
});
169169
});

0 commit comments

Comments
 (0)