Compare commits
38 Commits
v0.1.0
...
v1.0.0-beta-1
| Author | SHA1 | Date | |
|---|---|---|---|
| 47b444d72a | |||
| 323bf7089a | |||
| 24615fda7b | |||
| 5f57906aca | |||
| 606a7f2389 | |||
| 9d9dce052a | |||
| c7c484c714 | |||
| 4600172dbf | |||
| 3ce0277ecb | |||
| 6d7448f3ee | |||
| c22b950be3 | |||
| f96884e3e5 | |||
| 1552322429 | |||
| 8d07bc6120 | |||
| 1a236fd00f | |||
| 223ebf0539 | |||
| 05714ace50 | |||
| 4700e15a3c | |||
| 6b5ca1a54f | |||
| 24c4c36651 | |||
| 7e94c83a12 | |||
| b916c4c8fd | |||
| 35fbcbb46e | |||
| b68502fc05 | |||
| a39bcec7b2 | |||
| 982d3aae29 | |||
| 758759cda0 | |||
| e84a89809e | |||
| 1b55d869e3 | |||
| 2fd55fad1f | |||
| cfb50e278a | |||
| 86de170469 | |||
| eb4c72cfad | |||
| c7430220ec | |||
| 121e9a9e88 | |||
| 26443b7c85 | |||
| 3d72a5dedf | |||
| c33486b578 |
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 6.1 KiB |
@@ -30,6 +30,20 @@ jobs:
|
|||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: make test
|
run: make test
|
||||||
|
|
||||||
|
- name: Append PR info to version
|
||||||
|
if: github.event_name == 'pull_request'
|
||||||
|
run: |
|
||||||
|
PR_NUM=${{ github.event.pull_request.number }}
|
||||||
|
SHA=$(echo "${{ github.event.pull_request.head.sha }}" | cut -c1-7)
|
||||||
|
SUFFIX="PR${PR_NUM}-${SHA}"
|
||||||
|
jq --arg suffix "$SUFFIX" '.version = .version + "-" + $suffix' manifest.json > manifest.tmp && mv manifest.tmp manifest.json
|
||||||
|
|
||||||
|
- name: Append git SHA to version
|
||||||
|
if: github.event_name == 'push'
|
||||||
|
run: |
|
||||||
|
SHA=$(echo "${{ github.sha }}" | cut -c1-7)
|
||||||
|
jq --arg sha "$SHA" '.version = .version + "-" + $sha' manifest.json > manifest.tmp && mv manifest.tmp manifest.json
|
||||||
|
|
||||||
- name: Build and package plugin
|
- name: Build and package plugin
|
||||||
run: make package
|
run: make package
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,89 @@
|
|||||||
|
name: Create Release
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
version:
|
||||||
|
description: "Release version (e.g., 1.2.3, without the 'v' prefix)"
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
beta:
|
||||||
|
description: "Beta number (1, 2, 3...). Leave empty for stable release"
|
||||||
|
required: false
|
||||||
|
type: string
|
||||||
|
default: ""
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
create-release:
|
||||||
|
name: Create Release
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Validate version format
|
||||||
|
env:
|
||||||
|
VERSION: ${{ inputs.version }}
|
||||||
|
run: |
|
||||||
|
if [[ ! "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
|
||||||
|
echo "::error::Invalid version format '$VERSION'. Use X.X.X (e.g., 1.2.3)"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Compute full version
|
||||||
|
run: |
|
||||||
|
VERSION="${{ inputs.version }}"
|
||||||
|
BETA="${{ inputs.beta }}"
|
||||||
|
if [[ -n "$BETA" && "$BETA" != "0" ]]; then
|
||||||
|
VERSION="${VERSION}-beta-${BETA}"
|
||||||
|
fi
|
||||||
|
echo "VERSION=${VERSION}" >> "$GITHUB_ENV"
|
||||||
|
|
||||||
|
- name: Check out code
|
||||||
|
uses: actions/checkout@v5
|
||||||
|
|
||||||
|
- name: Check tag does not already exist
|
||||||
|
run: |
|
||||||
|
if git ls-remote --tags origin "refs/tags/v${VERSION}" | grep -q .; then
|
||||||
|
echo "::error::Tag v${VERSION} already exists"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Set up Go
|
||||||
|
uses: actions/setup-go@v5
|
||||||
|
with:
|
||||||
|
go-version-file: go.mod
|
||||||
|
|
||||||
|
- name: Run tests
|
||||||
|
run: go test -race ./...
|
||||||
|
|
||||||
|
- name: Update manifest.json version
|
||||||
|
run: |
|
||||||
|
jq --arg v "$VERSION" '.version = $v' manifest.json > manifest.tmp && mv manifest.tmp manifest.json
|
||||||
|
|
||||||
|
- name: Commit, tag, and push
|
||||||
|
run: |
|
||||||
|
git config user.name "github-actions[bot]"
|
||||||
|
git config user.email "github-actions[bot]@users.noreply.github.com"
|
||||||
|
git add manifest.json
|
||||||
|
git commit --allow-empty -m "Release v${VERSION}"
|
||||||
|
git tag "v${VERSION}"
|
||||||
|
git push origin main "v${VERSION}"
|
||||||
|
|
||||||
|
- name: Install TinyGo
|
||||||
|
run: |
|
||||||
|
wget https://github.com/tinygo-org/tinygo/releases/download/v0.40.1/tinygo_0.40.1_amd64.deb
|
||||||
|
sudo dpkg -i tinygo_0.40.1_amd64.deb
|
||||||
|
sudo apt install -y binaryen
|
||||||
|
|
||||||
|
- name: Build and package plugin
|
||||||
|
run: make package
|
||||||
|
|
||||||
|
- name: Create release
|
||||||
|
uses: softprops/action-gh-release@v2
|
||||||
|
with:
|
||||||
|
tag_name: v${{ env.VERSION }}
|
||||||
|
draft: true
|
||||||
|
prerelease: ${{ inputs.beta != '' && inputs.beta != '0' }}
|
||||||
|
files: discord-rich-presence.ndp
|
||||||
|
generate_release_notes: true
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
name: Release
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- "v*"
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
release:
|
|
||||||
name: Release
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Check out code
|
|
||||||
uses: actions/checkout@v5
|
|
||||||
|
|
||||||
- name: Set up Go
|
|
||||||
uses: actions/setup-go@v5
|
|
||||||
with:
|
|
||||||
go-version-file: go.mod
|
|
||||||
|
|
||||||
- name: Install TinyGo
|
|
||||||
run: |
|
|
||||||
wget https://github.com/tinygo-org/tinygo/releases/download/v0.40.1/tinygo_0.40.1_amd64.deb
|
|
||||||
sudo dpkg -i tinygo_0.40.1_amd64.deb
|
|
||||||
sudo apt install -y binaryen
|
|
||||||
|
|
||||||
- name: Run tests
|
|
||||||
run: make test
|
|
||||||
|
|
||||||
- name: Build and package plugin
|
|
||||||
run: make package
|
|
||||||
|
|
||||||
- name: Create release
|
|
||||||
uses: softprops/action-gh-release@v2
|
|
||||||
with:
|
|
||||||
draft: true
|
|
||||||
files: discord-rich-presence.ndp
|
|
||||||
generate_release_notes: true
|
|
||||||
@@ -34,3 +34,5 @@ jobs:
|
|||||||
number: ${{ steps.pr.outputs.number }}
|
number: ${{ steps.pr.outputs.number }}
|
||||||
message: |
|
message: |
|
||||||
Download the plugin for this PR: [discord-rich-presence.zip](https://nightly.link/${{ github.repository }}/actions/runs/${{ github.event.workflow_run.id }}/discord-rich-presence.zip)
|
Download the plugin for this PR: [discord-rich-presence.zip](https://nightly.link/${{ github.repository }}/actions/runs/${{ github.event.workflow_run.id }}/discord-rich-presence.zip)
|
||||||
|
|
||||||
|
Built from ${{ github.event.workflow_run.head_sha }} on ${{ github.event.workflow_run.updated_at }}
|
||||||
|
|||||||
+3
-1
@@ -1,2 +1,4 @@
|
|||||||
*.wasm
|
*.wasm
|
||||||
*.ndp
|
*.ndp
|
||||||
|
tmp
|
||||||
|
discord-rich-presence
|
||||||
@@ -0,0 +1,674 @@
|
|||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your program
|
||||||
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License. But first, please read
|
||||||
|
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||||
@@ -1,13 +1,20 @@
|
|||||||
|
SHELL := /usr/bin/env bash
|
||||||
.PHONY: test build package clean
|
.PHONY: test build package clean
|
||||||
|
|
||||||
PLUGIN_NAME := discord-rich-presence
|
PLUGIN_NAME := discord-rich-presence
|
||||||
WASM_FILE := plugin.wasm
|
WASM_FILE := plugin.wasm
|
||||||
|
TINYGO := $(shell command -v tinygo 2> /dev/null)
|
||||||
|
|
||||||
test:
|
test:
|
||||||
go test -race ./...
|
go test -race ./...
|
||||||
|
|
||||||
build:
|
build:
|
||||||
tinygo build -opt=2 -scheduler=none -no-debug -o $(WASM_FILE) -target wasi -buildmode=c-shared .
|
ifdef TINYGO
|
||||||
|
tinygo build -opt=2 -scheduler=none -no-debug -o $(WASM_FILE) -target wasip1 -buildmode=c-shared .
|
||||||
|
else
|
||||||
|
GOOS=wasip1 GOARCH=wasm go build -buildmode=c-shared -o $(WASM_FILE) .
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
package: build
|
package: build
|
||||||
zip $(PLUGIN_NAME).ndp $(WASM_FILE) manifest.json
|
zip $(PLUGIN_NAME).ndp $(WASM_FILE) manifest.json
|
||||||
@@ -15,10 +22,8 @@ package: build
|
|||||||
clean:
|
clean:
|
||||||
rm -f $(WASM_FILE) $(PLUGIN_NAME).ndp
|
rm -f $(WASM_FILE) $(PLUGIN_NAME).ndp
|
||||||
|
|
||||||
release: test
|
release:
|
||||||
@if [[ ! "${V}" =~ ^[0-9]+\.[0-9]+\.[0-9]+.*$$ ]]; then echo "Usage: make release V=X.X.X"; exit 1; fi
|
@if [[ ! "$${V}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$$ ]]; then echo "Usage: make release V=X.X.X [BETA=N]"; exit 1; fi
|
||||||
go mod tidy
|
gh workflow run create-release.yml -f version=$${V} -f beta=$(BETA)
|
||||||
@if [ -n "`git status -s`" ]; then echo "\n\nThere are pending changes. Please commit or stash first"; exit 1; fi
|
@echo "Release v$${V}$$(if [ -n "$(BETA)" ] && [ "$(BETA)" != "0" ]; then echo -beta-$(BETA); fi) workflow triggered. Check progress: gh run list --workflow=create-release.yml"
|
||||||
git tag v${V}
|
|
||||||
git push origin v${V} --no-verify
|
|
||||||
.PHONY: release
|
.PHONY: release
|
||||||
|
|||||||
@@ -1,15 +1,159 @@
|
|||||||
# Discord Rich Presence Plugin
|
# Discord Rich Presence Plugin for Navidrome
|
||||||
|
|
||||||
This plugin integrates Navidrome with Discord Rich Presence, displaying your currently playing track in your Discord status. It demonstrates how a Navidrome plugin can maintain real-time connections to external services while remaining completely stateless. Based on the [Navicord](https://github.com/logixism/navicord) project.
|
[](https://github.com/navidrome/discord-rich-presence-plugin/actions/workflows/build.yml)
|
||||||
|
[](https://github.com/navidrome/discord-rich-presence-plugin/releases/latest/download/discord-rich-presence.ndp)
|
||||||
|
|
||||||
|
**Attention: This plugin requires Navidrome 0.60.2 or later.**
|
||||||
|
|
||||||
|
This plugin integrates Navidrome with Discord Rich Presence, displaying your currently playing track in your Discord status.
|
||||||
|
The goal is to demonstrate the capabilities of Navidrome's plugin system by implementing a real-time presence feature using Discord's Gateway API.
|
||||||
|
It demonstrates how a Navidrome plugin can maintain real-time connections to external services while remaining completely stateless.
|
||||||
|
|
||||||
|
Based on the [Navicord](https://github.com/logixism/navicord) project.
|
||||||
|
|
||||||
**⚠️ WARNING: This plugin requires storing Discord user tokens, which may violate Discord's Terms of Service. Use at your own risk.**
|
**⚠️ WARNING: This plugin requires storing Discord user tokens, which may violate Discord's Terms of Service. Use at your own risk.**
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
- Shows currently playing track with title, artist, and album art
|
- Shows currently playing track with title, artist, and album art
|
||||||
|
- Clickable track title and artist name link to Spotify (direct track link via [ListenBrainz](https://listenbrainz.org), falls back to Spotify search)
|
||||||
|
- Clickable album art links to the Spotify track page
|
||||||
|
- Navidrome logo overlay on album art when track artwork is available
|
||||||
|
- Customizable activity name: "Navidrome" is default, but can be configured to display track title, artist, or album
|
||||||
- Displays playback progress with start/end timestamps
|
- Displays playback progress with start/end timestamps
|
||||||
- Automatic presence clearing when track finishes
|
- Automatic presence clearing when track finishes
|
||||||
- Multi-user support with individual Discord tokens
|
- Multi-user support with individual Discord tokens
|
||||||
|
- Optional album art from [Cover Art Archive](https://coverartarchive.org) for MusicBrainz-tagged music
|
||||||
|
- Optional image hosting via [uguu.se](https://uguu.se) for non-public Navidrome instances
|
||||||
|
|
||||||
|
<img alt="Discord Rich Presence showing currently playing track with album art, artist, and playback progress" src="https://raw.githubusercontent.com/navidrome/discord-rich-presence-plugin/master/.github/ss-richpresence.webp">
|
||||||
|
|
||||||
|
|
||||||
|
## Installation
|
||||||
|
|
||||||
|
### Step 1: Download and Install the Plugin
|
||||||
|
1. Download the `discord-rich-presence.ndp` file from the [releases page](https://github.com/navidrome/discord-rich-presence-plugin/releases)
|
||||||
|
2. Copy it to your Navidrome plugins folder. Default location: `<navidrome-data-directory>/plugins/`
|
||||||
|
|
||||||
|
### Step 2: Create a Discord Application
|
||||||
|
1. Go to the [Discord Developer Portal](https://discord.com/developers/applications)
|
||||||
|
2. Click "New Application" and give it a name (e.g., "My Navidrome")
|
||||||
|
3. Note down the **Application ID** (Client ID) - you'll need this for configuration
|
||||||
|
|
||||||
|
### Step 3: Get Your Discord User Token
|
||||||
|
⚠️ **WARNING**: This step involves using your Discord user token, which may violate Discord's Terms of Service. Proceed at your own risk.
|
||||||
|
|
||||||
|
We don't provide instructions for obtaining the token as it may violate Discord's policies. You can find guides online by searching for "how to get Discord user token".
|
||||||
|
|
||||||
|
### Step 4: Configure the Plugin
|
||||||
|
1. Open Navidrome and go to **Settings > Plugins > Discord Rich Presence**
|
||||||
|
2. Fill in the configuration:
|
||||||
|
- **Client ID**: Your Discord Application ID from Step 2
|
||||||
|
- **Activity Name Display**: Choose what to show as the activity name (Default, Track, Album, Artist)
|
||||||
|
- "Default" is recommended to help spread awareness of your favorite music server 😉, but feel free to choose the option that best suits your preferences
|
||||||
|
- **Use artwork from Cover Art Archive**: Enable this if your music has MusicBrainz tags (see Album Art section below)
|
||||||
|
- **Upload to uguu.se**: Enable this if your Navidrome isn't publicly accessible (see Album Art section below)
|
||||||
|
- **Enable Spotify link-through**: Enable this to make track title and album art clickable links to Spotify
|
||||||
|
- **Users**: Add your Navidrome username and Discord token from Step 3
|
||||||
|
|
||||||
|
### Step 5: Enable Discord Activity Sharing
|
||||||
|
In Discord, ensure your activity is visible to others:
|
||||||
|
1. Go to **User Settings** (gear icon)
|
||||||
|
2. Navigate to **Activity Privacy**
|
||||||
|
3. Enable **"Display current activity as a status message"**
|
||||||
|
|
||||||
|
### Step 6: Enable the Plugin
|
||||||
|
1. In Navidrome's plugin settings, toggle the plugin to **Enabled**
|
||||||
|
2. No restart required - check Navidrome logs for any initialization errors
|
||||||
|
|
||||||
|
## Album Art Display
|
||||||
|
|
||||||
|
For album artwork to display in Discord, Discord needs to be able to access the image. Choose one of these options:
|
||||||
|
|
||||||
|
### Option 1: Public Navidrome Instance
|
||||||
|
**Use this if**: Your Navidrome server can be reached from the internet
|
||||||
|
|
||||||
|
**Setup**:
|
||||||
|
1. Set the `ND_BASEURL` environment variable to your public URL:
|
||||||
|
```bash
|
||||||
|
# Example for Docker or Docker Compose
|
||||||
|
ND_BASEURL=https://music.yourdomain.com
|
||||||
|
|
||||||
|
# Example for navidrome.toml
|
||||||
|
BaseURL = "https://music.yourdomain.com"
|
||||||
|
```
|
||||||
|
2. **Restart Navidrome** (required for ND_BASEURL changes)
|
||||||
|
3. In plugin settings: **Disable** "Upload to uguu.se"
|
||||||
|
|
||||||
|
### Option 2: Cover Art Archive (for MusicBrainz-tagged music)
|
||||||
|
**Use this if**: Your music is tagged with MusicBrainz IDs
|
||||||
|
|
||||||
|
**Setup**:
|
||||||
|
1. In plugin settings: **Enable** "Use artwork from Cover Art Archive"
|
||||||
|
2. No other configuration needed
|
||||||
|
|
||||||
|
**How it works**: The plugin checks the [Cover Art Archive](https://coverartarchive.org) for album artwork using the track's MusicBrainz Release ID. If the specific release has no art, it falls back to the Release Group (which finds art from any edition of the same album). The resolved image URL is passed directly to Discord — no upload needed. Results are cached for 24 hours.
|
||||||
|
|
||||||
|
**Note**: This option takes priority over uguu.se and direct Navidrome URLs when enabled. It only works for tracks that have MusicBrainz IDs in their metadata — tracks without IDs will fall through to the next method.
|
||||||
|
|
||||||
|
### Option 3: Private Instance with uguu.se Upload
|
||||||
|
**Use this if**: Your Navidrome is only accessible locally (home network, behind VPN, etc.)
|
||||||
|
|
||||||
|
**Setup**:
|
||||||
|
1. In plugin settings: **Enable** "Upload to uguu.se"
|
||||||
|
2. No other configuration needed
|
||||||
|
|
||||||
|
**How it works**: Album art is automatically uploaded to uguu.se (temporary, anonymous hosting service) so Discord can access it. Files are deleted after 3 hours.
|
||||||
|
|
||||||
|
### Troubleshooting Album Art
|
||||||
|
- **No album art showing**: Check Navidrome logs for errors
|
||||||
|
- **Using public instance**: Verify ND_BASEURL is correct and Navidrome was restarted
|
||||||
|
- **Using Cover Art Archive**: Verify your music has MusicBrainz IDs (check file tags for `MUSICBRAINZ_ALBUMID`)
|
||||||
|
- **Using uguu.se**: Check that the option is enabled and your server has internet access
|
||||||
|
|
||||||
|
## Configuration
|
||||||
|
|
||||||
|
Access the plugin configuration in Navidrome: **Settings > Plugins > Discord Rich Presence**
|
||||||
|
|
||||||
|
<img alt="Plugin configuration panel showing all available settings" src="https://raw.githubusercontent.com/navidrome/discord-rich-presence-plugin/master/.github/ss-config.webp">
|
||||||
|
|
||||||
|
### Configuration Fields
|
||||||
|
|
||||||
|
#### Client ID
|
||||||
|
- **What it is**: Your Discord Application ID
|
||||||
|
- **How to get it**:
|
||||||
|
1. Go to [Discord Developer Portal](https://discord.com/developers/applications)
|
||||||
|
2. Create a new application or select an existing one
|
||||||
|
3. Copy the "Application ID" from the General Information page
|
||||||
|
- **Example**: `1234567890123456789`
|
||||||
|
|
||||||
|
#### Activity Name Display
|
||||||
|
- **What it is**: Choose what information to display as the activity name in Discord Rich Presence
|
||||||
|
- **Options**:
|
||||||
|
- **Default**: Shows "Navidrome" (static app name)
|
||||||
|
- **Track**: Shows the currently playing track title
|
||||||
|
- **Album**: Shows the currently playing track's album name
|
||||||
|
- **Artist**: Shows the currently playing track's artist name
|
||||||
|
|
||||||
|
#### Use artwork from Cover Art Archive
|
||||||
|
- **When to enable**: Your music is tagged with MusicBrainz IDs and you want album art from the Cover Art Archive
|
||||||
|
- **What it does**: Checks the [Cover Art Archive](https://coverartarchive.org) for artwork using MusicBrainz Release ID, with a fallback to Release Group ID. Takes priority over other artwork methods when enabled.
|
||||||
|
- **When to disable**: Your music isn't tagged with MusicBrainz IDs
|
||||||
|
|
||||||
|
#### Upload to uguu.se
|
||||||
|
- **When to enable**: Your Navidrome instance is NOT publicly accessible from the internet
|
||||||
|
- **What it does**: Automatically uploads album artwork to uguu.se (temporary hosting) so Discord can display it
|
||||||
|
- **When to disable**: Your Navidrome is publicly accessible and you've set `ND_BASEURL`
|
||||||
|
|
||||||
|
#### Enable Spotify Link-through
|
||||||
|
- **Default**: Disabled
|
||||||
|
- **What it does**: When enabled, clicking the track title or album art in Discord opens the corresponding Spotify page
|
||||||
|
- **How it works**: Track URLs are resolved via [ListenBrainz Labs](https://labs.api.listenbrainz.org) for direct Spotify links, falling back to Spotify search when no match is found
|
||||||
|
|
||||||
|
#### Users
|
||||||
|
Add each Navidrome user who wants Discord Rich Presence. For each user, provide:
|
||||||
|
- **Username**: The Navidrome login username (case-sensitive)
|
||||||
|
- **Token**: The Discord user token (see Step 3 in Installation for how to obtain this)
|
||||||
|
|
||||||
## How It Works
|
## How It Works
|
||||||
|
|
||||||
@@ -25,13 +169,14 @@ The plugin implements three Navidrome capabilities:
|
|||||||
|
|
||||||
### Host Services
|
### Host Services
|
||||||
|
|
||||||
| Service | Usage |
|
| Service | Usage |
|
||||||
|---------------|---------------------------------------------------------------------|
|
|-----------------|------------------------------------------------------------------------------------------------------|
|
||||||
| **HTTP** | Discord API calls (gateway discovery, external assets registration) |
|
| **HTTP** | Discord API calls (gateway discovery, external assets registration), Cover Art Archive lookups, ListenBrainz Spotify resolution |
|
||||||
| **WebSocket** | Persistent connection to Discord gateway |
|
| **WebSocket** | Persistent connection to Discord gateway |
|
||||||
| **Cache** | Sequence numbers, processed image URLs |
|
| **Cache** | Sequence numbers, processed image URLs, resolved Spotify URLs |
|
||||||
| **Scheduler** | Recurring heartbeats, one-time presence clearing |
|
| **Scheduler** | Recurring heartbeats, one-time presence clearing |
|
||||||
| **Artwork** | Track artwork public URL resolution |
|
| **Artwork** | Track artwork public URL resolution |
|
||||||
|
| **SubsonicAPI** | Fetches track artwork data for image hosting upload |
|
||||||
|
|
||||||
### Flow
|
### Flow
|
||||||
|
|
||||||
@@ -53,37 +198,46 @@ Navidrome plugins are stateless - each call creates a fresh instance. This plugi
|
|||||||
|
|
||||||
### Image Processing
|
### Image Processing
|
||||||
|
|
||||||
Discord requires images to be registered via their external assets API. The plugin:
|
Discord requires images to be registered via their external assets API. The plugin resolves artwork URLs using a priority chain:
|
||||||
1. Fetches track artwork URL from Navidrome
|
|
||||||
2. Registers it with Discord's API to get an `mp:` prefixed URL
|
1. **Cover Art Archive** (if enabled): HEAD request to check for artwork by MusicBrainz Release ID, with fallback to Release Group ID. The resolved `archive.org` URL is used directly.
|
||||||
3. Caches the result (4 hours for track art, 48 hours for default image)
|
2. **uguu.se** (if enabled): Fetches artwork from Navidrome and uploads to temporary hosting.
|
||||||
4. Falls back to a default image if artwork is unavailable
|
3. **Direct URL**: Uses the Navidrome artwork URL directly (requires public instance).
|
||||||
|
|
||||||
|
The resolved URL is then registered with Discord's external assets API to get an `mp:` prefixed URL, which is cached (4 hours for track art, 48 hours for default image). Falls back to a default image if artwork is unavailable.
|
||||||
|
|
||||||
|
### Spotify Linking
|
||||||
|
|
||||||
|
The plugin enriches the Discord presence with clickable Spotify links so others can easily find what you're listening to:
|
||||||
|
|
||||||
|
- **Track title** → links to the Spotify track (or a Spotify search as fallback)
|
||||||
|
- **Artist name** → links to a Spotify search for the artist
|
||||||
|
- **Album art** → links to the Spotify track page
|
||||||
|
|
||||||
|
Track URLs are resolved via the [ListenBrainz Labs API](https://labs.api.listenbrainz.org):
|
||||||
|
1. If the track has a MusicBrainz Recording ID (MBID), that is used for an exact lookup
|
||||||
|
2. Otherwise, artist name, track title, and album are used for a metadata-based lookup
|
||||||
|
3. If neither resolves, a Spotify search URL is used as a fallback
|
||||||
|
|
||||||
|
Resolved URLs are cached (30 days for direct track links, 4 hours for search fallbacks).
|
||||||
|
|
||||||
### Files
|
### Files
|
||||||
|
|
||||||
| File | Description |
|
| File | Description |
|
||||||
|--------------------------------|------------------------------------------------------------------------|
|
|----------------------------------|-------------------------------------------------------------------------------------|
|
||||||
| [main.go](main.go) | Plugin entry point, scrobbler and scheduler implementations |
|
| [main.go](main.go) | Plugin entry point, scrobbler and scheduler implementations, Spotify URL resolution |
|
||||||
| [rpc.go](rpc.go) | Discord gateway communication, WebSocket handling, activity management |
|
| [rpc.go](rpc.go) | Discord gateway communication, WebSocket handling, activity management |
|
||||||
| [manifest.json](manifest.json) | Plugin metadata and permission declarations |
|
| [coverart.go](coverart.go) | Artwork URL handling, Cover Art Archive lookups, and optional uguu.se image hosting |
|
||||||
| [Makefile](Makefile) | Build automation |
|
| [manifest.json](manifest.json) | Plugin metadata and permission declarations |
|
||||||
|
| [Makefile](Makefile) | Build automation |
|
||||||
## Configuration
|
|
||||||
|
|
||||||
Configure via the Navidrome UI under **Settings > Plugins > Discord Rich Presence**:
|
|
||||||
|
|
||||||
| Field | Description |
|
|
||||||
|---------------|-----------------------------------------------------------------------------------------------------------------|
|
|
||||||
| **Client ID** | Your Discord Application ID (create at [Discord Developer Portal](https://discord.com/developers/applications)) |
|
|
||||||
| **Users** | Array of username/token pairs mapping Navidrome users to Discord tokens |
|
|
||||||
|
|
||||||
|
|
||||||
## Building
|
## Building
|
||||||
|
|
||||||
Although the plugin can be compiled to WebAssembly with standard Go, it is recommended to use
|
### Prerequisites
|
||||||
[TinyGo](https://tinygo.org/getting-started/install/) for smaller binary size.
|
- **Recommended**: [TinyGo](https://tinygo.org/getting-started/install/) (produces smaller binary size)
|
||||||
|
- **Alternative**: Standard Go 1.19+ (larger binary but easier setup)
|
||||||
|
|
||||||
|
### Quick Build (Using Makefile)
|
||||||
```sh
|
```sh
|
||||||
# Run tests
|
# Run tests
|
||||||
make test
|
make test
|
||||||
@@ -97,23 +251,22 @@ make package
|
|||||||
|
|
||||||
The `make package` command creates `discord-rich-presence.ndp` containing the compiled WebAssembly module and manifest.
|
The `make package` command creates `discord-rich-presence.ndp` containing the compiled WebAssembly module and manifest.
|
||||||
|
|
||||||
### Manual build:
|
### Manual Build Options
|
||||||
|
|
||||||
|
#### Using TinyGo (Recommended)
|
||||||
```sh
|
```sh
|
||||||
|
# Install TinyGo first: https://tinygo.org/getting-started/install/
|
||||||
tinygo build -target wasip1 -buildmode=c-shared -o plugin.wasm -scheduler=none .
|
tinygo build -target wasip1 -buildmode=c-shared -o plugin.wasm -scheduler=none .
|
||||||
zip discord-rich-presence.ndp plugin.wasm manifest.json
|
zip discord-rich-presence.ndp plugin.wasm manifest.json
|
||||||
```
|
```
|
||||||
|
|
||||||
### Using standard Go:
|
#### Using Standard Go
|
||||||
```sh
|
```sh
|
||||||
GOOS=wasip1 GOARCH=wasm go build -buildmode=c-shared -o plugin.wasm .
|
GOOS=wasip1 GOARCH=wasm go build -buildmode=c-shared -o plugin.wasm .
|
||||||
zip discord-rich-presence.ndp plugin.wasm manifest.json
|
zip discord-rich-presence.ndp plugin.wasm manifest.json
|
||||||
```
|
```
|
||||||
|
|
||||||
## Installation
|
### Output
|
||||||
|
- `plugin.wasm`: The compiled WebAssembly module
|
||||||
1. Copy the `discord-rich-presence.ndp` file to your Navidrome plugins folder (default is `plugins/` under the Navidrome data directory).
|
- `discord-rich-presence.ndp`: The complete plugin package ready for installation
|
||||||
2. Configure the plugin in **Settings > Plugins > Discord Rich Presence**
|
|
||||||
3. Enable the plugin
|
|
||||||
|
|
||||||
There is no need to restart Navidrome; Check the logs for any errors during initialization.
|
|
||||||
|
|
||||||
|
|||||||
+207
@@ -0,0 +1,207 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/navidrome/navidrome/plugins/pdk/go/host"
|
||||||
|
"github.com/navidrome/navidrome/plugins/pdk/go/pdk"
|
||||||
|
"github.com/navidrome/navidrome/plugins/pdk/go/scrobbler"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Cache TTLs for cover art lookups
|
||||||
|
const (
|
||||||
|
caaCacheTTLHit int64 = 24 * 60 * 60 // 24 hours for resolved CAA artwork
|
||||||
|
caaCacheTTLMiss int64 = 4 * 60 * 60 // 4 hours for CAA misses
|
||||||
|
uguuCacheTTL int64 = 150 * 60 // 2.5 hours for uguu.se uploads
|
||||||
|
|
||||||
|
caaTimeOut = 4000 // 4 seconds timeout for CAA HEAD requests to avoid blocking NowPlaying
|
||||||
|
)
|
||||||
|
|
||||||
|
// headCoverArt sends a HEAD request to the given CAA URL without following redirects.
|
||||||
|
// Returns (location, true) on 307 with a Location header (image exists),
|
||||||
|
// ("", true) on 404 (definitive miss — safe to cache),
|
||||||
|
// ("", false) on network errors or unexpected responses (transient — do not cache).
|
||||||
|
func headCoverArt(url string) (string, bool) {
|
||||||
|
resp, err := host.HTTPSend(host.HTTPRequest{
|
||||||
|
Method: "HEAD",
|
||||||
|
URL: url,
|
||||||
|
NoFollowRedirects: true,
|
||||||
|
TimeoutMs: caaTimeOut,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
pdk.Log(pdk.LogDebug, fmt.Sprintf("CAA HEAD request failed for %s: %v", url, err))
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
if resp.StatusCode == 404 {
|
||||||
|
return "", true
|
||||||
|
}
|
||||||
|
if resp.StatusCode != 307 {
|
||||||
|
pdk.Log(pdk.LogDebug, fmt.Sprintf("CAA HEAD unexpected status %d for %s", resp.StatusCode, url))
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
location := resp.Headers["Location"]
|
||||||
|
if location == "" {
|
||||||
|
pdk.Log(pdk.LogWarn, fmt.Sprintf("CAA returned 307 but no Location header for %s", url))
|
||||||
|
}
|
||||||
|
return location, true
|
||||||
|
}
|
||||||
|
|
||||||
|
// getImageViaCoverArt checks the Cover Art Archive for album artwork.
|
||||||
|
// Tries the release first, then falls back to the release group.
|
||||||
|
// Returns the archive.org image URL on success, "" on failure.
|
||||||
|
func getImageViaCoverArt(mbzAlbumID, mbzReleaseGroupID string) string {
|
||||||
|
if mbzAlbumID == "" && mbzReleaseGroupID == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// Determine cache key: use album ID when available, otherwise release group ID
|
||||||
|
cacheKey := "caa.artwork." + mbzAlbumID
|
||||||
|
if mbzAlbumID == "" {
|
||||||
|
cacheKey = "caa.artwork.rg." + mbzReleaseGroupID
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check cache
|
||||||
|
cachedURL, exists, err := host.CacheGetString(cacheKey)
|
||||||
|
if err == nil && exists {
|
||||||
|
pdk.Log(pdk.LogDebug, fmt.Sprintf("CAA cache hit for %s", cacheKey))
|
||||||
|
return cachedURL
|
||||||
|
}
|
||||||
|
|
||||||
|
// Try release first
|
||||||
|
var imageURL string
|
||||||
|
definitive := false
|
||||||
|
if mbzAlbumID != "" {
|
||||||
|
imageURL, definitive = headCoverArt(fmt.Sprintf("https://coverartarchive.org/release/%s/front-500", mbzAlbumID))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fall back to release group
|
||||||
|
if imageURL == "" && mbzReleaseGroupID != "" {
|
||||||
|
imageURL, definitive = headCoverArt(fmt.Sprintf("https://coverartarchive.org/release-group/%s/front-500", mbzReleaseGroupID))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Cache hits always; only cache misses if the response was definitive (404),
|
||||||
|
// not transient failures (network errors, 5xx) which should be retried sooner.
|
||||||
|
if imageURL != "" {
|
||||||
|
_ = host.CacheSetString(cacheKey, imageURL, caaCacheTTLHit)
|
||||||
|
} else if definitive {
|
||||||
|
_ = host.CacheSetString(cacheKey, "", caaCacheTTLMiss)
|
||||||
|
}
|
||||||
|
|
||||||
|
if imageURL != "" {
|
||||||
|
pdk.Log(pdk.LogDebug, fmt.Sprintf("CAA resolved artwork for %s: %s", cacheKey, imageURL))
|
||||||
|
}
|
||||||
|
|
||||||
|
return imageURL
|
||||||
|
}
|
||||||
|
|
||||||
|
// uguu.se API response
|
||||||
|
type uguuResponse struct {
|
||||||
|
Success bool `json:"success"`
|
||||||
|
Files []struct {
|
||||||
|
URL string `json:"url"`
|
||||||
|
} `json:"files"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// getImageURL retrieves the track artwork URL, checking CAA first if enabled,
|
||||||
|
// then uguu.se, then direct Navidrome URL.
|
||||||
|
func getImageURL(username string, track scrobbler.TrackInfo) string {
|
||||||
|
caaEnabled, _ := pdk.GetConfig(caaEnabledKey)
|
||||||
|
if caaEnabled == "true" {
|
||||||
|
if url := getImageViaCoverArt(track.MBZAlbumID, track.MBZReleaseGroupID); url != "" {
|
||||||
|
return url
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
uguuEnabled, _ := pdk.GetConfig(uguuEnabledKey)
|
||||||
|
if uguuEnabled == "true" {
|
||||||
|
return getImageViaUguu(username, track.ID)
|
||||||
|
}
|
||||||
|
|
||||||
|
return getImageDirect(track.ID)
|
||||||
|
}
|
||||||
|
|
||||||
|
// getImageDirect returns the artwork URL directly from Navidrome (current behavior).
|
||||||
|
func getImageDirect(trackID string) string {
|
||||||
|
artworkURL, err := host.ArtworkGetTrackUrl(trackID, 300)
|
||||||
|
if err != nil {
|
||||||
|
pdk.Log(pdk.LogWarn, fmt.Sprintf("Failed to get artwork URL: %v", err))
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// Don't use localhost URLs
|
||||||
|
if strings.HasPrefix(artworkURL, "http://localhost") {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return artworkURL
|
||||||
|
}
|
||||||
|
|
||||||
|
// getImageViaUguu fetches artwork and uploads it to uguu.se.
|
||||||
|
func getImageViaUguu(username, trackID string) string {
|
||||||
|
// Check cache first
|
||||||
|
cacheKey := fmt.Sprintf("uguu.artwork.%s", trackID)
|
||||||
|
cachedURL, exists, err := host.CacheGetString(cacheKey)
|
||||||
|
if err == nil && exists {
|
||||||
|
pdk.Log(pdk.LogDebug, fmt.Sprintf("Cache hit for uguu artwork: %s", trackID))
|
||||||
|
return cachedURL
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fetch artwork data from Navidrome
|
||||||
|
contentType, data, err := host.SubsonicAPICallRaw(fmt.Sprintf("/getCoverArt?u=%s&id=%s&size=300", username, trackID))
|
||||||
|
if err != nil {
|
||||||
|
pdk.Log(pdk.LogWarn, fmt.Sprintf("Failed to fetch artwork data: %v", err))
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// Upload to uguu.se
|
||||||
|
url, err := uploadToUguu(data, contentType)
|
||||||
|
if err != nil {
|
||||||
|
pdk.Log(pdk.LogWarn, fmt.Sprintf("Failed to upload to uguu.se: %v", err))
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
_ = host.CacheSetString(cacheKey, url, uguuCacheTTL)
|
||||||
|
return url
|
||||||
|
}
|
||||||
|
|
||||||
|
// uploadToUguu uploads image data to uguu.se and returns the file URL.
|
||||||
|
func uploadToUguu(imageData []byte, contentType string) (string, error) {
|
||||||
|
// Build multipart/form-data body manually (TinyGo-compatible)
|
||||||
|
boundary := "----NavidromeCoverArt"
|
||||||
|
var body []byte
|
||||||
|
body = append(body, []byte(fmt.Sprintf("--%s\r\n", boundary))...)
|
||||||
|
body = append(body, []byte(fmt.Sprintf("Content-Disposition: form-data; name=\"files[]\"; filename=\"cover.jpg\"\r\n"))...)
|
||||||
|
body = append(body, []byte(fmt.Sprintf("Content-Type: %s\r\n", contentType))...)
|
||||||
|
body = append(body, []byte("\r\n")...)
|
||||||
|
body = append(body, imageData...)
|
||||||
|
body = append(body, []byte(fmt.Sprintf("\r\n--%s--\r\n", boundary))...)
|
||||||
|
|
||||||
|
resp, err := host.HTTPSend(host.HTTPRequest{
|
||||||
|
Method: "POST",
|
||||||
|
URL: "https://uguu.se/upload",
|
||||||
|
Headers: map[string]string{"Content-Type": fmt.Sprintf("multipart/form-data; boundary=%s", boundary)},
|
||||||
|
Body: body,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("uguu.se upload failed: %w", err)
|
||||||
|
}
|
||||||
|
if resp.StatusCode >= 400 {
|
||||||
|
return "", fmt.Errorf("uguu.se upload failed: HTTP %d", resp.StatusCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
var result uguuResponse
|
||||||
|
if err := json.Unmarshal(resp.Body, &result); err != nil {
|
||||||
|
return "", fmt.Errorf("failed to parse uguu.se response: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !result.Success || len(result.Files) == 0 {
|
||||||
|
return "", fmt.Errorf("uguu.se upload was not successful")
|
||||||
|
}
|
||||||
|
|
||||||
|
if result.Files[0].URL == "" {
|
||||||
|
return "", fmt.Errorf("uguu.se returned empty URL")
|
||||||
|
}
|
||||||
|
|
||||||
|
return result.Files[0].URL, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,347 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
|
||||||
|
"github.com/navidrome/navidrome/plugins/pdk/go/host"
|
||||||
|
"github.com/navidrome/navidrome/plugins/pdk/go/pdk"
|
||||||
|
"github.com/navidrome/navidrome/plugins/pdk/go/scrobbler"
|
||||||
|
"github.com/stretchr/testify/mock"
|
||||||
|
|
||||||
|
. "github.com/onsi/ginkgo/v2"
|
||||||
|
. "github.com/onsi/gomega"
|
||||||
|
)
|
||||||
|
|
||||||
|
var _ = Describe("headCoverArt", func() {
|
||||||
|
BeforeEach(func() {
|
||||||
|
pdk.ResetMock()
|
||||||
|
host.HTTPMock.ExpectedCalls = nil
|
||||||
|
host.HTTPMock.Calls = nil
|
||||||
|
pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns Location header and definitive=true on 307 response", func() {
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.Method == "HEAD" &&
|
||||||
|
req.URL == "https://coverartarchive.org/release/test-mbid/front-500" &&
|
||||||
|
req.NoFollowRedirects == true
|
||||||
|
})).Return(&host.HTTPResponse{
|
||||||
|
StatusCode: 307,
|
||||||
|
Headers: map[string]string{"Location": "https://archive.org/download/mbid-test/thumb500.jpg"},
|
||||||
|
}, nil)
|
||||||
|
|
||||||
|
result, definitive := headCoverArt("https://coverartarchive.org/release/test-mbid/front-500")
|
||||||
|
Expect(result).To(Equal("https://archive.org/download/mbid-test/thumb500.jpg"))
|
||||||
|
Expect(definitive).To(BeTrue())
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns empty and definitive=true on 404 response", func() {
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.Method == "HEAD" && req.NoFollowRedirects == true
|
||||||
|
})).Return(&host.HTTPResponse{StatusCode: 404}, nil)
|
||||||
|
|
||||||
|
result, definitive := headCoverArt("https://coverartarchive.org/release/no-art/front-500")
|
||||||
|
Expect(result).To(BeEmpty())
|
||||||
|
Expect(definitive).To(BeTrue())
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns empty and definitive=false on HTTP error", func() {
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.Method == "HEAD"
|
||||||
|
})).Return((*host.HTTPResponse)(nil), errors.New("connection refused"))
|
||||||
|
|
||||||
|
result, definitive := headCoverArt("https://coverartarchive.org/release/err/front-500")
|
||||||
|
Expect(result).To(BeEmpty())
|
||||||
|
Expect(definitive).To(BeFalse())
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns empty and definitive=true when Location header is missing on 307", func() {
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.Method == "HEAD"
|
||||||
|
})).Return(&host.HTTPResponse{
|
||||||
|
StatusCode: 307,
|
||||||
|
Headers: map[string]string{},
|
||||||
|
}, nil)
|
||||||
|
|
||||||
|
result, definitive := headCoverArt("https://coverartarchive.org/release/no-location/front-500")
|
||||||
|
Expect(result).To(BeEmpty())
|
||||||
|
Expect(definitive).To(BeTrue())
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
var _ = Describe("getImageURL", func() {
|
||||||
|
BeforeEach(func() {
|
||||||
|
pdk.ResetMock()
|
||||||
|
host.CacheMock.ExpectedCalls = nil
|
||||||
|
host.CacheMock.Calls = nil
|
||||||
|
host.ArtworkMock.ExpectedCalls = nil
|
||||||
|
host.ArtworkMock.Calls = nil
|
||||||
|
host.SubsonicAPIMock.ExpectedCalls = nil
|
||||||
|
host.SubsonicAPIMock.Calls = nil
|
||||||
|
host.HTTPMock.ExpectedCalls = nil
|
||||||
|
host.HTTPMock.Calls = nil
|
||||||
|
pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
|
||||||
|
})
|
||||||
|
|
||||||
|
Describe("uguu disabled (default)", func() {
|
||||||
|
BeforeEach(func() {
|
||||||
|
pdk.PDKMock.On("GetConfig", caaEnabledKey).Return("", false)
|
||||||
|
pdk.PDKMock.On("GetConfig", uguuEnabledKey).Return("", false)
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns artwork URL directly", func() {
|
||||||
|
host.ArtworkMock.On("GetTrackUrl", "track1", int32(300)).Return("https://example.com/art.jpg", nil)
|
||||||
|
|
||||||
|
url := getImageURL("testuser", scrobbler.TrackInfo{ID: "track1"})
|
||||||
|
Expect(url).To(Equal("https://example.com/art.jpg"))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns empty for localhost URL", func() {
|
||||||
|
host.ArtworkMock.On("GetTrackUrl", "track1", int32(300)).Return("http://localhost:4533/art.jpg", nil)
|
||||||
|
|
||||||
|
url := getImageURL("testuser", scrobbler.TrackInfo{ID: "track1"})
|
||||||
|
Expect(url).To(BeEmpty())
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns empty when artwork fetch fails", func() {
|
||||||
|
host.ArtworkMock.On("GetTrackUrl", "track1", int32(300)).Return("", errors.New("not found"))
|
||||||
|
|
||||||
|
url := getImageURL("testuser", scrobbler.TrackInfo{ID: "track1"})
|
||||||
|
Expect(url).To(BeEmpty())
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
Describe("uguu enabled", func() {
|
||||||
|
BeforeEach(func() {
|
||||||
|
pdk.PDKMock.On("GetConfig", caaEnabledKey).Return("", false)
|
||||||
|
pdk.PDKMock.On("GetConfig", uguuEnabledKey).Return("true", true)
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns cached URL when available", func() {
|
||||||
|
host.CacheMock.On("GetString", "uguu.artwork.track1").Return("https://a.uguu.se/cached.jpg", true, nil)
|
||||||
|
|
||||||
|
url := getImageURL("testuser", scrobbler.TrackInfo{ID: "track1"})
|
||||||
|
Expect(url).To(Equal("https://a.uguu.se/cached.jpg"))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("uploads artwork and caches the result", func() {
|
||||||
|
host.CacheMock.On("GetString", "uguu.artwork.track1").Return("", false, nil)
|
||||||
|
|
||||||
|
// Mock SubsonicAPICallRaw
|
||||||
|
imageData := []byte("fake-image-data")
|
||||||
|
host.SubsonicAPIMock.On("CallRaw", "/getCoverArt?u=testuser&id=track1&size=300").
|
||||||
|
Return("image/jpeg", imageData, nil)
|
||||||
|
|
||||||
|
// Mock uguu.se HTTP upload
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.URL == "https://uguu.se/upload"
|
||||||
|
})).Return(&host.HTTPResponse{StatusCode: 200, Body: []byte(`{"success":true,"files":[{"url":"https://a.uguu.se/uploaded.jpg"}]}`)}, nil)
|
||||||
|
|
||||||
|
// Mock cache set
|
||||||
|
host.CacheMock.On("SetString", "uguu.artwork.track1", "https://a.uguu.se/uploaded.jpg", uguuCacheTTL).Return(nil)
|
||||||
|
|
||||||
|
url := getImageURL("testuser", scrobbler.TrackInfo{ID: "track1"})
|
||||||
|
Expect(url).To(Equal("https://a.uguu.se/uploaded.jpg"))
|
||||||
|
host.CacheMock.AssertCalled(GinkgoT(), "SetString", "uguu.artwork.track1", "https://a.uguu.se/uploaded.jpg", uguuCacheTTL)
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns empty when artwork data fetch fails", func() {
|
||||||
|
host.CacheMock.On("GetString", "uguu.artwork.track1").Return("", false, nil)
|
||||||
|
host.SubsonicAPIMock.On("CallRaw", "/getCoverArt?u=testuser&id=track1&size=300").
|
||||||
|
Return("", []byte(nil), errors.New("fetch failed"))
|
||||||
|
|
||||||
|
url := getImageURL("testuser", scrobbler.TrackInfo{ID: "track1"})
|
||||||
|
Expect(url).To(BeEmpty())
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns empty when uguu.se upload fails", func() {
|
||||||
|
host.CacheMock.On("GetString", "uguu.artwork.track1").Return("", false, nil)
|
||||||
|
host.SubsonicAPIMock.On("CallRaw", "/getCoverArt?u=testuser&id=track1&size=300").
|
||||||
|
Return("image/jpeg", []byte("fake-image-data"), nil)
|
||||||
|
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.URL == "https://uguu.se/upload"
|
||||||
|
})).Return(&host.HTTPResponse{StatusCode: 500, Body: []byte(`{"success":false}`)}, nil)
|
||||||
|
|
||||||
|
url := getImageURL("testuser", scrobbler.TrackInfo{ID: "track1"})
|
||||||
|
Expect(url).To(BeEmpty())
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
Describe("CAA enabled", func() {
|
||||||
|
BeforeEach(func() {
|
||||||
|
pdk.PDKMock.ExpectedCalls = nil
|
||||||
|
pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
|
||||||
|
pdk.PDKMock.On("GetConfig", caaEnabledKey).Return("true", true)
|
||||||
|
pdk.PDKMock.On("GetConfig", uguuEnabledKey).Return("", false)
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns CAA URL when release HEAD succeeds", func() {
|
||||||
|
host.CacheMock.On("GetString", "caa.artwork.album-id").Return("", false, nil)
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.URL == "https://coverartarchive.org/release/album-id/front-500"
|
||||||
|
})).Return(&host.HTTPResponse{
|
||||||
|
StatusCode: 307,
|
||||||
|
Headers: map[string]string{"Location": "https://archive.org/art.jpg"},
|
||||||
|
}, nil)
|
||||||
|
host.CacheMock.On("SetString", "caa.artwork.album-id", "https://archive.org/art.jpg", int64(86400)).Return(nil)
|
||||||
|
|
||||||
|
url := getImageURL("testuser", scrobbler.TrackInfo{ID: "track1", MBZAlbumID: "album-id", MBZReleaseGroupID: "rg-id"})
|
||||||
|
Expect(url).To(Equal("https://archive.org/art.jpg"))
|
||||||
|
host.ArtworkMock.AssertNotCalled(GinkgoT(), "GetTrackUrl", mock.Anything, mock.Anything)
|
||||||
|
host.SubsonicAPIMock.AssertNotCalled(GinkgoT(), "CallRaw", mock.Anything)
|
||||||
|
})
|
||||||
|
|
||||||
|
It("falls through to direct when CAA misses and uguu is disabled", func() {
|
||||||
|
host.CacheMock.On("GetString", "caa.artwork.album-id").Return("", false, nil)
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.URL == "https://coverartarchive.org/release/album-id/front-500"
|
||||||
|
})).Return(&host.HTTPResponse{StatusCode: 404}, nil)
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.URL == "https://coverartarchive.org/release-group/rg-id/front-500"
|
||||||
|
})).Return(&host.HTTPResponse{StatusCode: 404}, nil)
|
||||||
|
host.CacheMock.On("SetString", "caa.artwork.album-id", "", int64(14400)).Return(nil)
|
||||||
|
host.ArtworkMock.On("GetTrackUrl", "track1", int32(300)).Return("https://example.com/art.jpg", nil)
|
||||||
|
|
||||||
|
url := getImageURL("testuser", scrobbler.TrackInfo{ID: "track1", MBZAlbumID: "album-id", MBZReleaseGroupID: "rg-id"})
|
||||||
|
Expect(url).To(Equal("https://example.com/art.jpg"))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("falls through to uguu when CAA misses and uguu is enabled", func() {
|
||||||
|
pdk.PDKMock.ExpectedCalls = nil
|
||||||
|
pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
|
||||||
|
pdk.PDKMock.On("GetConfig", caaEnabledKey).Return("true", true)
|
||||||
|
pdk.PDKMock.On("GetConfig", uguuEnabledKey).Return("true", true)
|
||||||
|
|
||||||
|
host.CacheMock.On("GetString", "caa.artwork.rg.rg-id").Return("", false, nil)
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.URL == "https://coverartarchive.org/release-group/rg-id/front-500"
|
||||||
|
})).Return(&host.HTTPResponse{StatusCode: 404}, nil)
|
||||||
|
host.CacheMock.On("SetString", "caa.artwork.rg.rg-id", "", int64(14400)).Return(nil)
|
||||||
|
|
||||||
|
host.CacheMock.On("GetString", "uguu.artwork.track1").Return("https://a.uguu.se/cached.jpg", true, nil)
|
||||||
|
|
||||||
|
url := getImageURL("testuser", scrobbler.TrackInfo{ID: "track1", MBZReleaseGroupID: "rg-id"})
|
||||||
|
Expect(url).To(Equal("https://a.uguu.se/cached.jpg"))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("skips CAA when no MBZ IDs are present", func() {
|
||||||
|
host.ArtworkMock.On("GetTrackUrl", "track1", int32(300)).Return("https://example.com/art.jpg", nil)
|
||||||
|
|
||||||
|
url := getImageURL("testuser", scrobbler.TrackInfo{ID: "track1"})
|
||||||
|
Expect(url).To(Equal("https://example.com/art.jpg"))
|
||||||
|
host.HTTPMock.AssertNotCalled(GinkgoT(), "Send", mock.Anything)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
var _ = Describe("getImageViaCoverArt", func() {
|
||||||
|
BeforeEach(func() {
|
||||||
|
pdk.ResetMock()
|
||||||
|
host.CacheMock.ExpectedCalls = nil
|
||||||
|
host.CacheMock.Calls = nil
|
||||||
|
host.HTTPMock.ExpectedCalls = nil
|
||||||
|
host.HTTPMock.Calls = nil
|
||||||
|
pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns cached URL on cache hit", func() {
|
||||||
|
host.CacheMock.On("GetString", "caa.artwork.album-123").Return("https://archive.org/cached.jpg", true, nil)
|
||||||
|
|
||||||
|
result := getImageViaCoverArt("album-123", "rg-456")
|
||||||
|
Expect(result).To(Equal("https://archive.org/cached.jpg"))
|
||||||
|
host.HTTPMock.AssertNotCalled(GinkgoT(), "Send", mock.Anything)
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns empty on cache hit with empty string (known miss)", func() {
|
||||||
|
host.CacheMock.On("GetString", "caa.artwork.album-123").Return("", true, nil)
|
||||||
|
|
||||||
|
result := getImageViaCoverArt("album-123", "rg-456")
|
||||||
|
Expect(result).To(BeEmpty())
|
||||||
|
host.HTTPMock.AssertNotCalled(GinkgoT(), "Send", mock.Anything)
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns release URL on 307 and caches it", func() {
|
||||||
|
host.CacheMock.On("GetString", "caa.artwork.album-123").Return("", false, nil)
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.URL == "https://coverartarchive.org/release/album-123/front-500"
|
||||||
|
})).Return(&host.HTTPResponse{
|
||||||
|
StatusCode: 307,
|
||||||
|
Headers: map[string]string{"Location": "https://archive.org/release-art.jpg"},
|
||||||
|
}, nil)
|
||||||
|
host.CacheMock.On("SetString", "caa.artwork.album-123", "https://archive.org/release-art.jpg", int64(86400)).Return(nil)
|
||||||
|
|
||||||
|
result := getImageViaCoverArt("album-123", "rg-456")
|
||||||
|
Expect(result).To(Equal("https://archive.org/release-art.jpg"))
|
||||||
|
host.CacheMock.AssertCalled(GinkgoT(), "SetString", "caa.artwork.album-123", "https://archive.org/release-art.jpg", int64(86400))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("falls back to release-group when release returns 404", func() {
|
||||||
|
host.CacheMock.On("GetString", "caa.artwork.album-123").Return("", false, nil)
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.URL == "https://coverartarchive.org/release/album-123/front-500"
|
||||||
|
})).Return(&host.HTTPResponse{StatusCode: 404}, nil)
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.URL == "https://coverartarchive.org/release-group/rg-456/front-500"
|
||||||
|
})).Return(&host.HTTPResponse{
|
||||||
|
StatusCode: 307,
|
||||||
|
Headers: map[string]string{"Location": "https://archive.org/rg-art.jpg"},
|
||||||
|
}, nil)
|
||||||
|
host.CacheMock.On("SetString", "caa.artwork.album-123", "https://archive.org/rg-art.jpg", int64(86400)).Return(nil)
|
||||||
|
|
||||||
|
result := getImageViaCoverArt("album-123", "rg-456")
|
||||||
|
Expect(result).To(Equal("https://archive.org/rg-art.jpg"))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("caches empty string when both release and release-group fail", func() {
|
||||||
|
host.CacheMock.On("GetString", "caa.artwork.album-123").Return("", false, nil)
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.URL == "https://coverartarchive.org/release/album-123/front-500"
|
||||||
|
})).Return(&host.HTTPResponse{StatusCode: 404}, nil)
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.URL == "https://coverartarchive.org/release-group/rg-456/front-500"
|
||||||
|
})).Return(&host.HTTPResponse{StatusCode: 404}, nil)
|
||||||
|
host.CacheMock.On("SetString", "caa.artwork.album-123", "", int64(14400)).Return(nil)
|
||||||
|
|
||||||
|
result := getImageViaCoverArt("album-123", "rg-456")
|
||||||
|
Expect(result).To(BeEmpty())
|
||||||
|
host.CacheMock.AssertCalled(GinkgoT(), "SetString", "caa.artwork.album-123", "", int64(14400))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("does not cache miss on transient failure", func() {
|
||||||
|
host.CacheMock.On("GetString", "caa.artwork.album-123").Return("", false, nil)
|
||||||
|
// Both requests fail with network errors (transient)
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.URL == "https://coverartarchive.org/release/album-123/front-500"
|
||||||
|
})).Return((*host.HTTPResponse)(nil), errors.New("connection refused"))
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.URL == "https://coverartarchive.org/release-group/rg-456/front-500"
|
||||||
|
})).Return((*host.HTTPResponse)(nil), errors.New("timeout"))
|
||||||
|
|
||||||
|
result := getImageViaCoverArt("album-123", "rg-456")
|
||||||
|
Expect(result).To(BeEmpty())
|
||||||
|
// Should NOT cache the miss since failures were transient
|
||||||
|
host.CacheMock.AssertNotCalled(GinkgoT(), "SetString", mock.Anything, mock.Anything, mock.Anything)
|
||||||
|
})
|
||||||
|
|
||||||
|
It("tries only release-group when MBZAlbumID is empty", func() {
|
||||||
|
host.CacheMock.On("GetString", "caa.artwork.rg.rg-456").Return("", false, nil)
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.URL == "https://coverartarchive.org/release-group/rg-456/front-500"
|
||||||
|
})).Return(&host.HTTPResponse{
|
||||||
|
StatusCode: 307,
|
||||||
|
Headers: map[string]string{"Location": "https://archive.org/rg-art.jpg"},
|
||||||
|
}, nil)
|
||||||
|
host.CacheMock.On("SetString", "caa.artwork.rg.rg-456", "https://archive.org/rg-art.jpg", int64(86400)).Return(nil)
|
||||||
|
|
||||||
|
result := getImageViaCoverArt("", "rg-456")
|
||||||
|
Expect(result).To(Equal("https://archive.org/rg-art.jpg"))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns empty when both IDs are empty", func() {
|
||||||
|
result := getImageViaCoverArt("", "")
|
||||||
|
Expect(result).To(BeEmpty())
|
||||||
|
host.HTTPMock.AssertNotCalled(GinkgoT(), "Send", mock.Anything)
|
||||||
|
host.CacheMock.AssertNotCalled(GinkgoT(), "GetString", mock.Anything)
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
module discord-rich-presence
|
module discord-rich-presence
|
||||||
|
|
||||||
go 1.25
|
go 1.25.0
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/navidrome/navidrome/plugins/pdk/go v0.0.0-20260202223454-15526b25e5c3
|
github.com/navidrome/navidrome/plugins/pdk/go v0.0.0-20260320221607-03844a9a369a
|
||||||
github.com/onsi/ginkgo/v2 v2.28.1
|
github.com/onsi/ginkgo/v2 v2.28.1
|
||||||
github.com/onsi/gomega v1.39.1
|
github.com/onsi/gomega v1.39.1
|
||||||
github.com/stretchr/testify v1.11.1
|
github.com/stretchr/testify v1.11.1
|
||||||
@@ -12,22 +12,24 @@ require (
|
|||||||
require (
|
require (
|
||||||
github.com/Masterminds/semver/v3 v3.4.0 // indirect
|
github.com/Masterminds/semver/v3 v3.4.0 // indirect
|
||||||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
|
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
|
||||||
github.com/extism/go-pdk v1.1.3 // indirect
|
github.com/extism/go-pdk v1.1.4-0.20260122165646-35abd9e2ba55 // indirect
|
||||||
github.com/go-logr/logr v1.4.3 // indirect
|
github.com/go-logr/logr v1.4.3 // indirect
|
||||||
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
|
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
|
||||||
|
github.com/goccy/go-yaml v1.19.2 // indirect
|
||||||
github.com/google/go-cmp v0.7.0 // indirect
|
github.com/google/go-cmp v0.7.0 // indirect
|
||||||
github.com/google/pprof v0.0.0-20260202012954-cb029daf43ef // indirect
|
github.com/google/pprof v0.0.0-20260302011040-a15ffb7f9dcc // indirect
|
||||||
github.com/maruel/natural v1.3.0 // indirect
|
github.com/maruel/natural v1.3.0 // indirect
|
||||||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
|
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
|
||||||
github.com/rogpeppe/go-internal v1.14.1 // indirect
|
github.com/rogpeppe/go-internal v1.14.1 // indirect
|
||||||
github.com/stretchr/objx v0.5.2 // indirect
|
github.com/stretchr/objx v0.5.3 // indirect
|
||||||
go.yaml.in/yaml/v3 v3.0.4 // indirect
|
go.yaml.in/yaml/v3 v3.0.4 // indirect
|
||||||
golang.org/x/mod v0.32.0 // indirect
|
golang.org/x/mod v0.33.0 // indirect
|
||||||
golang.org/x/net v0.49.0 // indirect
|
golang.org/x/net v0.51.0 // indirect
|
||||||
golang.org/x/sync v0.19.0 // indirect
|
golang.org/x/sync v0.19.0 // indirect
|
||||||
golang.org/x/sys v0.40.0 // indirect
|
golang.org/x/sys v0.41.0 // indirect
|
||||||
golang.org/x/text v0.33.0 // indirect
|
golang.org/x/text v0.34.0 // indirect
|
||||||
golang.org/x/tools v0.41.0 // indirect
|
golang.org/x/tools v0.42.0 // indirect
|
||||||
google.golang.org/protobuf v1.36.11 // indirect
|
google.golang.org/protobuf v1.36.11 // indirect
|
||||||
|
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -2,8 +2,8 @@ github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1
|
|||||||
github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
|
github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
|
||||||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
|
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
|
||||||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/extism/go-pdk v1.1.3 h1:hfViMPWrqjN6u67cIYRALZTZLk/enSPpNKa+rZ9X2SQ=
|
github.com/extism/go-pdk v1.1.4-0.20260122165646-35abd9e2ba55 h1:FMGmUdqiLsBCWNzm9crXk3d6TZ+ME9M+eLgPuYncxeY=
|
||||||
github.com/extism/go-pdk v1.1.3/go.mod h1:Gz+LIU/YCKnKXhgge8yo5Yu1F/lbv7KtKFkiCSzW/P4=
|
github.com/extism/go-pdk v1.1.4-0.20260122165646-35abd9e2ba55/go.mod h1:Gz+LIU/YCKnKXhgge8yo5Yu1F/lbv7KtKFkiCSzW/P4=
|
||||||
github.com/gkampitakis/ciinfo v0.3.2 h1:JcuOPk8ZU7nZQjdUhctuhQofk7BGHuIy0c9Ez8BNhXs=
|
github.com/gkampitakis/ciinfo v0.3.2 h1:JcuOPk8ZU7nZQjdUhctuhQofk7BGHuIy0c9Ez8BNhXs=
|
||||||
github.com/gkampitakis/ciinfo v0.3.2/go.mod h1:1NIwaOcFChN4fa/B0hEBdAb6npDlFL8Bwx4dfRLRqAo=
|
github.com/gkampitakis/ciinfo v0.3.2/go.mod h1:1NIwaOcFChN4fa/B0hEBdAb6npDlFL8Bwx4dfRLRqAo=
|
||||||
github.com/gkampitakis/go-diff v1.3.2 h1:Qyn0J9XJSDTgnsgHRdz9Zp24RaJeKMUHg2+PDZZdC4M=
|
github.com/gkampitakis/go-diff v1.3.2 h1:Qyn0J9XJSDTgnsgHRdz9Zp24RaJeKMUHg2+PDZZdC4M=
|
||||||
@@ -14,24 +14,27 @@ github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
|
|||||||
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
|
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
|
||||||
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
|
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
|
||||||
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
|
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
|
||||||
github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
|
github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM=
|
||||||
github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
|
github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
|
||||||
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
|
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
|
||||||
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
|
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
|
||||||
github.com/google/pprof v0.0.0-20260202012954-cb029daf43ef h1:xpF9fUHpoIrrjX24DURVKiwHcFpw19ndIs+FwTSMbno=
|
github.com/google/pprof v0.0.0-20260302011040-a15ffb7f9dcc h1:VBbFa1lDYWEeV5FZKUiYKYT0VxCp9twUmmaq9eb8sXw=
|
||||||
github.com/google/pprof v0.0.0-20260202012954-cb029daf43ef/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI=
|
github.com/google/pprof v0.0.0-20260302011040-a15ffb7f9dcc/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI=
|
||||||
github.com/joshdk/go-junit v1.0.0 h1:S86cUKIdwBHWwA6xCmFlf3RTLfVXYQfvanM5Uh+K6GE=
|
github.com/joshdk/go-junit v1.0.0 h1:S86cUKIdwBHWwA6xCmFlf3RTLfVXYQfvanM5Uh+K6GE=
|
||||||
github.com/joshdk/go-junit v1.0.0/go.mod h1:TiiV0PqkaNfFXjEiyjWM3XXrhVyCa1K4Zfga6W52ung=
|
github.com/joshdk/go-junit v1.0.0/go.mod h1:TiiV0PqkaNfFXjEiyjWM3XXrhVyCa1K4Zfga6W52ung=
|
||||||
|
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
|
||||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
||||||
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
||||||
|
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||||
|
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
||||||
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
||||||
github.com/maruel/natural v1.3.0 h1:VsmCsBmEyrR46RomtgHs5hbKADGRVtliHTyCOLFBpsg=
|
github.com/maruel/natural v1.3.0 h1:VsmCsBmEyrR46RomtgHs5hbKADGRVtliHTyCOLFBpsg=
|
||||||
github.com/maruel/natural v1.3.0/go.mod h1:v+Rfd79xlw1AgVBjbO0BEQmptqb5HvL/k9GRHB7ZKEg=
|
github.com/maruel/natural v1.3.0/go.mod h1:v+Rfd79xlw1AgVBjbO0BEQmptqb5HvL/k9GRHB7ZKEg=
|
||||||
github.com/mfridman/tparse v0.18.0 h1:wh6dzOKaIwkUGyKgOntDW4liXSo37qg5AXbIhkMV3vE=
|
github.com/mfridman/tparse v0.18.0 h1:wh6dzOKaIwkUGyKgOntDW4liXSo37qg5AXbIhkMV3vE=
|
||||||
github.com/mfridman/tparse v0.18.0/go.mod h1:gEvqZTuCgEhPbYk/2lS3Kcxg1GmTxxU7kTC8DvP0i/A=
|
github.com/mfridman/tparse v0.18.0/go.mod h1:gEvqZTuCgEhPbYk/2lS3Kcxg1GmTxxU7kTC8DvP0i/A=
|
||||||
github.com/navidrome/navidrome/plugins/pdk/go v0.0.0-20260202223454-15526b25e5c3 h1:Lnnc4Qf8/QcyeoW9zslgrGz/4IvoyZ8NCoI0WcDzEmY=
|
github.com/navidrome/navidrome/plugins/pdk/go v0.0.0-20260320221607-03844a9a369a h1:EHllNfhSpL6F3EqM4M0GDHQZb7DyClw0y7afddd8XPg=
|
||||||
github.com/navidrome/navidrome/plugins/pdk/go v0.0.0-20260202223454-15526b25e5c3/go.mod h1:5aedoevIXlwUFuR7kbd/WkjaiLg87D3XUFRGIwDBroo=
|
github.com/navidrome/navidrome/plugins/pdk/go v0.0.0-20260320221607-03844a9a369a/go.mod h1:5aedoevIXlwUFuR7kbd/WkjaiLg87D3XUFRGIwDBroo=
|
||||||
github.com/onsi/ginkgo/v2 v2.28.1 h1:S4hj+HbZp40fNKuLUQOYLDgZLwNUVn19N3Atb98NCyI=
|
github.com/onsi/ginkgo/v2 v2.28.1 h1:S4hj+HbZp40fNKuLUQOYLDgZLwNUVn19N3Atb98NCyI=
|
||||||
github.com/onsi/ginkgo/v2 v2.28.1/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE=
|
github.com/onsi/ginkgo/v2 v2.28.1/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE=
|
||||||
github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28=
|
github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28=
|
||||||
@@ -40,8 +43,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
|
|||||||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
|
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
|
||||||
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
|
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
|
||||||
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
|
github.com/stretchr/objx v0.5.3 h1:jmXUvGomnU1o3W/V5h2VEradbpJDwGrzugQQvL0POH4=
|
||||||
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
|
github.com/stretchr/objx v0.5.3/go.mod h1:rDQraq+vQZU7Fde9LOZLr8Tax6zZvy4kuNKF+QYS+U0=
|
||||||
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
||||||
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
||||||
github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
|
github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
|
||||||
@@ -54,22 +57,22 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
|
|||||||
github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
|
github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
|
||||||
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
|
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
|
||||||
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
|
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
|
||||||
golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
|
golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
|
||||||
golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
|
golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
|
||||||
golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
|
golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo=
|
||||||
golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
|
golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y=
|
||||||
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
|
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
|
||||||
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
|
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
|
||||||
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
|
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
|
||||||
golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
|
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
|
||||||
golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
|
golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
|
||||||
golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
|
golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
|
||||||
golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
|
golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
|
||||||
golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
|
golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
|
||||||
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
|
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
|
||||||
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
|
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
|
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
||||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
|||||||
@@ -25,8 +25,28 @@ import (
|
|||||||
|
|
||||||
// Configuration keys
|
// Configuration keys
|
||||||
const (
|
const (
|
||||||
clientIDKey = "clientid"
|
clientIDKey = "clientid"
|
||||||
usersKey = "users"
|
usersKey = "users"
|
||||||
|
activityNameKey = "activityname"
|
||||||
|
spotifyLinksKey = "spotifylinks"
|
||||||
|
caaEnabledKey = "caaenabled"
|
||||||
|
uguuEnabledKey = "uguuenabled"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
navidromeWebsiteURL = "https://www.navidrome.org"
|
||||||
|
|
||||||
|
// navidromeLogoURL is the small overlay image shown in the bottom-right of the album art.
|
||||||
|
// The file is stored in the plugins' GitHub repository so Discord can fetch it as an external asset.
|
||||||
|
navidromeLogoURL = "https://raw.githubusercontent.com/navidrome/website/refs/heads/master/assets/icons/logo.webp"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Activity name display options
|
||||||
|
const (
|
||||||
|
activityNameDefault = "Default"
|
||||||
|
activityNameTrack = "Track"
|
||||||
|
activityNameArtist = "Artist"
|
||||||
|
activityNameAlbum = "Album"
|
||||||
)
|
)
|
||||||
|
|
||||||
// userToken represents a user-token mapping from the config
|
// userToken represents a user-token mapping from the config
|
||||||
@@ -91,21 +111,6 @@ func getConfig() (clientID string, users map[string]string, err error) {
|
|||||||
return clientID, users, nil
|
return clientID, users, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// getImageURL retrieves the track artwork URL.
|
|
||||||
func getImageURL(trackID string) string {
|
|
||||||
artworkURL, err := host.ArtworkGetTrackUrl(trackID, 300)
|
|
||||||
if err != nil {
|
|
||||||
pdk.Log(pdk.LogWarn, fmt.Sprintf("Failed to get artwork URL: %v", err))
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
// Don't use localhost URLs
|
|
||||||
if strings.HasPrefix(artworkURL, "http://localhost") {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
return artworkURL
|
|
||||||
}
|
|
||||||
|
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
// Scrobbler Implementation
|
// Scrobbler Implementation
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
@@ -151,20 +156,51 @@ func (p *discordPlugin) NowPlaying(input scrobbler.NowPlayingRequest) error {
|
|||||||
startTime := (now - int64(input.Position)) * 1000
|
startTime := (now - int64(input.Position)) * 1000
|
||||||
endTime := startTime + int64(input.Track.Duration)*1000
|
endTime := startTime + int64(input.Track.Duration)*1000
|
||||||
|
|
||||||
|
// Resolve the activity name based on configuration
|
||||||
|
activityName := "Navidrome"
|
||||||
|
statusDisplayType := statusDisplayDetails
|
||||||
|
activityNameOption, _ := pdk.GetConfig(activityNameKey)
|
||||||
|
switch activityNameOption {
|
||||||
|
case activityNameTrack:
|
||||||
|
activityName = input.Track.Title
|
||||||
|
statusDisplayType = statusDisplayName
|
||||||
|
case activityNameAlbum:
|
||||||
|
activityName = input.Track.Album
|
||||||
|
statusDisplayType = statusDisplayName
|
||||||
|
case activityNameArtist:
|
||||||
|
activityName = input.Track.Artist
|
||||||
|
statusDisplayType = statusDisplayName
|
||||||
|
}
|
||||||
|
|
||||||
|
// Resolve Spotify URLs if enabled
|
||||||
|
var spotifyURL, artistSearchURL string
|
||||||
|
spotifyLinksOption, _ := pdk.GetConfig(spotifyLinksKey)
|
||||||
|
if spotifyLinksOption == "true" {
|
||||||
|
spotifyURL = resolveSpotifyURL(input.Track)
|
||||||
|
artistSearchURL = spotifySearchURL(input.Track.Artist)
|
||||||
|
}
|
||||||
|
|
||||||
// Send activity update
|
// Send activity update
|
||||||
if err := rpc.sendActivity(clientID, input.Username, userToken, activity{
|
if err := rpc.sendActivity(clientID, input.Username, userToken, activity{
|
||||||
Application: clientID,
|
Application: clientID,
|
||||||
Name: "Navidrome",
|
Name: activityName,
|
||||||
Type: 2, // Listening
|
Type: 2, // Listening
|
||||||
Details: input.Track.Title,
|
Details: input.Track.Title,
|
||||||
State: input.Track.Artist,
|
DetailsURL: spotifyURL,
|
||||||
|
State: input.Track.Artist,
|
||||||
|
StateURL: artistSearchURL,
|
||||||
|
StatusDisplayType: statusDisplayType,
|
||||||
Timestamps: activityTimestamps{
|
Timestamps: activityTimestamps{
|
||||||
Start: startTime,
|
Start: startTime,
|
||||||
End: endTime,
|
End: endTime,
|
||||||
},
|
},
|
||||||
Assets: activityAssets{
|
Assets: activityAssets{
|
||||||
LargeImage: getImageURL(input.Track.ID),
|
LargeImage: getImageURL(input.Username, input.Track),
|
||||||
LargeText: input.Track.Album,
|
LargeText: input.Track.Album,
|
||||||
|
LargeURL: spotifyURL,
|
||||||
|
SmallImage: navidromeLogoURL,
|
||||||
|
SmallText: "Navidrome",
|
||||||
|
SmallURL: navidromeWebsiteURL,
|
||||||
},
|
},
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
return fmt.Errorf("%w: failed to send activity: %v", scrobbler.ScrobblerErrorRetryLater, err)
|
return fmt.Errorf("%w: failed to send activity: %v", scrobbler.ScrobblerErrorRetryLater, err)
|
||||||
|
|||||||
+73
-20
@@ -2,8 +2,8 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/navidrome/navidrome/plugins/pdk/go/host"
|
"github.com/navidrome/navidrome/plugins/pdk/go/host"
|
||||||
"github.com/navidrome/navidrome/plugins/pdk/go/pdk"
|
"github.com/navidrome/navidrome/plugins/pdk/go/pdk"
|
||||||
@@ -15,11 +15,6 @@ import (
|
|||||||
. "github.com/onsi/gomega"
|
. "github.com/onsi/gomega"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestDiscordPlugin(t *testing.T) {
|
|
||||||
RegisterFailHandler(Fail)
|
|
||||||
RunSpecs(t, "Discord Plugin Main Suite")
|
|
||||||
}
|
|
||||||
|
|
||||||
var _ = Describe("discordPlugin", func() {
|
var _ = Describe("discordPlugin", func() {
|
||||||
var plugin discordPlugin
|
var plugin discordPlugin
|
||||||
|
|
||||||
@@ -36,6 +31,10 @@ var _ = Describe("discordPlugin", func() {
|
|||||||
host.SchedulerMock.Calls = nil
|
host.SchedulerMock.Calls = nil
|
||||||
host.ArtworkMock.ExpectedCalls = nil
|
host.ArtworkMock.ExpectedCalls = nil
|
||||||
host.ArtworkMock.Calls = nil
|
host.ArtworkMock.Calls = nil
|
||||||
|
host.SubsonicAPIMock.ExpectedCalls = nil
|
||||||
|
host.SubsonicAPIMock.Calls = nil
|
||||||
|
host.HTTPMock.ExpectedCalls = nil
|
||||||
|
host.HTTPMock.Calls = nil
|
||||||
})
|
})
|
||||||
|
|
||||||
Describe("getConfig", func() {
|
Describe("getConfig", func() {
|
||||||
@@ -122,15 +121,19 @@ var _ = Describe("discordPlugin", func() {
|
|||||||
It("successfully sends now playing update", func() {
|
It("successfully sends now playing update", func() {
|
||||||
pdk.PDKMock.On("GetConfig", clientIDKey).Return("test-client-id", true)
|
pdk.PDKMock.On("GetConfig", clientIDKey).Return("test-client-id", true)
|
||||||
pdk.PDKMock.On("GetConfig", usersKey).Return(`[{"username":"testuser","token":"test-token"}]`, true)
|
pdk.PDKMock.On("GetConfig", usersKey).Return(`[{"username":"testuser","token":"test-token"}]`, true)
|
||||||
|
pdk.PDKMock.On("GetConfig", uguuEnabledKey).Return("", false)
|
||||||
|
pdk.PDKMock.On("GetConfig", caaEnabledKey).Return("", false)
|
||||||
|
pdk.PDKMock.On("GetConfig", activityNameKey).Return("", false)
|
||||||
|
pdk.PDKMock.On("GetConfig", spotifyLinksKey).Return("", false)
|
||||||
|
|
||||||
// Connect mocks (isConnected check via heartbeat)
|
// Connect mocks (isConnected check via heartbeat)
|
||||||
host.CacheMock.On("GetInt", "discord.seq.testuser").Return(int64(0), false, errors.New("not found"))
|
host.CacheMock.On("GetInt", "discord.seq.testuser").Return(int64(0), false, errors.New("not found"))
|
||||||
|
|
||||||
// Mock HTTP GET request for gateway discovery
|
// Mock HTTP GET request for gateway discovery
|
||||||
gatewayResp := []byte(`{"url":"wss://gateway.discord.gg"}`)
|
gatewayResp := []byte(`{"url":"wss://gateway.discord.gg"}`)
|
||||||
gatewayReq := &pdk.HTTPRequest{}
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
pdk.PDKMock.On("NewHTTPRequest", pdk.MethodGet, "https://discord.com/api/gateway").Return(gatewayReq).Once()
|
return req.Method == "GET" && req.URL == "https://discord.com/api/gateway"
|
||||||
pdk.PDKMock.On("Send", gatewayReq).Return(pdk.NewStubHTTPResponse(200, nil, gatewayResp)).Once()
|
})).Return(&host.HTTPResponse{StatusCode: 200, Body: gatewayResp}, nil)
|
||||||
|
|
||||||
// Mock WebSocket connection
|
// Mock WebSocket connection
|
||||||
host.WebSocketMock.On("Connect", mock.MatchedBy(func(url string) bool {
|
host.WebSocketMock.On("Connect", mock.MatchedBy(func(url string) bool {
|
||||||
@@ -142,19 +145,13 @@ var _ = Describe("discordPlugin", func() {
|
|||||||
// Cancel existing clear schedule (may or may not exist)
|
// Cancel existing clear schedule (may or may not exist)
|
||||||
host.SchedulerMock.On("CancelSchedule", "testuser-clear").Return(nil)
|
host.SchedulerMock.On("CancelSchedule", "testuser-clear").Return(nil)
|
||||||
|
|
||||||
// Image mocks - cache miss, will make HTTP request to Discord
|
// Cache mocks (Discord image processing)
|
||||||
host.CacheMock.On("GetString", mock.MatchedBy(func(key string) bool {
|
host.CacheMock.On("GetString", discordImageKey).Return("", false, nil)
|
||||||
return strings.HasPrefix(key, "discord.image.")
|
host.CacheMock.On("SetString", discordImageKey, mock.Anything, mock.Anything).Return(nil)
|
||||||
})).Return("", false, nil)
|
|
||||||
host.CacheMock.On("SetString", mock.Anything, mock.Anything, mock.Anything).Return(nil)
|
|
||||||
host.ArtworkMock.On("GetTrackUrl", "track1", int32(300)).Return("https://example.com/art.jpg", nil)
|
host.ArtworkMock.On("GetTrackUrl", "track1", int32(300)).Return("https://example.com/art.jpg", nil)
|
||||||
|
|
||||||
// Mock HTTP request for Discord external assets API
|
// Mock HTTP POST requests (Discord external assets API)
|
||||||
assetsReq := &pdk.HTTPRequest{}
|
host.HTTPMock.On("Send", externalAssetsReq).Return(&host.HTTPResponse{StatusCode: 200, Body: []byte(`{}`)}, nil)
|
||||||
pdk.PDKMock.On("NewHTTPRequest", pdk.MethodPost, mock.MatchedBy(func(url string) bool {
|
|
||||||
return strings.Contains(url, "external-assets")
|
|
||||||
})).Return(assetsReq)
|
|
||||||
pdk.PDKMock.On("Send", assetsReq).Return(pdk.NewStubHTTPResponse(200, nil, []byte(`{"key":"test-key"}`)))
|
|
||||||
|
|
||||||
// Schedule clear activity callback
|
// Schedule clear activity callback
|
||||||
host.SchedulerMock.On("ScheduleOneTime", mock.Anything, payloadClearActivity, "testuser-clear").Return("testuser-clear", nil)
|
host.SchedulerMock.On("ScheduleOneTime", mock.Anything, payloadClearActivity, "testuser-clear").Return("testuser-clear", nil)
|
||||||
@@ -172,6 +169,62 @@ var _ = Describe("discordPlugin", func() {
|
|||||||
})
|
})
|
||||||
Expect(err).ToNot(HaveOccurred())
|
Expect(err).ToNot(HaveOccurred())
|
||||||
})
|
})
|
||||||
|
|
||||||
|
DescribeTable("activity name configuration",
|
||||||
|
func(configValue string, configExists bool, expectedName string, expectedDisplayType int) {
|
||||||
|
pdk.PDKMock.On("GetConfig", clientIDKey).Return("test-client-id", true)
|
||||||
|
pdk.PDKMock.On("GetConfig", usersKey).Return(`[{"username":"testuser","token":"test-token"}]`, true)
|
||||||
|
pdk.PDKMock.On("GetConfig", uguuEnabledKey).Return("", false)
|
||||||
|
pdk.PDKMock.On("GetConfig", caaEnabledKey).Return("", false)
|
||||||
|
pdk.PDKMock.On("GetConfig", activityNameKey).Return(configValue, configExists)
|
||||||
|
pdk.PDKMock.On("GetConfig", spotifyLinksKey).Return("", false)
|
||||||
|
|
||||||
|
// Connect mocks
|
||||||
|
host.CacheMock.On("GetInt", "discord.seq.testuser").Return(int64(0), false, errors.New("not found"))
|
||||||
|
gatewayResp := []byte(`{"url":"wss://gateway.discord.gg"}`)
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.Method == "GET" && req.URL == "https://discord.com/api/gateway"
|
||||||
|
})).Return(&host.HTTPResponse{StatusCode: 200, Body: gatewayResp}, nil)
|
||||||
|
host.WebSocketMock.On("Connect", mock.MatchedBy(func(url string) bool {
|
||||||
|
return strings.Contains(url, "gateway.discord.gg")
|
||||||
|
}), mock.Anything, "testuser").Return("testuser", nil)
|
||||||
|
|
||||||
|
// Capture the activity payload sent to Discord
|
||||||
|
var sentPayload string
|
||||||
|
host.WebSocketMock.On("SendText", "testuser", mock.Anything).Run(func(args mock.Arguments) {
|
||||||
|
sentPayload = args.Get(1).(string)
|
||||||
|
}).Return(nil)
|
||||||
|
host.SchedulerMock.On("ScheduleRecurring", mock.Anything, payloadHeartbeat, "testuser").Return("testuser", nil)
|
||||||
|
host.SchedulerMock.On("CancelSchedule", "testuser-clear").Return(nil)
|
||||||
|
|
||||||
|
// Cache mocks (Discord image processing)
|
||||||
|
host.CacheMock.On("GetString", discordImageKey).Return("", false, nil)
|
||||||
|
host.CacheMock.On("SetString", discordImageKey, mock.Anything, mock.Anything).Return(nil)
|
||||||
|
host.ArtworkMock.On("GetTrackUrl", "track1", int32(300)).Return("https://example.com/art.jpg", nil)
|
||||||
|
host.HTTPMock.On("Send", externalAssetsReq).Return(&host.HTTPResponse{StatusCode: 200, Body: []byte(`{}`)}, nil)
|
||||||
|
host.SchedulerMock.On("ScheduleOneTime", mock.Anything, payloadClearActivity, "testuser-clear").Return("testuser-clear", nil)
|
||||||
|
|
||||||
|
err := plugin.NowPlaying(scrobbler.NowPlayingRequest{
|
||||||
|
Username: "testuser",
|
||||||
|
Position: 10,
|
||||||
|
Track: scrobbler.TrackInfo{
|
||||||
|
ID: "track1",
|
||||||
|
Title: "Test Song",
|
||||||
|
Artist: "Test Artist",
|
||||||
|
Album: "Test Album",
|
||||||
|
Duration: 180,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
Expect(err).ToNot(HaveOccurred())
|
||||||
|
Expect(sentPayload).To(ContainSubstring(fmt.Sprintf(`"name":"%s"`, expectedName)))
|
||||||
|
Expect(sentPayload).To(ContainSubstring(fmt.Sprintf(`"status_display_type":%d`, expectedDisplayType)))
|
||||||
|
},
|
||||||
|
Entry("defaults to Navidrome when not configured", "", false, "Navidrome", 2),
|
||||||
|
Entry("defaults to Navidrome with explicit default value", "Default", true, "Navidrome", 2),
|
||||||
|
Entry("uses track title when configured", "Track", true, "Test Song", 0),
|
||||||
|
Entry("uses track album when configured", "Album", true, "Test Album", 0),
|
||||||
|
Entry("uses track artist when configured", "Artist", true, "Test Artist", 0),
|
||||||
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
Describe("Scrobble", func() {
|
Describe("Scrobble", func() {
|
||||||
|
|||||||
+71
-6
@@ -1,7 +1,8 @@
|
|||||||
{
|
{
|
||||||
|
"$schema": "https://raw.githubusercontent.com/navidrome/navidrome/refs/heads/master/plugins/manifest-schema.json",
|
||||||
"name": "Discord Rich Presence",
|
"name": "Discord Rich Presence",
|
||||||
"author": "Navidrome Team",
|
"author": "Navidrome Team",
|
||||||
"version": "0.1.0",
|
"version": "1.0.0-beta-1",
|
||||||
"description": "Discord Rich Presence integration for Navidrome",
|
"description": "Discord Rich Presence integration for Navidrome",
|
||||||
"website": "https://github.com/navidrome/discord-rich-presence-plugin",
|
"website": "https://github.com/navidrome/discord-rich-presence-plugin",
|
||||||
"permissions": {
|
"permissions": {
|
||||||
@@ -9,12 +10,19 @@
|
|||||||
"reason": "To process scrobbles on behalf of users"
|
"reason": "To process scrobbles on behalf of users"
|
||||||
},
|
},
|
||||||
"http": {
|
"http": {
|
||||||
"reason": "To communicate with Discord API for gateway discovery and image uploads",
|
"reason": "To communicate with Discord API, image uploads, and ListenBrainz for track resolution",
|
||||||
"requiredHosts": ["discord.com"]
|
"requiredHosts": [
|
||||||
|
"discord.com",
|
||||||
|
"uguu.se",
|
||||||
|
"labs.api.listenbrainz.org",
|
||||||
|
"coverartarchive.org"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"websocket": {
|
"websocket": {
|
||||||
"reason": "To maintain real-time connection with Discord gateway",
|
"reason": "To maintain real-time connection with Discord gateway",
|
||||||
"requiredHosts": ["gateway.discord.gg"]
|
"requiredHosts": [
|
||||||
|
"gateway.discord.gg"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"cache": {
|
"cache": {
|
||||||
"reason": "To store connection state and sequence numbers"
|
"reason": "To store connection state and sequence numbers"
|
||||||
@@ -24,6 +32,9 @@
|
|||||||
},
|
},
|
||||||
"artwork": {
|
"artwork": {
|
||||||
"reason": "To get track artwork URLs for rich presence display"
|
"reason": "To get track artwork URLs for rich presence display"
|
||||||
|
},
|
||||||
|
"subsonicapi": {
|
||||||
|
"reason": "To fetch track artwork data for image hosting upload"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"config": {
|
"config": {
|
||||||
@@ -38,6 +49,35 @@
|
|||||||
"maxLength": 20,
|
"maxLength": 20,
|
||||||
"pattern": "^[0-9]+$"
|
"pattern": "^[0-9]+$"
|
||||||
},
|
},
|
||||||
|
"activityname": {
|
||||||
|
"type": "string",
|
||||||
|
"title": "Activity Name Display",
|
||||||
|
"description": "Choose what to display as the activity name in Discord Rich Presence",
|
||||||
|
"enum": [
|
||||||
|
"Default",
|
||||||
|
"Track",
|
||||||
|
"Album",
|
||||||
|
"Artist"
|
||||||
|
],
|
||||||
|
"default": "Default"
|
||||||
|
},
|
||||||
|
"caaenabled": {
|
||||||
|
"type": "boolean",
|
||||||
|
"title": "Use artwork from Cover Art Archive (for MusicBrainz-tagged music)",
|
||||||
|
"description": "When enabled, attempts to fetch album artwork from the Cover Art Archive using MusicBrainz IDs. Takes priority over other artwork methods.",
|
||||||
|
"default": false
|
||||||
|
},
|
||||||
|
"uguuenabled": {
|
||||||
|
"type": "boolean",
|
||||||
|
"title": "Upload artwork to uguu.se (enable if Navidrome is not publicly accessible)",
|
||||||
|
"default": false
|
||||||
|
},
|
||||||
|
"spotifylinks": {
|
||||||
|
"type": "boolean",
|
||||||
|
"title": "Enable Spotify link-through",
|
||||||
|
"description": "When enabled, clicking the track title or album art in Discord opens the corresponding Spotify page",
|
||||||
|
"default": false
|
||||||
|
},
|
||||||
"users": {
|
"users": {
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"title": "User Tokens",
|
"title": "User Tokens",
|
||||||
@@ -59,11 +99,17 @@
|
|||||||
"minLength": 1
|
"minLength": 1
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": ["username", "token"]
|
"required": [
|
||||||
|
"username",
|
||||||
|
"token"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": ["clientid", "users"]
|
"required": [
|
||||||
|
"clientid",
|
||||||
|
"users"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"uiSchema": {
|
"uiSchema": {
|
||||||
"type": "VerticalLayout",
|
"type": "VerticalLayout",
|
||||||
@@ -72,6 +118,25 @@
|
|||||||
"type": "Control",
|
"type": "Control",
|
||||||
"scope": "#/properties/clientid"
|
"scope": "#/properties/clientid"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"type": "Control",
|
||||||
|
"scope": "#/properties/activityname",
|
||||||
|
"options": {
|
||||||
|
"format": "radio"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "Control",
|
||||||
|
"scope": "#/properties/caaenabled"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "Control",
|
||||||
|
"scope": "#/properties/uguuenabled"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "Control",
|
||||||
|
"scope": "#/properties/spotifylinks"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"type": "Control",
|
"type": "Control",
|
||||||
"scope": "#/properties/users",
|
"scope": "#/properties/users",
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/navidrome/navidrome/plugins/pdk/go/host"
|
||||||
|
. "github.com/onsi/ginkgo/v2"
|
||||||
|
. "github.com/onsi/gomega"
|
||||||
|
"github.com/stretchr/testify/mock"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestDiscordPlugin(t *testing.T) {
|
||||||
|
RegisterFailHandler(Fail)
|
||||||
|
RunSpecs(t, "Discord Plugin Main Suite")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Shared matchers for tighter mock expectations across all test files.
|
||||||
|
var (
|
||||||
|
discordImageKey = mock.MatchedBy(func(key string) bool { return strings.HasPrefix(key, "discord.image.") })
|
||||||
|
externalAssetsReq = mock.MatchedBy(func(req host.HTTPRequest) bool { return strings.Contains(req.URL, "external-assets") })
|
||||||
|
spotifyURLKey = mock.MatchedBy(func(key string) bool { return strings.HasPrefix(key, "spotify.url.") })
|
||||||
|
)
|
||||||
@@ -3,6 +3,11 @@
|
|||||||
// This file handles all Discord gateway communication including WebSocket connections,
|
// This file handles all Discord gateway communication including WebSocket connections,
|
||||||
// presence updates, and heartbeat management. The discordRPC struct implements WebSocket
|
// presence updates, and heartbeat management. The discordRPC struct implements WebSocket
|
||||||
// callback interfaces and encapsulates all Discord communication logic.
|
// callback interfaces and encapsulates all Discord communication logic.
|
||||||
|
//
|
||||||
|
// References:
|
||||||
|
// - Gateway Events (official): https://docs.discord.com/developers/events/gateway-events
|
||||||
|
// - Activity object (community): https://discord-api-types.dev/api/next/discord-api-types-v10/interface/GatewayActivity
|
||||||
|
// - Presence resources (community): https://docs.discord.food/resources/presence
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -15,16 +20,10 @@ import (
|
|||||||
"github.com/navidrome/navidrome/plugins/pdk/go/websocket"
|
"github.com/navidrome/navidrome/plugins/pdk/go/websocket"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Discord WebSocket Gateway constants
|
// Image cache TTL constants
|
||||||
const (
|
const (
|
||||||
heartbeatOpCode = 1 // Heartbeat operation code
|
imageCacheTTL int64 = 4 * 60 * 60 // 4 hours for track artwork
|
||||||
gateOpCode = 2 // Identify operation code
|
defaultImageCacheTTL int64 = 48 * 60 * 60 // 48 hours for default Navidrome logo
|
||||||
presenceOpCode = 3 // Presence update operation code
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
heartbeatInterval = 41 // Heartbeat interval in seconds
|
|
||||||
defaultImage = "https://i.imgur.com/hb3XPzA.png"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Scheduler callback payloads for routing
|
// Scheduler callback payloads for routing
|
||||||
@@ -36,6 +35,99 @@ const (
|
|||||||
// discordRPC handles Discord gateway communication and implements WebSocket callbacks.
|
// discordRPC handles Discord gateway communication and implements WebSocket callbacks.
|
||||||
type discordRPC struct{}
|
type discordRPC struct{}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// Discord types and constants
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
// Discord WebSocket Gateway constants
|
||||||
|
const (
|
||||||
|
heartbeatOpCode = 1 // Heartbeat operation code
|
||||||
|
gateOpCode = 2 // Identify operation code
|
||||||
|
presenceOpCode = 3 // Presence update operation code
|
||||||
|
)
|
||||||
|
|
||||||
|
// Discord status_display_type values control how the activity is shown in the member list.
|
||||||
|
const (
|
||||||
|
statusDisplayName = 0 // Show activity name in member list
|
||||||
|
statusDisplayState = 1 // Show state field in member list
|
||||||
|
statusDisplayDetails = 2 // Show details field in member list
|
||||||
|
)
|
||||||
|
|
||||||
|
const heartbeatInterval = 41 // Heartbeat interval in seconds
|
||||||
|
|
||||||
|
// Discord API field length limits
|
||||||
|
const (
|
||||||
|
maxTextLength = 128 // Max characters for text fields (details, state, name, large_text)
|
||||||
|
maxURLLength = 256 // Max characters for URL fields (details_url, state_url, etc.)
|
||||||
|
)
|
||||||
|
|
||||||
|
// truncateText truncates s to maxTextLength runes, appending "…" if truncated.
|
||||||
|
func truncateText(s string) string {
|
||||||
|
runes := []rune(s)
|
||||||
|
if len(runes) <= maxTextLength {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
return string(runes[:maxTextLength-1]) + "…"
|
||||||
|
}
|
||||||
|
|
||||||
|
// truncateURL returns s unchanged if within maxURLLength, otherwise returns ""
|
||||||
|
// (a truncated URL would be broken, so we omit it entirely).
|
||||||
|
func truncateURL(s string) string {
|
||||||
|
if len(s) <= maxURLLength {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// activity represents a Discord activity sent via Gateway opcode 3.
|
||||||
|
type activity struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
Type int `json:"type"`
|
||||||
|
Details string `json:"details"`
|
||||||
|
DetailsURL string `json:"details_url,omitempty"`
|
||||||
|
State string `json:"state"`
|
||||||
|
StateURL string `json:"state_url,omitempty"`
|
||||||
|
Application string `json:"application_id"`
|
||||||
|
StatusDisplayType int `json:"status_display_type"`
|
||||||
|
Timestamps activityTimestamps `json:"timestamps"`
|
||||||
|
Assets activityAssets `json:"assets"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type activityTimestamps struct {
|
||||||
|
Start int64 `json:"start"`
|
||||||
|
End int64 `json:"end"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type activityAssets struct {
|
||||||
|
LargeImage string `json:"large_image"`
|
||||||
|
LargeText string `json:"large_text"`
|
||||||
|
LargeURL string `json:"large_url,omitempty"`
|
||||||
|
SmallImage string `json:"small_image,omitempty"`
|
||||||
|
SmallText string `json:"small_text,omitempty"`
|
||||||
|
SmallURL string `json:"small_url,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// presencePayload represents a Discord presence update.
|
||||||
|
type presencePayload struct {
|
||||||
|
Activities []activity `json:"activities"`
|
||||||
|
Since int64 `json:"since"`
|
||||||
|
Status string `json:"status"`
|
||||||
|
Afk bool `json:"afk"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// identifyPayload represents a Discord identify payload.
|
||||||
|
type identifyPayload struct {
|
||||||
|
Token string `json:"token"`
|
||||||
|
Intents int `json:"intents"`
|
||||||
|
Properties identifyProperties `json:"properties"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type identifyProperties struct {
|
||||||
|
OS string `json:"os"`
|
||||||
|
Browser string `json:"browser"`
|
||||||
|
Device string `json:"device"`
|
||||||
|
}
|
||||||
|
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
// WebSocket Callback Implementation
|
// WebSocket Callback Implementation
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
@@ -63,59 +155,15 @@ func (r *discordRPC) OnClose(input websocket.OnCloseRequest) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// activity represents a Discord activity.
|
|
||||||
type activity struct {
|
|
||||||
Name string `json:"name"`
|
|
||||||
Type int `json:"type"`
|
|
||||||
Details string `json:"details"`
|
|
||||||
State string `json:"state"`
|
|
||||||
Application string `json:"application_id"`
|
|
||||||
Timestamps activityTimestamps `json:"timestamps"`
|
|
||||||
Assets activityAssets `json:"assets"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type activityTimestamps struct {
|
|
||||||
Start int64 `json:"start"`
|
|
||||||
End int64 `json:"end"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type activityAssets struct {
|
|
||||||
LargeImage string `json:"large_image"`
|
|
||||||
LargeText string `json:"large_text"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// presencePayload represents a Discord presence update.
|
|
||||||
type presencePayload struct {
|
|
||||||
Activities []activity `json:"activities"`
|
|
||||||
Since int64 `json:"since"`
|
|
||||||
Status string `json:"status"`
|
|
||||||
Afk bool `json:"afk"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// identifyPayload represents a Discord identify payload.
|
|
||||||
type identifyPayload struct {
|
|
||||||
Token string `json:"token"`
|
|
||||||
Intents int `json:"intents"`
|
|
||||||
Properties identifyProperties `json:"properties"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type identifyProperties struct {
|
|
||||||
OS string `json:"os"`
|
|
||||||
Browser string `json:"browser"`
|
|
||||||
Device string `json:"device"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
// Image Processing
|
// Image Processing
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
// processImage processes an image URL for Discord, with fallback to default image.
|
// processImage processes an image URL for Discord. Returns the processed image
|
||||||
func (r *discordRPC) processImage(imageURL, clientID, token string, isDefaultImage bool) (string, error) {
|
// string (mp:prefixed) or an error. No fallback logic — the caller handles retries.
|
||||||
|
func (r *discordRPC) processImage(imageURL, clientID, token string, ttl int64) (string, error) {
|
||||||
if imageURL == "" {
|
if imageURL == "" {
|
||||||
if isDefaultImage {
|
return "", fmt.Errorf("image URL is empty")
|
||||||
return "", fmt.Errorf("default image URL is empty")
|
|
||||||
}
|
|
||||||
return r.processImage(defaultImage, clientID, token, true)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if strings.HasPrefix(imageURL, "mp:") {
|
if strings.HasPrefix(imageURL, "mp:") {
|
||||||
@@ -123,7 +171,7 @@ func (r *discordRPC) processImage(imageURL, clientID, token string, isDefaultIma
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check cache first
|
// Check cache first
|
||||||
cacheKey := fmt.Sprintf("discord.image.%x", imageURL)
|
cacheKey := "discord.image." + hashKey(imageURL)
|
||||||
cachedValue, exists, err := host.CacheGetString(cacheKey)
|
cachedValue, exists, err := host.CacheGetString(cacheKey)
|
||||||
if err == nil && exists {
|
if err == nil && exists {
|
||||||
pdk.Log(pdk.LogDebug, fmt.Sprintf("Cache hit for image URL: %s", imageURL))
|
pdk.Log(pdk.LogDebug, fmt.Sprintf("Cache hit for image URL: %s", imageURL))
|
||||||
@@ -132,50 +180,36 @@ func (r *discordRPC) processImage(imageURL, clientID, token string, isDefaultIma
|
|||||||
|
|
||||||
// Process via Discord API
|
// Process via Discord API
|
||||||
body := fmt.Sprintf(`{"urls":[%q]}`, imageURL)
|
body := fmt.Sprintf(`{"urls":[%q]}`, imageURL)
|
||||||
req := pdk.NewHTTPRequest(pdk.MethodPost, fmt.Sprintf("https://discord.com/api/v9/applications/%s/external-assets", clientID))
|
resp, err := host.HTTPSend(host.HTTPRequest{
|
||||||
req.SetHeader("Authorization", token)
|
Method: "POST",
|
||||||
req.SetHeader("Content-Type", "application/json")
|
URL: fmt.Sprintf("https://discord.com/api/v9/applications/%s/external-assets", clientID),
|
||||||
req.SetBody([]byte(body))
|
Headers: map[string]string{"Authorization": token, "Content-Type": "application/json"},
|
||||||
|
Body: []byte(body),
|
||||||
resp := req.Send()
|
})
|
||||||
if resp.Status() >= 400 {
|
if err != nil {
|
||||||
if isDefaultImage {
|
pdk.Log(pdk.LogWarn, fmt.Sprintf("HTTP request failed for image processing: %v", err))
|
||||||
return "", fmt.Errorf("failed to process default image: HTTP %d", resp.Status())
|
return "", fmt.Errorf("failed to process image: %w", err)
|
||||||
}
|
}
|
||||||
return r.processImage(defaultImage, clientID, token, true)
|
if resp.StatusCode >= 400 {
|
||||||
|
return "", fmt.Errorf("failed to process image: HTTP %d", resp.StatusCode)
|
||||||
}
|
}
|
||||||
|
|
||||||
var data []map[string]string
|
var data []map[string]string
|
||||||
if err := json.Unmarshal(resp.Body(), &data); err != nil {
|
if err := json.Unmarshal(resp.Body, &data); err != nil {
|
||||||
if isDefaultImage {
|
return "", fmt.Errorf("failed to unmarshal image response: %w", err)
|
||||||
return "", fmt.Errorf("failed to unmarshal default image response: %w", err)
|
|
||||||
}
|
|
||||||
return r.processImage(defaultImage, clientID, token, true)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(data) == 0 {
|
if len(data) == 0 {
|
||||||
if isDefaultImage {
|
return "", fmt.Errorf("no data returned for image")
|
||||||
return "", fmt.Errorf("no data returned for default image")
|
|
||||||
}
|
|
||||||
return r.processImage(defaultImage, clientID, token, true)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
image := data[0]["external_asset_path"]
|
image := data[0]["external_asset_path"]
|
||||||
if image == "" {
|
if image == "" {
|
||||||
if isDefaultImage {
|
return "", fmt.Errorf("empty external_asset_path for image")
|
||||||
return "", fmt.Errorf("empty external_asset_path for default image")
|
|
||||||
}
|
|
||||||
return r.processImage(defaultImage, clientID, token, true)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
processedImage := fmt.Sprintf("mp:%s", image)
|
processedImage := fmt.Sprintf("mp:%s", image)
|
||||||
|
|
||||||
// Cache the processed image URL
|
|
||||||
var ttl int64 = 4 * 60 * 60 // 4 hours for regular images
|
|
||||||
if isDefaultImage {
|
|
||||||
ttl = 48 * 60 * 60 // 48 hours for default image
|
|
||||||
}
|
|
||||||
|
|
||||||
_ = host.CacheSetString(cacheKey, processedImage, ttl)
|
_ = host.CacheSetString(cacheKey, processedImage, ttl)
|
||||||
pdk.Log(pdk.LogDebug, fmt.Sprintf("Cached processed image URL for %s (TTL: %ds)", imageURL, ttl))
|
pdk.Log(pdk.LogDebug, fmt.Sprintf("Cached processed image URL for %s (TTL: %ds)", imageURL, ttl))
|
||||||
|
|
||||||
@@ -190,14 +224,50 @@ func (r *discordRPC) processImage(imageURL, clientID, token string, isDefaultIma
|
|||||||
func (r *discordRPC) sendActivity(clientID, username, token string, data activity) error {
|
func (r *discordRPC) sendActivity(clientID, username, token string, data activity) error {
|
||||||
pdk.Log(pdk.LogInfo, fmt.Sprintf("Sending activity for user %s: %s - %s", username, data.Details, data.State))
|
pdk.Log(pdk.LogInfo, fmt.Sprintf("Sending activity for user %s: %s - %s", username, data.Details, data.State))
|
||||||
|
|
||||||
processedImage, err := r.processImage(data.Assets.LargeImage, clientID, token, false)
|
// Truncate text fields to Discord's 128-character limit
|
||||||
|
data.Name = truncateText(data.Name)
|
||||||
|
data.Details = truncateText(data.Details)
|
||||||
|
data.State = truncateText(data.State)
|
||||||
|
data.Assets.LargeText = truncateText(data.Assets.LargeText)
|
||||||
|
|
||||||
|
// Omit URLs that exceed Discord's 256-character limit
|
||||||
|
data.DetailsURL = truncateURL(data.DetailsURL)
|
||||||
|
data.StateURL = truncateURL(data.StateURL)
|
||||||
|
data.Assets.LargeURL = truncateURL(data.Assets.LargeURL)
|
||||||
|
data.Assets.SmallURL = truncateURL(data.Assets.SmallURL)
|
||||||
|
|
||||||
|
// Try track artwork first, fall back to Navidrome logo
|
||||||
|
usingDefaultImage := false
|
||||||
|
processedImage, err := r.processImage(data.Assets.LargeImage, clientID, token, imageCacheTTL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
pdk.Log(pdk.LogWarn, fmt.Sprintf("Failed to process image for user %s, continuing without image: %v", username, err))
|
pdk.Log(pdk.LogWarn, fmt.Sprintf("Failed to process track image for user %s: %v, falling back to default", username, err))
|
||||||
data.Assets.LargeImage = ""
|
processedImage, err = r.processImage(navidromeLogoURL, clientID, token, defaultImageCacheTTL)
|
||||||
|
if err != nil {
|
||||||
|
pdk.Log(pdk.LogWarn, fmt.Sprintf("Failed to process default image for user %s: %v, continuing without image", username, err))
|
||||||
|
data.Assets.LargeImage = ""
|
||||||
|
} else {
|
||||||
|
data.Assets.LargeImage = processedImage
|
||||||
|
usingDefaultImage = true
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
data.Assets.LargeImage = processedImage
|
data.Assets.LargeImage = processedImage
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Only show SmallImage (Navidrome logo overlay) when LargeImage is actual track artwork
|
||||||
|
if usingDefaultImage || data.Assets.LargeImage == "" {
|
||||||
|
data.Assets.SmallImage = ""
|
||||||
|
data.Assets.SmallText = ""
|
||||||
|
} else if data.Assets.SmallImage != "" {
|
||||||
|
processedSmall, err := r.processImage(data.Assets.SmallImage, clientID, token, defaultImageCacheTTL)
|
||||||
|
if err != nil {
|
||||||
|
pdk.Log(pdk.LogWarn, fmt.Sprintf("Failed to process small image for user %s: %v", username, err))
|
||||||
|
data.Assets.SmallImage = ""
|
||||||
|
data.Assets.SmallText = ""
|
||||||
|
} else {
|
||||||
|
data.Assets.SmallImage = processedSmall
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
presence := presencePayload{
|
presence := presencePayload{
|
||||||
Activities: []activity{data},
|
Activities: []activity{data},
|
||||||
Status: "dnd",
|
Status: "dnd",
|
||||||
@@ -236,14 +306,20 @@ func (r *discordRPC) sendMessage(username string, opCode int, payload any) error
|
|||||||
|
|
||||||
// getDiscordGateway retrieves the Discord gateway URL.
|
// getDiscordGateway retrieves the Discord gateway URL.
|
||||||
func (r *discordRPC) getDiscordGateway() (string, error) {
|
func (r *discordRPC) getDiscordGateway() (string, error) {
|
||||||
req := pdk.NewHTTPRequest(pdk.MethodGet, "https://discord.com/api/gateway")
|
resp, err := host.HTTPSend(host.HTTPRequest{
|
||||||
resp := req.Send()
|
Method: "GET",
|
||||||
if resp.Status() != 200 {
|
URL: "https://discord.com/api/gateway",
|
||||||
return "", fmt.Errorf("failed to get Discord gateway: HTTP %d", resp.Status())
|
})
|
||||||
|
if err != nil {
|
||||||
|
pdk.Log(pdk.LogWarn, fmt.Sprintf("HTTP request failed for Discord gateway: %v", err))
|
||||||
|
return "", fmt.Errorf("failed to get Discord gateway: %w", err)
|
||||||
|
}
|
||||||
|
if resp.StatusCode != 200 {
|
||||||
|
return "", fmt.Errorf("failed to get Discord gateway: HTTP %d", resp.StatusCode)
|
||||||
}
|
}
|
||||||
|
|
||||||
var result map[string]string
|
var result map[string]string
|
||||||
if err := json.Unmarshal(resp.Body(), &result); err != nil {
|
if err := json.Unmarshal(resp.Body, &result); err != nil {
|
||||||
return "", fmt.Errorf("failed to parse Discord gateway response: %w", err)
|
return "", fmt.Errorf("failed to parse Discord gateway response: %w", err)
|
||||||
}
|
}
|
||||||
return result["url"], nil
|
return result["url"], nil
|
||||||
|
|||||||
+301
-17
@@ -1,6 +1,7 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
@@ -25,6 +26,8 @@ var _ = Describe("discordRPC", func() {
|
|||||||
host.WebSocketMock.Calls = nil
|
host.WebSocketMock.Calls = nil
|
||||||
host.SchedulerMock.ExpectedCalls = nil
|
host.SchedulerMock.ExpectedCalls = nil
|
||||||
host.SchedulerMock.Calls = nil
|
host.SchedulerMock.Calls = nil
|
||||||
|
host.HTTPMock.ExpectedCalls = nil
|
||||||
|
host.HTTPMock.Calls = nil
|
||||||
})
|
})
|
||||||
|
|
||||||
Describe("sendMessage", func() {
|
Describe("sendMessage", func() {
|
||||||
@@ -81,9 +84,9 @@ var _ = Describe("discordRPC", func() {
|
|||||||
|
|
||||||
// Mock HTTP GET request for gateway discovery
|
// Mock HTTP GET request for gateway discovery
|
||||||
gatewayResp := []byte(`{"url":"wss://gateway.discord.gg"}`)
|
gatewayResp := []byte(`{"url":"wss://gateway.discord.gg"}`)
|
||||||
httpReq := &pdk.HTTPRequest{}
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
pdk.PDKMock.On("NewHTTPRequest", pdk.MethodGet, "https://discord.com/api/gateway").Return(httpReq)
|
return req.Method == "GET" && req.URL == "https://discord.com/api/gateway"
|
||||||
pdk.PDKMock.On("Send", mock.Anything).Return(pdk.NewStubHTTPResponse(200, nil, gatewayResp))
|
})).Return(&host.HTTPResponse{StatusCode: 200, Body: gatewayResp}, nil)
|
||||||
|
|
||||||
// Mock WebSocket connection
|
// Mock WebSocket connection
|
||||||
host.WebSocketMock.On("Connect", mock.MatchedBy(func(url string) bool {
|
host.WebSocketMock.On("Connect", mock.MatchedBy(func(url string) bool {
|
||||||
@@ -202,7 +205,7 @@ var _ = Describe("discordRPC", func() {
|
|||||||
pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
|
pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
|
||||||
err := r.OnBinaryMessage(websocket.OnBinaryMessageRequest{
|
err := r.OnBinaryMessage(websocket.OnBinaryMessageRequest{
|
||||||
ConnectionID: "testuser",
|
ConnectionID: "testuser",
|
||||||
Data: "AQID", // base64 encoded [0x01, 0x02, 0x03]
|
Data: []byte("AQID"), // base64 encoded [0x01, 0x02, 0x03]
|
||||||
})
|
})
|
||||||
Expect(err).ToNot(HaveOccurred())
|
Expect(err).ToNot(HaveOccurred())
|
||||||
})
|
})
|
||||||
@@ -232,26 +235,103 @@ var _ = Describe("discordRPC", func() {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
Describe("processImage", func() {
|
||||||
|
BeforeEach(func() {
|
||||||
|
pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns error for empty URL", func() {
|
||||||
|
_, err := r.processImage("", "client123", "token123", imageCacheTTL)
|
||||||
|
Expect(err).To(HaveOccurred())
|
||||||
|
Expect(err.Error()).To(ContainSubstring("image URL is empty"))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns mp: prefixed URL as-is", func() {
|
||||||
|
result, err := r.processImage("mp:external/abc123", "client123", "token123", imageCacheTTL)
|
||||||
|
Expect(err).ToNot(HaveOccurred())
|
||||||
|
Expect(result).To(Equal("mp:external/abc123"))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns cached value on cache hit", func() {
|
||||||
|
host.CacheMock.On("GetString", mock.MatchedBy(func(key string) bool {
|
||||||
|
return strings.HasPrefix(key, "discord.image.")
|
||||||
|
})).Return("mp:cached/image", true, nil)
|
||||||
|
|
||||||
|
result, err := r.processImage("https://example.com/art.jpg", "client123", "token123", imageCacheTTL)
|
||||||
|
Expect(err).ToNot(HaveOccurred())
|
||||||
|
Expect(result).To(Equal("mp:cached/image"))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("processes image via Discord API and caches result", func() {
|
||||||
|
host.CacheMock.On("GetString", discordImageKey).Return("", false, nil)
|
||||||
|
host.CacheMock.On("SetString", discordImageKey, mock.MatchedBy(func(val string) bool {
|
||||||
|
return val == "mp:external/new-asset"
|
||||||
|
}), int64(imageCacheTTL)).Return(nil)
|
||||||
|
|
||||||
|
host.HTTPMock.On("Send", externalAssetsReq).Return(&host.HTTPResponse{StatusCode: 200, Body: []byte(`[{"external_asset_path":"external/new-asset"}]`)}, nil)
|
||||||
|
|
||||||
|
result, err := r.processImage("https://example.com/art.jpg", "client123", "token123", imageCacheTTL)
|
||||||
|
Expect(err).ToNot(HaveOccurred())
|
||||||
|
Expect(result).To(Equal("mp:external/new-asset"))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns error on HTTP failure", func() {
|
||||||
|
host.CacheMock.On("GetString", discordImageKey).Return("", false, nil)
|
||||||
|
|
||||||
|
host.HTTPMock.On("Send", externalAssetsReq).Return(&host.HTTPResponse{StatusCode: 500, Body: []byte(`error`)}, nil)
|
||||||
|
|
||||||
|
_, err := r.processImage("https://example.com/art.jpg", "client123", "token123", imageCacheTTL)
|
||||||
|
Expect(err).To(HaveOccurred())
|
||||||
|
Expect(err.Error()).To(ContainSubstring("HTTP 500"))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns error on unmarshal failure", func() {
|
||||||
|
host.CacheMock.On("GetString", discordImageKey).Return("", false, nil)
|
||||||
|
|
||||||
|
host.HTTPMock.On("Send", externalAssetsReq).Return(&host.HTTPResponse{StatusCode: 200, Body: []byte(`{"not":"an-array"}`)}, nil)
|
||||||
|
|
||||||
|
_, err := r.processImage("https://example.com/art.jpg", "client123", "token123", imageCacheTTL)
|
||||||
|
Expect(err).To(HaveOccurred())
|
||||||
|
Expect(err.Error()).To(ContainSubstring("failed to unmarshal"))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns error on empty response array", func() {
|
||||||
|
host.CacheMock.On("GetString", discordImageKey).Return("", false, nil)
|
||||||
|
|
||||||
|
host.HTTPMock.On("Send", externalAssetsReq).Return(&host.HTTPResponse{StatusCode: 200, Body: []byte(`[]`)}, nil)
|
||||||
|
|
||||||
|
_, err := r.processImage("https://example.com/art.jpg", "client123", "token123", imageCacheTTL)
|
||||||
|
Expect(err).To(HaveOccurred())
|
||||||
|
Expect(err.Error()).To(ContainSubstring("no data returned"))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns error on empty external_asset_path", func() {
|
||||||
|
host.CacheMock.On("GetString", discordImageKey).Return("", false, nil)
|
||||||
|
|
||||||
|
host.HTTPMock.On("Send", externalAssetsReq).Return(&host.HTTPResponse{StatusCode: 200, Body: []byte(`[{"external_asset_path":""}]`)}, nil)
|
||||||
|
|
||||||
|
_, err := r.processImage("https://example.com/art.jpg", "client123", "token123", imageCacheTTL)
|
||||||
|
Expect(err).To(HaveOccurred())
|
||||||
|
Expect(err.Error()).To(ContainSubstring("empty external_asset_path"))
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
Describe("sendActivity", func() {
|
Describe("sendActivity", func() {
|
||||||
BeforeEach(func() {
|
BeforeEach(func() {
|
||||||
pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
|
pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
|
||||||
host.CacheMock.On("GetString", mock.MatchedBy(func(key string) bool {
|
|
||||||
return strings.HasPrefix(key, "discord.image.")
|
|
||||||
})).Return("", false, nil)
|
|
||||||
host.CacheMock.On("SetString", mock.Anything, mock.Anything, mock.Anything).Return(nil)
|
|
||||||
|
|
||||||
// Mock HTTP request for Discord external assets API (image processing)
|
|
||||||
// When processImage is called, it makes an HTTP request
|
|
||||||
httpReq := &pdk.HTTPRequest{}
|
|
||||||
pdk.PDKMock.On("NewHTTPRequest", pdk.MethodPost, mock.Anything).Return(httpReq)
|
|
||||||
pdk.PDKMock.On("Send", mock.Anything).Return(pdk.NewStubHTTPResponse(200, nil, []byte(`{"key":"test-key"}`)))
|
|
||||||
})
|
})
|
||||||
|
|
||||||
It("sends activity update to Discord", func() {
|
It("sends activity with track artwork and SmallImage overlay", func() {
|
||||||
|
host.CacheMock.On("GetString", discordImageKey).Return("", false, nil)
|
||||||
|
host.CacheMock.On("SetString", discordImageKey, mock.Anything, mock.Anything).Return(nil)
|
||||||
|
|
||||||
|
host.HTTPMock.On("Send", externalAssetsReq).Return(&host.HTTPResponse{StatusCode: 200, Body: []byte(`[{"external_asset_path":"external/art"}]`)}, nil)
|
||||||
|
|
||||||
host.WebSocketMock.On("SendText", "testuser", mock.MatchedBy(func(msg string) bool {
|
host.WebSocketMock.On("SendText", "testuser", mock.MatchedBy(func(msg string) bool {
|
||||||
return strings.Contains(msg, `"op":3`) &&
|
return strings.Contains(msg, `"op":3`) &&
|
||||||
strings.Contains(msg, `"name":"Test Song"`) &&
|
strings.Contains(msg, `"large_image":"mp:external/art"`) &&
|
||||||
strings.Contains(msg, `"state":"Test Artist"`)
|
strings.Contains(msg, `"small_image":"mp:external/art"`) &&
|
||||||
|
strings.Contains(msg, `"small_text":"Navidrome"`)
|
||||||
})).Return(nil)
|
})).Return(nil)
|
||||||
|
|
||||||
err := r.sendActivity("client123", "testuser", "token123", activity{
|
err := r.sendActivity("client123", "testuser", "token123", activity{
|
||||||
@@ -260,6 +340,159 @@ var _ = Describe("discordRPC", func() {
|
|||||||
Type: 2,
|
Type: 2,
|
||||||
State: "Test Artist",
|
State: "Test Artist",
|
||||||
Details: "Test Album",
|
Details: "Test Album",
|
||||||
|
Assets: activityAssets{
|
||||||
|
LargeImage: "https://example.com/art.jpg",
|
||||||
|
LargeText: "Test Album",
|
||||||
|
SmallImage: navidromeLogoURL,
|
||||||
|
SmallText: "Navidrome",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
Expect(err).ToNot(HaveOccurred())
|
||||||
|
})
|
||||||
|
|
||||||
|
It("falls back to default image and clears SmallImage", func() {
|
||||||
|
// Track art fails (HTTP error), default image succeeds
|
||||||
|
host.CacheMock.On("GetString", discordImageKey).Return("", false, nil)
|
||||||
|
host.CacheMock.On("SetString", discordImageKey, mock.Anything, mock.Anything).Return(nil)
|
||||||
|
|
||||||
|
// First call (track art) returns 500, second call (default) succeeds
|
||||||
|
host.HTTPMock.On("Send", externalAssetsReq).Return(&host.HTTPResponse{StatusCode: 500, Body: []byte(`error`)}, nil).Once()
|
||||||
|
host.HTTPMock.On("Send", externalAssetsReq).Return(&host.HTTPResponse{StatusCode: 200, Body: []byte(`[{"external_asset_path":"external/logo"}]`)}, nil).Once()
|
||||||
|
|
||||||
|
host.WebSocketMock.On("SendText", "testuser", mock.MatchedBy(func(msg string) bool {
|
||||||
|
return strings.Contains(msg, `"op":3`) &&
|
||||||
|
strings.Contains(msg, `"large_image":"mp:external/logo"`) &&
|
||||||
|
!strings.Contains(msg, `"small_image":"mp:`) &&
|
||||||
|
!strings.Contains(msg, `"small_text":"Navidrome"`)
|
||||||
|
})).Return(nil)
|
||||||
|
|
||||||
|
err := r.sendActivity("client123", "testuser", "token123", activity{
|
||||||
|
Application: "client123",
|
||||||
|
Name: "Test Song",
|
||||||
|
Type: 2,
|
||||||
|
State: "Test Artist",
|
||||||
|
Details: "Test Album",
|
||||||
|
Assets: activityAssets{
|
||||||
|
LargeImage: "https://example.com/art.jpg",
|
||||||
|
LargeText: "Test Album",
|
||||||
|
SmallImage: navidromeLogoURL,
|
||||||
|
SmallText: "Navidrome",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
Expect(err).ToNot(HaveOccurred())
|
||||||
|
})
|
||||||
|
|
||||||
|
It("clears all images when both track art and default fail", func() {
|
||||||
|
host.CacheMock.On("GetString", discordImageKey).Return("", false, nil)
|
||||||
|
|
||||||
|
host.HTTPMock.On("Send", externalAssetsReq).Return(&host.HTTPResponse{StatusCode: 200, Body: []byte(`{"not":"array"}`)}, nil)
|
||||||
|
|
||||||
|
host.WebSocketMock.On("SendText", "testuser", mock.MatchedBy(func(msg string) bool {
|
||||||
|
return strings.Contains(msg, `"op":3`) &&
|
||||||
|
strings.Contains(msg, `"large_image":""`) &&
|
||||||
|
!strings.Contains(msg, `"small_image":"mp:`)
|
||||||
|
})).Return(nil)
|
||||||
|
|
||||||
|
err := r.sendActivity("client123", "testuser", "token123", activity{
|
||||||
|
Application: "client123",
|
||||||
|
Name: "Test Song",
|
||||||
|
Type: 2,
|
||||||
|
State: "Test Artist",
|
||||||
|
Details: "Test Album",
|
||||||
|
Assets: activityAssets{
|
||||||
|
LargeImage: "https://example.com/art.jpg",
|
||||||
|
LargeText: "Test Album",
|
||||||
|
SmallImage: navidromeLogoURL,
|
||||||
|
SmallText: "Navidrome",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
Expect(err).ToNot(HaveOccurred())
|
||||||
|
})
|
||||||
|
|
||||||
|
It("handles SmallImage processing failure gracefully", func() {
|
||||||
|
// LargeImage from cache (succeeds), SmallImage API fails
|
||||||
|
host.CacheMock.On("GetString", discordImageKey).Return("mp:cached/large", true, nil).Once()
|
||||||
|
host.CacheMock.On("GetString", discordImageKey).Return("", false, nil).Once()
|
||||||
|
|
||||||
|
host.HTTPMock.On("Send", externalAssetsReq).Return(&host.HTTPResponse{StatusCode: 500, Body: []byte(`error`)}, nil)
|
||||||
|
|
||||||
|
host.WebSocketMock.On("SendText", "testuser", mock.MatchedBy(func(msg string) bool {
|
||||||
|
return strings.Contains(msg, `"large_image":"mp:cached/large"`) &&
|
||||||
|
!strings.Contains(msg, `"small_image":"mp:`)
|
||||||
|
})).Return(nil)
|
||||||
|
|
||||||
|
err := r.sendActivity("client123", "testuser", "token123", activity{
|
||||||
|
Application: "client123",
|
||||||
|
Name: "Test Song",
|
||||||
|
Type: 2,
|
||||||
|
State: "Test Artist",
|
||||||
|
Details: "Test Album",
|
||||||
|
Assets: activityAssets{
|
||||||
|
LargeImage: "https://example.com/art.jpg",
|
||||||
|
LargeText: "Test Album",
|
||||||
|
SmallImage: navidromeLogoURL,
|
||||||
|
SmallText: "Navidrome",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
Expect(err).ToNot(HaveOccurred())
|
||||||
|
})
|
||||||
|
|
||||||
|
It("truncates long text fields and omits long URLs", func() {
|
||||||
|
host.CacheMock.On("GetString", discordImageKey).Return("mp:cached/art", true, nil).Once()
|
||||||
|
host.CacheMock.On("GetString", discordImageKey).Return("mp:cached/logo", true, nil).Once()
|
||||||
|
|
||||||
|
longName := strings.Repeat("N", 200)
|
||||||
|
longTitle := strings.Repeat("T", 200)
|
||||||
|
longArtist := strings.Repeat("A", 200)
|
||||||
|
longAlbum := strings.Repeat("B", 200)
|
||||||
|
longURL := "https://example.com/" + strings.Repeat("x", 237)
|
||||||
|
|
||||||
|
truncatedName := strings.Repeat("N", 127) + "…"
|
||||||
|
truncatedTitle := strings.Repeat("T", 127) + "…"
|
||||||
|
truncatedArtist := strings.Repeat("A", 127) + "…"
|
||||||
|
truncatedAlbum := strings.Repeat("B", 127) + "…"
|
||||||
|
|
||||||
|
host.WebSocketMock.On("SendText", "testuser", mock.MatchedBy(func(msg string) bool {
|
||||||
|
var message struct {
|
||||||
|
D json.RawMessage `json:"d"`
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal([]byte(msg), &message); err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
var presence presencePayload
|
||||||
|
if err := json.Unmarshal(message.D, &presence); err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if len(presence.Activities) != 1 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
act := presence.Activities[0]
|
||||||
|
return act.Name == truncatedName &&
|
||||||
|
act.Details == truncatedTitle &&
|
||||||
|
act.State == truncatedArtist &&
|
||||||
|
act.Assets.LargeText == truncatedAlbum &&
|
||||||
|
act.DetailsURL == "" &&
|
||||||
|
act.StateURL == "" &&
|
||||||
|
act.Assets.LargeURL == "" &&
|
||||||
|
act.Assets.SmallURL == ""
|
||||||
|
})).Return(nil)
|
||||||
|
|
||||||
|
err := r.sendActivity("client123", "testuser", "token123", activity{
|
||||||
|
Application: "client123",
|
||||||
|
Name: longName,
|
||||||
|
Type: 2,
|
||||||
|
Details: longTitle,
|
||||||
|
DetailsURL: longURL,
|
||||||
|
State: longArtist,
|
||||||
|
StateURL: longURL,
|
||||||
|
Assets: activityAssets{
|
||||||
|
LargeImage: "https://example.com/art.jpg",
|
||||||
|
LargeText: longAlbum,
|
||||||
|
LargeURL: longURL,
|
||||||
|
SmallImage: navidromeLogoURL,
|
||||||
|
SmallText: "Navidrome",
|
||||||
|
SmallURL: longURL,
|
||||||
|
},
|
||||||
})
|
})
|
||||||
Expect(err).ToNot(HaveOccurred())
|
Expect(err).ToNot(HaveOccurred())
|
||||||
})
|
})
|
||||||
@@ -276,4 +509,55 @@ var _ = Describe("discordRPC", func() {
|
|||||||
Expect(err).ToNot(HaveOccurred())
|
Expect(err).ToNot(HaveOccurred())
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
Describe("truncateText", func() {
|
||||||
|
It("returns short strings unchanged", func() {
|
||||||
|
Expect(truncateText("hello")).To(Equal("hello"))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns exactly 128-char strings unchanged", func() {
|
||||||
|
s := strings.Repeat("a", 128)
|
||||||
|
Expect(truncateText(s)).To(Equal(s))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("truncates strings over 128 chars to 127 + ellipsis", func() {
|
||||||
|
s := strings.Repeat("a", 200)
|
||||||
|
result := truncateText(s)
|
||||||
|
Expect([]rune(result)).To(HaveLen(128))
|
||||||
|
Expect(result).To(HaveSuffix("…"))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("handles multi-byte characters correctly", func() {
|
||||||
|
// 130 Japanese characters — each is one rune but 3 bytes
|
||||||
|
s := strings.Repeat("あ", 130)
|
||||||
|
result := truncateText(s)
|
||||||
|
runes := []rune(result)
|
||||||
|
Expect(runes).To(HaveLen(128))
|
||||||
|
Expect(string(runes[127])).To(Equal("…"))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns empty string unchanged", func() {
|
||||||
|
Expect(truncateText("")).To(Equal(""))
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
Describe("truncateURL", func() {
|
||||||
|
It("returns short URLs unchanged", func() {
|
||||||
|
Expect(truncateURL("https://example.com")).To(Equal("https://example.com"))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns exactly 256-char URLs unchanged", func() {
|
||||||
|
u := "https://example.com/" + strings.Repeat("a", 236)
|
||||||
|
Expect(truncateURL(u)).To(Equal(u))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns empty string for URLs over 256 chars", func() {
|
||||||
|
u := "https://example.com/" + strings.Repeat("a", 237)
|
||||||
|
Expect(truncateURL(u)).To(Equal(""))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns empty string unchanged", func() {
|
||||||
|
Expect(truncateURL("")).To(Equal(""))
|
||||||
|
})
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
+180
@@ -0,0 +1,180 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"net/url"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/navidrome/navidrome/plugins/pdk/go/host"
|
||||||
|
"github.com/navidrome/navidrome/plugins/pdk/go/pdk"
|
||||||
|
"github.com/navidrome/navidrome/plugins/pdk/go/scrobbler"
|
||||||
|
)
|
||||||
|
|
||||||
|
// hashKey returns a hex-encoded FNV-1a hash of s, for use as a cache key suffix.
|
||||||
|
func hashKey(s string) string {
|
||||||
|
const offset64 uint64 = 14695981039346656037
|
||||||
|
const prime64 uint64 = 1099511628211
|
||||||
|
h := offset64
|
||||||
|
for i := 0; i < len(s); i++ {
|
||||||
|
h ^= uint64(s[i])
|
||||||
|
h *= prime64
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("%016x", h)
|
||||||
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
spotifyCacheTTLHit int64 = 30 * 24 * 60 * 60 // 30 days for resolved track IDs
|
||||||
|
spotifyCacheTTLMiss int64 = 4 * 60 * 60 // 4 hours for misses (retry later)
|
||||||
|
)
|
||||||
|
|
||||||
|
// listenBrainzResult captures the relevant field from ListenBrainz Labs JSON responses.
|
||||||
|
// The API returns spotify_track_ids as an array of strings.
|
||||||
|
type listenBrainzResult struct {
|
||||||
|
SpotifyTrackIDs []string `json:"spotify_track_ids"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// spotifySearchURL builds a Spotify search URL from one or more terms.
|
||||||
|
// Empty terms are ignored. Returns "" if all terms are empty.
|
||||||
|
func spotifySearchURL(terms ...string) string {
|
||||||
|
query := strings.TrimSpace(strings.Join(terms, " "))
|
||||||
|
if query == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return "https://open.spotify.com/search/" + url.PathEscape(query)
|
||||||
|
}
|
||||||
|
|
||||||
|
// spotifyCacheKey returns a deterministic cache key for a track's Spotify URL.
|
||||||
|
func spotifyCacheKey(artist, title, album string) string {
|
||||||
|
return "spotify.url." + hashKey(strings.ToLower(artist)+"\x00"+strings.ToLower(title)+"\x00"+strings.ToLower(album))
|
||||||
|
}
|
||||||
|
|
||||||
|
// trySpotifyFromMBID calls the ListenBrainz spotify-id-from-mbid endpoint.
|
||||||
|
func trySpotifyFromMBID(mbid string) string {
|
||||||
|
body := fmt.Sprintf(`[{"recording_mbid":%q}]`, mbid)
|
||||||
|
resp, err := host.HTTPSend(host.HTTPRequest{
|
||||||
|
Method: "POST",
|
||||||
|
URL: "https://labs.api.listenbrainz.org/spotify-id-from-mbid/json",
|
||||||
|
Headers: map[string]string{"Content-Type": "application/json"},
|
||||||
|
Body: []byte(body),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
pdk.Log(pdk.LogInfo, fmt.Sprintf("ListenBrainz MBID lookup request failed: %v", err))
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
|
||||||
|
pdk.Log(pdk.LogDebug, fmt.Sprintf("ListenBrainz MBID lookup failed: HTTP %d, body=%s", resp.StatusCode, string(resp.Body)))
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
id := parseSpotifyID(resp.Body)
|
||||||
|
if id == "" {
|
||||||
|
pdk.Log(pdk.LogDebug, fmt.Sprintf("ListenBrainz MBID lookup returned no spotify_track_id for mbid=%s, body=%s", mbid, string(resp.Body)))
|
||||||
|
}
|
||||||
|
return id
|
||||||
|
}
|
||||||
|
|
||||||
|
// trySpotifyFromMetadata calls the ListenBrainz spotify-id-from-metadata endpoint.
|
||||||
|
func trySpotifyFromMetadata(artist, title, album string) string {
|
||||||
|
payload := fmt.Sprintf(`[{"artist_name":%q,"track_name":%q,"release_name":%q}]`, artist, title, album)
|
||||||
|
|
||||||
|
pdk.Log(pdk.LogDebug, fmt.Sprintf("ListenBrainz metadata request: %s", payload))
|
||||||
|
|
||||||
|
resp, err := host.HTTPSend(host.HTTPRequest{
|
||||||
|
Method: "POST",
|
||||||
|
URL: "https://labs.api.listenbrainz.org/spotify-id-from-metadata/json",
|
||||||
|
Headers: map[string]string{"Content-Type": "application/json"},
|
||||||
|
Body: []byte(payload),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
pdk.Log(pdk.LogInfo, fmt.Sprintf("ListenBrainz metadata lookup request failed: %v", err))
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
|
||||||
|
pdk.Log(pdk.LogDebug, fmt.Sprintf("ListenBrainz metadata lookup failed: HTTP %d, body=%s", resp.StatusCode, string(resp.Body)))
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
pdk.Log(pdk.LogDebug, fmt.Sprintf("ListenBrainz metadata response: HTTP %d, body=%s", resp.StatusCode, string(resp.Body)))
|
||||||
|
id := parseSpotifyID(resp.Body)
|
||||||
|
if id == "" {
|
||||||
|
pdk.Log(pdk.LogDebug, fmt.Sprintf("ListenBrainz metadata returned no spotify_track_id for %q - %q", artist, title))
|
||||||
|
}
|
||||||
|
return id
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseSpotifyID extracts the first spotify track ID from a ListenBrainz Labs JSON response.
|
||||||
|
// The response is an array of objects with spotify_track_ids arrays; we take the first non-empty ID.
|
||||||
|
func parseSpotifyID(body []byte) string {
|
||||||
|
var results []listenBrainzResult
|
||||||
|
if err := json.Unmarshal(body, &results); err != nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
for _, r := range results {
|
||||||
|
for _, id := range r.SpotifyTrackIDs {
|
||||||
|
if isValidSpotifyID(id) {
|
||||||
|
return id
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// isValidSpotifyID checks that a Spotify track ID is non-empty and contains only base-62 characters.
|
||||||
|
func isValidSpotifyID(id string) bool {
|
||||||
|
if len(id) == 0 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for i := 0; i < len(id); i++ {
|
||||||
|
c := id[i]
|
||||||
|
if !((c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
// resolveSpotifyURL resolves a direct Spotify track URL via ListenBrainz Labs,
|
||||||
|
// falling back to a search URL. Results are cached.
|
||||||
|
func resolveSpotifyURL(track scrobbler.TrackInfo) string {
|
||||||
|
var primary string
|
||||||
|
if len(track.Artists) > 0 {
|
||||||
|
primary = track.Artists[0].Name
|
||||||
|
}
|
||||||
|
|
||||||
|
cacheKey := spotifyCacheKey(primary, track.Title, track.Album)
|
||||||
|
|
||||||
|
if cached, exists, err := host.CacheGetString(cacheKey); err == nil && exists {
|
||||||
|
pdk.Log(pdk.LogDebug, fmt.Sprintf("Spotify URL cache hit for %q - %q → %s", primary, track.Title, cached))
|
||||||
|
return cached
|
||||||
|
}
|
||||||
|
|
||||||
|
pdk.Log(pdk.LogDebug, fmt.Sprintf("Resolving Spotify URL for: artist=%q title=%q album=%q mbid=%q", primary, track.Title, track.Album, track.MBZRecordingID))
|
||||||
|
|
||||||
|
// 1. Try MBID lookup (most accurate)
|
||||||
|
if track.MBZRecordingID != "" {
|
||||||
|
if trackID := trySpotifyFromMBID(track.MBZRecordingID); trackID != "" {
|
||||||
|
directURL := "https://open.spotify.com/track/" + trackID
|
||||||
|
_ = host.CacheSetString(cacheKey, directURL, spotifyCacheTTLHit)
|
||||||
|
pdk.Log(pdk.LogInfo, fmt.Sprintf("Resolved Spotify via MBID for %q: %s", track.Title, directURL))
|
||||||
|
return directURL
|
||||||
|
}
|
||||||
|
pdk.Log(pdk.LogDebug, "MBID lookup did not return a Spotify ID, trying metadata…")
|
||||||
|
} else {
|
||||||
|
pdk.Log(pdk.LogDebug, "No MBZRecordingID available, skipping MBID lookup")
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Try metadata lookup
|
||||||
|
if primary != "" && track.Title != "" {
|
||||||
|
if trackID := trySpotifyFromMetadata(primary, track.Title, track.Album); trackID != "" {
|
||||||
|
directURL := "https://open.spotify.com/track/" + trackID
|
||||||
|
_ = host.CacheSetString(cacheKey, directURL, spotifyCacheTTLHit)
|
||||||
|
pdk.Log(pdk.LogInfo, fmt.Sprintf("Resolved Spotify via metadata for %q - %q: %s", primary, track.Title, directURL))
|
||||||
|
return directURL
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Fallback to search URL
|
||||||
|
searchURL := spotifySearchURL(track.Artist, track.Title)
|
||||||
|
_ = host.CacheSetString(cacheKey, searchURL, spotifyCacheTTLMiss)
|
||||||
|
pdk.Log(pdk.LogInfo, fmt.Sprintf("Spotify resolution missed, falling back to search URL for %q - %q: %s", primary, track.Title, searchURL))
|
||||||
|
return searchURL
|
||||||
|
}
|
||||||
+219
@@ -0,0 +1,219 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/navidrome/navidrome/plugins/pdk/go/host"
|
||||||
|
"github.com/navidrome/navidrome/plugins/pdk/go/pdk"
|
||||||
|
"github.com/navidrome/navidrome/plugins/pdk/go/scrobbler"
|
||||||
|
"github.com/stretchr/testify/mock"
|
||||||
|
|
||||||
|
. "github.com/onsi/ginkgo/v2"
|
||||||
|
. "github.com/onsi/gomega"
|
||||||
|
)
|
||||||
|
|
||||||
|
var _ = Describe("Spotify", func() {
|
||||||
|
Describe("spotifySearchURL", func() {
|
||||||
|
DescribeTable("constructs Spotify search URL",
|
||||||
|
func(expectedURL string, terms ...string) {
|
||||||
|
Expect(spotifySearchURL(terms...)).To(Equal(expectedURL))
|
||||||
|
},
|
||||||
|
Entry("artist and title", "https://open.spotify.com/search/Rick%20Astley%20Never%20Gonna%20Give%20You%20Up", "Rick Astley", "Never Gonna Give You Up"),
|
||||||
|
Entry("single term", "https://open.spotify.com/search/Radiohead", "Radiohead"),
|
||||||
|
Entry("empty terms", "", "", ""),
|
||||||
|
Entry("one empty term", "https://open.spotify.com/search/Solo%20Artist", "Solo Artist", ""),
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
Describe("spotifyCacheKey", func() {
|
||||||
|
It("produces identical keys for identical inputs", func() {
|
||||||
|
key1 := spotifyCacheKey("Radiohead", "Karma Police", "OK Computer")
|
||||||
|
key2 := spotifyCacheKey("Radiohead", "Karma Police", "OK Computer")
|
||||||
|
Expect(key1).To(Equal(key2))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("produces different keys for different albums", func() {
|
||||||
|
key1 := spotifyCacheKey("Radiohead", "Karma Police", "OK Computer")
|
||||||
|
key2 := spotifyCacheKey("Radiohead", "Karma Police", "The Bends")
|
||||||
|
Expect(key1).ToNot(Equal(key2))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("uses the correct prefix", func() {
|
||||||
|
key := spotifyCacheKey("Radiohead", "Karma Police", "OK Computer")
|
||||||
|
Expect(key).To(HavePrefix("spotify.url."))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("is case-insensitive", func() {
|
||||||
|
keyUpper := spotifyCacheKey("Radiohead", "Karma Police", "OK Computer")
|
||||||
|
keyLower := spotifyCacheKey("radiohead", "karma police", "ok computer")
|
||||||
|
Expect(keyUpper).To(Equal(keyLower))
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
Describe("parseSpotifyID", func() {
|
||||||
|
DescribeTable("extracts first Spotify track ID from ListenBrainz response",
|
||||||
|
func(body, expectedID string) {
|
||||||
|
Expect(parseSpotifyID([]byte(body))).To(Equal(expectedID))
|
||||||
|
},
|
||||||
|
Entry("valid single result",
|
||||||
|
`[{"spotify_track_ids":["4tIGK5G9hNDA50ZdGioZRG"]}]`, "4tIGK5G9hNDA50ZdGioZRG"),
|
||||||
|
Entry("multiple IDs picks first",
|
||||||
|
`[{"artist_name":"Lil Baby & Drake","track_name":"Yes Indeed","spotify_track_ids":["6vN77lE9LK6HP2DewaN6HZ","4wlLbLeDWbA6TzwZFp1UaK"]}]`, "6vN77lE9LK6HP2DewaN6HZ"),
|
||||||
|
Entry("valid result with extra fields",
|
||||||
|
`[{"artist_name":"Radiohead","track_name":"Karma Police","spotify_track_ids":["63OQupATfueTdZMWIV7nzz"],"release_name":"OK Computer"}]`, "63OQupATfueTdZMWIV7nzz"),
|
||||||
|
Entry("empty spotify_track_ids array",
|
||||||
|
`[{"spotify_track_ids":[]}]`, ""),
|
||||||
|
Entry("no spotify_track_ids field",
|
||||||
|
`[{"artist_name":"Unknown"}]`, ""),
|
||||||
|
Entry("empty array",
|
||||||
|
`[]`, ""),
|
||||||
|
Entry("invalid JSON",
|
||||||
|
`not json`, ""),
|
||||||
|
Entry("null first result falls through to second",
|
||||||
|
`[{"spotify_track_ids":[]},{"spotify_track_ids":["6vN77lE9LK6HP2DewaN6HZ"]}]`, "6vN77lE9LK6HP2DewaN6HZ"),
|
||||||
|
Entry("skips invalid ID with special characters",
|
||||||
|
`[{"spotify_track_ids":["abc!@#$%^&*()_+=-12345"]}]`, ""),
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
Describe("isValidSpotifyID", func() {
|
||||||
|
DescribeTable("validates Spotify track IDs",
|
||||||
|
func(id string, expected bool) {
|
||||||
|
Expect(isValidSpotifyID(id)).To(Equal(expected))
|
||||||
|
},
|
||||||
|
Entry("valid 22-char ID", "6vN77lE9LK6HP2DewaN6HZ", true),
|
||||||
|
Entry("another valid ID", "4tIGK5G9hNDA50ZdGioZRG", true),
|
||||||
|
Entry("short valid ID", "abc123", true),
|
||||||
|
Entry("special characters", "6vN77lE9!K6HP2DewaN6HZ", false),
|
||||||
|
Entry("spaces", "6vN77 E9LK6HP2DewaN6HZ", false),
|
||||||
|
Entry("empty string", "", false),
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
Describe("ListenBrainz request payloads", func() {
|
||||||
|
It("builds valid JSON for MBID requests", func() {
|
||||||
|
mbid := "a1b2c3d4-e5f6-7890-abcd-ef1234567890"
|
||||||
|
body := []byte(fmt.Sprintf(`[{"recording_mbid":%q}]`, mbid))
|
||||||
|
var parsed []map[string]string
|
||||||
|
Expect(json.Unmarshal(body, &parsed)).To(Succeed())
|
||||||
|
Expect(parsed[0]["recording_mbid"]).To(Equal(mbid))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("builds valid JSON for metadata requests with special characters", func() {
|
||||||
|
artist := `Guns N' Roses`
|
||||||
|
title := `Sweet Child O' Mine`
|
||||||
|
album := `Appetite for Destruction`
|
||||||
|
payload := fmt.Sprintf(`[{"artist_name":%q,"track_name":%q,"release_name":%q}]`, artist, title, album)
|
||||||
|
var parsed []map[string]string
|
||||||
|
Expect(json.Unmarshal([]byte(payload), &parsed)).To(Succeed())
|
||||||
|
Expect(parsed[0]["artist_name"]).To(Equal(artist))
|
||||||
|
Expect(parsed[0]["track_name"]).To(Equal(title))
|
||||||
|
Expect(parsed[0]["release_name"]).To(Equal(album))
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
Describe("resolveSpotifyURL", func() {
|
||||||
|
BeforeEach(func() {
|
||||||
|
pdk.ResetMock()
|
||||||
|
host.CacheMock.ExpectedCalls = nil
|
||||||
|
host.CacheMock.Calls = nil
|
||||||
|
host.HTTPMock.ExpectedCalls = nil
|
||||||
|
host.HTTPMock.Calls = nil
|
||||||
|
pdk.PDKMock.On("Log", mock.Anything, mock.Anything).Maybe()
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns cached URL on cache hit", func() {
|
||||||
|
host.CacheMock.On("GetString", spotifyURLKey).Return("https://open.spotify.com/track/cached123", true, nil)
|
||||||
|
|
||||||
|
url := resolveSpotifyURL(scrobbler.TrackInfo{
|
||||||
|
Title: "Karma Police",
|
||||||
|
Artist: "Radiohead",
|
||||||
|
Artists: []scrobbler.ArtistRef{{Name: "Radiohead"}},
|
||||||
|
Album: "OK Computer",
|
||||||
|
})
|
||||||
|
Expect(url).To(Equal("https://open.spotify.com/track/cached123"))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("resolves via MBID when available", func() {
|
||||||
|
host.CacheMock.On("GetString", spotifyURLKey).Return("", false, nil)
|
||||||
|
host.CacheMock.On("SetString", spotifyURLKey, mock.Anything, mock.Anything).Return(nil)
|
||||||
|
|
||||||
|
// Mock the MBID HTTP request
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.URL == "https://labs.api.listenbrainz.org/spotify-id-from-mbid/json"
|
||||||
|
})).Return(&host.HTTPResponse{StatusCode: 200, Body: []byte(`[{"spotify_track_ids":["63OQupATfueTdZMWIV7nzz"]}]`)}, nil)
|
||||||
|
|
||||||
|
url := resolveSpotifyURL(scrobbler.TrackInfo{
|
||||||
|
Title: "Karma Police",
|
||||||
|
Artist: "Radiohead",
|
||||||
|
Artists: []scrobbler.ArtistRef{{Name: "Radiohead"}},
|
||||||
|
Album: "OK Computer",
|
||||||
|
MBZRecordingID: "mbid-123",
|
||||||
|
})
|
||||||
|
Expect(url).To(Equal("https://open.spotify.com/track/63OQupATfueTdZMWIV7nzz"))
|
||||||
|
host.CacheMock.AssertCalled(GinkgoT(), "SetString", spotifyURLKey, "https://open.spotify.com/track/63OQupATfueTdZMWIV7nzz", spotifyCacheTTLHit)
|
||||||
|
})
|
||||||
|
|
||||||
|
It("falls back to metadata lookup when MBID fails", func() {
|
||||||
|
host.CacheMock.On("GetString", spotifyURLKey).Return("", false, nil)
|
||||||
|
host.CacheMock.On("SetString", spotifyURLKey, mock.Anything, mock.Anything).Return(nil)
|
||||||
|
|
||||||
|
// MBID request fails
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.URL == "https://labs.api.listenbrainz.org/spotify-id-from-mbid/json"
|
||||||
|
})).Return(&host.HTTPResponse{StatusCode: 404, Body: []byte(`[]`)}, nil)
|
||||||
|
|
||||||
|
// Metadata request succeeds
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.URL == "https://labs.api.listenbrainz.org/spotify-id-from-metadata/json"
|
||||||
|
})).Return(&host.HTTPResponse{StatusCode: 200, Body: []byte(`[{"spotify_track_ids":["4wlLbLeDWbA6TzwZFp1UaK"]}]`)}, nil)
|
||||||
|
|
||||||
|
url := resolveSpotifyURL(scrobbler.TrackInfo{
|
||||||
|
Title: "Karma Police",
|
||||||
|
Artist: "Radiohead",
|
||||||
|
Artists: []scrobbler.ArtistRef{{Name: "Radiohead"}},
|
||||||
|
Album: "OK Computer",
|
||||||
|
MBZRecordingID: "mbid-123",
|
||||||
|
})
|
||||||
|
Expect(url).To(Equal("https://open.spotify.com/track/4wlLbLeDWbA6TzwZFp1UaK"))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("falls back to search URL when both lookups fail", func() {
|
||||||
|
host.CacheMock.On("GetString", spotifyURLKey).Return("", false, nil)
|
||||||
|
host.CacheMock.On("SetString", spotifyURLKey, mock.Anything, mock.Anything).Return(nil)
|
||||||
|
|
||||||
|
// No MBID, metadata request fails
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.URL == "https://labs.api.listenbrainz.org/spotify-id-from-metadata/json"
|
||||||
|
})).Return(&host.HTTPResponse{StatusCode: 500, Body: []byte(`error`)}, nil)
|
||||||
|
|
||||||
|
url := resolveSpotifyURL(scrobbler.TrackInfo{
|
||||||
|
Title: "Karma Police",
|
||||||
|
Artist: "Radiohead",
|
||||||
|
Artists: []scrobbler.ArtistRef{{Name: "Radiohead"}},
|
||||||
|
Album: "OK Computer",
|
||||||
|
})
|
||||||
|
Expect(url).To(HavePrefix("https://open.spotify.com/search/"))
|
||||||
|
Expect(url).To(ContainSubstring("Radiohead"))
|
||||||
|
host.CacheMock.AssertCalled(GinkgoT(), "SetString", spotifyURLKey, mock.Anything, spotifyCacheTTLMiss)
|
||||||
|
})
|
||||||
|
|
||||||
|
It("uses Artists[0] for primary artist", func() {
|
||||||
|
host.CacheMock.On("GetString", spotifyURLKey).Return("", false, nil)
|
||||||
|
host.CacheMock.On("SetString", spotifyURLKey, mock.Anything, mock.Anything).Return(nil)
|
||||||
|
|
||||||
|
host.HTTPMock.On("Send", mock.MatchedBy(func(req host.HTTPRequest) bool {
|
||||||
|
return req.URL == "https://labs.api.listenbrainz.org/spotify-id-from-metadata/json"
|
||||||
|
})).Return(&host.HTTPResponse{StatusCode: 200, Body: []byte(`[{"spotify_track_ids":["4tIGK5G9hNDA50ZdGioZRG"]}]`)}, nil)
|
||||||
|
|
||||||
|
url := resolveSpotifyURL(scrobbler.TrackInfo{
|
||||||
|
Title: "Some Song",
|
||||||
|
Artist: "",
|
||||||
|
Album: "Some Album",
|
||||||
|
Artists: []scrobbler.ArtistRef{{Name: "Fallback Artist"}},
|
||||||
|
})
|
||||||
|
Expect(url).To(Equal("https://open.spotify.com/track/4tIGK5G9hNDA50ZdGioZRG"))
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
Reference in New Issue
Block a user