diff options
| author | Christine Dodrill <me@christine.website> | 2019-06-04 13:35:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-04 13:35:44 -0400 |
| commit | 654f273baaaba63bf73fd46a65ecd1440c4758fe (patch) | |
| tree | 00db6f9b02cc8f6e8cff51a22819e34b582b9c6b | |
| parent | 7ce978fdecebdf623700fd8c5f882846f1a610ea (diff) | |
| download | x-654f273baaaba63bf73fd46a65ecd1440c4758fe.tar.xz x-654f273baaaba63bf73fd46a65ecd1440c4758fe.zip | |
[minor] move to within.website/x (#14)
* move to within.website/x
* Update user_agent.go
* cmd/within.website: add bot info page
48 files changed, 98 insertions, 84 deletions
diff --git a/cmd/appsluggr/main.go b/cmd/appsluggr/main.go index b4701a1..891b40c 100644 --- a/cmd/appsluggr/main.go +++ b/cmd/appsluggr/main.go @@ -13,7 +13,7 @@ import ( "strings" "github.com/otiai10/copy" - "github.com/Xe/x/internal" + "within.website/x/internal" ) var ( diff --git a/cmd/dnsd/main.go b/cmd/dnsd/main.go index d6e4df4..6cbc442 100644 --- a/cmd/dnsd/main.go +++ b/cmd/dnsd/main.go @@ -11,8 +11,8 @@ import ( "time" "fmt" - "github.com/Xe/x/web" - "github.com/Xe/x/internal" + "within.website/x/web" + "within.website/x/internal" "github.com/miekg/dns" "github.com/mmikulicic/stringlist" ) diff --git a/cmd/ff-primitive/main.go b/cmd/ff-primitive/main.go index 3ee0882..3de83a6 100644 --- a/cmd/ff-primitive/main.go +++ b/cmd/ff-primitive/main.go @@ -8,7 +8,7 @@ import ( "runtime" "runtime/pprof" - "github.com/Xe/x/internal" + "within.website/x/internal" "github.com/fogleman/primitive/primitive" farbfeld "github.com/hullerob/go.farbfeld" ) diff --git a/cmd/johaus/build.go b/cmd/johaus/build.go index 5241feb..43f4655 100644 --- a/cmd/johaus/build.go +++ b/cmd/johaus/build.go @@ -8,9 +8,9 @@ import ( "log" "os" - "github.com/Xe/x/internal/kahless" - "github.com/Xe/x/internal/minipaas" - "github.com/Xe/x/internal/yeet" + "within.website/x/internal/kahless" + "within.website/x/internal/minipaas" + "within.website/x/internal/yeet" ) func main() { diff --git a/cmd/johaus/main.go b/cmd/johaus/main.go index eaba012..6926b90 100644 --- a/cmd/johaus/main.go +++ b/cmd/johaus/main.go @@ -7,7 +7,7 @@ import ( "log" "net/http" - "github.com/Xe/x/internal" + "within.website/x/internal" "within.website/johaus/parser" _ "within.website/johaus/parser/camxes-beta" "within.website/johaus/pretty" diff --git a/cmd/la-baujmi/fact.go b/cmd/la-baujmi/fact.go index a421d1e..3a92357 100644 --- a/cmd/la-baujmi/fact.go +++ b/cmd/la-baujmi/fact.go @@ -4,7 +4,7 @@ import ( "errors" "strings" - "github.com/Xe/x/web/tokiponatokens" + "within.website/x/web/tokiponatokens" ) // Selbri is a predicate relationship between its arguments. The name comes from diff --git a/cmd/la-baujmi/fact_test.go b/cmd/la-baujmi/fact_test.go index 43f7a4b..7c08552 100644 --- a/cmd/la-baujmi/fact_test.go +++ b/cmd/la-baujmi/fact_test.go @@ -5,7 +5,7 @@ import ( "log" "testing" - "github.com/Xe/x/web/tokiponatokens" + "within.website/x/web/tokiponatokens" "github.com/kr/pretty" ) diff --git a/cmd/la-baujmi/main.go b/cmd/la-baujmi/main.go index 5183909..393b13c 100644 --- a/cmd/la-baujmi/main.go +++ b/cmd/la-baujmi/main.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "github.com/Xe/x/internal" - _ "github.com/Xe/x/internal/tokipona" - "github.com/Xe/x/web/tokiponatokens" + "within.website/x/internal" + _ "within.website/x/internal/tokipona" + "within.website/x/web/tokiponatokens" "github.com/mndrix/golog" line "github.com/peterh/liner" ) diff --git a/cmd/license/main.go b/cmd/license/main.go index 0f93df9..56d639d 100644 --- a/cmd/license/main.go +++ b/cmd/license/main.go @@ -10,8 +10,8 @@ import ( "text/template" "time" - "github.com/Xe/x/internal" - "github.com/Xe/x/cmd/license/licenses" + "within.website/x/internal" + "within.website/x/cmd/license/licenses" ) var ( diff --git a/cmd/mainsanow/main.go b/cmd/mainsanow/main.go index bb3df15..f75ec49 100644 --- a/cmd/mainsanow/main.go +++ b/cmd/mainsanow/main.go @@ -5,8 +5,8 @@ import ( "log" "time" - "github.com/Xe/x/internal" - "github.com/Xe/x/internal/mainsa" + "within.website/x/internal" + "within.website/x/internal/mainsa" ) func main() { diff --git a/cmd/minipaas/main.go b/cmd/minipaas/main.go index 24b2fda..2a6e8e7 100644 --- a/cmd/minipaas/main.go +++ b/cmd/minipaas/main.go @@ -5,8 +5,8 @@ import ( "log" "strings" - "github.com/Xe/x/internal" - "github.com/Xe/x/internal/minipaas" + "within.website/x/internal" + "within.website/x/internal/minipaas" ) func main() { diff --git a/cmd/mkapp/main.go b/cmd/mkapp/main.go index 376ce52..1827b9c 100644 --- a/cmd/mkapp/main.go +++ b/cmd/mkapp/main.go @@ -6,14 +6,14 @@ import ( "log" "github.com/McKael/madon/v2" - "github.com/Xe/x/internal" + "within.website/x/internal" ) var ( instance = flag.String("instance", "", "mastodon instance") appName = flag.String("app-name", "Xe/x bot", "app name for mastodon") redirectURI = flag.String("redirect-uri", "urn:ietf:wg:oauth:2.0:oob", "redirect URI for app users") - website = flag.String("website", "https://github.com/Xe/x", "website for users that click the app name") + website = flag.String("website", "https://within.website/x", "website for users that click the app name") username = flag.String("username", "", "username to generate token") password = flag.String("password", "", "password to generate token") ) diff --git a/cmd/priorworkgen/main.go b/cmd/priorworkgen/main.go index f484c27..97fc6ce 100644 --- a/cmd/priorworkgen/main.go +++ b/cmd/priorworkgen/main.go @@ -7,7 +7,7 @@ import ( "log" "os" - "github.com/Xe/x/internal" + "within.website/x/internal" "github.com/google/go-github/github" _ "github.com/joho/godotenv/autoload" "golang.org/x/oauth2" diff --git a/cmd/quickserv/main.go b/cmd/quickserv/main.go index 7506320..caea45d 100644 --- a/cmd/quickserv/main.go +++ b/cmd/quickserv/main.go @@ -5,7 +5,7 @@ import ( "log" "net/http" - "github.com/Xe/x/internal" + "within.website/x/internal" ) var ( diff --git a/cmd/relayd/main.go b/cmd/relayd/main.go index 97ff5b5..71cee2b 100644 --- a/cmd/relayd/main.go +++ b/cmd/relayd/main.go @@ -11,7 +11,7 @@ import ( "net/url" "time" - "github.com/Xe/x/internal" + "within.website/x/internal" "golang.org/x/crypto/acme/autocert" ) diff --git a/cmd/thumber/main.go b/cmd/thumber/main.go index c968853..2da2ad6 100644 --- a/cmd/thumber/main.go +++ b/cmd/thumber/main.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/Xe/x/internal" + "within.website/x/internal" "github.com/disintegration/imaging" ) diff --git a/cmd/tlstestd/main.go b/cmd/tlstestd/main.go index 0315406..660972f 100644 --- a/cmd/tlstestd/main.go +++ b/cmd/tlstestd/main.go @@ -5,7 +5,7 @@ import ( "net/http" "log" - "github.com/Xe/x/internal" + "within.website/x/internal" ) var ( diff --git a/cmd/within.website/build.go b/cmd/within.website/build.go index 40ab861..43923fb 100644 --- a/cmd/within.website/build.go +++ b/cmd/within.website/build.go @@ -8,9 +8,9 @@ import ( "log" "os" - "github.com/Xe/x/internal/kahless" - "github.com/Xe/x/internal/minipaas" - "github.com/Xe/x/internal/yeet" + "within.website/x/internal/kahless" + "within.website/x/internal/minipaas" + "within.website/x/internal/yeet" ) func main() { diff --git a/cmd/within.website/main.go b/cmd/within.website/main.go index 834d70a..fbcb552 100644 --- a/cmd/within.website/main.go +++ b/cmd/within.website/main.go @@ -5,12 +5,12 @@ import ( "flag" "net/http" - "github.com/Xe/x/internal" - "github.com/Xe/x/vanity" assetfs "github.com/elazarl/go-bindata-assetfs" "github.com/mmikulicic/stringlist" "within.website/ln" "within.website/ln/opname" + "within.website/x/internal" + "within.website/x/vanity" ) //go:generate go-bindata -pkg main static @@ -85,6 +85,11 @@ func main() { w.Write([]byte(indexTemplate)) }) + http.HandleFunc("/.x.botinfo", func(w http.ResponseWriter, r *http.Request) { + w.Header().Add("Content-Type", "text/html") + w.Write([]byte(botInfoPage)) + }) + ln.Log(ctx, ln.F{"port": *port}, ln.Info("Listening on HTTP")) http.ListenAndServe(":"+*port, nil) @@ -116,3 +121,12 @@ const indexTemplate = `<!DOCTYPE html> </main> </body> </html>` + +const botInfoPage = `<link rel="stylesheet" href="/static/gruvbox.css"> +<main> +<h1>x repo bots</h1> + +Hello, if you are reading this, you have found this URL in your access logs. + +If one of these programs is doing something you don't want them to do, please <a href="https://christine.website/contact">contact me</a> or open an issue <a href="https://github.com/Xe/x">here</a>. +</main>` diff --git a/discord/cadeybot/main.go b/discord/cadeybot/main.go index 3af8c38..08899fe 100644 --- a/discord/cadeybot/main.go +++ b/discord/cadeybot/main.go @@ -10,8 +10,8 @@ import ( "syscall" "time" - "github.com/Xe/x/internal" - "github.com/Xe/x/internal/flagenv" + "within.website/x/internal" + "within.website/x/internal/flagenv" "github.com/bwmarrin/discordgo" _ "github.com/joho/godotenv" ) diff --git a/discord/frequency/main.go b/discord/frequency/main.go index 63a32df..4b55c8e 100644 --- a/discord/frequency/main.go +++ b/discord/frequency/main.go @@ -10,7 +10,7 @@ import ( "syscall" "time" - "github.com/Xe/x/internal" + "within.website/x/internal" "github.com/bwmarrin/discordgo" "github.com/garyburd/redigo/redis" ) diff --git a/discord/ilo-kesi/bot.go b/discord/ilo-kesi/bot.go index 2475e36..96ed15d 100644 --- a/discord/ilo-kesi/bot.go +++ b/discord/ilo-kesi/bot.go @@ -3,8 +3,8 @@ package main import ( "errors" - "github.com/Xe/x/markov" - "github.com/Xe/x/web/switchcounter" + "within.website/x/markov" + "within.website/x/web/switchcounter" ) // ilo li ilo pi toki sona. diff --git a/discord/ilo-kesi/context.go b/discord/ilo-kesi/context.go index ec42acd..ee17265 100644 --- a/discord/ilo-kesi/context.go +++ b/discord/ilo-kesi/context.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/Xe/x/web/tokiponatokens" + "within.website/x/web/tokiponatokens" ) const ( diff --git a/discord/ilo-kesi/main.go b/discord/ilo-kesi/main.go index 2ba7284..e9fc7a6 100644 --- a/discord/ilo-kesi/main.go +++ b/discord/ilo-kesi/main.go @@ -11,10 +11,10 @@ import ( "syscall" "time" - "github.com/Xe/x/internal" - _ "github.com/Xe/x/internal/tokipona" - "github.com/Xe/x/markov" - "github.com/Xe/x/web/switchcounter" + "within.website/x/internal" + _ "within.website/x/internal/tokipona" + "within.website/x/markov" + "within.website/x/web/switchcounter" "github.com/bwmarrin/discordgo" "github.com/joeshaw/envdecode" _ "github.com/joho/godotenv/autoload" diff --git a/discord/ilo-kesi/parse.go b/discord/ilo-kesi/parse.go index c54f9c4..bd231be 100644 --- a/discord/ilo-kesi/parse.go +++ b/discord/ilo-kesi/parse.go @@ -8,9 +8,9 @@ import ( "net/http" "time" - "github.com/Xe/x/internal/mainsa" - "github.com/Xe/x/web/switchcounter" - "github.com/Xe/x/web/tokiponatokens" + "within.website/x/internal/mainsa" + "within.website/x/web/switchcounter" + "within.website/x/web/tokiponatokens" ) var ( @@ -97,13 +97,13 @@ func (i ilo) parse(authorID, inp string) (*reply, error) { fmt.Fprintf(buf, "ma insa la tenpo ni li tenpo pi %s\n", ni) goto ok case actionBotInfo: - fmt.Fprintf(buf, "mi ilo Kesi. mi ilo e kama sona e pali pona mute. mi wile pona sina. lipu sona mi li sitelen https://github.com/Xe/x/tree/master/discord/ilo-kesi.\n") + fmt.Fprintf(buf, "mi ilo Kesi. mi ilo e kama sona e pali pona mute. mi wile pona sina. lipu sona mi li sitelen https://within.website/x/tree/master/discord/ilo-kesi.\n") goto ok } case "": switch req.Subject { case "sina seme": - fmt.Fprintf(buf, "mi ilo Kesi. mi ilo e kama sona e pali pona mute. mi wile pona sina. lipu sona mi li sitelen https://github.com/Xe/x/tree/master/discord/ilo-kesi.\n") + fmt.Fprintf(buf, "mi ilo Kesi. mi ilo e kama sona e pali pona mute. mi wile pona sina. lipu sona mi li sitelen https://within.website/x/tree/master/discord/ilo-kesi.\n") goto ok } } diff --git a/discord/pdevbitcoinbot/main.go b/discord/pdevbitcoinbot/main.go index e19ea0d..4abe162 100644 --- a/discord/pdevbitcoinbot/main.go +++ b/discord/pdevbitcoinbot/main.go @@ -12,9 +12,9 @@ import ( "os" "strconv" - "github.com/Xe/x/internal" - "github.com/Xe/x/web" - "github.com/Xe/x/web/discordwebhook" + "within.website/x/internal" + "within.website/x/web" + "within.website/x/web/discordwebhook" "github.com/codahale/hdrhistogram" experrors "golang.org/x/exp/errors" "within.website/ln" @@ -8,7 +8,7 @@ import ( "log" "path/filepath" - "github.com/Xe/x/internal/yeet" + "within.website/x/internal/yeet" ) func main() { @@ -1,4 +1,4 @@ -module github.com/Xe/x +module within.website/x require ( github.com/McKael/madon/v2 v2.0.0-20180929094633-c679abc985d6 diff --git a/idp/build.go b/idp/build.go index 7c8e1a2..52a1d58 100644 --- a/idp/build.go +++ b/idp/build.go @@ -8,9 +8,9 @@ import ( "log" "os" - "github.com/Xe/x/internal/kahless" - "github.com/Xe/x/internal/minipaas" - "github.com/Xe/x/internal/yeet" + "within.website/x/internal/kahless" + "within.website/x/internal/minipaas" + "within.website/x/internal/yeet" ) func main() { diff --git a/idp/idpmiddleware/_example/test.go b/idp/idpmiddleware/_example/test.go index 1d28ecb..b63009e 100644 --- a/idp/idpmiddleware/_example/test.go +++ b/idp/idpmiddleware/_example/test.go @@ -7,8 +7,8 @@ import ( "log" "net/http" - "github.com/Xe/x/idp/idpmiddleware" - "github.com/Xe/x/internal" + "within.website/x/idp/idpmiddleware" + "within.website/x/internal" "within.website/ln/ex" ) diff --git a/idp/main.go b/idp/main.go index c22206f..cdc01f3 100644 --- a/idp/main.go +++ b/idp/main.go @@ -10,9 +10,9 @@ import ( "text/template" "time" - "github.com/Xe/x/i18n" - "github.com/Xe/x/idp/idpmiddleware" - "github.com/Xe/x/internal" + "within.website/x/i18n" + "within.website/x/idp/idpmiddleware" + "within.website/x/internal" "github.com/pborman/uuid" "github.com/xlzd/gotp" "within.website/ln" diff --git a/internal/flagenv/flagenv_test.go b/internal/flagenv/flagenv_test.go index 4ff958b..eb21a39 100644 --- a/internal/flagenv/flagenv_test.go +++ b/internal/flagenv/flagenv_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/Xe/x/internal/flagenv" + "within.website/x/internal/flagenv" "github.com/facebookgo/ensure" ) diff --git a/internal/internal.go b/internal/internal.go index a7225b8..53b08f4 100644 --- a/internal/internal.go +++ b/internal/internal.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - "github.com/Xe/x/internal/flagenv" - "github.com/Xe/x/internal/manpage" + "within.website/x/internal/flagenv" + "within.website/x/internal/manpage" "go4.org/legal" "within.website/confyg/flagconfyg" "within.website/ln" @@ -20,7 +20,7 @@ import ( _ "github.com/joho/godotenv/autoload" // User agent init hook - _ "github.com/Xe/x/web" + _ "within.website/x/web" ) var ( diff --git a/internal/license.go b/internal/license.go index 7b4cbae..bb4dc0b 100644 --- a/internal/license.go +++ b/internal/license.go @@ -5,7 +5,7 @@ import ( "net/http" "os" - "github.com/Xe/x/cmd/license/licenses" + "within.website/x/cmd/license/licenses" "go4.org/legal" ) diff --git a/mastodon/almarid/main.go b/mastodon/almarid/main.go index 9ee08fd..7633404 100644 --- a/mastodon/almarid/main.go +++ b/mastodon/almarid/main.go @@ -13,7 +13,7 @@ import ( "time" "github.com/McKael/madon/v2" - "github.com/Xe/x/internal" + "within.website/x/internal" "within.website/ln" ) diff --git a/mastodon/furrybb/main.go b/mastodon/furrybb/main.go index 478ccd3..2eebb6a 100644 --- a/mastodon/furrybb/main.go +++ b/mastodon/furrybb/main.go @@ -5,7 +5,7 @@ import ( "flag" "github.com/McKael/madon/v2" - "github.com/Xe/x/internal" + "within.website/x/internal" _ "github.com/joho/godotenv/autoload" "within.website/ln" ) diff --git a/mastodon/tptrans/build.go b/mastodon/tptrans/build.go index 13ce656..a2aab5a 100644 --- a/mastodon/tptrans/build.go +++ b/mastodon/tptrans/build.go @@ -8,9 +8,9 @@ import ( "log" "os" - "github.com/Xe/x/internal/greedo" - "github.com/Xe/x/internal/minipaas" - "github.com/Xe/x/internal/yeet" + "within.website/x/internal/greedo" + "within.website/x/internal/minipaas" + "within.website/x/internal/yeet" ) func main() { diff --git a/mastodon/tptrans/gokrazy.go b/mastodon/tptrans/gokrazy.go index f1c48db..f1999d5 100644 --- a/mastodon/tptrans/gokrazy.go +++ b/mastodon/tptrans/gokrazy.go @@ -2,4 +2,4 @@ package main -import _ "github.com/Xe/x/internal/gokrazy" +import _ "within.website/x/internal/gokrazy" diff --git a/mastodon/tptrans/main.go b/mastodon/tptrans/main.go index 90f9740..549b067 100644 --- a/mastodon/tptrans/main.go +++ b/mastodon/tptrans/main.go @@ -6,8 +6,8 @@ import ( "fmt" madon "github.com/McKael/madon/v2" - "github.com/Xe/x/internal" - "github.com/Xe/x/tokipona" + "within.website/x/internal" + "within.website/x/tokipona" "github.com/jaytaylor/html2text" "within.website/ln" "within.website/ln/opname" diff --git a/tg/polyglot/gokrazy.go b/tg/polyglot/gokrazy.go index f1c48db..f1999d5 100644 --- a/tg/polyglot/gokrazy.go +++ b/tg/polyglot/gokrazy.go @@ -2,4 +2,4 @@ package main -import _ "github.com/Xe/x/internal/gokrazy" +import _ "within.website/x/internal/gokrazy" diff --git a/tg/polyglot/main.go b/tg/polyglot/main.go index 231980e..35ea098 100644 --- a/tg/polyglot/main.go +++ b/tg/polyglot/main.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "github.com/Xe/x/idp/idpmiddleware" - "github.com/Xe/x/internal" - _ "github.com/Xe/x/tokipona" - "github.com/Xe/x/web/tokiponatokens" + "within.website/x/idp/idpmiddleware" + "within.website/x/internal" + _ "within.website/x/tokipona" + "within.website/x/web/tokiponatokens" _ "github.com/joho/godotenv/autoload" tb "gopkg.in/tucnak/telebot.v2" "within.website/johaus/parser" diff --git a/tg/polyglot/tokipona.go b/tg/polyglot/tokipona.go index 3357c04..5d17c98 100644 --- a/tg/polyglot/tokipona.go +++ b/tg/polyglot/tokipona.go @@ -3,7 +3,7 @@ package main import ( "strings" - "github.com/Xe/x/web/tokiponatokens" + "within.website/x/web/tokiponatokens" ) func tokiBraces(s tokiponatokens.Sentence) string { diff --git a/tokipona/nimi.go b/tokipona/nimi.go index 55226c6..1c54f24 100644 --- a/tokipona/nimi.go +++ b/tokipona/nimi.go @@ -4,7 +4,7 @@ import ( "bytes" "encoding/json" - "github.com/Xe/x/tokipona/internal" + "within.website/x/tokipona/internal" ) // Word is a single word in the Toki Pona dictionary. diff --git a/web/discordwebhook/webhook.go b/web/discordwebhook/webhook.go index 91df381..c09b89c 100644 --- a/web/discordwebhook/webhook.go +++ b/web/discordwebhook/webhook.go @@ -6,7 +6,7 @@ import ( "encoding/json" "net/http" - "github.com/Xe/x/web" + "within.website/x/web" ) // Webhook is the parent structure fired off to Discord. diff --git a/web/switchcounter/switchc.go b/web/switchcounter/switchc.go index f40929f..7acbe43 100644 --- a/web/switchcounter/switchc.go +++ b/web/switchcounter/switchc.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - "github.com/Xe/x/web" + "within.website/x/web" ) type arg struct { |