From b385a42b63b80b2dc84bebf2ec6a2222d6a0ebce Mon Sep 17 00:00:00 2001
From: Alex Bloom <djshadowxm82@users.noreply.github.com>
Date: Sat, 11 Jul 2026 05:46:43 -0400
Subject: [PATCH] Integrate OTA alias for Broadcastify srcId_alias  (#2395)

* Add srcId_alias (source radio alias) to Broadcastify calls uploads

Ports the OTA alias lookup logic from trunk-recorder commit 91597dc into
sdrtrunk's Broadcastify Calls integration. When uploading a call, the
source radio ID's alias name is resolved via the existing alias system
and sent as the srcId_alias form field. If no alias is configured, the
field is omitted.

Agent-Logs-Url: https://github.com/djshadowxm82/sdrtrunk/sessions/abc044d3-99c6-4d5c-8d44-99ac8a11bef9

Co-authored-by: djshadowxm82 <10658965+djshadowxm82@users.noreply.github.com>

* Use OTA TalkerAliasIdentifier for srcId_alias instead of manual AliasList lookup

Changes getFromAlias() to resolve the over-the-air talker alias acquired
in real-time from RF signals (P25 Motorola Talker Alias, DMR Talker
Alias) instead of looking up manually pre-configured aliases from the
AliasList system. Follows the same pattern used by OpenMHZ and
RdioScanner broadcasters.

Agent-Logs-Url: https://github.com/djshadowxm82/sdrtrunk/sessions/d8cbaf9c-e6db-419a-90f4-c9ee04846995

Co-authored-by: djshadowxm82 <10658965+djshadowxm82@users.noreply.github.com>

* Add build-test workflow for downloadable release artifacts on this branch

Agent-Logs-Url: https://github.com/djshadowxm82/sdrtrunk/sessions/224c0998-9677-4b83-8fb4-724c1e745e00

Co-authored-by: djshadowxm82 <10658965+djshadowxm82@users.noreply.github.com>

* Remove workflow file

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: djshadowxm82 <10658965+djshadowxm82@users.noreply.github.com>
---
 .../BroadcastifyCallBroadcaster.java          | 29 +++++++++++++++++++
 .../broadcast/broadcastify/FormField.java     |  1 +
 2 files changed, 30 insertions(+)

diff --git a/src/main/java/io/github/dsheirer/audio/broadcast/broadcastify/BroadcastifyCallBroadcaster.java b/src/main/java/io/github/dsheirer/audio/broadcast/broadcastify/BroadcastifyCallBroadcaster.java
index 43ffa801..7646883f 100644
--- a/src/main/java/io/github/dsheirer/audio/broadcast/broadcastify/BroadcastifyCallBroadcaster.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/broadcastify/BroadcastifyCallBroadcaster.java
@@ -34,6 +34,7 @@ import io.github.dsheirer.identifier.Form;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.identifier.IdentifierClass;
 import io.github.dsheirer.identifier.Role;
+import io.github.dsheirer.identifier.alias.TalkerAliasIdentifier;
 import io.github.dsheirer.identifier.configuration.AliasListConfigurationIdentifier;
 import io.github.dsheirer.identifier.configuration.ConfigurationLongIdentifier;
 import io.github.dsheirer.identifier.patch.PatchGroup;
@@ -253,6 +254,8 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
                 String radioId = getFrom(audioRecording);
                 float frequency = getFrequency(audioRecording);
 
+                String radioIdAlias = getFromAlias(audioRecording);
+
                 BroadcastifyCallBuilder bodyBuilder = new BroadcastifyCallBuilder();
                 bodyBuilder.addPart(FormField.API_KEY, getBroadcastConfiguration().getApiKey())
                     .addPart(FormField.SYSTEM_ID, getBroadcastConfiguration().getSystemID())
@@ -263,6 +266,11 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
                     .addPart(FormField.FREQUENCY, frequency)
                     .addPart(FormField.ENCODING, ENCODING_TYPE_MP3);
 
+                if(radioIdAlias != null && !radioIdAlias.isEmpty())
+                {
+                    bodyBuilder.addPart(FormField.RADIO_ID_ALIAS, radioIdAlias);
+                }
+
                 try
                 {
                     HttpRequest request = HttpRequest.newBuilder()
@@ -446,6 +454,27 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
         return "0";
     }
 
+    /**
+     * Resolves the over-the-air talker alias for the FROM (source radio) identifier, acquired in real-time from RF
+     * (e.g. P25 Motorola Talker Alias or DMR Talker Alias). Returns null if no OTA alias was received for this call.
+     * This is sent as the srcId_alias field in Broadcastify uploads.
+     */
+    private static String getFromAlias(AudioRecording audioRecording)
+    {
+        for(Identifier identifier: audioRecording.getIdentifierCollection().getIdentifiers(Role.FROM))
+        {
+            if(identifier instanceof TalkerAliasIdentifier talkerAliasIdentifier)
+            {
+                if(talkerAliasIdentifier.isValid())
+                {
+                    return talkerAliasIdentifier.getValue();
+                }
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Creates a formatted string with the TO identifiers or uses a default of zero (0)
      */
diff --git a/src/main/java/io/github/dsheirer/audio/broadcast/broadcastify/FormField.java b/src/main/java/io/github/dsheirer/audio/broadcast/broadcastify/FormField.java
index eebf912c..1122a7ef 100644
--- a/src/main/java/io/github/dsheirer/audio/broadcast/broadcastify/FormField.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/broadcastify/FormField.java
@@ -30,6 +30,7 @@ public enum FormField
     TIMESTAMP("ts"),
     TALKGROUP_ID("tg"),
     RADIO_ID("src"),
+    RADIO_ID_ALIAS("srcId_alias"),
     FREQUENCY("freq"),
     ENCODING("enc"),
     TEST("test");