commit 96b0646855f6f840b233e5777a0f739e976e898a · ptr.pet/ark

+1 -1

dns/dnsconfig.js

···

       59
       59
        
           TXT("@", "a data endpoint for entity with serial id /90008/."),

     

       60
       60
        
           TXT(

     

       61
       61
        
               "@",

     

       62
       62
       -
               "entity linked here uses it/they pronouns. it can be referred to as /dusk/ or /dawn/.",

     

       62
       62
       +
               "entity linked here uses it/that pronouns. it can also be referred to as /dawn/.",

     

       63
       63
        
           ),

     

       64
       64
        
           TXT(

     

       65
       65
        
               "@",

+1 -1

hosts/trimounts/modules/arpa.nix

···

       8
       8
        
           connection to https://gaze.systems/about for more data.

     

       9
       9
        
       

     

       10
       10
        
           /discord           90.008/

     

       11
       11
       -
           /bsky           @poor.dog/

     

       11
       11
       +
           /bsky            @ptr.pet/

     

       12
       12
        
           /email 90008@gaze.systems/

     

       13
       13
        
       

     

       14
       14
        
           /dig +short TXT 9.0.0.0.8.e.f.1.5.0.7.4.0.1.0.0.2.ip6.arpa/

pkgs-set/overlays/navidrome.nix/default.nix

···

       1
       1
       +
       final: prev: {

     

       2
       2
       +
         navidrome = prev.navidrome.overrideAttrs (old: {

     

       3
       3
       +
           patches = (old.patches or []) ++ [./origin_url.patch];

     

       4
       4
       +
           doCheck = false;

     

       5
       5
       +
         });

     

       6
       6
       +
       }

+85

pkgs-set/overlays/navidrome.nix/origin_url.patch

···

       1
       1
       +
       diff --git a/core/agents/listenbrainz/agent.go b/core/agents/listenbrainz/agent.go

     

       2
       2
       +
       index 769b0f5..758eb85 100644

     

       3
       3
       +
       --- a/core/agents/listenbrainz/agent.go

     

       4
       4
       +
       +++ b/core/agents/listenbrainz/agent.go

     

       5
       5
       +
       @@ -3,6 +3,7 @@ package listenbrainz

     

       6
       6
       +
        import (

     

       7
       7
       +
        	"context"

     

       8
       8
       +
        	"errors"

     

       9
       9
       +
       +	"fmt"

     

       10
       10
       +
        	"net/http"

     

       11
       11
       +
        

     

       12
       12
       +
        	"github.com/navidrome/navidrome/conf"

     

       13
       13
       +
       @@ -52,6 +53,10 @@ func (l *listenBrainzAgent) formatListen(track *model.MediaFile) listenInfo {

     

       14
       14
       +
        	artistNames := slice.Map(track.Participants[model.RoleArtist], func(p model.Participant) string {

     

       15
       15
       +
        		return p.Name

     

       16
       16
       +
        	})

     

       17
       17
       +
       +	var originURL string

     

       18
       18
       +
       +	if v := track.Tags.Values(model.TagSource); len(v) > 0 {

     

       19
       19
       +
       +		originURL = v[0]

     

       20
       20
       +
       +	}

     

       21
       21
       +
        	li := listenInfo{

     

       22
       22
       +
        		TrackMetadata: trackMetadata{

     

       23
       23
       +
        			ArtistName:  track.Artist,

     

       24
       24
       +
       @@ -67,9 +72,12 @@ func (l *listenBrainzAgent) formatListen(track *model.MediaFile) listenInfo {

     

       25
       25
       +
        				ReleaseMBID:             track.MbzAlbumID,

     

       26
       26
       +
        				ReleaseGroupMBID:        track.MbzReleaseGroupID,

     

       27
       27
       +
        				DurationMs:              int(track.Duration * 1000),

     

       28
       28
       +
       +				OriginURL:               originURL,

     

       29
       29
       +
        			},

     

       30
       30
       +
        		},

     

       31
       31
       +
        	}

     

       32
       32
       +
       +	fmt.Printf("listen info: %+v\n", li)

     

       33
       33
       +
       +	fmt.Printf("track tags: %+v\n", track.Tags)

     

       34
       34
       +
        	return li

     

       35
       35
       +
        }

     

       36
       36
       +
        

     

       37
       37
       +
       diff --git a/core/agents/listenbrainz/agent_test.go b/core/agents/listenbrainz/agent_test.go

     

       38
       38
       +
       index e99b442..11e7b3c 100644

     

       39
       39
       +
       --- a/core/agents/listenbrainz/agent_test.go

     

       40
       40
       +
       +++ b/core/agents/listenbrainz/agent_test.go

     

       41
       41
       +
       @@ -69,6 +69,7 @@ var _ = Describe("listenBrainzAgent", func() {

     

       42
       42
       +
        						"ArtistNames":             ConsistOf("Artist 1", "Artist 2"),

     

       43
       43
       +
        						"ArtistMBIDs":             ConsistOf("mbz-111", "mbz-222"),

     

       44
       44
       +
        						"DurationMs":              Equal(142200),

     

       45
       45
       +
       +						"OriginURL":               Ignore(),

     

       46
       46
       +
        					}),

     

       47
       47
       +
        				}),

     

       48
       48
       +
        			}))

     

       49
       49
       +
       diff --git a/core/agents/listenbrainz/client.go b/core/agents/listenbrainz/client.go

     

       50
       50
       +
       index 168aad5..807bdef 100644

     

       51
       51
       +
       --- a/core/agents/listenbrainz/client.go

     

       52
       52
       +
       +++ b/core/agents/listenbrainz/client.go

     

       53
       53
       +
       @@ -82,6 +82,7 @@ type additionalInfo struct {

     

       54
       54
       +
        	ReleaseMBID             string   `json:"release_mbid,omitempty"`

     

       55
       55
       +
        	ReleaseGroupMBID        string   `json:"release_group_mbid,omitempty"`

     

       56
       56
       +
        	DurationMs              int      `json:"duration_ms,omitempty"`

     

       57
       57
       +
       +	OriginURL               string   `json:"origin_url,omitempty"`

     

       58
       58
       +
        }

     

       59
       59
       +
        

     

       60
       60
       +
        func (c *client) validateToken(ctx context.Context, apiKey string) (*listenBrainzResponse, error) {

     

       61
       61
       +
       diff --git a/model/tag.go b/model/tag.go

     

       62
       62
       +
       index 674f688..ecd1a12 100644

     

       63
       63
       +
       --- a/model/tag.go

     

       64
       64
       +
       +++ b/model/tag.go

     

       65
       65
       +
       @@ -194,6 +194,7 @@ const (

     

       66
       66
       +
        	TagISRC           TagName = "isrc"

     

       67
       67
       +
        	TagBPM            TagName = "bpm"

     

       68
       68
       +
        	TagExplicitStatus TagName = "explicitstatus"

     

       69
       69
       +
       +	TagSource         TagName = "source"

     

       70
       70
       +
        

     

       71
       71
       +
        	// Dates and years

     

       72
       72
       +
        

     

       73
       73
       +
       diff --git a/resources/mappings.yaml b/resources/mappings.yaml

     

       74
       74
       +
       index d1da5c6..905ad01 100644

     

       75
       75
       +
       --- a/resources/mappings.yaml

     

       76
       76
       +
       +++ b/resources/mappings.yaml

     

       77
       77
       +
       @@ -251,6 +251,8 @@ additional:

     

       78
       78
       +
            aliases: [ txxx:script, script, ----:com.apple.itunes:script, wm/script ]

     

       79
       79
       +
          subtitle:

     

       80
       80
       +
            aliases: [ tit3, subtitle, ----:com.apple.itunes:subtitle, wm/subtitle ]

     

       81
       81
       +
       +  source:

     

       82
       82
       +
       +    aliases: [ source, woas, audio source, txxx:source, ----:com.apple.itunes:source ]

     

       83
       83
       +
          website:

     

       84
       84
       +
            aliases: [ woar, website, weblink, wm/authorurl ]

     

       85
       85
       +
          work: