Skip to content

Commit c735be5

Browse files
authored
Merge pull request #1080 from Splamy/task/net10
net10
2 parents cc29328 + e6d045b commit c735be5

131 files changed

Lines changed: 1605 additions & 2057 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/FUNDING.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/dotnet.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Setup .NET
2121
uses: actions/setup-dotnet@v4
2222
with:
23-
dotnet-version: 8.0.x
23+
dotnet-version: 10.0.x
2424

2525
- name: Restore dependencies
2626
run: dotnet restore
@@ -86,13 +86,13 @@ jobs:
8686
- name: Setup .NET
8787
uses: actions/setup-dotnet@v4
8888
with:
89-
dotnet-version: 8.0.x
89+
dotnet-version: 10.0.x
9090

9191
- name: Publish
9292
run: |
9393
dotnet publish TS3AudioBot/TS3AudioBot.csproj \
9494
-c Release \
95-
--framework net8.0 \
95+
--framework net10.0 \
9696
--self-contained \
9797
--runtime ${{ matrix.rid }} \
9898
-p:PublishSingleFile=true,IncludeNativeLibrariesForSelfExtract=true \

LICENSE_COMPLETE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# TS3AudioBot, TS3Client
1+
# TS3AudioBot, TSLib
22

33
Open Software License ("OSL") v 3.0
44

README.md

Lines changed: 35 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,15 @@ This is a open-source TeamSpeak3 bot, playing music and much more.
44

55
- **Got questions?** Check out our [Wiki](https://github.com/Splamy/TS3AudioBot/wiki), [FAQ](https://github.com/Splamy/TS3AudioBot/wiki/FAQ), or ask on our [![Join Gitter Chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/TS3AudioBot/Lobby?utm_source=share-link&utm_medium=link&utm_campaign=share-link)
66
- **Something's broken or it's complicated?** [Open an issue](https://github.com/Splamy/TS3AudioBot/issues/new/choose)
7-
- Please use and fill out one of the templates we provide unless they are not applicable or you have a good reason not to.
8-
This helps us getting through the technical stuff faster
9-
- Please keep issues in english, this makes it easier for everyone to participate and keeps issues relevant to link to.
7+
- Please use and fill out one of the templates we provide unless they are not applicable, or you have a good reason not to.
8+
This helps us to get through the technical stuff faster
9+
- Please keep issues in English, this makes it easier for everyone to participate and keeps issues relevant to link to.
1010
- **Want to support this Project?**
11-
- You can discuss and suggest features. However the [backlog](https://github.com/Splamy/TS3AudioBot/projects/2) is large and feature requests will probably take time
11+
- You can discuss and suggest features. However, the [backlog](https://github.com/Splamy/TS3AudioBot/projects/2) is large and feature requests will probably take time
1212
- You can contribute code. This is always appreciated, please open an issue or contact a maintainer to discuss *before* you start.
13-
- You can support me on [![Patreon][patreon-badge]][patreon-link] or [![Paypal][paypal-badge]][paypal-link]
14-
15-
[patreon-badge]: https://img.shields.io/badge/Patreon-Donate!-F96854.svg?logo=patreon&style=flat-square
16-
[patreon-link]: https://patreon.com/Splamy
17-
18-
[paypal-badge]: https://img.shields.io/badge/Paypal-Donate!-00457C.svg?logo=paypal&style=flat-square
19-
[paypal-link]: https://paypal.me/Splamy
2013

2114
## Features
22-
* Play Youtube and Soundcloud songs as well as stream Twitch (extensible with plugins)
15+
* Play YouTube and Soundcloud songs as well as stream Twitch (extensible with plugins)
2316
* Song history
2417
* Various voice subscription modes; including to clients, channels and whisper groups
2518
* Playlist management for all users
@@ -43,14 +36,14 @@ For an in-depth command tutorial see [here in the wiki](https://github.com/Splam
4336
### Download
4437
Pick and download the build for your platform and liking:
4538

46-
| | Stable | Experimental |
47-
| -- | -- | -- |
48-
| | Versions are mostly considered stable but won't get bigger features as fast. | Will always have the latest and greatest but might not be fully stable or have broken features. |
49-
| Windows_x64 | [![Download](https://img.shields.io/badge/Download-master-green.svg)](https://splamy.de/api/nightly/ts3ab/master_win_x64/download) | [![Download](https://img.shields.io/badge/Download-develop-green.svg)](https://splamy.de/api/nightly/ts3ab/develop_win_x64/download) |
50-
| Linux_x64 | [![Download](https://img.shields.io/badge/Download-master-green.svg)](https://splamy.de/api/nightly/ts3ab/master_linux_x64/download) | [![Download](https://img.shields.io/badge/Download-develop-green.svg)](https://splamy.de/api/nightly/ts3ab/develop_linux_x64/download) |
51-
| Docker | [![Docker](https://img.shields.io/badge/Docker-0.11.0-0db7ed.svg)](https://github.com/getdrunkonmovies-com/TS3AudioBot_docker) (NOTE: This build is community-maintained. It comes with all dependencies as well as youtube-dl preconfigured) | - |
39+
| | Stable | Experimental |
40+
|-------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------|
41+
| | Versions are mostly considered stable but won't get bigger features as fast. | Will always have the latest and greatest but might not be fully stable or have broken features. |
42+
| Windows_x64 | [![Download](https://img.shields.io/badge/Download-master-green.svg)](https://splamy.de/api/nightly/ts3ab/master_win_x64/download) | [![Download](https://img.shields.io/badge/Download-develop-green.svg)](https://splamy.de/api/nightly/ts3ab/develop_win_x64/download) |
43+
| Linux_x64 | [![Download](https://img.shields.io/badge/Download-master-green.svg)](https://splamy.de/api/nightly/ts3ab/master_linux_x64/download) | [![Download](https://img.shields.io/badge/Download-develop-green.svg)](https://splamy.de/api/nightly/ts3ab/develop_linux_x64/download) |
44+
| Docker | [![Docker](https://img.shields.io/badge/Docker-0.11.0-0db7ed.svg)](https://github.com/getdrunkonmovies-com/TS3AudioBot_docker) (NOTE: This build is community-maintained. It comes with all dependencies as well as youtube-dl preconfigured) | - |
5245

53-
(We have more builds like linux arm/arm64 and .NET framework dependent builds available on our [nightly server](https://splamy.de/Nightly#ts3ab))
46+
(We have more builds like linux arm/arm64 and .NET Framework dependent builds available on our [nightly server](https://splamy.de/Nightly#ts3ab))
5447

5548
#### Linux
5649
Install the required dependencies for your distro:
@@ -67,57 +60,57 @@ Run
6760
```
6861
* or **manually**:
6962
1. Make sure you have a C compiler installed
70-
1. Make the Opus script runnable with `chmod u+x InstallOpus.sh` and run it with `./InstallOpus.sh`
71-
1. Get the ffmpeg [32bit](https://johnvansickle.com/ffmpeg/builds/ffmpeg-git-i686-static.tar.xz) or [64bit](https://johnvansickle.com/ffmpeg/builds/ffmpeg-git-amd64-static.tar.xz) binary.
72-
1. Extract the ffmpeg archive with `tar -vxf ffmpeg-git-*XXbit*-static.tar.xz`
73-
1. Get the ffmpeg binary from `ffmpeg-git-*DATE*-amd64-static/ffmpeg` and copy it into your TS3AudioBot folder.
63+
2. Make the Opus script runnable with `chmod u+x InstallOpus.sh` and run it with `./InstallOpus.sh`
64+
3. Get the ffmpeg [32bit](https://johnvansickle.com/ffmpeg/builds/ffmpeg-git-i686-static.tar.xz) or [64bit](https://johnvansickle.com/ffmpeg/builds/ffmpeg-git-amd64-static.tar.xz) binary.
65+
4. Extract the ffmpeg archive with `tar -vxf ffmpeg-git-*XXbit*-static.tar.xz`
66+
5. Get the ffmpeg binary from `ffmpeg-git-*DATE*-amd64-static/ffmpeg` and copy it into your TS3AudioBot folder.
7467

7568
#### Windows
7669
1. Get the ffmpeg [32bit](https://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-latest-win32-static.zip) or [64bit](https://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-latest-win64-static.zip) binary.
77-
1. Open the archive and copy the ffmpeg binary from `ffmpeg-latest-winXX-static/bin/ffmpeg.exe` into your TS3AudioBot folder.
70+
2. Open the archive and copy the ffmpeg binary from `ffmpeg-latest-winXX-static/bin/ffmpeg.exe` into your TS3AudioBot folder.
7871

7972
### Optional Dependencies
8073
If the bot can't play some youtube videos it might be due to some embedding restrictions which are blocking this.
8174
You can install the [youtube-dl](https://github.com/rg3/youtube-dl/) binary or source folder (and specify the path in the config) to try to bypass this.
8275

8376
### First time setup
8477
1. Run the bot with `./TS3AudioBot` (Linux) or `TS3AudioBot.exe` (Windows) and follow the setup instructions.
85-
1. (Optional) Close the bot and configure your `rights.toml` to your desires.
86-
You can use the template rules as suggested in the automatically generated file,
87-
or dive into the rights syntax [here](https://github.com/Splamy/TS3AudioBot/wiki/Rights).
88-
Then start the bot again.
89-
1. (Optional, but highly recommended for everything to work properly).
78+
2. (Optional) Close the bot and configure your `rights.toml` to your desires.
79+
You can use the template rules as suggested in the automatically generated file,
80+
or dive into the rights syntax [here](https://github.com/Splamy/TS3AudioBot/wiki/Rights).
81+
Then start the bot again.
82+
3. (Optional, but highly recommended for everything to work properly).
9083
- Create a privilege key for the ServerAdmin group (or a group which has equivalent rights).
9184
- Send the bot in a private message `!bot setup <privilege key>`.
92-
1. Congratz, you're done! Enjoy listening to your favourite music, experimenting with the crazy command system or do whatever you wish to do ;).
85+
4. Congratz, you're done! Enjoy listening to your favourite music, experimenting with the crazy command system or do whatever you wish to do ;).
9386
For further reading check out the [CommandSystem](https://github.com/Splamy/TS3AudioBot/wiki/CommandSystem).
9487

9588
## Building manually
9689

97-
|master|develop|
98-
|:--:|:--:|
99-
|[![Build status](https://ci.appveyor.com/api/projects/status/i7nrhqkbntdhwpxp/branch/master?svg=true)](https://ci.appveyor.com/project/Splamy/ts3audiobot/branch/master)|[![Build status](https://ci.appveyor.com/api/projects/status/i7nrhqkbntdhwpxp/branch/develop?svg=true)](https://ci.appveyor.com/project/Splamy/ts3audiobot/branch/develop)|
90+
| master | develop |
91+
|:-----------------------------------------------------------------------------------------------:|:------------------------------------------------------------------------------------------------:|
92+
| ![](https://github.com/Splamy/TS3AudioBot/actions/workflows/dotnet.yml/badge.svg?branch=master) | ![](https://github.com/Splamy/TS3AudioBot/actions/workflows/dotnet.yml/badge.svg?branch=develop) |
10093

10194
### Download
10295
Download the git repository with `git clone --recurse-submodules https://github.com/Splamy/TS3AudioBot.git`.
10396

10497
#### Linux
105-
1. Get the `.NET 5.0` sdk by following [this tutorial](https://docs.microsoft.com/dotnet/core/install/linux-package-managers) and choose your platform
106-
1. Go into the directory of the repository with `cd TS3AudioBot`
107-
1. Execute `dotnet build --framework net5.0 --configuration Release TS3AudioBot` to build the AudioBot
108-
1. The binary will be in `./TS3AudioBot/bin/Release/net5.0` and can be run with `dotnet TS3AudioBot.dll`
98+
1. Get the `.NET 10.0` sdk by following [this tutorial](https://docs.microsoft.com/dotnet/core/install/linux-package-managers) and choose your platform
99+
2. Go into the directory of the repository with `cd TS3AudioBot`
100+
3. Execute `dotnet build --framework net10.0 --configuration Release TS3AudioBot` to build the AudioBot
101+
4. The binary will be in `./TS3AudioBot/bin/Release/net10.0` and can be run with `dotnet TS3AudioBot.dll`
109102

110103
#### Windows
111-
1. Make sure you have `Visual Studio` with the `.NET 5.0` development toolchain installed
112-
1. Build the AudioBot with Visual Studio.
104+
1. Make sure you have `Visual Studio` with the `.NET 10.0` development toolchain installed
105+
2. Build the AudioBot with Visual Studio.
113106

114107
### Building the WebInterface
115108
1. Go with the console of your choice into the `./WebInterface` folder
116-
1. Run `yarn install` to restore or update all dependencies for this project
117-
1. Run `yarn run build` to build the project.
109+
2. Run `yarn install` to restore or update all dependencies for this project
110+
3. Run `yarn run build` to build the project.
118111
The built project will be in `./WebInterface/dist`.
119112
Make sure to the set the webinterface path in the ts3audiobot.toml to this folder.
120-
1. You can alternatively use `yarn run start` for development.
113+
4. You can alternatively use `yarn run start` for development.
121114
This will use the webpack dev server with live reload instead of the ts3ab server.
122115

123116
## Community

TS3ABotUnitTests/ColorGeneratorTests.cs

Lines changed: 0 additions & 67 deletions
This file was deleted.

TS3ABotUnitTests/M3uParserTests.cs

Lines changed: 0 additions & 73 deletions
This file was deleted.

TS3ABotUnitTests/ResourceFactoriesTests.cs

Lines changed: 0 additions & 26 deletions
This file was deleted.

TS3ABotUnitTests/TS3ABotUnitTests.csproj

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)