Skip to content

Commit f7375ff

Browse files
committed
Merge branch 'develop'
2 parents cb1448a + 4be7c65 commit f7375ff

File tree

203 files changed

+16341
-6403
lines changed

Some content is hidden

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

203 files changed

+16341
-6403
lines changed

.editorconfig

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# EditorConfig is awesome: https://EditorConfig.org
2+
13
root = true
24

35
[*]
@@ -7,6 +9,8 @@ charset = utf-8
79

810
[*.cs]
911
indent_style = tab
12+
indent_size = tab
13+
tab_width = 4
1014
trim_trailing_whitespace = true
1115

1216
[*.{tt,ttinclude}]

.github/ISSUE_TEMPLATE/bug_report.md

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
5+
---
6+
7+
**Describe the bug**
8+
A clear and concise description of what the bug is.
9+
10+
**Expected behavior**
11+
A clear and concise description of what you expected to happen.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior (if possible)
15+
16+
**Version**
17+
Which commit did you build or download? (mono TS3AudiBot.exe -V or !version in chat)
18+
19+
**Platform**
20+
Which platform(-version) are you running on? (ubuntu 16.04, arch, windows,...)
21+
Which runtime(-version) are you using? (mono: mono -V, dotnet: dotnet --info)
22+
23+
**Log**
24+
```
25+
Paste the important log parts from the ts3audiobot.log into this code block here.
26+
Try not to paste too little.
27+
At best from the first to last interaction from you which reproduces this problem.
28+
```
+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
5+
---
6+
7+
**Is your feature request related to a problem? Please describe.**
8+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
9+
10+
**Describe the solution you'd like**
11+
A clear and concise description of what you want to happen.
12+
13+
**Describe alternatives you've considered**
14+
A clear and concise description of any alternative solutions or features you've considered.

.github/ISSUE_TEMPLATE/setup_help.md

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
name: Setup help
3+
about: Problems setting up or running the bot
4+
5+
---
6+
7+
**Describe the problem**
8+
A clear and concise description of what the problem is.
9+
10+
**To Reproduce**
11+
Steps to reproduce the behavior
12+
13+
**System Information**
14+
- **Platform**: (Ubuntu 16.04, Debian 8, Arch, etc)
15+
16+
- **Mono version**: (`mono -V`)
17+
18+
- **Which commit did you download**: (or on prebuilt: `mono TS3AudioBot.exe -V`)
19+
20+
(If all fields in the TS3AudioBot log header are correctly filled you can
21+
alternatively just post the header here.)
22+
23+
**Additional Logs, Exceptions, etc**
24+
When applicable try to add relevant log excerpts here.
25+
26+
```
27+
Put logs or code in triple backticks like here to properly format it.
28+
```

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ ipch/
9999
*.psess
100100
*.vsp
101101
*.vspx
102+
*.diagsession
102103

103104
# TFS 2012 Local Workspace
104105
$tf/

.travis.yml

+42-17
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
sudo: false
22
language: csharp
33

4+
matrix:
5+
include:
6+
- dotnet: 2.1.4
7+
mono: none
8+
env: DOTNETCORE=1
9+
- mono: latest
10+
411
notifications:
512
email: false
613

@@ -20,30 +27,48 @@ addons:
2027
git:
2128
depth: 9999999
2229

30+
# TODO: add test runner for dotnet core too
2331
install:
24-
- nuget restore TS3AudioBot.sln
25-
- nuget install NUnit.Runners -OutputDirectory nunit
32+
- |
33+
if [[ $DOTNETCORE = 1 ]]; then
34+
echo "dotnet core"
35+
dotnet restore TS3AudioBot.sln
36+
else
37+
echo "mono"
38+
nuget restore TS3AudioBot.sln
39+
nuget install NUnit.Runners -OutputDirectory nunit
40+
fi
2641
2742
script:
28-
- cfg="/p:Configuration=Release TS3AudioBot.sln"
29-
- if command -v msbuild; then
30-
msbuild $cfg;
31-
elif command -v xbuild; then
32-
xbuild $cfg;
43+
- |
44+
if [[ $DOTNETCORE = 1 ]]; then
45+
dotnet build --framework netcoreapp2.0 --configuration Release TS3AudioBot
3346
else
34-
echo "No mono build tool found!";
35-
false;
47+
if command -v msbuild; then
48+
buildtool="msbuild"
49+
elif command -v xbuild; then
50+
buildtool="xbuild"
51+
else
52+
echo "No mono build tool found!"
53+
false
54+
fi
55+
"${buildtool}" /p:Configuration=Release /p:TargetFramework=net46 TS3AudioBot.sln
56+
mono ./nunit/NUnit.ConsoleRunner.*.*.*/tools/nunit3-console.exe ./TS3ABotUnitTests/bin/Release/net46/TS3ABotUnitTests.dll
3657
fi
37-
- mono ./nunit/NUnit.ConsoleRunner.*.*.*/tools/nunit3-console.exe ./TS3ABotUnitTests/bin/Release/TS3ABotUnitTests.dll
3858
3959
after_success:
40-
- export MAIN_DIR=`pwd`
41-
- cd ./TS3AudioBot/bin/Release
42-
- ls
43-
- zip TS3AudioBot.zip NLog.config *.exe *.dll x64/* x86/*
44-
- 'export version=`mono TS3AudioBot.exe --version | grep "Version: "`'
45-
- "curl -I -H \"Content-Type: application/zip\" -X PUT \"https://splamy.de/api/nightly/ts3ab/${TRAVIS_BRANCH}?token=${uploadkey}&filename=TS3AudioBot.zip&commit=${TRAVIS_COMMIT}&version=${version:9}\" --upload-file ./TS3AudioBot.zip"
46-
- cd "$MAIN_DIR"
60+
- |
61+
if [[ $DOTNETCORE = 1 ]]; then
62+
echo "No Task!"
63+
else
64+
export MAIN_DIR=`pwd`
65+
cd ./TS3AudioBot/bin/Release/net46
66+
ls
67+
zip TS3AudioBot.zip NLog.config *.exe *.dll x64/* x86/*
68+
export version=`mono TS3AudioBot.exe --version | grep "Version: "`
69+
curl -I -H "Content-Type: application/zip" -X PUT "https://splamy.de/api/nightly/ts3ab/${TRAVIS_BRANCH}?token=${uploadkey}&filename=TS3AudioBot.zip&commit=${TRAVIS_COMMIT}&version=${version:9}" --upload-file ./TS3AudioBot.zip
70+
cd "$MAIN_DIR"
71+
fi
4772
4873
after_script:
4974
- chmod u+x ts3notify.sh

.vscode/launch.json

-22
This file was deleted.

InstallOpus.sh

+9-11
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
baseDir=`pwd`
44

5-
OpusBaseName="opus-1.1.3"
5+
OpusBaseName="opus-1.2.1"
66
OpusFileName="$OpusBaseName.tar.gz"
77

88
# Download the Opus library
@@ -21,15 +21,13 @@ tar -vxf "$OpusFileName"
2121
cd "$OpusBaseName"
2222

2323
# Build the library
24-
./configure && make
24+
./configure && make && sudo make install
2525

26-
# Go back
27-
cd "$baseDir"
28-
29-
# Copy the required libopus.so to the local folder
30-
cp "$OpusBaseName/.libs/libopus.so" "./"
31-
32-
# Copy the libopus.so to the folder we need
33-
cp "./libopus.so" "$baseDir/TS3AudioBot/bin/Release/libopus.so"
26+
# Move to global folder
27+
if [ ! -f /usr/lib/libopus.so ]; then
28+
sudo cp ".libs/libopus.so" "/usr/lib/"
29+
else
30+
echo "'/urs/lib/libopus.so' already exists, will not be overwritten"
31+
fi
3432

35-
echo "Done"
33+
echo "Done"

0 commit comments

Comments
 (0)