navap
diff --git a/‎admin/InitDb.pl
+4-1 b/‎admin/InitDb.pl
+4-1
diff --git a/‎contrib/ssssss.psgi
+71-7 b/‎contrib/ssssss.psgi
+71-7
diff --git a/‎entities.json
+5-1 b/‎entities.json
+5-1
diff --git a/‎lib/DBDefs/Default.pm
+1 b/‎lib/DBDefs/Default.pm
+1
diff --git a/‎lib/MusicBrainz/Server/Constants.pm
+13-1 b/‎lib/MusicBrainz/Server/Constants.pm
+13-1
diff --git a/‎lib/MusicBrainz/Server/Controller/Area.pm
+38-10 b/‎lib/MusicBrainz/Server/Controller/Area.pm
+38-10
diff --git a/‎lib/MusicBrainz/Server/Controller/Artist.pm
+22-7 b/‎lib/MusicBrainz/Server/Controller/Artist.pm
+22-7
diff --git a/‎lib/MusicBrainz/Server/Controller/CDTOC.pm
+3-2 b/‎lib/MusicBrainz/Server/Controller/CDTOC.pm
+3-2
@@ -473,6 +473,8 @@ sub Usage
                          (Should only be used, when an import without the option
                          fails with an "ERROR:  invalid UTF-8 byte sequence detected"!
                          see also `MBImport.pl --help')
+     --reptype=TYPE      Override the REPLICATION_TYPE set in DBDefs. This only
+                         exists for testing purposes.
 
 Less commonly used options:
 
@@ -508,7 +510,8 @@ sub Usage
     "fix-broken-utf8"     => \$fFixUTF8,
     "install-extension=s" => \$fInstallExtension,
     "extension-schema=s"  => \$fExtensionSchema,
-    "tmp-dir=s"           => \$tmp_dir
+    "tmp-dir=s"           => \$tmp_dir,
+    "reptype=s"           => \$REPTYPE,
 ) or exit 2;
 
 my $DB = Databases->get($databaseName);
 
@@ -41,6 +41,9 @@ use Plack::Request;
 use Plack::Response;
 use Log::Dispatch;
 
+use lib "$FindBin::Bin/../lib";
+use DBDefs;
+
 my $log = Log::Dispatch->new(outputs => [[ 'Screen', min_level => 'info' ]] );
 my $imgext = 'gif|jpg|pdf|png';
 my $ssssss_storage = $ENV{SSSSSS_STORAGE}
@@ -72,6 +75,16 @@ sub create_bucket
     return $bucketdir;
 }
 
+sub bucket_exists
+{
+    my $bucket = shift;
+    my $bucketdir = catfile($ssssss_storage, $bucket);
+    if (-d $bucketdir) {
+        return 1;
+    }
+    return 0;
+}
+
 sub handle_options
 {
     my $response = shift->new_response(200);
@@ -80,17 +93,53 @@ sub handle_options
     return $response;
 }
 
+sub check_authorization_header
+{
+    my ($request) = @_;
+    my $auth = $request->header('authorization');
+
+    my ($user, $pass) = $auth =~ /^LOW ([^:]+):(.+)$/;
+    if (
+        !defined $user ||
+        !defined $pass ||
+        $user ne DBDefs->COVER_ART_ARCHIVE_ACCESS_KEY ||
+        $pass ne DBDefs->COVER_ART_ARCHIVE_SECRET_KEY
+    ) {
+        my $response = $request->new_response(403);
+        $response->content_type('text/xml');
+        $response->body(q{<?xml version='1.0' encoding='UTF-8'?>
+            <Error><Code>AccessDenied</Code></Error>});
+        return $response;
+    }
+}
+
 sub handle_put
 {
     my ($request) = @_;
 
-    my $bucketdir = create_bucket($request->path_info);
-    my $dest = catfile($bucketdir, $request->param('file'));
-    $log->info("PUT, storing upload at $dest\n");
+    my $response = check_authorization_header($request);
+    if ($response) {
+        return $response;
+    }
 
-    open(my $fh, ">", $dest);
-    print $fh $request->content;
-    close($fh);
+    my $file = $request->param('file');
+    if ($file) {
+        my $bucketdir = create_bucket($request->path_info);
+        my $dest = catfile($bucketdir, $file);
+        $log->info("PUT, storing upload at $dest\n");
+
+        open(my $fh, ">", $dest);
+        print $fh $request->content;
+        close($fh);
+    } elsif (bucket_exists($request->path_info)) {
+        $response = $request->new_response(409);
+        $response->content_type('text/xml');
+        $response->body(q{<?xml version='1.0' encoding='UTF-8'?>
+            <Error><Code>BucketAlreadyExists</Code></Error>});
+        return $response;
+    } else {
+        create_bucket($request->path_info);
+    }
 
     return $request->new_response(204);
 }
@@ -149,7 +198,22 @@ my %mime_types = (
 sub handle_get {
     my ($request) = @_;
 
-    my $filename = catfile($ssssss_storage, $request->path_info);
+    my $path_info = $request->path_info;
+
+    # Simulate the only bits from
+    # https://archive.org/services/docs/api/metadata.html that we need.
+    #
+    # This doesn't exactly belong in an "S3 simulator" service, but
+    # it's simpler to have it here than to create a whole 'nother file
+    # that has to run on a different port.
+    if ($path_info =~ m{^/metadata/}) {
+        my $response = $request->new_response(200);
+        $response->content_type('application/json; charset=UTF-8');
+        $response->body(q({"is_dark":false,"metadata":{"uploader":"[email protected]"}}));
+        return $response;
+    }
+
+    my $filename = catfile($ssssss_storage, $path_info);
 
     if (-f $filename) {
         my ($ext) = $filename =~ m/\.($imgext)$/;
 
@@ -392,7 +392,11 @@
             "id": 18
         },
         "last_updated_column": true,
-        "model": "LinkType"
+        "mbid": {
+            "relatable": false
+        },
+        "model": "LinkType",
+        "url": "relationship"
     },
     "medium": {"model": "Medium"},
     "medium_cdtoc": {"model": "MediumCDTOC"},
 
@@ -359,6 +359,7 @@ sub COVER_ART_ARCHIVE_SECRET_KEY { };
 sub COVER_ART_ARCHIVE_UPLOAD_PREFIXER { shift; sprintf("//%s.s3.us.archive.org/", shift) };
 sub COVER_ART_ARCHIVE_DOWNLOAD_PREFIX { "//coverartarchive.org" };
 sub COVER_ART_ARCHIVE_IA_DOWNLOAD_PREFIX { '//archive.org/download' };
+sub COVER_ART_ARCHIVE_IA_METADATA_PREFIX { 'https://archive.org/metadata' };
 
 # Mapbox access token must be set to display area/place maps.
 sub MAPBOX_MAP_ID { 'mapbox/streets-v11' }
 
@@ -25,6 +25,7 @@ sub _get
 }
 
 our %EXPORT_TAGS = (
+    direction          => _get(qr/^DIRECTION_/),
     edit_type          => _get(qr/^EDIT_/),
     expire_action      => _get(qr/^EXPIRE_/),
     quality            => _get(qr/^QUALITY_/),
@@ -36,7 +37,7 @@ our %EXPORT_TAGS = (
     vote               => _get(qr/^VOTE_/),
     edit_status        => _get(qr/^STATUS_/),
     access_scope       => _get(qr/^ACCESS_SCOPE_/),
-    privileges         => _get(qr/_FLAG$/),
+    privileges         => _get(qr/_FLAGS?$/),
     language_frequency => _get(qr/^LANGUAGE_FREQUENCY/),
     script_frequency   => _get(qr/^SCRIPT_FREQUENCY/),
     election_status => [
@@ -104,6 +105,9 @@ Readonly our $VARTIST_ID  => 1;
 Readonly our $NOLABEL_GID => '157afde4-4bf5-4039-8ad2-5a15acc85176';
 Readonly our $NOLABEL_ID  => 3267;
 
+Readonly our $DIRECTION_FORWARD => 1;
+Readonly our $DIRECTION_BACKWARD => 2;
+
 Readonly our $EXPIRE_ACCEPT => 1;
 Readonly our $EXPIRE_REJECT => 2;
 
@@ -341,6 +345,14 @@ Readonly our $LOCATION_EDITOR_FLAG          => 256;
 Readonly our $BANNER_EDITOR_FLAG            => 512;
 Readonly our $EDITING_DISABLED_FLAG         => 1024;
 Readonly our $ADDING_NOTES_DISABLED_FLAG    => 2048;
+# If you update this, also update root/utility/sanitizedEditor.js
+Readonly our $PUBLIC_PRIVILEGE_FLAGS        => $AUTO_EDITOR_FLAG &
+                                               $BOT_FLAG &
+                                               $RELATIONSHIP_EDITOR_FLAG &
+                                               $WIKI_TRANSCLUSION_FLAG &
+                                               $ACCOUNT_ADMIN_FLAG &
+                                               $LOCATION_EDITOR_FLAG &
+                                               $BANNER_EDITOR_FLAG;
 
 Readonly our $ELECTION_VOTE_NO      => -1;
 Readonly our $ELECTION_VOTE_ABSTAIN => 0;
 
@@ -9,6 +9,8 @@ with 'MusicBrainz::Server::Controller::Role::Load' => {
         cardinal    => ['edit'],
         subset      => {
             show => [qw( area artist label place series instrument release_group url )],
+        },
+        paged_subset => {
             recordings => ['recording'],
             releases => ['release'],
             works => ['work'],
@@ -214,17 +216,27 @@ sub releases : Chained('load')
 {
     my  ($self, $c) = @_;
 
-    my $releases = $self->_load_paged($c, sub {
-            $c->model('Release')->find_by_country($c->stash->{area}->id, shift, shift);
+    my $stash = $c->stash;
+    my $paged_link_type_group = $stash->{paged_link_type_group};
+    my $releases;
+
+    unless ($paged_link_type_group) {
+        $releases = $self->_load_paged($c, sub {
+            $c->model('Release')->find_by_country($stash->{area}->id, shift, shift);
         });
+        $c->model('ArtistCredit')->load(@$releases);
+        $c->model('Release')->load_related_info(@$releases);
+    }
 
-    $c->model('ArtistCredit')->load(@$releases);
-    $c->model('Release')->load_related_info(@$releases);
+    my $pager = defined $stash->{pager}
+        ? serialize_pager($stash->{pager})
+        : undef;
 
     my %props = (
-        area        => $c->stash->{area}->TO_JSON,
-        releases    => to_json_array($releases),
-        pager       => serialize_pager($c->stash->{pager}),
+        area => $stash->{area}->TO_JSON,
+        releases => to_json_array($releases),
+        pagedLinkTypeGroup => to_json_object($paged_link_type_group),
+        pager => $pager,
     );
 
     $c->stash(
@@ -312,9 +324,17 @@ Shows recordings related to this area.
 sub recordings : Chained('load') {
     my ($self, $c) = @_;
 
+    my $stash = $c->stash;
+    my $pager = defined $stash->{pager}
+        ? serialize_pager($stash->{pager})
+        : undef;
     $c->stash(
         component_path => 'area/AreaRecordings',
-        component_props => { area => $c->stash->{area}->TO_JSON },
+        component_props => {
+            area => $stash->{area}->TO_JSON,
+            pagedLinkTypeGroup => to_json_object($stash->{paged_link_type_group}),
+            pager => $pager,
+        },
         current_view => 'Node',
     );
 }
@@ -328,14 +348,22 @@ Shows works related to this area.
 sub works : Chained('load') {
     my ($self, $c) = @_;
 
+    my $stash = $c->stash;
+    my $pager = defined $stash->{pager}
+        ? serialize_pager($stash->{pager})
+        : undef;
     $c->stash(
         component_path => 'area/AreaWorks',
-        component_props => { area => $c->stash->{area}->TO_JSON },
+        component_props => {
+            area => $stash->{area}->TO_JSON,
+            pagedLinkTypeGroup => to_json_object($stash->{paged_link_type_group}),
+            pager => $pager,
+        },
         current_view => 'Node',
     );
 }
 
-after [qw( show collections details tags aliases artists labels releases recordings places users works )] => sub {
+after [qw( show collections details tags aliases artists events labels releases recordings places users works )] => sub {
     my ($self, $c) = @_;
     $self->_stash_collections($c);
 };
 
@@ -9,10 +9,16 @@ BEGIN { extends 'MusicBrainz::Server::Controller'; }
 with 'MusicBrainz::Server::Controller::Role::Load' => {
     model           => 'Artist',
     relationships   => {
-        all         => ['relationships'],
         cardinal    => ['edit'],
-        subset      => { split => ['artist'], show => ['artist', 'url'] },
-        default     => ['url']
+        subset => {
+            split => ['artist'],
+            show => ['artist', 'url'],
+            relationships => [qw( area artist event instrument label place series url )],
+        },
+        default     => ['url'],
+        paged_subset => {
+            relationships => [qw( recording release release_group work )],
+        },
     },
 };
 with 'MusicBrainz::Server::Controller::Role::LoadWithRowID';
@@ -50,6 +56,7 @@ use MusicBrainz::Server::Data::Utils qw(
     is_special_artist
 );
 use MusicBrainz::Server::Constants qw(
+    :direction
     $DARTIST_ID
     $EDITOR_MODBOT
     $EDIT_ARTIST_MERGE
@@ -261,7 +268,7 @@ sub show : PathPart('') Chained('load')
     my $legal_name_artist_aliases;
     my $legal_name_aliases;
     my ($legal_name) = map { $_->target }
-                       grep { $_->direction == $MusicBrainz::Server::Entity::Relationship::DIRECTION_BACKWARD }
+                       grep { $_->direction == $DIRECTION_BACKWARD }
                        grep { $_->link->type->gid eq 'dd9886f2-1dfe-4270-97db-283f6839a666' } @{ $artist->relationships };
     if (defined $legal_name) {
         $c->model('Relationship')->load_subset(['artist'], $legal_name);
@@ -293,7 +300,7 @@ sub show : PathPart('') Chained('load')
                            grep { $_->id != $artist->id }
                            uniq
                            map { $_->target }
-                           grep { $_->direction == $MusicBrainz::Server::Entity::Relationship::DIRECTION_FORWARD }
+                           grep { $_->direction == $DIRECTION_FORWARD }
                            grep { $_->link->type->gid eq 'dd9886f2-1dfe-4270-97db-283f6839a666' }
                            @{ ($legal_name // $artist)->relationships };
     push(@identities, @other_identities);
@@ -330,9 +337,17 @@ sub show : PathPart('') Chained('load')
 sub relationships : Chained('load') PathPart('relationships') {
     my ($self, $c) = @_;
 
+    my $stash = $c->stash;
+    my $pager = defined $stash->{pager}
+        ? serialize_pager($stash->{pager})
+        : undef;
     $c->stash(
         component_path => 'artist/ArtistRelationships',
-        component_props => { artist => $c->stash->{artist}->TO_JSON },
+        component_props => {
+            artist => $stash->{artist}->TO_JSON,
+            pagedLinkTypeGroup => to_json_object($stash->{paged_link_type_group}),
+            pager => $pager,
+        },
         current_view => 'Node',
     );
 }
@@ -526,7 +541,7 @@ sub releases : Chained('load')
     );
 }
 
-after [qw( show collections details tags aliases releases recordings works events relationships )] => sub {
+after [qw( show collections details tags ratings aliases subscribers releases recordings works events relationships )] => sub {
     my ($self, $c) = @_;
     $self->_stash_collections($c);
 };
 
@@ -158,7 +158,8 @@ sub attach : Local DenyWhenReadonly Edit
     my $cdtoc = MusicBrainz::Server::Entity::CDTOC->new_from_toc($toc)
         or $self->error(
             $c, status => HTTP_BAD_REQUEST,
-            message => l('The provided CD TOC is not valid')
+            message => l(
+                'The provided CD TOC is not valid. This is probably an issue with the software you used to generate it. Try again and please report the error to your software maker if it persists, including the technical information below.')
         );
 
     $c->stash( cdtoc => $cdtoc );
@@ -351,7 +352,7 @@ sub move : Local Edit
     my $medium_cdtoc = $c->model('MediumCDTOC')->get_by_id($medium_cdtoc_id)
         or $self->error(
             $c, status => HTTP_BAD_REQUEST,
-            message => l('The provided CD TOC is not valid')
+            message => l('The provided CD TOC ID doesn’t exist.')
         );
 
     $c->model('CDTOC')->load($medium_cdtoc);