Merge 25.3 to 25.5

Author: cnathe

panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java

@@ -43,6 +43,8 @@
 import org.labkey.api.view.ViewContext;
 import org.labkey.api.view.WebPartFactory;
 import org.labkey.api.view.WebPartView;
+import org.labkey.panoramapublic.bluesky.BlueskyApiClient;
+import org.labkey.panoramapublic.bluesky.PanoramaPublicLogoResourceType;
 import org.labkey.panoramapublic.catalog.CatalogImageAttachmentType;
 import org.labkey.panoramapublic.model.Journal;
 import org.labkey.panoramapublic.model.speclib.SpecLibKey;
@@ -104,6 +106,7 @@ protected void init()
         addController(PanoramaPublicController.NAME, PanoramaPublicController.class);
         PanoramaPublicSchema.register(this);
         AttachmentService.get().registerAttachmentType(CatalogImageAttachmentType.get());
+        AttachmentService.get().registerAttachmentType(PanoramaPublicLogoResourceType.get());
     }
 
     @Override
@@ -378,6 +381,7 @@ public Set<Class> getUnitTests()
         set.add(ContainerJoin.TestCase.class);
         set.add(Formula.TestCase.class);
         set.add(CatalogEntryManager.TestCase.class);
+        set.add(BlueskyApiClient.TestCase.class);
         return set;
 
     }

panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicModule.java

@@ -132,7 +132,7 @@ public static void notifyCopied(ExperimentAnnotations srcExpAnnotations, Experim
     }
 
     public static void notifyDataPublished(ExperimentAnnotations srcExperiment, ExperimentAnnotations journalCopy, Journal journal,
-                                           JournalExperiment je, DataCiteException doiError, boolean madePublic, boolean addedPublication, User user)
+                                           JournalExperiment je, DataCiteException doiError, boolean madePublic, boolean addedPublication, String blueskyPostUrl, User user)
     {
         StringBuilder messageBody = new StringBuilder();
         messageBody.append("Dear ").append(getUserName(user)).append(",").append(NL2);
@@ -161,6 +161,10 @@ else if (addedPublication)
         {
             messageBody.append(NL2).append("The data will be available under the ").append(journalCopy.getDataLicense().getDisplayName()).append(" license.");
         }
+        if (madePublic && !StringUtils.isBlank(blueskyPostUrl))
+        {
+            messageBody.append(NL2).append("We have announced your data on Bluesky - take a look here: ").append(bold(link("Bluesky Post", blueskyPostUrl))).append(".");
+        }
         if (journalCopy.hasPxid())
         {
             messageBody.append(NL2);