amigan/stillbox
1
1
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Wiki Activity Actions

add audioURL to shares

Browse source
This commit is contained in:
Daniel Ponte 2025-02-02 21:08:43 -05:00
parent 0adf3b4978
commit 3f4fe56ed0
3 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkg/calls/call.go
View file

@ -3,9 +3,11 @@ package calls
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"net/url"
"time" "time"
"dynatron.me/x/stillbox/internal/audio" "dynatron.me/x/stillbox/internal/audio"
"dynatron.me/x/stillbox/internal/common"
"dynatron.me/x/stillbox/internal/jsontypes" "dynatron.me/x/stillbox/internal/jsontypes"
"dynatron.me/x/stillbox/pkg/pb" "dynatron.me/x/stillbox/pkg/pb"
"dynatron.me/x/stillbox/pkg/rbac/entities" "dynatron.me/x/stillbox/pkg/rbac/entities"
@ -94,6 +96,11 @@ func (c *Call) ShouldStore() bool {
return c.shouldStore return c.shouldStore
} }
func (c *Call) SetShareURL(baseURL url.URL, shareID string) {
baseURL.Path = fmt.Sprintf("/share/%s/call", shareID)
c.AudioURL = common.PtrTo(baseURL.String())
}
func Make(call *Call, dontStore bool) (*Call, error) { func Make(call *Call, dontStore bool) (*Call, error) {
err := call.computeLength() err := call.computeLength()
if err != nil { if err != nil {

10
pkg/incidents/incident.go
View file

@ -2,8 +2,11 @@ package incidents
import ( import (
"encoding/json" "encoding/json"
"fmt"
"net/url"
"strings" "strings"
"dynatron.me/x/stillbox/internal/common"
"dynatron.me/x/stillbox/internal/jsontypes" "dynatron.me/x/stillbox/internal/jsontypes"
"dynatron.me/x/stillbox/pkg/calls" "dynatron.me/x/stillbox/pkg/calls"
"dynatron.me/x/stillbox/pkg/rbac/entities" "dynatron.me/x/stillbox/pkg/rbac/entities"
@ -23,6 +26,13 @@ type Incident struct {
Calls []IncidentCall `json:"calls"` Calls []IncidentCall `json:"calls"`
} }
func (inc *Incident) SetShareURL(bu url.URL, shareID string) {
bu.Path = fmt.Sprintf("/share/%s/call/", shareID)
for i := range inc.Calls {
inc.Calls[i].AudioURL = common.PtrTo(bu.String() + inc.Calls[i].ID.String())
}
}
func (inc *Incident) GetResourceName() string { func (inc *Incident) GetResourceName() string {
return entities.ResourceIncident return entities.ResourceIncident
} }

9
pkg/rest/share.go
View file

@ -35,9 +35,9 @@ const (
func (s *api) shareHandlers() ShareHandlers { func (s *api) shareHandlers() ShareHandlers {
return ShareHandlers{ return ShareHandlers{
ShareRequestCall: s.calls.shareCallRoute, ShareRequestCall: s.calls.shareCallRoute,
ShareRequestCallInfo: respondShareHandler(s.calls.getCallInfo), ShareRequestCallInfo: s.respondShareHandler(s.calls.getCallInfo),
ShareRequestCallDL: s.calls.shareCallDLRoute, ShareRequestCallDL: s.calls.shareCallDLRoute,
ShareRequestIncident: respondShareHandler(s.incidents.getIncident), ShareRequestIncident: s.respondShareHandler(s.incidents.getIncident),
ShareRequestIncidentM3U: s.incidents.getCallsM3U, ShareRequestIncidentM3U: s.incidents.getCallsM3U,
ShareRequestTalkgroups: s.tgs.getTGsShareRoute, ShareRequestTalkgroups: s.tgs.getTGsShareRoute,
} }
@ -65,6 +65,7 @@ type shareAPI struct {
type EntityFunc func(ctx context.Context, id ID) (SharedItem, error) type EntityFunc func(ctx context.Context, id ID) (SharedItem, error)
type SharedItem interface { type SharedItem interface {
SetShareURL(baseURL url.URL, shareID string)
} }
type shareResponse struct { type shareResponse struct {
@ -81,7 +82,7 @@ func ShareFrom(ctx context.Context) *shares.Share {
return nil return nil
} }
func respondShareHandler(ie EntityFunc) ShareHandlerFunc { func (s *api) respondShareHandler(ie EntityFunc) ShareHandlerFunc {
return func(id ID, w http.ResponseWriter, r *http.Request) { return func(id ID, w http.ResponseWriter, r *http.Request) {
ctx := r.Context() ctx := r.Context()
share := ShareFrom(ctx) share := ShareFrom(ctx)
@ -102,6 +103,8 @@ func respondShareHandler(ie EntityFunc) ShareHandlerFunc {
SharedItem: res, SharedItem: res,
} }
sRes.SharedItem.SetShareURL(*s.baseURL, share.ID)
respond(w, r, sRes) respond(w, r, sRes)
} }
} }