@@ -32,24 +32,24 @@ public DiscordWebhookWindow(ValheimServer server)
3232
3333 txtWebhook . Text = _server . DiscordWebhook ;
3434
35- ContextMenu contextMenu = new ContextMenu ( ) ;
36- MenuItem defaultMenu = new MenuItem ( ) ;
35+ var contextMenu = new ContextMenu ( ) ;
36+ var defaultMenu = new MenuItem ( ) ;
3737 contextMenu . Items . Add ( defaultMenu ) ;
3838 defaultMenu . Header = "Reset to default" ;
3939 defaultMenu . Click += DefaultMenu_Click ;
4040
41- messageControls = new List < TextBox > ( ) ;
42- messageControls . Add ( OnPlayerConnected ) ;
43- messageControls . Add ( OnPlayerDisconnected ) ;
44- messageControls . Add ( OnPlayerDied ) ;
45- messageControls . Add ( OnFailedPassword ) ;
46- messageControls . Add ( OnRandomServerEvent ) ;
47- messageControls . Add ( OnStarted ) ;
48- messageControls . Add ( OnStartFailed ) ;
49- messageControls . Add ( OnServerExited ) ;
50- foreach ( TextBox textBox in messageControls )
41+ messageControls = new ( ) ;
42+ messageControls . Add ( txtOnPlayerConnected ) ;
43+ messageControls . Add ( txtOnPlayerDisconnected ) ;
44+ messageControls . Add ( txtOnPlayerDied ) ;
45+ messageControls . Add ( txtOnFailedPassword ) ;
46+ messageControls . Add ( txtOnRandomServerEvent ) ;
47+ messageControls . Add ( txtOnStarted ) ;
48+ messageControls . Add ( txtOnStartFailed ) ;
49+ messageControls . Add ( txtOnServerExited ) ;
50+ foreach ( var textBox in messageControls )
5151 {
52- textBox . Text = server . GetWebhookMessage ( textBox . Name ) ;
52+ textBox . Text = server . GetWebhookMessage ( textBox . Tag . ToString ( ) ) ;
5353 textBox . ContextMenu = contextMenu ;
5454 textBox . ContextMenuOpening += TextBox_ContextMenuOpening ;
5555 }
@@ -62,66 +62,36 @@ private void TextBox_ContextMenuOpening(object sender, ContextMenuEventArgs e)
6262
6363 private void DefaultMenu_Click ( object sender , RoutedEventArgs e )
6464 {
65- clickedTextBox . Text = _server . DefaultWebhookMessages [ clickedTextBox . Name ] ;
66- }
67-
68- private void btnTestConnected_Click ( object sender , RoutedEventArgs e )
69- {
70- _server . SendDiscordWebhook ( OnPlayerConnected . Name , new Player ( "Bjorn" , "123456789101112" ) ) ;
71- }
72-
73- private void btnTestDisconnected_Click ( object sender , RoutedEventArgs e )
74- {
75- _server . SendDiscordWebhook ( OnPlayerDisconnected . Name , new Player ( "Bjorn" , "123456789101112" ) ) ;
76- }
77-
78- private void btnTestDied_Click ( object sender , RoutedEventArgs e )
79- {
80- _server . SendDiscordWebhook ( OnPlayerDied . Name , new Player ( "Bjorn" , "123456789101112" ) ) ;
81- }
82-
83- private void btnFailedPassword_Click ( object sender , RoutedEventArgs e )
84- {
85- _server . SendDiscordWebhook ( OnFailedPassword . Name , new Player ( "Bjorn" , "123456789101112" ) ) ;
86- }
87-
88- private void btnRandomServerEvent_Click ( object sender , RoutedEventArgs e )
89- {
90- _server . SendDiscordWebhook ( OnRandomServerEvent . Name , null , "army_bonemass" ) ;
65+ clickedTextBox . Text = ValheimServer . DiscordWebhookDefaultMessages [ clickedTextBox . Tag . ToString ( ) ] ;
9166 }
9267
9368 private void btnSave_Click ( object sender , RoutedEventArgs e )
9469 {
9570 _server . DiscordWebhook = txtWebhook . Text ;
96- foreach ( TextBox textBox in messageControls )
71+ foreach ( var textBox in messageControls )
9772 {
98- if ( textBox . Text != null && _server . DefaultWebhookMessages . ContainsKey ( textBox . Name ) && textBox . Text != this . _server . DefaultWebhookMessages [ textBox . Name ] )
73+ var webHookName = textBox . Tag . ToString ( ) ;
74+ if ( textBox . Text != null && ValheimServer . DiscordWebhookDefaultMessages . ContainsKey ( webHookName ) && textBox . Text != ValheimServer . DiscordWebhookDefaultMessages [ webHookName ] )
9975 {
100- _server . DiscordWebhookMessages [ textBox . Name ] = textBox . Text ;
76+ _server . DiscordWebhookMessages [ webHookName ] = textBox . Text ;
10177 }
102- else if ( _server . DefaultWebhookMessages . ContainsKey ( textBox . Name ) && textBox . Text == this . _server . DefaultWebhookMessages [ textBox . Name ] )
78+ else if ( ValheimServer . DiscordWebhookDefaultMessages . ContainsKey ( webHookName ) && textBox . Text == ValheimServer . DiscordWebhookDefaultMessages [ webHookName ] )
10379 {
104- if ( _server . DiscordWebhookMessages . ContainsKey ( textBox . Name ) )
80+ if ( _server . DiscordWebhookMessages . ContainsKey ( webHookName ) )
10581 {
106- _server . DiscordWebhookMessages . Remove ( textBox . Name ) ;
82+ _server . DiscordWebhookMessages . Remove ( webHookName ) ;
10783 }
10884 }
10985 }
11086 DialogResult = true ;
11187 Close ( ) ;
11288 }
113-
114- private void btnTestServerStarted_Click ( object sender , RoutedEventArgs e )
115- {
116- _server . SendDiscordWebhook ( OnStarted . Name , null , null ) ;
117- }
118- private void btnTestServerStartFailed_Click ( object sender , RoutedEventArgs e )
89+ private void btnTestWebhook_Click ( object sender , RoutedEventArgs e )
11990 {
120- _server . SendDiscordWebhook ( OnStartFailed . Name , null , null ) ;
121- }
122- private void btnTestServerStopped_Click ( object sender , RoutedEventArgs e )
123- {
124- _server . SendDiscordWebhook ( OnStarted . Name , null , null ) ;
91+ var oldUrl = _server . DiscordWebhook ;
92+ _server . DiscordWebhook = txtWebhook . Text ;
93+ _server . SendDiscordWebhook ( ( ( Button ) sender ) . Tag . ToString ( ) , new Player ( "Bjorn" , "123456789101112" ) , "army_bonemass" ) ;
94+ _server . DiscordWebhook = oldUrl ;
12595 }
12696
12797 private void btnCancel_Click ( object sender , RoutedEventArgs e )
0 commit comments