navap
diff --git a/‎.eslintrc.yaml
+7 b/‎.eslintrc.yaml
+7
diff --git a/‎HACKING.md
+1-7 b/‎HACKING.md
+1-7
diff --git a/‎admin/GenerateSQLScripts.pl
+3-3 b/‎admin/GenerateSQLScripts.pl
+3-3
diff --git a/‎admin/InitDb.pl
+4-4 b/‎admin/InitDb.pl
+4-4
diff --git a/‎admin/NormalizeToHTTPS
+1-1 b/‎admin/NormalizeToHTTPS
+1-1
diff --git a/‎admin/sql/CreateTriggers.sql
+20-4 b/‎admin/sql/CreateTriggers.sql
+20-4
diff --git a/‎admin/sql/DropTriggers.sql
+7-3 b/‎admin/sql/DropTriggers.sql
+7-3
diff --git a/‎admin/sql/updates/20210702-mbs-11760.sql
+21 b/‎admin/sql/updates/20210702-mbs-11760.sql
+21
diff --git a/‎lib/MusicBrainz/Script/JSONDump/Full.pm
+2-2 b/‎lib/MusicBrainz/Script/JSONDump/Full.pm
+2-2
diff --git a/‎lib/MusicBrainz/Script/JSONDump/Incremental.pm
+1-1 b/‎lib/MusicBrainz/Script/JSONDump/Incremental.pm
+1-1
diff --git a/‎lib/MusicBrainz/Script/RemoveExpiredSessions.pm
+1-1 b/‎lib/MusicBrainz/Script/RemoveExpiredSessions.pm
+1-1
diff --git a/‎lib/MusicBrainz/Server/Controller/Account.pm
+3-3 b/‎lib/MusicBrainz/Server/Controller/Account.pm
+3-3
diff --git a/‎lib/MusicBrainz/Server/Controller/Admin.pm
+59 b/‎lib/MusicBrainz/Server/Controller/Admin.pm
+59
diff --git a/‎lib/MusicBrainz/Server/Controller/Edit.pm
+1-1 b/‎lib/MusicBrainz/Server/Controller/Edit.pm
+1-1
diff --git a/‎lib/MusicBrainz/Server/Controller/Relationship/LinkType.pm
+8-3 b/‎lib/MusicBrainz/Server/Controller/Relationship/LinkType.pm
+8-3
diff --git a/‎lib/MusicBrainz/Server/Controller/Release.pm
+1 b/‎lib/MusicBrainz/Server/Controller/Release.pm
+1
diff --git a/‎lib/MusicBrainz/Server/Controller/Role/WikipediaExtract.pm
+3-2 b/‎lib/MusicBrainz/Server/Controller/Role/WikipediaExtract.pm
+3-2
@@ -6,6 +6,7 @@ plugins:
   - import
   - react
   - flowtype
+  - fb-flow
   - react-hooks
 
 env:
@@ -333,6 +334,12 @@ rules:
   flowtype/union-intersection-spacing: [warn, always]
   flowtype/use-flow-type: warn
 
+  #########################
+  # eslint-plugin-fb-flow #
+  #########################
+
+  fb-flow/use-indexed-access-type: error
+
   #############################
   # eslint-plugin-react-hooks #
   #############################
 
@@ -212,13 +212,7 @@ These are a bit more involved to set up:
 
  * Set USE_SET_DATABASE_HEADER to 1 in lib/DBDefs.pm.
 
- * Run ./script/create_test_db.sh and ./script/compile_resources.sh again.
-
- * Create the `musicbrainz_selenium` database using `musicbrainz_test` as
-   a template:
-
-       $ # On Ubuntu, use sudo -u postgres
-       $ createdb -O musicbrainz -T musicbrainz_test -U postgres musicbrainz_selenium
+ * Run ./script/create_test_db.sh SELENIUM and run ./script/compile_resources.sh again.
 
 With the above prerequisites out of the way, the tests can be run from the
 command line like so:
 
@@ -223,9 +223,9 @@ sub process_tables
         print OUT "BEGIN;\n\n";
         foreach my $row (@replication_triggers) {
             my ($table, $verbose) = @$row;
-            print OUT "CREATE TRIGGER \"reptg_$table\"\n";
-            print OUT "AFTER INSERT OR DELETE OR UPDATE ON \"$table\"\n";
-            print OUT "FOR EACH ROW EXECUTE PROCEDURE \"recordchange\" (" . ($verbose ? "'verbose'" : "") . ");\n\n"
+            print OUT qq(CREATE TRIGGER "reptg_$table"\n);
+            print OUT qq(AFTER INSERT OR DELETE OR UPDATE ON "$table"\n);
+            print OUT 'FOR EACH ROW EXECUTE PROCEDURE "recordchange" (' . ($verbose ? "'verbose'" : "") . ");\n\n"
         }
         print OUT "COMMIT;\n";
         close OUT;
 
@@ -148,8 +148,8 @@ sub CreateReplicationFunction
 
     $sql->auto_commit;
     $sql->do(
-        "CREATE FUNCTION \"recordchange\" () RETURNS trigger
-        AS ?, 'recordchange' LANGUAGE C",
+        q(CREATE FUNCTION "recordchange" () RETURNS trigger
+        AS ?, 'recordchange' LANGUAGE C),
         $path_to_pending_so,
     );
 }
@@ -260,7 +260,7 @@ sub CreateRelations
     my $opts = $DB->shell_args;
     $ENV{"PGPASSWORD"} = $DB->password;
 
-    system(sprintf("echo \"CREATE SCHEMA %s\" | $psql $opts", $_))
+    system(sprintf(qq(echo "CREATE SCHEMA %s" | $psql $opts), $_))
         for (qw(
             musicbrainz
             cover_art_archive
@@ -384,7 +384,7 @@ sub CreateRelations
     print localtime() . " : Optimizing database ...\n" unless $fQuiet;
     $opts = $DB->shell_args;
     $ENV{"PGPASSWORD"} = $DB->password;
-    system("echo \"vacuum analyze\" | $psql $opts");
+    system(qq(echo "vacuum analyze" | $psql $opts));
     die "\nFailed to optimize database\n" if ($? >> 8);
 
     print localtime() . " : Initialized and imported data into the database.\n" unless $fQuiet;
 
@@ -9,7 +9,7 @@ use lib "$FindBin::Bin/../lib";
 use MusicBrainz::Server::Context;
 use MusicBrainz::Server::Validation qw( is_positive_integer );
 
-my $usage = "\"Usage: $0 number_of_rows domain.name [domain.name ...]\"";
+my $usage = qq("Usage: $0 number_of_rows domain.name [domain.name ...]");
 
 my $number_of_rows = shift;
 is_positive_integer($number_of_rows) or warn $usage and die "invalid number of rows";
 
@@ -1036,34 +1036,50 @@ CREATE CONSTRAINT TRIGGER delete_unused_tag
 AFTER INSERT ON tag DEFERRABLE INITIALLY DEFERRED
 FOR EACH ROW EXECUTE PROCEDURE trg_delete_unused_tag();
 
+CREATE CONSTRAINT TRIGGER delete_unused_tag
+AFTER DELETE ON area_tag DEFERRABLE INITIALLY DEFERRED
+FOR EACH ROW EXECUTE PROCEDURE trg_delete_unused_tag_ref();
+
 CREATE CONSTRAINT TRIGGER delete_unused_tag
 AFTER DELETE ON artist_tag DEFERRABLE INITIALLY DEFERRED
 FOR EACH ROW EXECUTE PROCEDURE trg_delete_unused_tag_ref();
 
+CREATE CONSTRAINT TRIGGER delete_unused_tag
+AFTER DELETE ON event_tag DEFERRABLE INITIALLY DEFERRED
+FOR EACH ROW EXECUTE PROCEDURE trg_delete_unused_tag_ref();
+
+CREATE CONSTRAINT TRIGGER delete_unused_tag
+AFTER DELETE ON instrument_tag DEFERRABLE INITIALLY DEFERRED
+FOR EACH ROW EXECUTE PROCEDURE trg_delete_unused_tag_ref();
+
 CREATE CONSTRAINT TRIGGER delete_unused_tag
 AFTER DELETE ON label_tag DEFERRABLE INITIALLY DEFERRED
 FOR EACH ROW EXECUTE PROCEDURE trg_delete_unused_tag_ref();
 
 CREATE CONSTRAINT TRIGGER delete_unused_tag
-AFTER DELETE ON release_group_tag DEFERRABLE INITIALLY DEFERRED
+AFTER DELETE ON place_tag DEFERRABLE INITIALLY DEFERRED
 FOR EACH ROW EXECUTE PROCEDURE trg_delete_unused_tag_ref();
 
 CREATE CONSTRAINT TRIGGER delete_unused_tag
-AFTER DELETE ON work_tag DEFERRABLE INITIALLY DEFERRED
+AFTER DELETE ON recording_tag DEFERRABLE INITIALLY DEFERRED
 FOR EACH ROW EXECUTE PROCEDURE trg_delete_unused_tag_ref();
 
 CREATE CONSTRAINT TRIGGER delete_unused_tag
-AFTER DELETE ON area_tag DEFERRABLE INITIALLY DEFERRED
+AFTER DELETE ON release_group_tag DEFERRABLE INITIALLY DEFERRED
 FOR EACH ROW EXECUTE PROCEDURE trg_delete_unused_tag_ref();
 
 CREATE CONSTRAINT TRIGGER delete_unused_tag
-AFTER DELETE ON instrument_tag DEFERRABLE INITIALLY DEFERRED
+AFTER DELETE ON release_tag DEFERRABLE INITIALLY DEFERRED
 FOR EACH ROW EXECUTE PROCEDURE trg_delete_unused_tag_ref();
 
 CREATE CONSTRAINT TRIGGER delete_unused_tag
 AFTER DELETE ON series_tag DEFERRABLE INITIALLY DEFERRED
 FOR EACH ROW EXECUTE PROCEDURE trg_delete_unused_tag_ref();
 
+CREATE CONSTRAINT TRIGGER delete_unused_tag
+AFTER DELETE ON work_tag DEFERRABLE INITIALLY DEFERRED
+FOR EACH ROW EXECUTE PROCEDURE trg_delete_unused_tag_ref();
+
 --------------------------------------------------------------------------------
 CREATE CONSTRAINT TRIGGER apply_artist_release_group_pending_updates
     AFTER INSERT OR UPDATE OR DELETE ON release DEFERRABLE INITIALLY DEFERRED
 
@@ -314,13 +314,17 @@ DROP TRIGGER url_gc_a_del_l_url_url ON l_url_url;
 DROP TRIGGER url_gc_a_upd_l_url_work ON l_url_work;
 DROP TRIGGER url_gc_a_del_l_url_work ON l_url_work;
 DROP TRIGGER delete_unused_tag ON tag;
+DROP TRIGGER delete_unused_tag ON area_tag;
 DROP TRIGGER delete_unused_tag ON artist_tag;
+DROP TRIGGER delete_unused_tag ON event_tag;
+DROP TRIGGER delete_unused_tag ON instrument_tag;
 DROP TRIGGER delete_unused_tag ON label_tag;
+DROP TRIGGER delete_unused_tag ON place_tag;
+DROP TRIGGER delete_unused_tag ON recording_tag;
 DROP TRIGGER delete_unused_tag ON release_group_tag;
-DROP TRIGGER delete_unused_tag ON work_tag;
-DROP TRIGGER delete_unused_tag ON area_tag;
-DROP TRIGGER delete_unused_tag ON instrument_tag;
+DROP TRIGGER delete_unused_tag ON release_tag;
 DROP TRIGGER delete_unused_tag ON series_tag;
+DROP TRIGGER delete_unused_tag ON work_tag;
 DROP TRIGGER apply_artist_release_group_pending_updates ON release;
 DROP TRIGGER apply_artist_release_pending_updates ON release;
 DROP TRIGGER apply_artist_release_pending_updates ON release_country;
 
@@ -0,0 +1,21 @@
+\set ON_ERROR_STOP 1
+
+BEGIN;
+
+CREATE CONSTRAINT TRIGGER delete_unused_tag
+AFTER DELETE ON event_tag DEFERRABLE INITIALLY DEFERRED
+FOR EACH ROW EXECUTE PROCEDURE trg_delete_unused_tag_ref();
+
+CREATE CONSTRAINT TRIGGER delete_unused_tag
+AFTER DELETE ON place_tag DEFERRABLE INITIALLY DEFERRED
+FOR EACH ROW EXECUTE PROCEDURE trg_delete_unused_tag_ref();
+
+CREATE CONSTRAINT TRIGGER delete_unused_tag
+AFTER DELETE ON recording_tag DEFERRABLE INITIALLY DEFERRED
+FOR EACH ROW EXECUTE PROCEDURE trg_delete_unused_tag_ref();
+
+CREATE CONSTRAINT TRIGGER delete_unused_tag
+AFTER DELETE ON release_tag DEFERRABLE INITIALLY DEFERRED
+FOR EACH ROW EXECUTE PROCEDURE trg_delete_unused_tag_ref();
+
+COMMIT;
@@ -30,7 +30,7 @@ has force_update_entity_types => (
     cmd_flag => 'force-update',
     documentation => ('force-update entities of this type in its ' .
                       'json_dump.${entity}_json table; by default, ' .
-                      'entities are only inserted where they don\'t ' .
+                      q(entities are only inserted where they don't ) .
                       'exist, and updates are done by the incremental ' .
                       'dump only. can specify multiple of this flag ' .
                       '(default: no force-updates)'),
@@ -118,7 +118,7 @@ sub run_impl {
         }
 
         unless (defined $dump_replication_sequence) {
-            die 'Couldn\'t determine which replication sequence to dump. ' .
+            die q(Couldn't determine which replication sequence to dump. ) .
                 'Is the replication_control table empty?';
         }
 
 
@@ -144,7 +144,7 @@ sub run_impl {
     my $full_replication_sequence = $c->sql->select_single_value(
         'SELECT full_json_dump_replication_sequence FROM json_dump.control');
 
-    die 'The incremental script can\'t run until a full dump has run at least once.'
+    die q(The incremental script can't run until a full dump has run at least once.)
         unless defined $full_replication_sequence;
 
     $self->packet_limit(1);
 
@@ -52,7 +52,7 @@ sub run {
     my $r = $store->_connection;
     my $now = time + 5; # five seconds grace period for server differences
 
-    printf "Fetching entries from database; prefix used is \"%s\".\n", $store->_namespace if $self->verbose;
+    printf qq(Fetching entries from database; prefix used is "%s".\n), $store->_namespace if $self->verbose;
     my @keys = $r->_connection->keys($store->_namespace . "expires:*");
         # KEYS is very heavy, but our current Redis doesn't have SCAN
     my $considered = scalar @keys;
 
@@ -119,7 +119,7 @@ sub verify_email : Path('/verify-email') ForbiddenOnSlaves DenyWhenReadonly
             current_view => 'Node',
             component_path => 'account/EmailVerificationStatus',
             component_props => {
-                message => l('The user with ID \'{user_id}\' could not be found.',
+                message => l(q(The user with ID '{user_id}' could not be found.),
                                                 { user_id => $user_id }),
             }
         );
@@ -200,7 +200,7 @@ sub lost_password : Path('/lost-password') ForbiddenOnSlaves SecureForm
                 $form->field('email')->add_error(l('There is no user with this username and email'));
             }
             elsif (!$editor->email) {
-                $form->field('email')->add_error(l('We can\'t send a password reset email, because we have no email on record for this user.'));
+                $form->field('email')->add_error(l(q(We can't send a password reset email, because we have no email on record for this user.)));
             }
             else {
                 $self->_send_password_reset_email($c, $editor);
@@ -279,7 +279,7 @@ sub reset_password : Path('/reset-password') ForbiddenOnSlaves DenyWhenReadonly
             current_view => 'Node',
             component_path => 'account/ResetPasswordStatus',
             component_props => {
-                message => l('The user with ID \'{user_id}\' could not be found.',
+                message => l(q(The user with ID '{user_id}' could not be found.),
                                                 { user_id => $editor_id }),
             }
         );
 
@@ -5,6 +5,7 @@ use Try::Tiny;
 BEGIN { extends 'MusicBrainz::Server::Controller' };
 
 use MusicBrainz::Server::Translation qw(l ln );
+use MusicBrainz::Server::Data::Utils qw( boolean_to_json );
 
 sub edit_user : Path('/admin/user/edit') Args(1) RequireAuth HiddenOnSlaves SecureForm
 {
@@ -202,6 +203,64 @@ sub ip_lookup : Path('/admin/ip-lookup') Args(1) RequireAuth(account_admin) Hidd
     );
 }
 
+sub locked_username_search : Path('/admin/locked-usernames/search') Args(0) RequireAuth(account_admin) HiddenOnSlaves {
+    my ($self, $c) = @_;
+
+    my $form = $c->form(form => 'Admin::LockedUsernameSearch');
+    my @results;
+    my $show_results = 0;
+
+    if ($c->form_posted_and_valid($form, $c->req->body_params)) {
+        try {
+            @results = $c->model('Editor')->search_old_editor_names(
+                $form->field('username')->value // '',
+                $form->field('use_regular_expression')->value,
+            );
+            $show_results = 1;
+        } catch {
+            my $error = $_;
+            if ("$error" =~ m/invalid regular expression/) {
+                $form->field('username')->add_error(l('Invalid regular expression.'));
+                $c->response->status(400);
+            } else {
+                die $error;
+            }
+        };
+    }
+
+    $c->stash(
+        current_view => 'Node',
+        component_path => 'admin/LockedUsernameSearch',
+        component_props => {
+            form => $form->TO_JSON,
+            @results ? (results => \@results) : (),
+            showResults => boolean_to_json($show_results),
+        },
+    );
+}
+
+sub unlock_username : Path('/admin/locked-usernames/unlock') Args(1) RequireAuth(account_admin) HiddenOnSlaves {
+    my ($self, $c, $username) = @_;
+
+    my $form = $c->form(form => 'SecureConfirm');
+
+    if ($c->form_posted_and_valid($form)) {
+        $c->model('MB')->with_transaction(sub {
+            $c->model('Editor')->unlock_old_editor_name($username);
+        });
+        $c->response->redirect($c->uri_for_action('/admin/locked_username_search'));
+    }
+
+    $c->stash(
+        current_view => 'Node',
+        component_path => 'admin/LockedUsernameUnlock',
+        component_props => {
+            form => $form->TO_JSON,
+            username => $username,
+        },
+    );
+}
+
 1;
 
 =head1 COPYRIGHT AND LICENSE
 
@@ -240,7 +240,7 @@ sub search : Path('/search/edits')
         quality => [ [$QUALITY_LOW => N_l('Low')], [$QUALITY_NORMAL => N_l('Normal')], [$QUALITY_HIGH => N_l('High')], [$QUALITY_UNKNOWN => N_l('Default')] ],
         languages => [ grep { $_->frequency > 0 } $c->model('Language')->get_all ],
         countries => [ $c->model('CountryArea')->get_all ],
-        relationship_type => [ $c->model('LinkType')->get_full_tree ]
+        relationship_type => [ $c->model('LinkType')->get_full_tree(get_deprecated_and_empty => 1) ]
     );
     return unless %{ $c->req->query_params };
 
 
@@ -90,7 +90,8 @@ sub tree : Chained('type_specific') PathPart('')
     my ($self, $c) = @_;
 
     my $root = $c->model('LinkType')->get_tree($c->stash->{type0},
-                                                $c->stash->{type1});
+                                                $c->stash->{type1},
+                                                get_deprecated_and_empty => 1);
 
     $c->stash(
         component_path  => 'relationship/linktype/RelationshipTypePairTree',
@@ -127,7 +128,10 @@ sub create : Chained('type_specific') PathPart('create') RequireAuth(relationshi
     my $form = $c->form(
         form => 'Admin::LinkType',
         init_object => { attributes => $attribs },
-        root => $c->model('LinkType')->get_tree($c->stash->{type0}, $c->stash->{type1})
+        root => $c->model('LinkType')->get_tree(
+            $c->stash->{type0},
+            $c->stash->{type1},
+            get_deprecated_and_empty => 1)
     );
     $form->field('parent_id')->_load_options;
 
@@ -172,7 +176,8 @@ sub edit : Chained('load') RequireAuth(relationship_editor)
                     orderable_direction )
         },
         root => $c->model('LinkType')->get_tree($link_type->entity0_type,
-                                                $link_type->entity1_type)
+                                                $link_type->entity1_type,
+                                                get_deprecated_and_empty => 1)
     );
     $form->field('parent_id')->_load_options;
 
 
@@ -296,6 +296,7 @@ sub add_cover_art : Chained('load') PathPart('add-cover-art') Edit {
     my @mime_types = map { $_->{mime_type} } @{ $c->model('CoverArt')->mime_types };
 
     my @artwork = @{ $c->model('Artwork')->find_by_release($entity) };
+    $c->model('CoverArtType')->load_for(@artwork);
 
     my $count = 1;
     my @positions = map {
 
@@ -42,8 +42,9 @@ sub _get_extract
             elsif ($_->target->isa('MusicBrainz::Server::Entity::URL::Wikidata')) { 1; }
             else { 0; }
         } grep {
-            $_->target->isa('MusicBrainz::Server::Entity::URL::Wikipedia') ||
-            $_->target->isa('MusicBrainz::Server::Entity::URL::Wikidata')
+            !$_->link->{ended} &&
+            ($_->target->isa('MusicBrainz::Server::Entity::URL::Wikipedia') ||
+             $_->target->isa('MusicBrainz::Server::Entity::URL::Wikidata'))
         } @{ $entity->relationships_by_link_type_names('wikipedia', 'wikidata') };
 
     if (scalar @links) {