Merge branch 'main' into skander/spectrograms

.github/workflows/codeql.yml

@@ -50,7 +50,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # v3.26.1
+        uses: github/codeql-action/init@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -60,7 +60,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # v3.26.1
+        uses: github/codeql-action/autobuild@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -73,6 +73,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # v3.26.1
+        uses: github/codeql-action/analyze@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/scorecard.yml

@@ -72,6 +72,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # v3.26.1
+        uses: github/codeql-action/upload-sarif@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
         with:
           sarif_file: results.sarif

server/lib/orcasite/notifications/resources/subscriber.ex

@@ -39,10 +39,6 @@ defmodule Orcasite.Notifications.Subscriber do
     has_many :subscriptions, Subscription
   end
 
-  code_interface do
-    define :by_email, args: [:email]
-  end
-
   authentication do
     domain Orcasite.Notifications
 
@@ -76,12 +72,6 @@ defmodule Orcasite.Notifications.Subscriber do
     end
   end
 
-  resource do
-    description """
-    A subscriber object. Can relate to an individual, an organization, a newsletter, or an admin.
-    """
-  end
-
   actions do
     defaults [:create, :read, :update, :destroy]
 
@@ -122,7 +112,9 @@ defmodule Orcasite.Notifications.Subscriber do
 
       change fn changeset, _context ->
         meta =
-          case Orcasite.Accounts.User.by_email(Ash.Changeset.get_argument(changeset, :email)) do
+          case Orcasite.Accounts.User.by_email(Ash.Changeset.get_argument(changeset, :email),
+                 authorize?: false
+               ) do
             {:ok, %{id: user_id}} -> %{user_id: user_id}
             _ -> %{}
           end
@@ -150,6 +142,26 @@ defmodule Orcasite.Notifications.Subscriber do
     end
   end
 
+  code_interface do
+    define :by_email, args: [:email]
+  end
+
+  resource do
+    description """
+    A subscriber object. Can relate to an individual, an organization, a newsletter, or an admin.
+    """
+  end
+
+  admin do
+    table_columns [:id, :name, :meta, :inserted_at]
+    read_actions [:read, :by_email]
+    format_fields meta: {Jason, :encode!, []}
+
+    form do
+      field :event_type, type: :default
+    end
+  end
+
   validations do
     validate fn changeset, _context ->
       # Check if email subscriber already exists
@@ -167,16 +179,6 @@ defmodule Orcasite.Notifications.Subscriber do
     end
   end
 
-  admin do
-    table_columns [:id, :name, :meta, :inserted_at]
-    read_actions [:read, :by_email]
-    format_fields meta: {Jason, :encode!, []}
-
-    form do
-      field :event_type, type: :default
-    end
-  end
-
   json_api do
     type "subscriber"
 

server/lib/orcasite/radio/feed.ex

@@ -130,7 +130,8 @@ defmodule Orcasite.Radio.Feed do
         :bucket,
         :bucket_region,
         :cloudfront_url,
-        :dataplicity_id
+        :dataplicity_id,
+        :orcahello_id
       ]
 
       argument :lat_lng_string, :string do
@@ -154,7 +155,8 @@ defmodule Orcasite.Radio.Feed do
         :bucket,
         :bucket_region,
         :cloudfront_url,
-        :dataplicity_id
+        :dataplicity_id,
+        :orcahello_id
       ]
 
       argument :lat_lng_string, :string do