rebeccanod1/SecondBot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update BetterRelay.cs

Browse source 
converts function to return a task vs void
This commit is contained in:
Madpeterz 2021-03-26 07:37:58 +00:00
parent 0ba5b2fc4b
commit da92479936
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
BetterSecondbot/BetterRelayService/BetterRelay.cs
View file

@ -10,6 +10,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System.Net.Http; using System.Net.Http;
using System.Threading.Tasks;
namespace BetterSecondBot.BetterRelayService namespace BetterSecondBot.BetterRelayService
{ {
@ -182,7 +183,7 @@ namespace BetterSecondBot.BetterRelayService
protected HttpClient HTTPclient = new HttpClient(); protected HttpClient HTTPclient = new HttpClient();
protected async void TriggerRelay(string sourcetype, string name,string message, string filtervalue, string discordServerid, string discordChannelid) protected async Task<Task> TriggerRelay(string sourcetype, string name,string message, string filtervalue, string discordServerid, string discordChannelid)
{ {
List<relay_config> Dataset = new List<relay_config>(); List<relay_config> Dataset = new List<relay_config>();
if (sourcetype == "localchat") if (sourcetype == "localchat")
@ -207,7 +208,7 @@ namespace BetterSecondBot.BetterRelayService
} }
if(message.Contains("[relay]") == true) if(message.Contains("[relay]") == true)
{ {
return; return Task.CompletedTask;
} }
string message_no_name = "[relay]" + message; string message_no_name = "[relay]" + message;
message = "[relay] " + sourcetype + " # " + name + ": " + message; message = "[relay] " + sourcetype + " # " + name + ": " + message;
@ -283,11 +284,12 @@ namespace BetterSecondBot.BetterRelayService
} }
} }
} }
return Task.CompletedTask;
} }
protected void DiscordMessageHandler(object sender, DiscordMessageEvent e) protected void DiscordMessageHandler(object sender, DiscordMessageEvent e)
{ {
TriggerRelay("discord", e.name, e.message, "" + e.server.ToString() + "@" + e.channel.ToString(),e.server.ToString(),e.channel.ToString()); _ = TriggerRelay("discord", e.name, e.message, "" + e.server.ToString() + "@" + e.channel.ToString(),e.server.ToString(),e.channel.ToString());
} }
protected void SLMessageHandler(object sender, MessageEventArgs e) protected void SLMessageHandler(object sender, MessageEventArgs e)
@ -296,19 +298,19 @@ namespace BetterSecondBot.BetterRelayService
{ {
if (e.localchat == true) if (e.localchat == true)
{ {
TriggerRelay("localchat", e.sender_name, e.message, e.sender_uuid.ToString(), "", ""); _ = TriggerRelay("localchat", e.sender_name, e.message, e.sender_uuid.ToString(), "", "");
} }
else if (e.avatar == false) else if (e.avatar == false)
{ {
TriggerRelay("objectim", e.sender_name, e.message, e.sender_uuid.ToString(), "", ""); _ = TriggerRelay("objectim", e.sender_name, e.message, e.sender_uuid.ToString(), "", "");
} }
else if (e.group == true) else if (e.group == true)
{ {
TriggerRelay("groupchat", e.sender_name, e.message, e.group_uuid.ToString(), "", ""); _ = TriggerRelay("groupchat", e.sender_name, e.message, e.group_uuid.ToString(), "", "");
} }
else if (e.avatar == true) else if (e.avatar == true)
{ {
TriggerRelay("avatarim", e.sender_name, e.message, e.sender_uuid.ToString(), "", ""); _ = TriggerRelay("avatarim", e.sender_name, e.message, e.sender_uuid.ToString(), "", "");
} }
} }