Skip to content

Commit bb2d76b

Browse files
suicvnesuicvne
committed
Some Luigibot stuff for bot account compliency (is that a word?)
1 parent 9f7b69e commit bb2d76b

File tree

4 files changed

+229
-2
lines changed

4 files changed

+229
-2
lines changed

‎DiscordSharp.sln.save

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,150 @@
1+

2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.24720.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscordSharp", "DiscordSharp\DiscordSharp.csproj", "{A96FFE9E-3650-4976-872E-5BB336CC1589}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luigibot", "DiscordSharpTestApplication\Luigibot.csproj", "{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}"
9+
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandsTest", "VoiceCaptureTest\CommandsTest.csproj", "{8CD30B38-9D45-4E49-94F9-7A48977CDA49}"
11+
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscordSharp.Commands", "DiscordSharp.Commands\DiscordSharp.Commands.csproj", "{2E99D97F-3480-43E2-AC9D-7DAE521CB610}"
13+
EndProject
14+
bal
15+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
16+
Debug|Any CPU = Debug|Any CPU
17+
Debug|x64 = Debug|x64
18+
Debug|x86 = Debug|x86
19+
DebugDLL|Any CPU = DebugDLL|Any CPU
20+
DebugDLL|x64 = DebugDLL|x64
21+
DebugDLL|x86 = DebugDLL|x86
22+
Release|Any CPU = Release|Any CPU
23+
Release|x64 = Release|x64
24+
Release|x86 = Release|x86
25+
ReleaseDLL|Any CPU = ReleaseDLL|Any CPU
26+
ReleaseDLL|x64 = ReleaseDLL|x64
27+
ReleaseDLL|x86 = ReleaseDLL|x86
28+
EndGlobalSection
29+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
30+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.Debug|Any CPU.Build.0 = Debug|Any CPU
32+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.Debug|x64.ActiveCfg = Debug|Any CPU
33+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.Debug|x64.Build.0 = Debug|Any CPU
34+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.Debug|x86.ActiveCfg = Debug|Any CPU
35+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.Debug|x86.Build.0 = Debug|Any CPU
36+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.DebugDLL|Any CPU.ActiveCfg = Debug|Any CPU
37+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.DebugDLL|Any CPU.Build.0 = Debug|Any CPU
38+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.DebugDLL|x64.ActiveCfg = Debug|Any CPU
39+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.DebugDLL|x64.Build.0 = Debug|Any CPU
40+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.DebugDLL|x86.ActiveCfg = Debug|Any CPU
41+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.DebugDLL|x86.Build.0 = Debug|Any CPU
42+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.Release|Any CPU.ActiveCfg = Release|Any CPU
43+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.Release|Any CPU.Build.0 = Release|Any CPU
44+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.Release|x64.ActiveCfg = Release|Any CPU
45+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.Release|x64.Build.0 = Release|Any CPU
46+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.Release|x86.ActiveCfg = Release|Any CPU
47+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.Release|x86.Build.0 = Release|Any CPU
48+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.ReleaseDLL|Any CPU.ActiveCfg = Release|Any CPU
49+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.ReleaseDLL|Any CPU.Build.0 = Release|Any CPU
50+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.ReleaseDLL|x64.ActiveCfg = Release|Any CPU
51+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.ReleaseDLL|x64.Build.0 = Release|Any CPU
52+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.ReleaseDLL|x86.ActiveCfg = Release|Any CPU
53+
{A96FFE9E-3650-4976-872E-5BB336CC1589}.ReleaseDLL|x86.Build.0 = Release|Any CPU
54+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
55+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.Debug|Any CPU.Build.0 = Debug|Any CPU
56+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.Debug|x64.ActiveCfg = Debug|Any CPU
57+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.Debug|x64.Build.0 = Debug|Any CPU
58+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.Debug|x86.ActiveCfg = Debug|Any CPU
59+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.Debug|x86.Build.0 = Debug|Any CPU
60+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.DebugDLL|Any CPU.ActiveCfg = Debug|Any CPU
61+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.DebugDLL|Any CPU.Build.0 = Debug|Any CPU
62+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.DebugDLL|x64.ActiveCfg = Debug|Any CPU
63+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.DebugDLL|x64.Build.0 = Debug|Any CPU
64+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.DebugDLL|x86.ActiveCfg = Debug|Any CPU
65+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.DebugDLL|x86.Build.0 = Debug|Any CPU
66+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.Release|Any CPU.ActiveCfg = Release|Any CPU
67+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.Release|Any CPU.Build.0 = Release|Any CPU
68+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.Release|x64.ActiveCfg = Release|Any CPU
69+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.Release|x64.Build.0 = Release|Any CPU
70+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.Release|x86.ActiveCfg = Release|Any CPU
71+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.Release|x86.Build.0 = Release|Any CPU
72+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.ReleaseDLL|Any CPU.ActiveCfg = Release|Any CPU
73+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.ReleaseDLL|Any CPU.Build.0 = Release|Any CPU
74+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.ReleaseDLL|x64.ActiveCfg = Release|Any CPU
75+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.ReleaseDLL|x64.Build.0 = Release|Any CPU
76+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.ReleaseDLL|x86.ActiveCfg = Release|Any CPU
77+
{02AA3864-7A3D-45E4-92DE-C6DAE8972ABF}.ReleaseDLL|x86.Build.0 = Release|Any CPU
78+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
79+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.Debug|Any CPU.Build.0 = Debug|Any CPU
80+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.Debug|x64.ActiveCfg = Debug|Any CPU
81+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.Debug|x64.Build.0 = Debug|Any CPU
82+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.Debug|x86.ActiveCfg = Debug|Any CPU
83+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.Debug|x86.Build.0 = Debug|Any CPU
84+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.DebugDLL|Any CPU.ActiveCfg = Debug|Any CPU
85+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.DebugDLL|Any CPU.Build.0 = Debug|Any CPU
86+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.DebugDLL|x64.ActiveCfg = Debug|Any CPU
87+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.DebugDLL|x64.Build.0 = Debug|Any CPU
88+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.DebugDLL|x86.ActiveCfg = Debug|Any CPU
89+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.DebugDLL|x86.Build.0 = Debug|Any CPU
90+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.Release|Any CPU.ActiveCfg = Release|Any CPU
91+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.Release|Any CPU.Build.0 = Release|Any CPU
92+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.Release|x64.ActiveCfg = Release|Any CPU
93+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.Release|x64.Build.0 = Release|Any CPU
94+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.Release|x86.ActiveCfg = Release|Any CPU
95+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.Release|x86.Build.0 = Release|Any CPU
96+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.ReleaseDLL|Any CPU.ActiveCfg = Release|Any CPU
97+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.ReleaseDLL|Any CPU.Build.0 = Release|Any CPU
98+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.ReleaseDLL|x64.ActiveCfg = Release|Any CPU
99+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.ReleaseDLL|x64.Build.0 = Release|Any CPU
100+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.ReleaseDLL|x86.ActiveCfg = Release|Any CPU
101+
{8CD30B38-9D45-4E49-94F9-7A48977CDA49}.ReleaseDLL|x86.Build.0 = Release|Any CPU
102+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
103+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.Debug|Any CPU.Build.0 = Debug|Any CPU
104+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.Debug|x64.ActiveCfg = Debug|Any CPU
105+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.Debug|x64.Build.0 = Debug|Any CPU
106+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.Debug|x86.ActiveCfg = Debug|Any CPU
107+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.Debug|x86.Build.0 = Debug|Any CPU
108+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.DebugDLL|Any CPU.ActiveCfg = Debug|Any CPU
109+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.DebugDLL|Any CPU.Build.0 = Debug|Any CPU
110+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.DebugDLL|x64.ActiveCfg = Debug|Any CPU
111+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.DebugDLL|x64.Build.0 = Debug|Any CPU
112+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.DebugDLL|x86.ActiveCfg = Debug|Any CPU
113+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.DebugDLL|x86.Build.0 = Debug|Any CPU
114+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.Release|Any CPU.ActiveCfg = Release|Any CPU
115+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.Release|Any CPU.Build.0 = Release|Any CPU
116+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.Release|x64.ActiveCfg = Release|Any CPU
117+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.Release|x64.Build.0 = Release|Any CPU
118+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.Release|x86.ActiveCfg = Release|Any CPU
119+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.Release|x86.Build.0 = Release|Any CPU
120+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.ReleaseDLL|Any CPU.ActiveCfg = Release|Any CPU
121+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.ReleaseDLL|Any CPU.Build.0 = Release|Any CPU
122+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.ReleaseDLL|x64.ActiveCfg = Release|Any CPU
123+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.ReleaseDLL|x64.Build.0 = Release|Any CPU
124+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.ReleaseDLL|x86.ActiveCfg = Release|Any CPU
125+
{2E99D97F-3480-43E2-AC9D-7DAE521CB610}.ReleaseDLL|x86.Build.0 = Release|Any CPU
126+
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|Any CPU.ActiveCfg = Debug|Win32
127+
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|x64.ActiveCfg = Debug|x64
128+
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|x64.Build.0 = Debug|x64
129+
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|x86.ActiveCfg = Debug|Win32
130+
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|x86.Build.0 = Debug|Win32
131+
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|Any CPU.ActiveCfg = DebugDLL|Win32
132+
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
133+
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|x64.Build.0 = DebugDLL|x64
134+
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|x86.ActiveCfg = DebugDLL|Win32
135+
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|x86.Build.0 = DebugDLL|Win32
136+
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|Any CPU.ActiveCfg = Release|Win32
137+
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|x64.ActiveCfg = Release|x64
138+
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|x64.Build.0 = Release|x64
139+
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|x86.ActiveCfg = Release|Win32
140+
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|x86.Build.0 = Release|Win32
141+
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.ReleaseDLL|Any CPU.ActiveCfg = ReleaseDLL|Win32
142+
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64
143+
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64
144+
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.ReleaseDLL|x86.ActiveCfg = ReleaseDLL|Win32
145+
{A185B162-6CB6-4502-B03F-B56F7699A8D9}.ReleaseDLL|x86.Build.0 = ReleaseDLL|Win32
146+
EndGlobalSection
147+
GlobalSection(SolutionProperties) = preSolution
148+
HideSolutionNode = FALSE
149+
EndGlobalSection
150+
EndGlobal

‎DiscordSharpTestApplication/Luigibot.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
<Compile Include="Program.cs" />
8686
<Compile Include="Properties\AssemblyInfo.cs" />
8787
<Compile Include="RandomCodeGenerator.cs" />
88+
<Compile Include="Native.cs" />
8889
</ItemGroup>
8990
<ItemGroup>
9091
<None Include="App.config" />

‎DiscordSharpTestApplication/LuigibotMain.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,13 @@ public LuigibotMain()
9595
config.CommandPrefix = '?';
9696

9797
runningOnMono = Type.GetType ("Mono.Runtime") != null;
98-
osString = Environment.OSVersion.ToString ();
98+
99+
if (OSDetermination.IsOnUnix ())
100+
{
101+
osString = OSDetermination.GetUnixName ();
102+
}
103+
else
104+
osString = Environment.OSVersion.ToString ();
99105
}
100106

101107
public void RunLuigibot()
@@ -290,6 +296,8 @@ private Task SetupEvents(CancellationToken token)
290296
CommandsManager.OverridePermissionsDictionary(permissionsDictionary);
291297
}
292298
SetupCommands();
299+
300+
client.UpdateCurrentGame($"DiscordSharp {typeof(DiscordClient).Assembly.GetName().Version.ToString()}");
293301
};
294302
if(client.SendLoginRequest() != null)
295303
{
@@ -599,7 +607,7 @@ private void SetupCommands()
599607
message += $"OS: {osString}\n";
600608
long memUsage = GetMemoryUsage();
601609
if (memUsage > 0)
602-
message += "Memory Usage: " + (memUsage / 1024) / 2 + "mb\n";
610+
message += "Memory Usage: " + (memUsage / 1024) /* / 2*/ + "mb\n";
603611
message += "Commands: " + CommandsManager.Commands.Count + "\n";
604612
message += "Command Prefix: " + config.CommandPrefix + "\n";
605613
message += "Total Servers: " + client.GetServersList().Count + "\n";

‎DiscordSharpTestApplication/Native.cs

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
using System;
2+
using System.Diagnostics;
3+
4+
namespace DiscordSharpTestApplication
5+
{
6+
public static class OSDetermination
7+
{
8+
public static bool IsOnUnix()
9+
{
10+
if (System.IO.Path.DirectorySeparatorChar == '/')
11+
return true;
12+
13+
return false;
14+
}
15+
16+
public static bool IsOnMac()
17+
{
18+
string output = GetProcessOutput ("uname", "");
19+
if(output.Contains("Darwin")) //codename for OS X
20+
return true;
21+
22+
return false;
23+
}
24+
25+
public static string GetUnixName()
26+
{
27+
if (IsOnMac ())
28+
{
29+
string macReturn = "OS X " + GetProcessOutput("sw_vers", "-productVersion");
30+
macReturn += " " + GetProcessOutput ("uname", "-m");
31+
macReturn.Trim ();
32+
33+
return macReturn;
34+
}
35+
36+
string returnValue = GetProcessOutput ("lsb_release", "-d");
37+
returnValue = returnValue.Substring (returnValue.LastIndexOf (':') + 1).Trim ();
38+
returnValue += " " + GetProcessOutput ("uname", "-m");
39+
40+
return returnValue;
41+
}
42+
43+
private static string GetProcessOutput(string process, string args)
44+
{
45+
try
46+
{
47+
Process p = new Process();
48+
p.StartInfo.UseShellExecute = false;
49+
p.StartInfo.RedirectStandardOutput = true;
50+
if(!string.IsNullOrEmpty(args))
51+
p.StartInfo.Arguments = $" {args}";
52+
p.StartInfo.FileName = process;
53+
p.Start();
54+
string output = p.StandardOutput.ReadToEnd();
55+
p.WaitForExit();
56+
if(output == null)
57+
output = "";
58+
output = output.Trim();
59+
return output;
60+
}
61+
catch(Exception)
62+
{
63+
return "";
64+
}
65+
}
66+
}
67+
}
68+

0 commit comments

Comments
 (0)