oh god the pain

.dockerignore

@@ -1,24 +1,24 @@
-**/.classpath
-**/.dockerignore
-**/.env
-**/.gitignore
-**/.project
-**/.settings
-**/.toolstarget
-**/.vs
-**/.vscode
-**/*.*proj.user
-**/*.dbmdl
-**/*.jfm
-**/azds.yaml
-**/bin
-**/charts
-**/docker-compose*
-**/Dockerfile*
-**/node_modules
-**/npm-debug.log
-**/obj
-**/secrets.dev.yaml
-**/values.dev.yaml
-LICENSE
+**/.classpath
+**/.dockerignore
+**/.env
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
 README.md

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,33 +1,33 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: Madpeterz
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Hardware (please complete the following information):**
- - OS: [e.g. iOS]
- - Version [e.g. 22]
- - Running in docker: [Yes/No]
- - Running as linux service: [Yes/No]
-
-**Additional context**
-Add any other context about the problem here.
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: Madpeterz
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Hardware (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Version [e.g. 22]
+ - Running in docker: [Yes/No]
+ - Running as linux service: [Yes/No]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +1,20 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: Madpeterz
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: Madpeterz
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/workflows/dotnetcore.yml

@@ -1,25 +1,25 @@
-name: .NET Core
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.1.101
-    - name: Install dependencies
-      run: dotnet restore
-    - name: Build
-      run: dotnet build --configuration Release --no-restore
-    - name: Test
-      run: dotnet test --no-restore --verbosity normal
+name: .NET Core
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.101
+    - name: Install dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --configuration Release --no-restore
+    - name: Test
+      run: dotnet test --no-restore --verbosity normal

BSBshared/BSBshared.csproj

@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Configurations>Debug;Release;DockerBuild</Configurations>
-    <Platforms>x64</Platforms>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DockerBuild|x64'">
-    <ErrorReport>none</ErrorReport>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <PublishTrimmed>false</PublishTrimmed>
-    <PublishSingleFile>false</PublishSingleFile>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\libremetaverse-core\Libremetaverse.structureddata\LibreMetaverse-core.StructuredData.csproj" />
-    <ProjectReference Include="..\libremetaverse-core\Libremetaverse.types\LibreMetaverse-core.Types.csproj" />
-    <ProjectReference Include="..\libremetaverse-core\Libremetaverse\LibreMetaverse-core.csproj" />
-  </ItemGroup>
-</Project>
-

BetterSecondBot.sln

@@ -1,108 +1,74 @@
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
-VisualStudioVersion = 16.0.29123.88
+VisualStudioVersion = 16.0.30907.101
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BSB", "Core\BSB.csproj", "{077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Secondbot", "Secondbot", "{4388BA41-F3FC-4A0E-AA00-50E9ED45A027}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BetterSecondBot", "CLI\BetterSecondBot.csproj", "{E34873C1-3860-430A-8AE5-6289C4E68AC7}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Metaverse", "Metaverse", "{E9B97D05-D5FB-4CA9-99C3-839248621C21}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BSBshared", "BSBshared\BSBshared.csproj", "{42075C8C-8055-4178-8C12-AE97DAFE8484}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse", "libremetaverse-core\LibreMetaverse\LibreMetaverse.csproj", "{27C70F3A-0000-0000-0000-000000000000}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libmeta-core", "Libmeta-core", "{7538B15D-152B-4A0F-A24D-A89EDC382564}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse.StructuredData", "libremetaverse-core\LibreMetaverse.StructuredData\LibreMetaverse.StructuredData.csproj", "{89D7A3E5-0000-0000-0000-000000000000}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B861AB1B-8F09-41A9-8817-CB8A2E961E4C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse.Types", "libremetaverse-core\LibreMetaverseTypes\LibreMetaverse.Types.csproj", "{B37B02AD-0000-0000-0000-000000000000}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared", "Secondbot\Shared\Shared.csproj", "{55CFC932-BECF-4FDE-A48A-3C282E080F56}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "Secondbot\Core\Core.csproj", "{D19B5D86-4680-4CC0-87BC-07B7BDF83FC0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BetterSecondbot", "Secondbot\BetterSecondbot\BetterSecondbot.csproj", "{513D7ED1-519E-47C0-BB28-29275BE041DC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Items", "Project Items", "{C343303B-F9BF-46B3-BBB5-5596823EC71C}"
 	ProjectSection(SolutionItems) = preProject
 		Dockerfile = Dockerfile
 		NuGet.Config = NuGet.Config
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse-core", "libremetaverse-core\Libremetaverse\LibreMetaverse-core.csproj", "{467F6546-8053-4B59-8C4E-65E621B1A0A6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse-core.StructuredData", "libremetaverse-core\Libremetaverse.structureddata\LibreMetaverse-core.StructuredData.csproj", "{67E9D8FC-29C6-470C-90C7-A38B60622133}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse-core.Types", "libremetaverse-core\Libremetaverse.types\LibreMetaverse-core.Types.csproj", "{69DE5884-FD5F-4040-9C8F-DBADE189902B}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		DockerBuild|Any CPU = DockerBuild|Any CPU
-		DockerBuild|x64 = DockerBuild|x64
 		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.Debug|x64.ActiveCfg = Debug|x64
-		{077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.Debug|x64.Build.0 = Debug|x64
-		{077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.DockerBuild|Any CPU.ActiveCfg = DockerBuild|x64
-		{077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.DockerBuild|Any CPU.Build.0 = DockerBuild|x64
-		{077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.DockerBuild|x64.ActiveCfg = DockerBuild|x64
-		{077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.DockerBuild|x64.Build.0 = DockerBuild|x64
-		{077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.Release|x64.ActiveCfg = Release|x64
-		{077DC0CD-6B3D-4BD9-83ED-9E098768AAA8}.Release|x64.Build.0 = Release|x64
-		{E34873C1-3860-430A-8AE5-6289C4E68AC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E34873C1-3860-430A-8AE5-6289C4E68AC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E34873C1-3860-430A-8AE5-6289C4E68AC7}.Debug|x64.ActiveCfg = Debug|x64
-		{E34873C1-3860-430A-8AE5-6289C4E68AC7}.Debug|x64.Build.0 = Debug|x64
-		{E34873C1-3860-430A-8AE5-6289C4E68AC7}.DockerBuild|Any CPU.ActiveCfg = DockerBuild|x64
-		{E34873C1-3860-430A-8AE5-6289C4E68AC7}.DockerBuild|Any CPU.Build.0 = DockerBuild|x64
-		{E34873C1-3860-430A-8AE5-6289C4E68AC7}.DockerBuild|x64.ActiveCfg = DockerBuild|Any CPU
-		{E34873C1-3860-430A-8AE5-6289C4E68AC7}.DockerBuild|x64.Build.0 = DockerBuild|Any CPU
-		{E34873C1-3860-430A-8AE5-6289C4E68AC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E34873C1-3860-430A-8AE5-6289C4E68AC7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E34873C1-3860-430A-8AE5-6289C4E68AC7}.Release|x64.ActiveCfg = Release|x64
-		{E34873C1-3860-430A-8AE5-6289C4E68AC7}.Release|x64.Build.0 = Release|x64
-		{42075C8C-8055-4178-8C12-AE97DAFE8484}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{42075C8C-8055-4178-8C12-AE97DAFE8484}.Debug|x64.ActiveCfg = Debug|x64
-		{42075C8C-8055-4178-8C12-AE97DAFE8484}.Debug|x64.Build.0 = Debug|x64
-		{42075C8C-8055-4178-8C12-AE97DAFE8484}.DockerBuild|Any CPU.ActiveCfg = DockerBuild|x64
-		{42075C8C-8055-4178-8C12-AE97DAFE8484}.DockerBuild|x64.ActiveCfg = DockerBuild|x64
-		{42075C8C-8055-4178-8C12-AE97DAFE8484}.DockerBuild|x64.Build.0 = DockerBuild|x64
-		{42075C8C-8055-4178-8C12-AE97DAFE8484}.Release|Any CPU.ActiveCfg = Release|x64
-		{42075C8C-8055-4178-8C12-AE97DAFE8484}.Release|x64.ActiveCfg = Release|x64
-		{42075C8C-8055-4178-8C12-AE97DAFE8484}.Release|x64.Build.0 = Release|x64
-		{467F6546-8053-4B59-8C4E-65E621B1A0A6}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{467F6546-8053-4B59-8C4E-65E621B1A0A6}.Debug|x64.ActiveCfg = Debug|x64
-		{467F6546-8053-4B59-8C4E-65E621B1A0A6}.Debug|x64.Build.0 = Debug|x64
-		{467F6546-8053-4B59-8C4E-65E621B1A0A6}.DockerBuild|Any CPU.ActiveCfg = DockerBuild|x64
-		{467F6546-8053-4B59-8C4E-65E621B1A0A6}.DockerBuild|x64.ActiveCfg = DockerBuild|x64
-		{467F6546-8053-4B59-8C4E-65E621B1A0A6}.DockerBuild|x64.Build.0 = DockerBuild|x64
-		{467F6546-8053-4B59-8C4E-65E621B1A0A6}.Release|Any CPU.ActiveCfg = Release|x64
-		{467F6546-8053-4B59-8C4E-65E621B1A0A6}.Release|x64.ActiveCfg = Release|x64
-		{467F6546-8053-4B59-8C4E-65E621B1A0A6}.Release|x64.Build.0 = Release|x64
-		{67E9D8FC-29C6-470C-90C7-A38B60622133}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{67E9D8FC-29C6-470C-90C7-A38B60622133}.Debug|x64.ActiveCfg = Debug|x64
-		{67E9D8FC-29C6-470C-90C7-A38B60622133}.Debug|x64.Build.0 = Debug|x64
-		{67E9D8FC-29C6-470C-90C7-A38B60622133}.DockerBuild|Any CPU.ActiveCfg = DockerBuild|x64
-		{67E9D8FC-29C6-470C-90C7-A38B60622133}.DockerBuild|x64.ActiveCfg = DockerBuild|x64
-		{67E9D8FC-29C6-470C-90C7-A38B60622133}.DockerBuild|x64.Build.0 = DockerBuild|x64
-		{67E9D8FC-29C6-470C-90C7-A38B60622133}.Release|Any CPU.ActiveCfg = Release|x64
-		{67E9D8FC-29C6-470C-90C7-A38B60622133}.Release|x64.ActiveCfg = Release|x64
-		{67E9D8FC-29C6-470C-90C7-A38B60622133}.Release|x64.Build.0 = Release|x64
-		{69DE5884-FD5F-4040-9C8F-DBADE189902B}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{69DE5884-FD5F-4040-9C8F-DBADE189902B}.Debug|x64.ActiveCfg = Debug|x64
-		{69DE5884-FD5F-4040-9C8F-DBADE189902B}.Debug|x64.Build.0 = Debug|x64
-		{69DE5884-FD5F-4040-9C8F-DBADE189902B}.DockerBuild|Any CPU.ActiveCfg = DockerBuild|x64
-		{69DE5884-FD5F-4040-9C8F-DBADE189902B}.DockerBuild|x64.ActiveCfg = DockerBuild|x64
-		{69DE5884-FD5F-4040-9C8F-DBADE189902B}.DockerBuild|x64.Build.0 = DockerBuild|x64
-		{69DE5884-FD5F-4040-9C8F-DBADE189902B}.Release|Any CPU.ActiveCfg = Release|x64
-		{69DE5884-FD5F-4040-9C8F-DBADE189902B}.Release|x64.ActiveCfg = Release|x64
-		{69DE5884-FD5F-4040-9C8F-DBADE189902B}.Release|x64.Build.0 = Release|x64
+		{27C70F3A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{27C70F3A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{27C70F3A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{27C70F3A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{89D7A3E5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{89D7A3E5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{89D7A3E5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{89D7A3E5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B37B02AD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B37B02AD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B37B02AD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B37B02AD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{55CFC932-BECF-4FDE-A48A-3C282E080F56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55CFC932-BECF-4FDE-A48A-3C282E080F56}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55CFC932-BECF-4FDE-A48A-3C282E080F56}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{55CFC932-BECF-4FDE-A48A-3C282E080F56}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D19B5D86-4680-4CC0-87BC-07B7BDF83FC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D19B5D86-4680-4CC0-87BC-07B7BDF83FC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D19B5D86-4680-4CC0-87BC-07B7BDF83FC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D19B5D86-4680-4CC0-87BC-07B7BDF83FC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{513D7ED1-519E-47C0-BB28-29275BE041DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{513D7ED1-519E-47C0-BB28-29275BE041DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{513D7ED1-519E-47C0-BB28-29275BE041DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{513D7ED1-519E-47C0-BB28-29275BE041DC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{467F6546-8053-4B59-8C4E-65E621B1A0A6} = {7538B15D-152B-4A0F-A24D-A89EDC382564}
-		{67E9D8FC-29C6-470C-90C7-A38B60622133} = {7538B15D-152B-4A0F-A24D-A89EDC382564}
-		{69DE5884-FD5F-4040-9C8F-DBADE189902B} = {7538B15D-152B-4A0F-A24D-A89EDC382564}
+		{27C70F3A-0000-0000-0000-000000000000} = {E9B97D05-D5FB-4CA9-99C3-839248621C21}
+		{89D7A3E5-0000-0000-0000-000000000000} = {E9B97D05-D5FB-4CA9-99C3-839248621C21}
+		{B37B02AD-0000-0000-0000-000000000000} = {E9B97D05-D5FB-4CA9-99C3-839248621C21}
+		{55CFC932-BECF-4FDE-A48A-3C282E080F56} = {4388BA41-F3FC-4A0E-AA00-50E9ED45A027}
+		{D19B5D86-4680-4CC0-87BC-07B7BDF83FC0} = {4388BA41-F3FC-4A0E-AA00-50E9ED45A027}
+		{513D7ED1-519E-47C0-BB28-29275BE041DC} = {4388BA41-F3FC-4A0E-AA00-50E9ED45A027}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {39A7E333-AFC1-4BA8-9EBC-9298791FDC78}
+		SolutionGuid = {EC43F382-FAF2-49CC-8E23-5DDF87592DFA}
 	EndGlobalSection
 EndGlobal

BetterSecondBot.sln.DotSettings

@@ -1,4 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Teleport/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Xfer/@EntryIndexedValue">True</s:Boolean>
-	</wpf:ResourceDictionary>

CLI/BetterSecondBot.csproj

@@ -1,47 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <Platforms>AnyCPU;x64</Platforms>
-  </PropertyGroup>
-  <ItemGroup>
-    <AssemblyMetadataCommand Remove="GitDescription" />
-  </ItemGroup>
-  <PropertyGroup>
-    <MSBuildGitHashCommand>git rev-parse --short HEAD</MSBuildGitHashCommand>
-    <MSBuildGitHashValidate>False</MSBuildGitHashValidate>
-    <MSBuildGitHashSuppressDirtyWarning>False</MSBuildGitHashSuppressDirtyWarning>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <StartupObject>BetterSecondBot.Program</StartupObject>
-    <Configurations>Debug;Release;DockerBuild;Windows</Configurations>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DockerBuild|x64'">
-    <ErrorReport>none</ErrorReport>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <PublishTrimmed>false</PublishTrimmed>
-    <PublishSingleFile>false</PublishSingleFile>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Remove="WikiMake\wiki_footer.txt" />
-    <None Remove="WikiMake\wiki_header.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="EmbedIO" Version="3.4.3" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
-    <PackageReference Include="MSBuildGitHash" Version="2.0.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="WikiMake\wiki_footer.txt" />
-    <EmbeddedResource Include="WikiMake\wiki_header.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Core\BSB.csproj" />
-  </ItemGroup>
-</Project>

CLI/Properties/PublishProfiles/Linux-x64.pubxml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <Configuration>Release</Configuration>
-    <Platform>x64</Platform>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <PublishDir>..\Publish\linux-x64</PublishDir>
-    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
-    <SelfContained>true</SelfContained>
-    <PublishSingleFile>True</PublishSingleFile>
-    <PublishReadyToRun>False</PublishReadyToRun>
-    <PublishTrimmed>False</PublishTrimmed>
-  </PropertyGroup>
-</Project>

CLI/Properties/PublishProfiles/Windows-64bit.pubxml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <Configuration>Release</Configuration>
-    <Platform>x64</Platform>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <PublishDir>..\Publish\windows_x64</PublishDir>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <SelfContained>true</SelfContained>
-    <PublishSingleFile>True</PublishSingleFile>
-    <PublishReadyToRun>False</PublishReadyToRun>
-    <PublishTrimmed>False</PublishTrimmed>
-  </PropertyGroup>
-</Project>

Core/BSB.csproj

@@ -1,31 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Configurations>Debug;Release;DockerBuild</Configurations>
-    <Platforms>x64;AnyCPU</Platforms>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DockerBuild|x64'">
-    <ErrorReport>none</ErrorReport>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <PublishTrimmed>false</PublishTrimmed>
-    <PublishSingleFile>false</PublishSingleFile>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DockerBuild|AnyCPU'">
-    <ErrorReport>none</ErrorReport>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <PublishTrimmed>false</PublishTrimmed>
-    <PublishSingleFile>false</PublishSingleFile>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
-  </PropertyGroup>  <ItemGroup>
-    <PackageReference Include="Discord.Net" Version="2.3.0" />
-    <PackageReference Include="Discord.Net.WebSocket" Version="2.3.0" />
-    <PackageReference Include="RestSharp" Version="106.11.2" />
-  </ItemGroup>  <ItemGroup>
-  <ProjectReference Include="..\BSBshared\BSBshared.csproj" />
-</ItemGroup>
-
-</Project>

Dockerfile

@@ -1,74 +1,72 @@
-#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/core/runtime:3.1-buster-slim AS base
-WORKDIR /app
-
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
-WORKDIR /src
-COPY ["NuGet.Config", ""]
-COPY ["CLI/BetterSecondBot.csproj", "CLI/"]
-COPY ["Core/BSB.csproj", "Core/"]
-COPY ["BSBshared/BSBshared.csproj", "BSBshared/"]
-COPY ["libremetaverse-core/Libremetaverse/LibreMetaverse-core.csproj", "libremetaverse-core/Libremetaverse/"]
-COPY ["libremetaverse-core/Libremetaverse.structureddata/LibreMetaverse-core.StructuredData.csproj", "libremetaverse-core/Libremetaverse.structureddata/"]
-COPY ["libremetaverse-core/Libremetaverse.types/LibreMetaverse-core.Types.csproj", "libremetaverse-core/Libremetaverse.types/"]
-RUN dotnet restore "CLI/BetterSecondBot.csproj"
-COPY . .
-WORKDIR "/src/CLI"
-RUN dotnet build "BetterSecondBot.csproj" -c DockerBuild -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "BetterSecondBot.csproj" -c DockerBuild -o /app/publish
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-
-# --- Update your settings ---
-
-ENV Basic_BotUserName=''
-ENV Basic_BotPassword=''
-ENV Basic_HomeRegions='http://maps.secondlife.com/secondlife/Viserion/50/140/23'
-ENV Basic_LoginLocation='home'
-
-ENV Security_MasterUsername='Madpeter Zond'
-ENV Security_SubMasters='X X,Y Y,Z Z'
-ENV Security_SignedCommandkey=''
-ENV Security_WebUIKey=''
-
-ENV Setting_AllowRLV='false'
-ENV Setting_AllowFunds='false'
-ENV Setting_LogCommands='false'
-ENV Setting_RelayImToAvatarUUID=''
-ENV Setting_DefaultSit_UUID=''
-ENV Setting_loginURI='secondlife'
-
-ENV DiscordRelay_URL=''
-ENV DiscordRelay_GroupUUID=''
-ENV DiscordFull_Enable='false'
-ENV DiscordFull_Token=''
-ENV DiscordFull_ServerID=''
-ENV DiscordFull_Keep_GroupChat='false'
-
-ENV Http_Enable='false'
-ENV Http_Host='docker'
-
-ENV Name2Key_Enable='false'
-ENV Name2Key_Url='http://localhost:1234'
-ENV Name2Key_Key='magic'
-
-ENV DiscordTTS_Enable='false'
-ENV DiscordTTS_server_id=''
-ENV DiscordTTS_channel_name=''
-ENV DiscordTTS_avatar_uuid=''
-ENV DiscordTTS_Nickname=''
-
-ENV Log2File_Enable='false'
-ENV Log2File_Level=1
-
-EXPOSE 80
-ENV ASPNETCORE_URLS http://+:80
-
-# --- End of settings ---
-
-ENTRYPOINT ["/app/BetterSecondBot"]
+#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/core/runtime:3.1-buster-slim AS base
+WORKDIR /app
+
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
+WORKDIR /src
+COPY ["Secondbot/BetterSecondbot/BetterSecondbot.csproj", "Secondbot/BetterSecondbot/"]
+COPY ["Secondbot/Core/Core.csproj", "Secondbot/Core/"]
+COPY ["Secondbot/Shared/Shared.csproj", "Secondbot/Shared/"]
+COPY ["libremetaverse-core/LibreMetaverse/LibreMetaverse.csproj", "libremetaverse-core/LibreMetaverse/"]
+COPY ["libremetaverse-core/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj", "libremetaverse-core/LibreMetaverse.StructuredData/"]
+COPY ["libremetaverse-core/LibreMetaverseTypes/LibreMetaverse.Types.csproj", "libremetaverse-core/LibreMetaverseTypes/"]
+RUN dotnet restore "Secondbot/BetterSecondbot/BetterSecondbot.csproj"
+COPY . .
+WORKDIR "/src/Secondbot/BetterSecondbot"
+RUN dotnet build "BetterSecondbot.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "BetterSecondbot.csproj" -c Release -o /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+# --- Update your settings ---
+
+ENV Basic_BotUserName=''
+ENV Basic_BotPassword=''
+ENV Basic_HomeRegions='http://maps.secondlife.com/secondlife/Viserion/50/140/23'
+ENV Basic_LoginLocation='home'
+
+ENV Security_MasterUsername='Madpeter Zond'
+ENV Security_SubMasters='X X,Y Y,Z Z'
+ENV Security_SignedCommandkey=''
+ENV Security_WebUIKey=''
+
+ENV Setting_AllowRLV='false'
+ENV Setting_AllowFunds='false'
+ENV Setting_LogCommands='false'
+ENV Setting_RelayImToAvatarUUID=''
+ENV Setting_DefaultSit_UUID=''
+ENV Setting_loginURI='secondlife'
+
+ENV DiscordRelay_URL=''
+ENV DiscordRelay_GroupUUID=''
+ENV DiscordFull_Enable='false'
+ENV DiscordFull_Token=''
+ENV DiscordFull_ServerID=''
+ENV DiscordFull_Keep_GroupChat='false'
+
+ENV Http_Enable='false'
+ENV Http_Host='docker'
+
+ENV Name2Key_Enable='false'
+ENV Name2Key_Url='http://localhost:1234'
+ENV Name2Key_Key='magic'
+
+ENV DiscordTTS_Enable='false'
+ENV DiscordTTS_server_id=''
+ENV DiscordTTS_channel_name=''
+ENV DiscordTTS_avatar_uuid=''
+ENV DiscordTTS_Nickname=''
+
+ENV Log2File_Enable='false'
+ENV Log2File_Level=1
+
+EXPOSE 80
+ENV ASPNETCORE_URLS http://+:80
+
+# --- End of settings ---
+
+ENTRYPOINT ["/app/BetterSecondBot"]

Secondbot/BetterSecondbot/BetterSecondbot.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <DockerfileContext>..\..</DockerfileContext>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="EmbedIO" Version="3.4.3" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.9" />
+    <PackageReference Include="MSBuildGitHash" Version="2.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Core\Core.csproj" />
+  </ItemGroup>
+
+</Project>

Secondbot/BetterSecondbot/DiscordSupervisor/Inbound.cs

@@ -307,7 +307,11 @@ namespace BetterSecondBot.DiscordSupervisor
                 {
                     ITextChannel Chan = (ITextChannel)message.Channel;
                     IGuildUser user = await Chan.Guild.GetUserAsync(message.Author.Id).ConfigureAwait(true);
-                    On_MessageEvent(new DiscordMessageEvent(Chan.GuildId, Chan.Id, user.Nickname, message.Content));
+                    string username = user.Nickname;
+                    if(username == null) {
+                        username = message.Author.Username;
+                    }
+                    On_MessageEvent(new DiscordMessageEvent(Chan.GuildId, Chan.Id, username, message.Content));
                     if (message.Content.StartsWith("!clear") == true)
                     {
                         await CleanDiscordChannel(Chan, 0, true).ConfigureAwait(false);

Secondbot/BetterSecondbot/Dockerfile

@@ -0,0 +1,72 @@
+#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/core/runtime:3.1-buster-slim AS base
+WORKDIR /app
+
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
+WORKDIR /src
+COPY ["Secondbot/BetterSecondbot/BetterSecondbot.csproj", "Secondbot/BetterSecondbot/"]
+COPY ["Secondbot/Core/Core.csproj", "Secondbot/Core/"]
+COPY ["Secondbot/Shared/Shared.csproj", "Secondbot/Shared/"]
+COPY ["libremetaverse-core/LibreMetaverse/LibreMetaverse.csproj", "libremetaverse-core/LibreMetaverse/"]
+COPY ["libremetaverse-core/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj", "libremetaverse-core/LibreMetaverse.StructuredData/"]
+COPY ["libremetaverse-core/LibreMetaverseTypes/LibreMetaverse.Types.csproj", "libremetaverse-core/LibreMetaverseTypes/"]
+RUN dotnet restore "Secondbot/BetterSecondbot/BetterSecondbot.csproj"
+COPY . .
+WORKDIR "/src/Secondbot/BetterSecondbot"
+RUN dotnet build "BetterSecondbot.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "BetterSecondbot.csproj" -c Release -o /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+# --- Update your settings ---
+
+ENV Basic_BotUserName=''
+ENV Basic_BotPassword=''
+ENV Basic_HomeRegions='http://maps.secondlife.com/secondlife/Viserion/50/140/23'
+ENV Basic_LoginLocation='home'
+
+ENV Security_MasterUsername='Madpeter Zond'
+ENV Security_SubMasters='X X,Y Y,Z Z'
+ENV Security_SignedCommandkey=''
+ENV Security_WebUIKey=''
+
+ENV Setting_AllowRLV='false'
+ENV Setting_AllowFunds='false'
+ENV Setting_LogCommands='false'
+ENV Setting_RelayImToAvatarUUID=''
+ENV Setting_DefaultSit_UUID=''
+ENV Setting_loginURI='secondlife'
+
+ENV DiscordRelay_URL=''
+ENV DiscordRelay_GroupUUID=''
+ENV DiscordFull_Enable='false'
+ENV DiscordFull_Token=''
+ENV DiscordFull_ServerID=''
+ENV DiscordFull_Keep_GroupChat='false'
+
+ENV Http_Enable='false'
+ENV Http_Host='docker'
+
+ENV Name2Key_Enable='false'
+ENV Name2Key_Url='http://localhost:1234'
+ENV Name2Key_Key='magic'
+
+ENV DiscordTTS_Enable='false'
+ENV DiscordTTS_server_id=''
+ENV DiscordTTS_channel_name=''
+ENV DiscordTTS_avatar_uuid=''
+ENV DiscordTTS_Nickname=''
+
+ENV Log2File_Enable='false'
+ENV Log2File_Level=1
+
+EXPOSE 80
+ENV ASPNETCORE_URLS http://+:80
+
+# --- End of settings ---
+
+ENTRYPOINT ["/app/BetterSecondBot"]

Secondbot/BetterSecondbot/Properties/launchSettings.json

@@ -1,10 +1,10 @@
-{
-  "profiles": {
-    "BetterSecondBot": {
-      "commandName": "Project"
-    },
-    "Docker": {
-      "commandName": "Docker"
-    }
-  }
+{
+  "profiles": {
+    "BetterSecondbot": {
+      "commandName": "Project"
+    },
+    "Docker": {
+      "commandName": "Docker"
+    }
+  }
 }

Secondbot/BetterSecondbot/WikiMake/wiki_footer.txt

@@ -1,11 +1,11 @@
-</div>
-<script src="https://code.jquery.com/jquery-3.3.1.js" crossorigin="anonymous"></script>
-<script src="https://cdn.datatables.net/1.10.20/js/jquery.dataTables.min.js" crossorigin="anonymous"></script>
-<script src="https://cdn.datatables.net/1.10.20/js/dataTables.bootstrap4.min.js" crossorigin="anonymous"></script>
-<script>
-$(document).ready(function() {
-    $('.datatable').DataTable();
-} );
-</script>
-</body>
+</div>
+<script src="https://code.jquery.com/jquery-3.3.1.js" crossorigin="anonymous"></script>
+<script src="https://cdn.datatables.net/1.10.20/js/jquery.dataTables.min.js" crossorigin="anonymous"></script>
+<script src="https://cdn.datatables.net/1.10.20/js/dataTables.bootstrap4.min.js" crossorigin="anonymous"></script>
+<script>
+$(document).ready(function() {
+    $('.datatable').DataTable();
+} );
+</script>
+</body>
 </html>

Secondbot/BetterSecondbot/WikiMake/wikimake.cs

@@ -289,12 +289,12 @@ namespace BetterSecondBot.WikiMake
             InterfaceWiki("JSON", defaultJson);
 
             // CMD 
-            BSB.Commands.CoreCommandsInterface cmd = new BSB.Commands.CoreCommandsInterface(null,true);
+            BSB.Commands.CoreCommandsInterface cmd = new BSB.Commands.CoreCommandsInterface(null);
             api_reports.Add("Core", new KeyValuePair<int, string>(cmd.ApiCommandsCount, "Good"));
             InterfaceWiki("Core", cmd, true);
 
             // RLVapi
-            BSB.RLV.RLVcontrol RLVapi = new BSB.RLV.RLVcontrol(null,true);
+            BSB.RLV.RLVcontrol RLVapi = new BSB.RLV.RLVcontrol(null);
             api_reports.Add("RLVapi", new KeyValuePair<int, string>(RLVapi.ApiCommandsCount, "Limited"));
             InterfaceWiki("RLVapi", RLVapi, true);