Merge branch 'master' into beta

* master:
  Update POT files using the production database
  MBS-14179: Include the event being browsed in the response
  MBS-14188: Avoid extending `jQuery.fn` to unbreak some userscripts
  MBS-14137: Alert user when deleting work with relationships
  LoadReplicationChanges: Retry fetching packets on server errors
  Cleanup hourly JSON dumps/sitemaps $TEMP_DIR
  admin/RunIncrementalJSONDump: chmod 755 $TEMP_DIR
  Allow running ProcessSubscriptions for weekly only

Author: reosarevok

admin/RunIncrementalJSONDump

@@ -23,6 +23,12 @@ source admin/config.sh
 . ./admin/functions.sh
 make_temp_dir
 
+# We use "$TEMP_DIR" directly as an rsync source below, which means its
+# permissions are transferred onto the remote directory as well. This sets
+# something more permissive than the default 0700, which allows the uwsgi
+# processes serving the incremental JSON dumps to be able to read them.
+chmod 755 "$TEMP_DIR"
+
 # Create a clean test database from which to dump foreign keys.
 export REPLICATION_TYPE=3 # RT_STANDALONE
 ./script/create_test_db.sh TEST
@@ -40,7 +46,11 @@ echo Making incremental JSON dumps
     --foreign-keys-dump "$FK_DUMP" \
     || exit $?
 
-cleanup() { rm -f "$FK_DUMP"; }
+cleanup() {
+    rm -f "$FK_DUMP"
+    # We've clobbered the trap set by `make_temp_dir`. Reinstate it.
+    rmdir "$TEMP_DIR"
+}
 trap cleanup EXIT
 
 # Was a dump created?

admin/cron/hourly-sitemaps.sh

@@ -24,7 +24,11 @@ FK_DUMP="$TEMP_DIR"/foreign_keys
     --foreign-keys-dump "$FK_DUMP" \
     --ping
 
-cleanup() { rm -f "$FK_DUMP"; }
+cleanup() {
+    rm -f "$FK_DUMP"
+    # We've clobbered the trap set by `make_temp_dir`. Reinstate it.
+    rmdir "$TEMP_DIR"
+}
 trap cleanup EXIT
 
 ./bin/rsync-sitemaps

admin/replication/LoadReplicationChanges

@@ -11,7 +11,12 @@ use DBDefs;
 use integer;
 
 use Getopt::Long;
-use HTTP::Status qw( RC_OK RC_NOT_FOUND RC_NOT_MODIFIED );
+use HTTP::Status qw(
+    RC_OK
+    RC_NOT_FOUND
+    RC_NOT_MODIFIED
+    is_server_error
+);
 use String::ShellQuote qw( shell_quote );
 
 use MusicBrainz::Server::Replication qw(
@@ -208,24 +213,30 @@ if ($dbmirror2) {
 my $url = "$baseuri/$file";
 my $localfile = "$tmpdir/$file";
 
-my $resp = retrieve_remote_file($url, $localfile, $fVerifySig);
-# We only understand a limited set of responses:
-# OK, not found, and the rest.
-
-if ($resp->code == RC_NOT_FOUND)
-{
-    # TODO check for newer replication packets, in case the server has lost one?
-    # die if so
-
-    # Otherwise exit ok
-    print localtime() . " : Replication packet #$iNextReplicationSequence not available\n";
-    exit 0;
-}
-
-unless ($resp->code == RC_OK or $resp->code == RC_NOT_MODIFIED)
-{
-    print $resp->as_string;
-    die;
+my $packet_retrieval_attempts = 0;
+while (1) {
+    my $resp = retrieve_remote_file($url, $localfile, $fVerifySig);
+    my $code = $resp->code;
+    if ($code == RC_OK || $code == RC_NOT_MODIFIED) {
+        last;
+    } elsif ($code == RC_NOT_FOUND) {
+        # TODO check for newer replication packets, in case the server has lost one?
+        # die if so
+
+        # Otherwise exit ok
+        print localtime() . " : Replication packet #$iNextReplicationSequence not available\n";
+        exit 0;
+    } else {
+        print localtime() . " : Error retrieving $url:\n";
+        print $resp->as_string;
+        # Retry up to 3 times on server errors.
+        if (is_server_error($code) && (++$packet_retrieval_attempts) <= 3) {
+            print localtime() . " : Retrying in 10 seconds...\n";
+            sleep 10;
+            next;
+        }
+        die;
+    }
 }
 
 # We successfully retrieved the replication packet.

lib/MusicBrainz/Script/SubscriptionEmails.pm

@@ -38,6 +38,12 @@ has 'dry_run' => (
     cmd_flag => 'dry-run',
 );
 
+has 'daily' => (
+    isa => 'Bool',
+    is => 'ro',
+    default => 1,
+);
+
 has 'weekly' => (
     isa => 'Bool',
     is => 'ro',
@@ -91,11 +97,17 @@ sub run {
     my $collator = get_collator('root');
         # plain UCA without language-specific tailoring
 
+    # We include "never" when processing daily subscriptions only to call
+    # `update_subscriptions` on those editors.
+    my @email_periods;
+    push @email_periods, 'daily', 'never' if $self->daily;
+    push @email_periods, 'weekly' if $self->weekly;
+
     my $max = $self->c->model('Edit')->get_max_id;
     my $seen = 0;
     my $count;
     do {
-        my @editors = $self->c->model('Editor')->editors_with_subscriptions($seen, $BATCH_SIZE);
+        my @editors = $self->c->model('Editor')->editors_with_subscriptions(\@email_periods, $seen, $BATCH_SIZE);
         $count = @editors;
         printf "Starting batch with %d editors\n\n", $count if $self->verbose;
 
@@ -105,8 +117,6 @@ sub run {
             printf "Processing subscriptions for '%s' (%s)\n", $editor->name, $period
                 if $self->verbose;
 
-            next if $period eq 'weekly' && !$self->weekly;
-
             unless ($period eq 'never') {
                 my @subscriptions = $self->c->model('EditorSubscriptions')
                     ->get_all_subscriptions($editor->id);

lib/MusicBrainz/Server/Data/Editor.pm

@@ -710,7 +710,7 @@ sub load_for_collection {
 }
 
 sub editors_with_subscriptions {
-    my ($self, $after, $limit) = @_;
+    my ($self, $email_periods, $after, $limit) = @_;
 
     my @tables = (entities_with('subscriptions',
                                 take => sub { return 'editor_subscribe_' . (shift) }),
@@ -722,13 +722,14 @@ sub editors_with_subscriptions {
               LEFT JOIN editor_preference ep
                      ON ep.editor = editor.id AND
                         ep.name = 'subscriptions_email_period'
-                  WHERE editor.id > ?
+                  WHERE coalesce(ep.value, 'daily') = any(?)
+                    AND editor.id > ?
                     AND editor.id IN ($ids)
                     AND (editor.privs & $SPAMMER_FLAG) = 0
                ORDER BY editor.id ASC
                   LIMIT ?";
 
-    $self->query_to_list($query, [$after, $limit], sub {
+    $self->query_to_list($query, [$email_periods, $after, $limit], sub {
         my ($model, $row) = @_;
 
         my $editor = $model->_new_from_row($row);

lib/MusicBrainz/Server/Data/Event.pm

@@ -301,6 +301,15 @@ sub _order_by {
     return $order_by;
 }
 
+=method find_by_events
+
+Recursively find all events linked to the given event IDs via relationships,
+using the provided C<$limit> and C<$offset> parameters for pagination. Note
+that this also includes the events having the given C<$event_ids> in the
+results.
+
+=cut
+
 sub find_by_events {
     my ($self, $event_ids, $limit, $offset) = @_;
 
@@ -331,6 +340,9 @@ sub find_by_events {
         )
         SELECT $columns FROM event
         WHERE id IN (
+            -- The requested events (MBS-14179)
+            SELECT unnest(\$1::INTEGER[]) event
+             UNION ALL
             SELECT event FROM linked_entity0
              UNION ALL
             SELECT event FROM linked_entity1

po/mb_server.pot

@@ -10,7 +10,7 @@ msgstr ""
 "#-#-#-#-#  mb_server.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-10-27 17:21+0100\n"
+"POT-Creation-Date: 2025-11-13 12:11+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -15718,7 +15718,7 @@ msgstr ""
 #: ../root/static/scripts/relationship-editor/components/RelationshipPhraseGroup.js:160
 #: ../root/static/scripts/relationship-editor/components/RelationshipTargetTypeGroups.js:42
 #: ../root/static/scripts/release/components/RelationshipEditorBatchTools.js:50
-#: ../root/static/scripts/release/components/TrackRelationshipEditor.js:376
+#: ../root/static/scripts/release/components/TrackRelationshipEditor.js:403
 msgctxt "header"
 msgid "Add relationship"
 msgstr ""
@@ -16023,11 +16023,15 @@ msgstr ""
 msgid "Release group relationships"
 msgstr ""
 
-#: ../root/static/scripts/release/components/TrackRelationshipEditor.js:322
+#: ../root/static/scripts/release/components/TrackRelationshipEditor.js:267
+msgid "Are you sure you want to remove this work?"
+msgstr ""
+
+#: ../root/static/scripts/release/components/TrackRelationshipEditor.js:349
 msgid "Error loading work relationships: {error}"
 msgstr ""
 
-#: ../root/static/scripts/release/components/TrackRelationshipEditor.js:396
+#: ../root/static/scripts/release/components/TrackRelationshipEditor.js:423
 msgid "Add related work"
 msgstr ""
 

root/static/scripts/edit/MB/Control/ArtistEdit.js

@@ -23,12 +23,12 @@ export default function ArtistEdit() {
    * some of the labels below (like ended) might have other child nodes
    * this method supports replacing text without removing child nodes
    */
-  jQuery.fn.replaceText = function (newText) {
+  function replaceText(newText) {
     return this.contents().filter(function () {
       return (this.nodeType === Node.TEXT_NODE &&
         this.nodeValue.trim() !== '');
     }).replaceWith(newText);
-  };
+  }
 
 
   self.$name = $('#id-edit-artist\\.name');
@@ -42,14 +42,14 @@ export default function ArtistEdit() {
   self.old_gender = self.$gender.val();
 
   self.changeDateText = function (begin, end, ended) {
-    self.$begin.replaceText(begin);
-    self.$end.replaceText(end);
-    self.$ended.replaceText(ended);
+    replaceText.call(self.$begin, begin);
+    replaceText.call(self.$end, end);
+    replaceText.call(self.$ended, ended);
   };
 
   self.changeAreaText = function (begin, end) {
-    self.$beginarea.replaceText(begin);
-    self.$endarea.replaceText(end);
+    replaceText.call(self.$beginarea, begin);
+    replaceText.call(self.$endarea, end);
   };
 
   /*

root/static/scripts/release/components/TrackRelationshipEditor.js

@@ -38,6 +38,7 @@ import type {
 import {
   compareTargetTypeWithGroup,
   iterateRelationshipsInTargetTypeGroup,
+  iterateRelationshipsInTargetTypeGroups,
 } from '../../relationship-editor/utility/findState.js';
 
 import EditWorkDialog from './EditWorkDialog.js';
@@ -244,12 +245,38 @@ component _RelatedWorkRelationshipEditor(
   ]);
 
   const removeWork = React.useCallback(() => {
+    if (isNewWork) {
+      let hasRelationships = false;
+      for (
+        const relationship of
+        iterateRelationshipsInTargetTypeGroups(relatedWork.targetTypeGroups)
+      ) {
+        if (
+          relationship.entity0.entityType === 'recording' &&
+          relationship.entity0.id === track.recording.id &&
+          relationship.entity1.entityType === 'work' &&
+          relationship.entity1.id === relatedWork.work.id
+        ) {
+          continue;
+        }
+        hasRelationships = true;
+        break;
+      }
+      if (hasRelationships) {
+        const confirmed = window.confirm(
+          l('Are you sure you want to remove this work?'),
+        );
+        if (!confirmed) {
+          return;
+        }
+      }
+    }
     dispatch({
       recording: track.recording,
       type: 'remove-work',
       workState: relatedWork,
     });
-  }, [dispatch, track.recording, relatedWork]);
+  }, [dispatch, track.recording, relatedWork, isNewWork]);
 
   const removeWorkButton = React.useMemo(() => (
     <button