From 065c5f70c0c3432608dfe08db784e6687a7ef180 Mon Sep 17 00:00:00 2001
From: TopiSenpai <tobi@strasserhof.com>
Date: Fri, 23 Apr 2021 20:50:33 +0200
Subject: [PATCH] added test mdoule & fixed stoopid stuff

---
 api/endpoints/endpoints.go   |  2 +-
 disgohook.go                 |  8 ++++----
 internal/rest_client_impl.go |  1 -
 test/go.mod                  | 12 ++++++++++++
 test/go.sum                  |  9 +++++++++
 test/test.go                 | 24 ++++++++++++++++++++++++
 6 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100644 test/go.mod
 create mode 100644 test/go.sum
 create mode 100644 test/test.go

diff --git a/api/endpoints/endpoints.go b/api/endpoints/endpoints.go
index ad14dbf..3c012d8 100644
--- a/api/endpoints/endpoints.go
+++ b/api/endpoints/endpoints.go
@@ -14,7 +14,7 @@ var (
 	UpdateWebhok  = NewAPIRoute(PATCH, "/webhooks/{webhook.id}/{token}")
 	DeleteWebhook = NewAPIRoute(DELETE, "/webhooks/{webhook.id}/{token}")
 
-	CreateWebhookMessage = NewAPIRoute(POST, "/webhooks/{webhook.id}/{webhook.token}")
+	CreateWebhookMessage = NewAPIRoute(POST, "/webhooks/{webhook.id}/{webhook.token}?wait=true")
 	UpdateWebhookMessage = NewAPIRoute(POST, "/webhooks/{webhook.id}/{webhook.token}/messages/{message.id}")
 	DeleteWebhookMessage = NewAPIRoute(POST, "/webhooks/{webhook.id}/{webhook.token}/messages/{message.id}")
 )
diff --git a/disgohook.go b/disgohook.go
index 370224f..c5ea2fe 100644
--- a/disgohook.go
+++ b/disgohook.go
@@ -8,14 +8,14 @@ import (
 	"github.com/DisgoOrg/log"
 )
 
-func NewWebhookByToken(webhookToken string, logger log.Logger) (api.Webhook, error) {
+func NewWebhookByToken(logger log.Logger, webhookToken string) (api.Webhook, error) {
 	webhookTokenSplit := strings.SplitN(webhookToken, "/", 2)
 	if len(webhookTokenSplit) != 2 {
 		return nil, api.ErrMalformedWebhookToken
 	}
-	return internal.NewWebhookImpl(nil, logger, webhookTokenSplit[0], webhookTokenSplit[1]), nil
+	return internal.NewWebhookImpl(nil, logger, webhookTokenSplit[1], webhookTokenSplit[0]), nil
 }
 
-func NewWebhookByID(id string, token string) (api.Webhook, error) {
-	return nil, nil
+func NewWebhookByIDToken(logger log.Logger, webhookID string, webhookToken string) (api.Webhook, error) {
+	return internal.NewWebhookImpl(nil, logger, webhookID, webhookToken), nil
 }
diff --git a/internal/rest_client_impl.go b/internal/rest_client_impl.go
index dc9cc1c..a5ead31 100644
--- a/internal/rest_client_impl.go
+++ b/internal/rest_client_impl.go
@@ -53,7 +53,6 @@ func (r *RestClientImpl) Request(route endpoints.CompiledAPIRoute, rqBody interf
 	}
 
 	rq.Header.Set("User-Agent", r.UserAgent())
-	rq.Header.Set("Authorization", "Bot "+r.webhook.Token())
 	rq.Header.Set("Content-Type", "application/json")
 
 	rs, err := r.client.Do(rq)
diff --git a/test/go.mod b/test/go.mod
new file mode 100644
index 0000000..040cc0d
--- /dev/null
+++ b/test/go.mod
@@ -0,0 +1,12 @@
+module github.com/DisgoOrg/disgo/disgohook
+
+go 1.16
+
+replace (
+	github.com/DisgoOrg/disgohook => ../
+)
+
+require (
+github.com/DisgoOrg/disgohook v1.0.1
+	github.com/sirupsen/logrus v1.8.1
+)
diff --git a/test/go.sum b/test/go.sum
new file mode 100644
index 0000000..6b1e7b0
--- /dev/null
+++ b/test/go.sum
@@ -0,0 +1,9 @@
+github.com/DisgoOrg/log v1.0.3 h1:IjmZQQu/kuBIui22EdXmxzQGYwcPCJEkXa0Fe6W9fJk=
+github.com/DisgoOrg/log v1.0.3/go.mod h1:KFGKhBQr37d6rxZ7p2bmc8BEmDH8DZbtgdlJDSCsE7I=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
diff --git a/test/test.go b/test/test.go
new file mode 100644
index 0000000..a1f64f6
--- /dev/null
+++ b/test/test.go
@@ -0,0 +1,24 @@
+package main
+
+import (
+	"os"
+
+	"github.com/DisgoOrg/disgohook"
+	"github.com/sirupsen/logrus"
+)
+
+func main() {
+	logger := logrus.New()
+	logger.SetLevel(logrus.InfoLevel)
+	logger.Info("starting test...")
+	webhook, err := disgohook.NewWebhookByToken(os.Getenv("webhook_token"), logger)
+	if err != nil {
+		logger.Errorf("failed to create webhook: %s", err)
+		return
+	}
+	_, err = webhook.SendContent("test")
+	if err != nil {
+		logger.Errorf("failed to send webhook message: %s", err)
+		return
+	}
+}
\ No newline at end of file