From ddc6ceada89df91b3bbc6fd51d369848e2e56585 Mon Sep 17 00:00:00 2001
From: Madpeterz <57852827+Madpeterz@users.noreply.github.com>
Date: Sun, 14 Feb 2021 20:25:40 +0000
Subject: [PATCH] http relay target plus faster at home

---
 BetterSecondbot/BetterAtHome/BetterAtHome.cs  |  4 +--
 .../BetterRelayService/BetterRelay.cs         | 30 ++++++++++++-------
 README.md                                     |  5 +++-
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/BetterSecondbot/BetterAtHome/BetterAtHome.cs b/BetterSecondbot/BetterAtHome/BetterAtHome.cs
index 1bac3eb..9f02bce 100644
--- a/BetterSecondbot/BetterAtHome/BetterAtHome.cs
+++ b/BetterSecondbot/BetterAtHome/BetterAtHome.cs
@@ -131,7 +131,7 @@ namespace BetterSecondbot.BetterAtHome
                 return;
             }
             long dif = helpers.UnixTimeNow() - LastLoginEvent;
-            if (dif < 60)
+            if (dif < 25)
             {
                 controler.Bot.SetBetterAtHomeAction("Waiting for login lockout");
                 return;
@@ -150,7 +150,7 @@ namespace BetterSecondbot.BetterAtHome
                 return;
             }
             long dif = helpers.UnixTimeNow() - LastLoginEvent;
-            if (dif < 60)
+            if (dif < 25)
             {
                 controler.Bot.SetBetterAtHomeAction("Waiting for Login cooldown");
                 return;
diff --git a/BetterSecondbot/BetterRelayService/BetterRelay.cs b/BetterSecondbot/BetterRelayService/BetterRelay.cs
index aac3313..1c5fec3 100644
--- a/BetterSecondbot/BetterRelayService/BetterRelay.cs
+++ b/BetterSecondbot/BetterRelayService/BetterRelay.cs
@@ -9,6 +9,7 @@ using OpenMetaverse;
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Net.Http;
 
 namespace BetterSecondBot.BetterRelayService
 {
@@ -164,6 +165,8 @@ namespace BetterSecondBot.BetterRelayService
             superV.MessageEvent += DiscordMessageHandler;
         }
 
+        protected HttpClient HTTPclient = new HttpClient();
+
         protected async void TriggerRelay(string sourcetype, string name,string message, string filtervalue, string discordServerid, string discordChannelid)
         {
             List<relay_config> Dataset = new List<relay_config>();
@@ -186,14 +189,9 @@ namespace BetterSecondBot.BetterRelayService
                 {
                     relay_packet packet = new relay_packet();
                     packet.source_message = message;
-                    packet.source_name = sourcetype;
                     packet.source_user = name;
-                    packet.target_name = cfg.targetname;
-                    packet.target_value = cfg.targetvalue;
-                    packet.unixtime = helpers.UnixTimeNow().ToString();
                     if (sourcetype == "discord")
                     {
-                        packet.discord_serverid = discordServerid;
                         packet.discord_channelid = discordChannelid;
                     }
                     sendmessage = JsonConvert.SerializeObject(packet);
@@ -212,6 +210,23 @@ namespace BetterSecondBot.BetterRelayService
                             }
                         }
                     }
+                    else if (cfg.targetname == "http")
+                    {
+                        Dictionary<string, string> values = new Dictionary<string, string>
+                        {
+                            { "reply", sendmessage },
+                        };
+
+                        var content = new FormUrlEncodedContent(values);
+                        try
+                        {
+                            await HTTPclient.PostAsync(cfg.targetvalue, content).ConfigureAwait(true);
+                        }
+                        catch (Exception e)
+                        {
+                            LogFormater.Crit("[BetterRelay] HTTP failed: " + e.Message + "");
+                        }
+                    }
                     else if (cfg.targetname == "localchat")
                     {
                         int chan = 0;
@@ -290,13 +305,8 @@ namespace BetterSecondBot.BetterRelayService
 
     public class relay_packet
     {
-        public string source_name = "";
         public string source_user = "";
         public string source_message = "";
-        public string target_name = "";
-        public string target_value = "";
-        public string discord_serverid = "notused";
         public string discord_channelid = "notused";
-        public string unixtime = "";
     }
 }
diff --git a/README.md b/README.md
index f98154f..fb12e11 100644
--- a/README.md
+++ b/README.md
@@ -190,4 +190,7 @@ To config the relay please use the settings below.
 		    target-config: avatar uuid
 
 	    groupchat
-		    target-config: group uuid
\ No newline at end of file
+		    target-config: group uuid
+
+        http
+            target-config: full url
\ No newline at end of file