Skip to content

Commit 42a18a1

Browse files
InterfaceGUIInterfaceGUI
committed
fix BUG
1 parent ceec7a9 commit 42a18a1

12 files changed

+245
-177
lines changed

‎DiscordGameServersStatus/DiscordGameServersStatus/App.config

+58-48
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,59 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<configuration>
3-
<configSections>
4-
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5-
<section name="DiscordGameServersStatus.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
6-
</sectionGroup>
7-
</configSections>
8-
<startup>
9-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
10-
</startup>
11-
<runtime>
12-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
13-
<dependentAssembly>
14-
<assemblyIdentity name="System.Interactive.Async" publicKeyToken="94bc3704cddfc263" culture="neutral" />
15-
<bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
16-
</dependentAssembly>
17-
<dependentAssembly>
18-
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
19-
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
20-
</dependentAssembly>
21-
<dependentAssembly>
22-
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
23-
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
24-
</dependentAssembly>
25-
</assemblyBinding>
26-
</runtime>
27-
<userSettings>
28-
<DiscordGameServersStatus.My.MySettings>
29-
<setting name="token" serializeAs="String">
30-
<value />
31-
</setting>
32-
<setting name="channel" serializeAs="String">
33-
<value />
34-
</setting>
35-
<setting name="serverCount" serializeAs="String">
36-
<value>0</value>
37-
</setting>
38-
<setting name="Timer" serializeAs="String">
39-
<value>0</value>
40-
</setting>
41-
<setting name="MessageID" serializeAs="String">
42-
<value>0</value>
43-
</setting>
44-
<setting name="WMessage_ServerList" serializeAs="String">
45-
<value>True</value>
46-
</setting>
47-
</DiscordGameServersStatus.My.MySettings>
48-
</userSettings>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<configSections>
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5+
<section name="DiscordGameServersStatus.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
6+
</sectionGroup>
7+
</configSections>
8+
<startup>
9+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
10+
</startup>
11+
<runtime>
12+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
13+
<dependentAssembly>
14+
<assemblyIdentity name="System.Interactive.Async" publicKeyToken="94bc3704cddfc263" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
16+
</dependentAssembly>
17+
<dependentAssembly>
18+
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
20+
</dependentAssembly>
21+
<dependentAssembly>
22+
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
24+
</dependentAssembly>
25+
<dependentAssembly>
26+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
27+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
28+
</dependentAssembly>
29+
</assemblyBinding>
30+
</runtime>
31+
<userSettings>
32+
<DiscordGameServersStatus.My.MySettings>
33+
<setting name="token" serializeAs="String">
34+
<value />
35+
</setting>
36+
<setting name="channel" serializeAs="String">
37+
<value />
38+
</setting>
39+
<setting name="serverCount" serializeAs="String">
40+
<value>0</value>
41+
</setting>
42+
<setting name="Timer" serializeAs="String">
43+
<value>0</value>
44+
</setting>
45+
<setting name="MessageID" serializeAs="String">
46+
<value>0</value>
47+
</setting>
48+
<setting name="WMessage_ServerList" serializeAs="String">
49+
<value>True</value>
50+
</setting>
51+
<setting name="dcServerID" serializeAs="String">
52+
<value>0</value>
53+
</setting>
54+
<setting name="lastver" serializeAs="String">
55+
<value />
56+
</setting>
57+
</DiscordGameServersStatus.My.MySettings>
58+
</userSettings>
4959
</configuration>

‎DiscordGameServersStatus/DiscordGameServersStatus/DGSS.Designer.vb

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎DiscordGameServersStatus/DiscordGameServersStatus/DGSS.vb

+11-7
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,18 @@ Public Class DGSS
99
Dim Start As Boolean
1010
Dim Time() As Int32 = {600000, 1200000, 1800000, 3600000} ' 10分鐘,20分鐘,30分鐘,60分鐘
1111
Dim msg As Rest.RestUserMessage
12+
Dim ver As String
1213
Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
1314

1415
'取得版本資訊
1516
If Deployment.Application.ApplicationDeployment.IsNetworkDeployed Then
16-
Label4.Text = "Ver：" & Deployment.Application.ApplicationDeployment.CurrentDeployment.CurrentVersion.ToString()
17+
ver = Deployment.Application.ApplicationDeployment.CurrentDeployment.CurrentVersion.ToString()
18+
Label4.Text = "Ver：" & ver
1719
End If
1820
'--------------------------------------
1921

2022
'初始化Dsicord-------------------
2123
Discord = New DiscordSocketClient(New DiscordSocketConfig With {
22-
.WebSocketProvider = Net.Providers.WS4Net.WS4NetProvider.Instance,
2324
.MessageCacheSize = 20
2425
})
2526
'--------------------------------------
@@ -29,11 +30,13 @@ Public Class DGSS
2930
Button4.Enabled = False
3031
AddHandler Discord.Ready, AddressOf Ready
3132

33+
If ver <> My.Settings.lastver Then
3234

33-
If Not My.Settings.WMessage_ServerList Then
3435
My.Computer.Audio.PlaySystemSound(Media.SystemSounds.Exclamation)
3536
MsgBox_ServerList.ShowDialog()
3637
End If
38+
39+
My.Settings.lastver = ver
3740
End Sub
3841

3942
Function Ready() As Task
@@ -58,7 +61,7 @@ Public Class DGSS
5861

5962

6063
Private Async Sub StartButton_Click(sender As Object, e As EventArgs) Handles StartButton.Click
61-
If My.Settings.token Is "" Then
64+
If My.Settings.token Is "" Or My.Settings.dcServerID = 0 Then
6265
MsgBox("請先設定DiscordBot", 0 + 48)
6366
Discordsetting.ShowDialog()
6467
Exit Sub
@@ -307,7 +310,7 @@ Public Class DGSS
307310
.Timestamp = Date.UtcNow,
308311
.Footer = New EmbedFooterBuilder With {
309312
.IconUrl = "https://i.imgur.com/UNPFf1f.jpg",
310-
.Text = "BOT made by 拉斯哈格(LarsHagrid)"
313+
.Text = "BOT made by LarsHagrid"
311314
}
312315
}
313316

@@ -316,14 +319,15 @@ Public Class DGSS
316319
End Try
317320

318321
Try
319-
message = Await Discord.GetGuild(Discord.Guilds(0).Id).GetTextChannel(My.Settings.channel).GetMessageAsync(My.Settings.MessageID)
322+
message = Await Discord.GetGuild(My.Settings.dcServerID).GetTextChannel(My.Settings.channel).GetMessageAsync(My.Settings.MessageID)
320323
Catch ex As Exception
321324

322325
End Try
323326

324327
Try
325328
If message Is Nothing Then
326-
message = Await Discord.GetGuild(Discord.Guilds(0).Id).GetTextChannel(My.Settings.channel).SendMessageAsync("", False, embed)
329+
message = Await Discord.GetGuild(My.Settings.dcServerID).GetTextChannel(My.Settings.channel).SendMessageAsync("", False, embed.Build)
330+
'message = Await Discord.GetGuild(Discord.Guilds(0).Id).GetTextChannel(My.Settings.channel).SendMessageAsync("", False, embed.Build)
327331
My.Settings.MessageID = message.Id
328332
My.Settings.Save()
329333
Else

‎DiscordGameServersStatus/DiscordGameServersStatus/DiscordGameServersStatus.vbproj

+27-15
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
3535
<WebPage>publish.htm</WebPage>
3636
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
37-
<ApplicationRevision>40</ApplicationRevision>
37+
<ApplicationRevision>44</ApplicationRevision>
3838
<ApplicationVersion>1.5.0.%2a</ApplicationVersion>
3939
<UseApplicationTrust>false</UseApplicationTrust>
4040
<CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -92,30 +92,33 @@
9292
<ManifestKeyFile>DiscordGameServersStatus_2_TemporaryKey.pfx</ManifestKeyFile>
9393
</PropertyGroup>
9494
<ItemGroup>
95-
<Reference Include="Discord.Net.Commands, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
96-
<HintPath>..\packages\Discord.Net.Commands.1.0.2\lib\netstandard1.1\Discord.Net.Commands.dll</HintPath>
95+
<Reference Include="Discord.Net.Commands, Version=2.3.1.0, Culture=neutral, processorArchitecture=MSIL">
96+
<HintPath>..\packages\Discord.Net.Commands.2.3.1\lib\net461\Discord.Net.Commands.dll</HintPath>
9797
</Reference>
98-
<Reference Include="Discord.Net.Core, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
99-
<HintPath>..\packages\Discord.Net.Core.1.0.2\lib\net45\Discord.Net.Core.dll</HintPath>
98+
<Reference Include="Discord.Net.Core, Version=2.3.1.0, Culture=neutral, processorArchitecture=MSIL">
99+
<HintPath>..\packages\Discord.Net.Core.2.3.1\lib\net461\Discord.Net.Core.dll</HintPath>
100100
</Reference>
101101
<Reference Include="Discord.Net.Providers.WS4Net, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
102102
<HintPath>..\packages\Discord.Net.Providers.WS4Net.1.0.2\lib\net45\Discord.Net.Providers.WS4Net.dll</HintPath>
103103
</Reference>
104-
<Reference Include="Discord.Net.Rest, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
105-
<HintPath>..\packages\Discord.Net.Rest.1.0.2\lib\net45\Discord.Net.Rest.dll</HintPath>
104+
<Reference Include="Discord.Net.Rest, Version=2.3.1.0, Culture=neutral, processorArchitecture=MSIL">
105+
<HintPath>..\packages\Discord.Net.Rest.2.3.1\lib\net461\Discord.Net.Rest.dll</HintPath>
106106
</Reference>
107107
<Reference Include="Discord.Net.Rpc, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
108108
<HintPath>..\packages\Discord.Net.Rpc.1.0.2\lib\net45\Discord.Net.Rpc.dll</HintPath>
109109
</Reference>
110-
<Reference Include="Discord.Net.Webhook, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
111-
<HintPath>..\packages\Discord.Net.Webhook.1.0.2\lib\netstandard1.1\Discord.Net.Webhook.dll</HintPath>
110+
<Reference Include="Discord.Net.Webhook, Version=2.3.1.0, Culture=neutral, processorArchitecture=MSIL">
111+
<HintPath>..\packages\Discord.Net.Webhook.2.3.1\lib\netstandard2.0\Discord.Net.Webhook.dll</HintPath>
112112
</Reference>
113-
<Reference Include="Discord.Net.WebSocket, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
114-
<HintPath>..\packages\Discord.Net.WebSocket.1.0.2\lib\net45\Discord.Net.WebSocket.dll</HintPath>
113+
<Reference Include="Discord.Net.WebSocket, Version=2.3.1.0, Culture=neutral, processorArchitecture=MSIL">
114+
<HintPath>..\packages\Discord.Net.WebSocket.2.3.1\lib\net461\Discord.Net.WebSocket.dll</HintPath>
115115
</Reference>
116116
<Reference Include="ICSharpCode.SharpZipLib">
117117
<HintPath>..\..\..\..\..\Desktop\ICSharpCode.SharpZipLib.dll</HintPath>
118118
</Reference>
119+
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
120+
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
121+
</Reference>
119122
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
120123
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.1.1.1\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll</HintPath>
121124
</Reference>
@@ -125,8 +128,8 @@
125128
<Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
126129
<HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
127130
</Reference>
128-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
129-
<HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
131+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
132+
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
130133
</Reference>
131134
<Reference Include="SSQLib, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
132135
<HintPath>..\packages\SSQLib.0.9.2\lib\net40\SSQLib.dll</HintPath>
@@ -151,8 +154,8 @@
151154
<Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
152155
<HintPath>..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
153156
</Reference>
154-
<Reference Include="System.Interactive.Async, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
155-
<HintPath>..\packages\System.Interactive.Async.3.1.1\lib\net46\System.Interactive.Async.dll</HintPath>
157+
<Reference Include="System.Interactive.Async, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
158+
<HintPath>..\packages\System.Interactive.Async.4.0.0\lib\net461\System.Interactive.Async.dll</HintPath>
156159
</Reference>
157160
<Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
158161
<HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
@@ -167,13 +170,19 @@
167170
<Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
168171
<HintPath>..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
169172
</Reference>
173+
<Reference Include="System.Linq.Async, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
174+
<HintPath>..\packages\System.Linq.Async.4.0.0\lib\net461\System.Linq.Async.dll</HintPath>
175+
</Reference>
170176
<Reference Include="System.Net.Http, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
171177
<HintPath>..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll</HintPath>
172178
</Reference>
173179
<Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
174180
<HintPath>..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
175181
</Reference>
176182
<Reference Include="System.Numerics" />
183+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
184+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
185+
</Reference>
177186
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
178187
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
179188
</Reference>
@@ -189,6 +198,9 @@
189198
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
190199
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
191200
</Reference>
201+
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
202+
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
203+
</Reference>
192204
<Reference Include="System.Windows.Forms" />
193205
<Reference Include="System.Xml" />
194206
<Reference Include="System.Core" />

0 commit comments

Comments
 (0)