aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBobby <[email protected]>2024-08-19 00:30:06 -0400
committerGitHub <[email protected]>2024-08-19 00:30:06 -0400
commitb605bf220859acd767533e0ab9436ced771bb8e2 (patch)
tree34d49df5727a98c94f5bab615616b3d117bb5a7f
parentacc66977ab8c0583a22d665db7e74f7b3bf3fcad (diff)
parent1e17b94321744ffbe4a6176a900286a834c952d1 (diff)
downloadmuse-b605bf220859acd767533e0ab9436ced771bb8e2.tar.xz
muse-b605bf220859acd767533e0ab9436ced771bb8e2.zip
Merge branch 'museofficial:master' into master
-rw-r--r--.github/workflows/pr-release.yml108
-rw-r--r--.github/workflows/pr-snapshot.yml101
-rw-r--r--.github/workflows/pr.yml91
-rw-r--r--.github/workflows/publish.yml76
-rw-r--r--.github/workflows/release-comment.yml2
-rw-r--r--CHANGELOG.md19
-rw-r--r--Dockerfile8
-rw-r--r--README.md16
-rw-r--r--RELEASING.md5
-rw-r--r--package.json8
-rw-r--r--src/events/guild-create.ts2
-rw-r--r--yarn.lock28
12 files changed, 316 insertions, 148 deletions
diff --git a/.github/workflows/pr-release.yml b/.github/workflows/pr-release.yml
new file mode 100644
index 0000000..e121edd
--- /dev/null
+++ b/.github/workflows/pr-release.yml
@@ -0,0 +1,108 @@
+name: Release snapshot of PR
+on:
+ workflow_run:
+ workflows: ["Build snapshot of PR"]
+ types:
+ - completed
+
+env:
+ REGISTRY_IMAGE: ghcr.io/museofficial/muse
+
+jobs:
+ release-and-comment:
+ name: Release snapshot and comment in PR
+ runs-on: ubuntu-latest
+ permissions:
+ contents: read
+ packages: write
+ attestations: write
+ id-token: write
+ steps:
+ - name: Login to GitHub Container Registry
+ uses: docker/login-action@v3
+ with:
+ registry: ghcr.io
+ username: ${{ github.repository_owner }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Set up Buildx
+ uses: docker/setup-buildx-action@v1
+
+ - name: Download images
+ uses: actions/download-artifact@v4
+ with:
+ path: /tmp/images
+ pattern: image-linux-*
+ merge-multiple: true
+ run-id: ${{ github.event.workflow_run.id }}
+ github-token: ${{ secrets.GH_PAT }}
+
+ - name: Load image
+ shell: bash
+ run: |
+ docker load -i /tmp/images/image-linux-amd64.tar
+ docker load -i /tmp/images/image-linux-arm64.tar
+
+ - name: Download SHA
+ uses: actions/download-artifact@v4
+ with:
+ path: /tmp/SHA
+ pattern: sha
+ run-id: ${{ github.event.workflow_run.id }}
+ github-token: ${{ secrets.GH_PAT }}
+
+ - name: Read SHA
+ shell: bash
+ run: |
+ echo "SHA=$(cat /tmp/SHA/sha/sha.txt | tr -d '\n')" >> $GITHUB_ENV
+
+ - name: Push images
+ run: |
+ docker push ${{ env.REGISTRY_IMAGE }}:${{ env.SHA }}-linux-amd64
+ docker push ${{ env.REGISTRY_IMAGE }}:${{ env.SHA }}-linux-arm64
+
+ - name: Download Docker metadata
+ uses: actions/download-artifact@v4
+ with:
+ path: /tmp/metadata
+ pattern: metadata
+ run-id: ${{ github.event.workflow_run.id }}
+ github-token: ${{ secrets.GH_PAT }}
+
+ - name: Read the metadata.json file
+ id: metadata_reader
+ uses: juliangruber/[email protected]
+ with:
+ path: /tmp/metadata/metadata/metadata.json
+
+ - name: Download PR number
+ uses: actions/download-artifact@v4
+ with:
+ path: /tmp/pull_request_number
+ pattern: pull_request_number
+ run-id: ${{ github.event.workflow_run.id }}
+ github-token: ${{ secrets.GH_PAT }}
+
+ - name: Read PR number
+ shell: bash
+ run: |
+ echo "PR_NUMBER=$(cat /tmp/pull_request_number/pull_request_number/pull_request_number.txt | tr -d '\n')" >> $GITHUB_ENV
+
+ - name: Create manifest list and push
+ run: |
+ docker buildx imagetools create $(cat /tmp/metadata/metadata/metadata.json | jq -cr '.tags | map("-t " + .) | join(" ")') ${{ env.REGISTRY_IMAGE }}:${{ env.SHA }}-linux-amd64 ${{ env.REGISTRY_IMAGE }}:${{ env.SHA }}-linux-arm64
+
+ - name: Create comment
+ uses: marocchino/sticky-pull-request-comment@v2
+ with:
+ header: "pr-release"
+ number: ${{ env.PR_NUMBER }}
+ GITHUB_TOKEN: ${{ secrets.GH_PAT }}
+ message: |
+ #### :package: :robot: A new release has been made for this pull request.
+
+ To play around with this PR, pull `${{ env.REGISTRY_IMAGE }}:pr-${{ env.PR_NUMBER }}`.
+
+ Images are available for x86_64 and ARM64.
+
+ > Latest commit: ${{ env.SHA }}
diff --git a/.github/workflows/pr-snapshot.yml b/.github/workflows/pr-snapshot.yml
new file mode 100644
index 0000000..88182cb
--- /dev/null
+++ b/.github/workflows/pr-snapshot.yml
@@ -0,0 +1,101 @@
+name: Build snapshot of PR
+
+on: pull_request
+
+env:
+ REGISTRY_IMAGE: ghcr.io/museofficial/muse
+
+jobs:
+ build:
+ name: Build snapshot
+ strategy:
+ matrix:
+ runner-platform:
+ - ubuntu-latest
+ - namespace-profile-default-arm64
+ include:
+ - runner-platform: ubuntu-latest
+ build-arch: linux/amd64
+ - runner-platform: namespace-profile-default-arm64
+ build-arch: linux/arm64
+ runs-on: ${{ matrix.runner-platform }}
+ steps:
+ - name: Prepare
+ run: |
+ platform=${{ matrix.build-arch }}
+ echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+
+ - name: Docker meta
+ id: meta
+ uses: docker/metadata-action@v5
+ with:
+ images: ${{ env.REGISTRY_IMAGE }}
+ tags: type=ref,event=pr
+
+ - name: Set up Buildx
+ uses: docker/setup-buildx-action@v3
+
+ - name: Login to GitHub Container Registry
+ uses: docker/login-action@v3
+ with:
+ registry: ghcr.io
+ username: ${{ github.repository_owner }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Get current time
+ uses: josStorer/get-current-time@v2
+ id: current-time
+
+ - name: Build
+ id: build
+ uses: docker/build-push-action@v6
+ with:
+ outputs: type=docker,dest=/tmp/image-${{ env.PLATFORM_PAIR }}.tar
+ platforms: ${{ matrix.build-arch }}
+ tags: |
+ ${{ env.REGISTRY_IMAGE }}:${{ github.sha }}-${{ env.PLATFORM_PAIR }}
+ build-args: |
+ COMMIT_HASH=${{ github.sha }}
+ BUILD_DATE=${{ steps.current-time.outputs.time }}
+
+ - name: Export Docker meta output
+ shell: bash
+ run: echo $DOCKER_METADATA_OUTPUT_JSON > /tmp/metadata.json
+
+ - name: Upload metadata
+ uses: actions/upload-artifact@v4
+ with:
+ name: metadata
+ path: /tmp/metadata.json
+ overwrite: true
+
+ - name: Export SHA
+ run: |
+ echo "${{ github.sha }}" > /tmp/sha.txt
+
+ - name: Upload SHA
+ uses: actions/upload-artifact@v4
+ with:
+ name: sha
+ path: /tmp/sha.txt
+ overwrite: true
+
+ - name: Upload image
+ uses: actions/upload-artifact@v4
+ with:
+ name: image-${{ env.PLATFORM_PAIR }}
+ path: /tmp/image-${{ env.PLATFORM_PAIR }}.tar
+ if-no-files-found: error
+ retention-days: 1
+
+ - name: Save PR number in artifact
+ shell: bash
+ env:
+ PR_NUMBER: ${{ github.event.number }}
+ run: echo $PR_NUMBER > /tmp/pull_request_number.txt
+ - name: Upload PR number
+ uses: actions/upload-artifact@v4
+ with:
+ name: pull_request_number
+ path: /tmp/pull_request_number.txt
+ overwrite: true
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
deleted file mode 100644
index 7c611ac..0000000
--- a/.github/workflows/pr.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-name: PR Workflow
-
-on: pull_request_target
-
-jobs:
- release-snapshot:
- name: Release snapshot
- strategy:
- matrix:
- runner-platform:
- - ubuntu-latest
- - buildjet-4vcpu-ubuntu-2204-arm
- include:
- - runner-platform: ubuntu-latest
- build-arch: linux/amd64
- tagged-platform: amd64
- - runner-platform: buildjet-4vcpu-ubuntu-2204-arm
- build-arch: linux/arm64
- tagged-platform: arm64
- runs-on: ${{ matrix.runner-platform }}
- steps:
- - name: Set up Buildx
- uses: docker/setup-buildx-action@v1
-
- - name: Cache Docker layers
- # AWS data transfer is pricy
- if: ${{ matrix.runner-platform != 'buildjet-4vcpu-ubuntu-2204-arm' }}
- uses: actions/cache@v2
- with:
- path: /tmp/.buildx-cache
- key: ${{ runner.os }}-buildx-prs-${{ matrix.build-arch }}-${{ github.event.pull_request.head.sha }}
- restore-keys: |
- ${{ runner.os }}-buildx-prs-${{ matrix.build-arch }}
-
- - name: Login to DockerHub
- uses: docker/login-action@v1
- with:
- username: ${{ secrets.DOCKERHUB_USERNAME }}
- password: ${{ secrets.DOCKERHUB_TOKEN }}
-
- - uses: actions/checkout@v2
- with:
- ref: ${{ github.event.pull_request.head.sha }}
-
- - name: Get current time
- uses: josStorer/get-current-time@v2
- id: current-time
-
- - name: Build and push
- id: docker_build
- uses: docker/build-push-action@v2
- with:
- context: .
- push: true
- tags: codetheweb/muse:${{ github.event.pull_request.head.sha }}-${{ matrix.tagged-platform }}
- cache-from: type=local,src=/tmp/.buildx-cache
- cache-to: type=local,dest=/tmp/.buildx-cache,mode=min
- platforms: ${{ matrix.build-arch }}
- build-args: |
- COMMIT_HASH=${{ github.sha }}
- BUILD_DATE=${{ steps.current-time.outputs.time }}
-
- combine-and-comment:
- name: Combine platform tags and leave comment
- runs-on: ubuntu-latest
- needs: release-snapshot
- steps:
- - name: Set up Buildx
- uses: docker/setup-buildx-action@v1
-
- - name: Login to DockerHub
- uses: docker/login-action@v1
- with:
- username: ${{ secrets.DOCKERHUB_USERNAME }}
- password: ${{ secrets.DOCKERHUB_TOKEN }}
-
- - name: Combine tags
- run: docker buildx imagetools create -t 'codetheweb/muse:pr-${{ github.event.number }}' -t 'codetheweb/muse:${{ github.event.pull_request.head.sha }}' 'codetheweb/muse:${{ github.event.pull_request.head.sha }}-arm64' 'codetheweb/muse:${{ github.event.pull_request.head.sha }}-amd64'
-
- - name: Create comment
- uses: marocchino/sticky-pull-request-comment@v2
- with:
- header: "pr-release"
- message: |
- #### :package: A new release has been made for this pull request.
-
- To play around with this PR, pull `codetheweb/muse:pr-${{ github.event.number }}` or `codetheweb/muse:${{ github.event.pull_request.head.sha }}`.
-
- Images are available for x86_64 and ARM64.
-
- > Latest commit: ${{ github.event.pull_request.head.sha }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 08acff9..a279abe 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -5,34 +5,32 @@ on:
tags:
- 'v*'
+env:
+ REGISTRY_IMAGE: ghcr.io/museofficial/muse
+
jobs:
publish:
strategy:
matrix:
runner-platform:
- ubuntu-latest
- - buildjet-4vcpu-ubuntu-2204-arm
+ - namespace-profile-default-arm64
include:
- runner-platform: ubuntu-latest
build-arch: linux/amd64
tagged-platform: amd64
- - runner-platform: buildjet-4vcpu-ubuntu-2204-arm
+ - runner-platform: namespace-profile-default-arm64
build-arch: linux/arm64
tagged-platform: arm64
runs-on: ${{ matrix.runner-platform }}
+ permissions:
+ contents: read
+ packages: write
+ attestations: write
+ id-token: write
steps:
- name: Set up Buildx
- uses: docker/setup-buildx-action@v1
-
- - name: Cache Docker layers
- # AWS data transfer is pricy
- if: ${{ matrix.runner-platform != 'buildjet-4vcpu-ubuntu-2204-arm' }}
- uses: actions/cache@v2
- with:
- path: /tmp/.buildx-cache
- key: ${{ runner.os }}-buildx-prs-${{ matrix.build-arch }}-${{ github.sha }}
- restore-keys: |
- ${{ runner.os }}-buildx-prs-${{ matrix.build-arch }}
+ uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v1
@@ -40,19 +38,26 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
+ - name: Login to GitHub Container Registry
+ uses: docker/login-action@v3
+ with:
+ registry: ghcr.io
+ username: ${{ github.repository_owner }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+
- name: Get current time
uses: josStorer/get-current-time@v2
id: current-time
- name: Build and push
id: docker_build
- uses: docker/build-push-action@v2
+ uses: docker/build-push-action@v6
with:
push: true
- tags: codetheweb/muse:${{ github.sha }}-${{ matrix.tagged-platform }}
+ tags: |
+ codetheweb/muse:${{ github.sha }}-${{ matrix.tagged-platform }}
+ ${{ env.REGISTRY_IMAGE }}:${{ github.sha }}-${{ matrix.tagged-platform }}
platforms: ${{ matrix.build-arch }}
- cache-from: type=local,src=/tmp/.buildx-cache
- cache-to: type=local,dest=/tmp/.buildx-cache,mode=min
build-args: |
COMMIT_HASH=${{ github.sha }}
BUILD_DATE=${{ steps.current-time.outputs.time }}
@@ -61,6 +66,11 @@ jobs:
name: Combine platform tags
runs-on: ubuntu-latest
needs: publish
+ permissions:
+ contents: read
+ packages: write
+ attestations: write
+ id-token: write
steps:
- uses: actions/checkout@v1
@@ -73,21 +83,37 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- - name: Get tags
- id: get-tags
+ - name: Login to GitHub Container Registry
+ uses: docker/login-action@v3
+ with:
+ registry: ghcr.io
+ username: ${{ github.repository_owner }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Get tags (Docker Hub)
+ id: get-tags-dockerhub
uses: Surgo/docker-smart-tag-action@v1
with:
docker_image: codetheweb/muse
- - name: Combine tags
- run: docker buildx imagetools create $(echo '${{ steps.get-tags.outputs.tag }}' | tr "," "\0" | xargs -0 printf -- '-t %s ') 'codetheweb/muse:${{ github.sha }}-arm64' 'codetheweb/muse:${{ github.sha }}-amd64'
+ - name: Get tags (ghcr.io)
+ id: get-tags-ghcr
+ uses: Surgo/docker-smart-tag-action@v1
+ with:
+ docker_image: ${{ env.REGISTRY_IMAGE }}
+
+ - name: Combine tags (Docker Hub)
+ run: docker buildx imagetools create $(echo '${{ steps.get-tags-dockerhub.outputs.tag }}' | tr "," "\0" | xargs -0 printf -- '-t %s ') 'codetheweb/muse:${{ github.sha }}-arm64' 'codetheweb/muse:${{ github.sha }}-amd64'
+
+ - name: Combine tags (GitHub Container Registry)
+ run: docker buildx imagetools create $(echo '${{ steps.get-tags-ghcr.outputs.tag }}' | tr "," "\0" | xargs -0 printf -- '-t %s ') '${{ env.REGISTRY_IMAGE }}:${{ github.sha }}-arm64' '${{ env.REGISTRY_IMAGE }}:${{ github.sha }}-amd64'
- name: Update Docker Hub description
uses: peter-evans/[email protected]
- env:
- DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
- DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
- DOCKERHUB_REPOSITORY: codetheweb/muse
+ with:
+ username: ${{ secrets.DOCKERHUB_USERNAME }}
+ password: ${{ secrets.DOCKERHUB_PASSWORD }}
+ repository: codetheweb/muse
release:
name: Create GitHub release
diff --git a/.github/workflows/release-comment.yml b/.github/workflows/release-comment.yml
index ab042ac..af122e7 100644
--- a/.github/workflows/release-comment.yml
+++ b/.github/workflows/release-comment.yml
@@ -8,6 +8,6 @@ jobs:
steps:
- uses: apexskier/github-release-commenter@v1
with:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ GITHUB_TOKEN: ${{ secrets.GH_PAT }}
comment-template: |
🚀 Released in {release_link}.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 783217a..27c084e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
+## [2.9.3] - 2024-08-19
+
+### Fixed
+
+- bumped @discordjs/voice
+- bumped @distube/ytdl-core
+
+## [2.9.2] - 2024-08-18
+
+### Changed
+
+- Muse has new maintainers! I ([@codetheweb](https://github.com/codetheweb)) am stepping aside as I haven't used Muse myself for a few years and haven't been able to spend as much time on Muse as I'd like. See [this issue](https://github.com/museofficial/muse/issues/1063) for details. Welcome @museofficial/maintainers!
+- This repository has been moved to museofficial/muse.
+- Docker images are now published to `ghcr.io/museofficial/muse`. **Please update your image source if you use Docker**.
+
## [2.9.1] - 2024-08-04
### Fixed
@@ -323,7 +338,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Initial release
-[unreleased]: https://github.com/codetheweb/muse/compare/v2.9.1...HEAD
+[unreleased]: https://github.com/codetheweb/muse/compare/v2.9.3...HEAD
+[2.9.3]: https://github.com/codetheweb/muse/compare/v2.9.2...v2.9.3
+[2.9.2]: https://github.com/codetheweb/muse/compare/v2.9.1...v2.9.2
[2.9.1]: https://github.com/codetheweb/muse/compare/v2.9.0...v2.9.1
[2.9.0]: https://github.com/codetheweb/muse/compare/v2.8.1...v2.9.0
[2.8.1]: https://github.com/codetheweb/muse/compare/v2.8.0...v2.8.1
diff --git a/Dockerfile b/Dockerfile
index 6541a2d..328c7d9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,9 +48,9 @@ COPY . .
ARG COMMIT_HASH=unknown
ARG BUILD_DATE=unknown
-ENV DATA_DIR /data
-ENV NODE_ENV production
-ENV COMMIT_HASH $COMMIT_HASH
-ENV BUILD_DATE $BUILD_DATE
+ENV DATA_DIR=/data
+ENV NODE_ENV=production
+ENV COMMIT_HASH=$COMMIT_HASH
+ENV BUILD_DATE=$BUILD_DATE
CMD ["tini", "--", "node", "--enable-source-maps", "dist/scripts/migrate-and-start.js"]
diff --git a/README.md b/README.md
index 0538183..7fec19f 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,10 @@
<p align="center">
- <img width="250" height="250" src="https://raw.githubusercontent.com/codetheweb/muse/master/.github/logo.png">
+ <img width="250" height="250" src="https://raw.githubusercontent.com/museofficial/muse/master/.github/logo.png">
</p>
-**🔎 I'm currently looking for maintainers.** Check out [this issue](https://github.com/codetheweb/muse/issues/1063) for details.
+> [!WARNING]
+> I ([@codetheweb](https://github.com/codetheweb)) am no longer the primary maintainer of Muse. **If you use the Docker image, update your image source to `ghcr.io/museofficial/muse`.** We are currently publishing new releases to both `ghcr.io/museofficial/muse` and `codetheweb/muse`, but this may change in the future.
+> Thank you to all the people who stepped up to help maintain Muse!
------
@@ -42,7 +44,7 @@ A 64-bit OS is required to run Muse.
The `master` branch acts as the developing / bleeding edge branch and is not guaranteed to be stable.
-When running a production instance, I recommend that you use the [latest release](https://github.com/codetheweb/muse/releases/).
+When running a production instance, I recommend that you use the [latest release](https://github.com/museofficial/muse/releases/).
### 🐳 Docker
@@ -56,7 +58,7 @@ There are a variety of image tags available:
(Replace empty config strings with correct values.)
```bash
-docker run -it -v "$(pwd)/data":/data -e DISCORD_TOKEN='' -e SPOTIFY_CLIENT_ID='' -e SPOTIFY_CLIENT_SECRET='' -e YOUTUBE_API_KEY='' codetheweb/muse:latest
+docker run -it -v "$(pwd)/data":/data -e DISCORD_TOKEN='' -e SPOTIFY_CLIENT_ID='' -e SPOTIFY_CLIENT_SECRET='' -e YOUTUBE_API_KEY='' ghcr.io/museofficial/muse:latest
```
This starts Muse and creates a data directory in your current directory.
@@ -68,7 +70,7 @@ version: '3.4'
services:
muse:
- image: codetheweb/muse:latest
+ image: ghcr.io/museofficial/muse:latest
restart: always
volumes:
- ./muse:/data
@@ -85,13 +87,13 @@ services:
* Node.js (18.17.0 or later is required and latest 18.x.x LTS is recommended)
* ffmpeg (4.1 or later)
-1. `git clone https://github.com/codetheweb/muse.git && cd muse`
+1. `git clone https://github.com/museofficial/muse.git && cd muse`
2. Copy `.env.example` to `.env` and populate with values
3. I recommend checking out a tagged release with `git checkout v[latest release]`
4. `yarn install` (or `npm i`)
5. `yarn start` (or `npm run start`)
-**Note**: if you're on Windows, you may need to manually set the ffmpeg path. See [#345](https://github.com/codetheweb/muse/issues/345) for details.
+**Note**: if you're on Windows, you may need to manually set the ffmpeg path. See [#345](https://github.com/museofficial/muse/issues/345) for details.
## ⚙️ Additional configuration (advanced)
diff --git a/RELEASING.md b/RELEASING.md
new file mode 100644
index 0000000..34d3b81
--- /dev/null
+++ b/RELEASING.md
@@ -0,0 +1,5 @@
+# Releasing
+
+1. Confirm that CHANGELOG.md is updated (any new changes should go under "Unreleased" at the top).
+2. On the master branch, run `yarn release` and follow the prompts.
+3. After a new tag is pushed from the above step, the [publish workflow](./.github/workflows/publish.yml) will automatically build & push Docker images and create a GitHub release for the tag.
diff --git a/package.json b/package.json
index ae5aecf..5cbb1d8 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
{
"name": "muse",
- "version": "2.9.1",
+ "version": "2.9.3",
"description": "🎧 a self-hosted Discord music bot that doesn't suck ",
- "repository": "[email protected]:codetheweb/muse.git",
+ "repository": "[email protected]:museofficial/muse.git",
"author": "Max Isom <[email protected]>",
"license": "MIT",
"private": true,
@@ -88,8 +88,8 @@
"@discordjs/builders": "1.1.0",
"@discordjs/opus": "^0.8.0",
"@discordjs/rest": "1.0.1",
- "@discordjs/voice": "0.11.0",
- "@distube/ytdl-core": "^4.13.7",
+ "@discordjs/voice": "0.17.0",
+ "@distube/ytdl-core": "^4.14.4",
"@distube/ytsr": "^2.0.0",
"@prisma/client": "4.16.0",
"@types/libsodium-wrappers": "^0.7.9",
diff --git a/src/events/guild-create.ts b/src/events/guild-create.ts
index 1d60910..c903009 100644
--- a/src/events/guild-create.ts
+++ b/src/events/guild-create.ts
@@ -40,5 +40,5 @@ export default async (guild: Guild): Promise<void> => {
}
const owner = await guild.fetchOwner();
- await owner.send('👋 Hi! Someone (probably you) just invited me to a server you own. By default, I\'m usable by all guild member in all guild channels. To change this, check out the wiki page on permissions: https://github.com/codetheweb/muse/wiki/Configuring-Bot-Permissions.');
+ await owner.send('👋 Hi! Someone (probably you) just invited me to a server you own. By default, I\'m usable by all guild member in all guild channels. To change this, check out the wiki page on permissions: https://github.com/museofficial/muse/wiki/Configuring-Bot-Permissions.');
};
diff --git a/yarn.lock b/yarn.lock
index 5fa5f69..c965d69 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -126,16 +126,16 @@
resolved "https://registry.npmjs.org/@discordjs/util/-/util-0.3.1.tgz"
integrity sha512-HxXKYKg7vohx2/OupUN/4Sd02Ev3PBJ5q0gtjdcvXb0ErCva8jNHWfe/v5sU3UKjIB/uxOhc+TDOnhqffj9pRA==
-"@discordjs/[email protected]":
- version "0.11.0"
- resolved "https://registry.npmjs.org/@discordjs/voice/-/voice-0.11.0.tgz"
- integrity sha512-6+9cj1dxzBJm7WJ9qyG2XZZQ8rcLl6x2caW0C0OxuTtMLAaEDntpb6lqMTFiBg/rDc4Rd59g1w0gJmib33CuHw==
- dependencies:
- "@types/ws" "^8.5.3"
- discord-api-types "^0.36.2"
- prism-media "^1.3.4"
- tslib "^2.4.0"
- ws "^8.8.1"
+"@discordjs/voice@^0.17.0":
+ version "0.17.0"
+ resolved "https://registry.npmjs.org/@discordjs/voice/-/voice-0.17.0.tgz"
+ integrity sha512-hArn9FF5ZYi1IkxdJEVnJi+OxlwLV0NJYWpKXsmNOojtGtAZHxmsELA+MZlu2KW1F/K1/nt7lFOfcMXNYweq9w==
+ dependencies:
+ "@types/ws" "^8.5.10"
+ discord-api-types "0.37.83"
+ prism-media "^1.3.5"
+ tslib "^2.6.2"
+ ws "^8.16.0"
"@discordjs/ws@^0.8.3":
version "0.8.3"
@@ -152,10 +152,10 @@
tslib "^2.5.0"
ws "^8.13.0"
-"@distube/ytdl-core@^4.13.7":
- version "4.13.7"
- resolved "https://registry.yarnpkg.com/@distube/ytdl-core/-/ytdl-core-4.13.7.tgz#4b48e009eb8df6ea21623c18999a4dd76d893fbf"
- integrity sha512-xpovwZVPwQ0R4Mrwt/fhh1rqmBjiZ5qj30ck5kz+mQJ5XPzW9dUiTDz89qCxO3YvgbCAqaC5BNNnWiFC2uCV5Q==
+"@distube/ytdl-core@^4.14.4":
+ version "4.14.4"
+ resolved "https://registry.npmjs.org/@distube/ytdl-core/-/ytdl-core-4.14.4.tgz"
+ integrity sha512-dHb4GW3qATIjRsS6VIhm3Pop7FdUcDFhsnyQlsPeXW7UhTPuNS0BmraKiTpFbpp0Ky+rxBQjJBfPRFsM+dT1fg==
dependencies:
http-cookie-agent "^6.0.5"
m3u8stream "^0.8.6"