From bd1e6dd1138185f3994f6c6efa6983aff4d3bb8c Mon Sep 17 00:00:00 2001 From: Daniel Aberger Date: Fri, 23 Apr 2021 14:12:48 +0200 Subject: [PATCH] Normalize all line endings --- .gitignore | 12 +-- README.md | 48 ++++++------ audio/readme.txt | 6 +- templates/collwrapend.html | 2 +- templates/collwrapstart.html | 4 +- templates/footer.html | 22 +++--- templates/header.html | 140 +++++++++++++++++------------------ templates/home.html | 6 +- templates/item.html | 2 +- templates/itemrowend.html | 2 +- templates/itemrowstart.html | 2 +- 11 files changed, 123 insertions(+), 123 deletions(-) diff --git a/.gitignore b/.gitignore index 820dcba..8e0172a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ -run.bat -run.sh -audio/*.dca -audio/*_*.txt -static/img/*.jpg -gidbig +run.bat +run.sh +audio/*.dca +audio/*_*.txt +static/img/*.jpg +gidbig config.yaml \ No newline at end of file diff --git a/README.md b/README.md index 9c7bb5f..99b3281 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,25 @@ # Gidbig - -Gidbig is a Discord Bot in Go based on -[Airhorn Bot by Hammer and Chisel](https://github.com/hammerandchisel/airhornbot/). -Visit [https://airhorn.solutions/](https://airhorn.solutions/). - -## Features -- Plays Ping Pong with you, if you type "ping" or "pong" in any channel he has access to. -- Airhorn-Feature to play sound files in the voice channel you are currently in. -Since there is not yet any command to request a list of available sound files, just take a look in `audio/`. -They are named after the scheme `command_soundname.dca` and would result in a channel command like `!command soundname` like in `!airhorn default`. -Typing only the `!command` without an argument results in a random sound of this command's collection. -- Comfortable web interface to trigger sounds -- Automatically detect all `.dca` files in `audio/` -- Optional sound descriptions via `.txt` files in `audio/` with the same name as the soundfile - -## Installation -Coming soon. -## To do -- more web interface enhancements - -## Known issues -- `https://discordapp.com/api/oauth2` needs to be added to `brokenAuthHeaderProviders` in `golang.org/x/oauth2/internal/token.go` in order for oauth2 to work again. - -Please use the issue tracker. Thank you! + +Gidbig is a Discord Bot in Go based on +[Airhorn Bot by Hammer and Chisel](https://github.com/hammerandchisel/airhornbot/). +Visit [https://airhorn.solutions/](https://airhorn.solutions/). + +## Features +- Plays Ping Pong with you, if you type "ping" or "pong" in any channel he has access to. +- Airhorn-Feature to play sound files in the voice channel you are currently in. +Since there is not yet any command to request a list of available sound files, just take a look in `audio/`. +They are named after the scheme `command_soundname.dca` and would result in a channel command like `!command soundname` like in `!airhorn default`. +Typing only the `!command` without an argument results in a random sound of this command's collection. +- Comfortable web interface to trigger sounds +- Automatically detect all `.dca` files in `audio/` +- Optional sound descriptions via `.txt` files in `audio/` with the same name as the soundfile + +## Installation +Coming soon. +## To do +- more web interface enhancements + +## Known issues +- `https://discordapp.com/api/oauth2` needs to be added to `brokenAuthHeaderProviders` in `golang.org/x/oauth2/internal/token.go` in order for oauth2 to work again. + +Please use the issue tracker. Thank you! diff --git a/audio/readme.txt b/audio/readme.txt index e6306f8..f1d55c1 100644 --- a/audio/readme.txt +++ b/audio/readme.txt @@ -1,3 +1,3 @@ -Place .dca audio files here. -Naming convention is as follows: command_soundname.dca -This will result in "!command soundname". +Place .dca audio files here. +Naming convention is as follows: command_soundname.dca +This will result in "!command soundname". diff --git a/templates/collwrapend.html b/templates/collwrapend.html index 0c2eddc..04f5b84 100644 --- a/templates/collwrapend.html +++ b/templates/collwrapend.html @@ -1 +1 @@ - + diff --git a/templates/collwrapstart.html b/templates/collwrapstart.html index cc49d84..4321c9a 100644 --- a/templates/collwrapstart.html +++ b/templates/collwrapstart.html @@ -1,2 +1,2 @@ -
{{ .Itemprefix }}
-
+
{{ .Itemprefix }}
+
diff --git a/templates/footer.html b/templates/footer.html index 40b5cae..04d675e 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -1,11 +1,11 @@ -{{ define "footer" }} -
-
- - - - - - - -{{ end }} +{{ define "footer" }} + + + + + + + + + +{{ end }} diff --git a/templates/header.html b/templates/header.html index 2a0d7b1..ac83ae0 100644 --- a/templates/header.html +++ b/templates/header.html @@ -1,70 +1,70 @@ -{{ define "header" }} - - - - - - - - - - - - - - - - - - - - - - - - - - Gidbig - - - - - -
-
-

Gidbig

-

{{ template "sessionHandler" . }}

- {{ end }} +{{ define "header" }} + + + + + + + + + + + + + + + + + + + + + + + + + + Gidbig + + + + + +
+
+

Gidbig

+

{{ template "sessionHandler" . }}

+ {{ end }} diff --git a/templates/home.html b/templates/home.html index ad7174d..4281d52 100644 --- a/templates/home.html +++ b/templates/home.html @@ -1,3 +1,3 @@ -{{ define "sessionHandler" }} -Login with Discord -{{ end }} +{{ define "sessionHandler" }} +Login with Discord +{{ end }} diff --git a/templates/item.html b/templates/item.html index d093f21..f02f380 100644 --- a/templates/item.html +++ b/templates/item.html @@ -1 +1 @@ -
{{ .Itemcommand }} {{ .Itemsoundname }}
{{ .Itemshorttext }}

+
{{ .Itemcommand }} {{ .Itemsoundname }}
{{ .Itemshorttext }}

diff --git a/templates/itemrowend.html b/templates/itemrowend.html index 0c2eddc..04f5b84 100644 --- a/templates/itemrowend.html +++ b/templates/itemrowend.html @@ -1 +1 @@ -
+
diff --git a/templates/itemrowstart.html b/templates/itemrowstart.html index cc4da1a..38b3744 100644 --- a/templates/itemrowstart.html +++ b/templates/itemrowstart.html @@ -1 +1 @@ -
+