internal: add license flag

9 files changed, 78 insertions, 11 deletions

diff --git a/discord/ilo-kesi/main.go b/discord/ilo-kesi/main.go
index 84350fc..2622be2 100644
--- a/discord/ilo-kesi/main.go
+++ b/discord/ilo-kesi/main.go
@@ -2,12 +2,14 @@ package main
 
 import (
 	"context"
+	"flag"
 	"fmt"
 	"log"
 	"math/rand"
 	"net/http"
 	"time"
 
+	"github.com/Xe/x/internal"
 	"github.com/Xe/x/web/switchcounter"
 	"github.com/Xe/x/web/tokiponatokens"
 	"github.com/joeshaw/envdecode"
@@ -34,6 +36,9 @@ func main() {
 		log.Fatal(err)
 	}
 
+	flag.Parse()
+	internal.HandleLicense()
+
 	//pretty.Println(cfg)
 
 	sw := switchcounter.NewHTTPClient(http.DefaultClient, cfg.SwitchCounterWebhook)
diff --git a/discord/ilo-kesi/tokipona.json b/discord/ilo-kesi/tokipona.json
new file mode 100644
index 0000000..8d96443
--- /dev/null
+++ b/discord/ilo-kesi/tokipona.json
@@ -0,0 +1 @@
+[{"name":"a","gloss":"ah","grammar":["interj"]},{"name":"akesi","category":"animal","gloss":"reptile","grammar":["n"]},{"name":"ala","gloss":"no","grammar":["mod","n","interj"]},{"name":"ali","gloss":"all","grammar":["n","mod"]},{"name":"anpa","gloss":"under","grammar":["n","mod"]},{"name":"ante","gloss":"different","grammar":["n","mod","conj","vt"]},{"name":"anu","category":"separator","gloss":"or","grammar":["conj"]},{"name":"awen","gloss":"remain","grammar":["vi","vt","mod"]},{"name":"e","category":"separator","gloss":"object marker","grammar":["sep"]},{"name":"en","category":"separator","gloss":"and","grammar":["conj"]},{"name":"esun","gloss":"shop","grammar":["n"]},{"name":"ijo","gloss":"thing","grammar":["n","mod","vt"]},{"name":"ike","gloss":"evil","grammar":["mod","interj","n","vt","vi"]},{"name":"ilo","gloss":"tool","grammar":["n"]},{"name":"insa","gloss":"inside","grammar":["n","mod"]},{"name":"jaki","gloss":"dirty","grammar":["mod","n","vt","interj"]},{"name":"jan","category":"animal","gloss":"person","grammar":["n","mod","vt"]},{"name":"jelo","category":"color","gloss":"yellow","grammar":["mod"]},{"name":"jo","gloss":"have","grammar":["vt","n"]},{"name":"kala","category":"animal","gloss":"fish","grammar":["n"]},{"name":"kalama","gloss":"sound","grammar":["n","vi","vt"]},{"name":"kama","gloss":"come","grammar":["vi","n","mod","vt"]},{"name":"kasi","gloss":"plant","grammar":["n"]},{"name":"ken","gloss":"possible","grammar":["vi","n","vt"]},{"name":"kepeken","gloss":"use","grammar":["vt","prep"]},{"name":"kili","gloss":"fruit","grammar":["n"]},{"name":"kin","gloss":"also","grammar":["mod"]},{"name":"kiwen","gloss":"rock","grammar":["mod","n"]},{"name":"ko","gloss":"squishy","grammar":["n"]},{"name":"kon","gloss":"soul","grammar":["n","mod"]},{"name":"kule","gloss":"color","grammar":["n","mod","vt"]},{"name":"kulupu","gloss":"group","grammar":["n","mod"]},{"name":"kute","gloss":"listen","grammar":["vt","mod"]},{"name":"la","category":"separator","gloss":"in context","grammar":["sep"]},{"name":"lape","gloss":"rest","grammar":["n","vi","mod"]},{"name":"laso","category":"color","gloss":"blue/green","grammar":["mod"]},{"name":"lawa","gloss":"head","grammar":["n","mod","vt"]},{"name":"len","gloss":"cloth","grammar":["n"]},{"name":"lete","gloss":"cold","grammar":["n","mod","vt"]},{"name":"li","category":"separator","gloss":"is","grammar":["sep"]},{"name":"lili","gloss":"small","grammar":["mod","vt"]},{"name":"linja","gloss":"string","grammar":["n"]},{"name":"lipu","gloss":"paper","grammar":["n"]},{"name":"loje","category":"color","gloss":"red","grammar":["mod"]},{"name":"lon","gloss":"located","grammar":["prep","vi"]},{"name":"luka","gloss":"hand","grammar":["n"]},{"name":"lukin","gloss":"see","grammar":["vt","vi","mod"]},{"name":"lupa","gloss":"hole","grammar":["n"]},{"name":"ma","gloss":"land","grammar":["n"]},{"name":"mama","category":"animal","gloss":"parent","grammar":["n","mod"]},{"name":"mani","gloss":"money","grammar":["n"]},{"name":"meli","category":"animal","gloss":"female","grammar":["n","mod"]},{"name":"mi","gloss":"I/we","grammar":["n","mod"]},{"name":"mije","category":"animal","gloss":"male","grammar":["n","mod"]},{"name":"moku","gloss":"food","grammar":["n","vt"]},{"name":"moli","gloss":"death","grammar":["n","vi","vt","mod"]},{"name":"monsi","gloss":"back","grammar":["n","mod"]},{"name":"mu","gloss":"moo!","grammar":["interj"]},{"name":"mun","gloss":"moon","grammar":["n","mod"]},{"name":"musi","gloss":"play","grammar":["n","mod","vi","vt"]},{"name":"mute","gloss":"many","grammar":["mod","n","vt"]},{"name":"namako","gloss":"extra","grammar":["n","mod"]},{"name":"nanpa","gloss":"number","grammar":["n"]},{"name":"nasa","gloss":"crazy","grammar":["mod","vt"]},{"name":"nasin","gloss":"manner","grammar":["n"]},{"name":"nena","gloss":"bump","grammar":["n"]},{"name":"ni","gloss":"this","grammar":["mod"]},{"name":"nimi","gloss":"name","grammar":["n"]},{"name":"noka","gloss":"leg","grammar":["n"]},{"name":"o","gloss":"imperative","grammar":["sep","interj"]},{"name":"oko","gloss":"eye","grammar":["n"]},{"name":"olin","gloss":"love","grammar":["n","mod","vt"]},{"name":"ona","gloss":"he/she/it","grammar":["n","mod"]},{"name":"open","gloss":"open","grammar":["vt"]},{"name":"pakala","gloss":"destroy","grammar":["n","vt","vi","interj"]},{"name":"pali","gloss":"make","grammar":["n","mod","vt","vi"]},{"name":"palisa","gloss":"rod","grammar":["n"]},{"name":"pan","gloss":"grain","grammar":["n"]},{"name":"pana","gloss":"give","grammar":["vt","n"]},{"name":"pi","category":"separator","gloss":"of","grammar":["sep"]},{"name":"pilin","gloss":"feel","grammar":["n","vi","vt"]},{"name":"pimeja","category":"color","gloss":"black","grammar":["mod","n","vt"]},{"name":"pini","gloss":"end","grammar":["n","mod","vt"]},{"name":"pipi","category":"animal","gloss":"insect","grammar":["n"]},{"name":"poka","gloss":"side","grammar":["n","mod","prep"]},{"name":"poki","gloss":"box","grammar":["n"]},{"name":"pona","gloss":"good","grammar":["n","mod","interj","vt"]},{"name":"pu","gloss":"toki ponist","grammar":["n","mod","vi"]},{"name":"sama","gloss":"similar","grammar":["mod","prep"]},{"name":"seli","gloss":"warm","grammar":["n","mod","vt"]},{"name":"selo","gloss":"surface","grammar":["n"]},{"name":"seme","gloss":"what","grammar":["n","mod","vi"]},{"name":"sewi","gloss":"superior","grammar":["n","mod"]},{"name":"sijelo","gloss":"body","grammar":["n"]},{"name":"sike","gloss":"circle","grammar":["n","mod"]},{"name":"sin","gloss":"new","grammar":["mod","vt"]},{"name":"sina","gloss":"you","grammar":["n","mod"]},{"name":"sinpin","gloss":"front","grammar":["n"]},{"name":"sitelen","gloss":"draw","grammar":["n","vt"]},{"name":"sona","gloss":"wisdom","grammar":["n","vt","vi"]},{"name":"soweli","category":"animal","gloss":"mammal","grammar":["n"]},{"name":"suli","gloss":"big","grammar":["mod","vt","n"]},{"name":"suno","gloss":"light","grammar":["n"]},{"name":"supa","gloss":"table","grammar":["n"]},{"name":"suwi","gloss":"sweet","grammar":["n","mod","vt"]},{"name":"tan","gloss":"because","grammar":["prep","n"]},{"name":"taso","gloss":"only","grammar":["mod","conj"]},{"name":"tawa","gloss":"move","grammar":["prep","vi","n","mod","vt"]},{"name":"telo","gloss":"liquid","grammar":["n","vt"]},{"name":"tenpo","gloss":"time","grammar":["n"]},{"name":"toki","gloss":"talking","grammar":["n","mod","vt","vi","interj"]},{"name":"tomo","gloss":"house","grammar":["n","mod"]},{"name":"tu","gloss":"two","grammar":["mod","n"]},{"name":"unpa","gloss":"sex","grammar":["n","mod","vt","vi"]},{"name":"uta","gloss":"mouth","grammar":["n","mod"]},{"name":"utala","gloss":"attack","grammar":["n","vt"]},{"name":"walo","category":"color","gloss":"white","grammar":["mod","n"]},{"name":"wan","gloss":"one","grammar":["mod","n","vt"]},{"name":"waso","category":"animal","gloss":"bird","grammar":["n"]},{"name":"wawa","gloss":"power","grammar":["n","mod","vt"]},{"name":"weka","gloss":"away","grammar":["mod","n","vt"]},{"name":"wile","gloss":"need","grammar":["vt","n","mod"]},{"name":".","category":"separator","gloss":"period","type":"punctuation","grammar":["punct"]},{"name":"?","category":"separator","gloss":"question","type":"punctuation","grammar":["punct"]},{"name":"!","category":"separator","gloss":"exclamation","type":"punctuation","grammar":["punct"]},{"name":":","category":"separator","gloss":"colon","type":"punctuation","grammar":["punct"]},{"name":",","category":"separator","gloss":"comma","type":"punctuation","grammar":["punct"]}]
diff --git a/farbfeld/ff-primitive/main.go b/farbfeld/ff-primitive/main.go
index 589d13a..f9e3e19 100644
--- a/farbfeld/ff-primitive/main.go
+++ b/farbfeld/ff-primitive/main.go
@@ -6,6 +6,7 @@ import (
 	"log"
 	"os"
 	"runtime"
+	"runtime/pprof"
 
 	"github.com/fogleman/primitive/primitive"
 	farbfeld "github.com/hullerob/go.farbfeld"
@@ -15,6 +16,7 @@ var (
 	shapeCount       = flag.Int("count", 150, "number of shapes used")
 	repeatShapeCount = flag.Int("repeat-count", 0, "number of extra shapes drawn in each step")
 	alpha            = flag.Int("alpha", 128, "alpha of all shapes")
+	cpuprofile       = flag.String("cpuprofile", "", "write cpu profile to file")
 )
 
 func stepImg(img image.Image, count int) image.Image {
@@ -31,6 +33,15 @@ func stepImg(img image.Image, count int) image.Image {
 func main() {
 	flag.Parse()
 
+	if *cpuprofile != "" {
+		f, err := os.Create(*cpuprofile)
+		if err != nil {
+			log.Fatal(err)
+		}
+		pprof.StartCPUProfile(f)
+		defer pprof.StopCPUProfile()
+	}
+
 	img, err := farbfeld.Decode(os.Stdin)
 	if err != nil {
 		log.Fatal(err)
diff --git a/internal/internal.go b/internal/internal.go
new file mode 100644
index 0000000..f21624e
--- /dev/null
+++ b/internal/internal.go
@@ -0,0 +1,40 @@
+package internal
+
+import (
+	"encoding/json"
+	"flag"
+	"fmt"
+	"log"
+	"net/http"
+	"os"
+
+	"github.com/Xe/x/tools/license/licenses"
+	"go4.org/legal"
+)
+
+var (
+	licenseShow = flag.Bool("license", false, "show software license?")
+)
+
+func init() {
+	legal.RegisterLicense(licenses.CC0License)
+	legal.RegisterLicense(licenses.SQLiteBlessing)
+
+	http.HandleFunc("/.within/licenses", func(w http.ResponseWriter, r *http.Request) {
+		json.NewEncoder(w).Encode(legal.Licenses())
+	})
+}
+
+// HandleLicense optionally shows all software licenses.
+func HandleLicense() {
+	if *licenseShow {
+		log.Printf("Licenses for %v", os.Args)
+
+		for _, li := range legal.Licenses() {
+			fmt.Println(li)
+			fmt.Println()
+		}
+
+		os.Exit(0)
+	}
+}
diff --git a/irc/clevelandbrown/main.go b/irc/clevelandbrown/main.go
index 2a7ff2c..8fa96c0 100644
--- a/irc/clevelandbrown/main.go
+++ b/irc/clevelandbrown/main.go
@@ -223,7 +223,6 @@ func scoreCleveland(c *irc.Client, m *irc.Message) {
 				"channel":    m.Params[0],
 				"user":       m.Prefix.String(),
 				"scoredelta": 1,
-				"svclog":     true,
 			})
 		}
 	}
@@ -232,7 +231,7 @@ func scoreCleveland(c *irc.Client, m *irc.Message) {
 
 	for _, efnLine := range efknockr {
 		if strings.Contains(thisLine, strings.ToLower(efnLine)) {
-			const delta = 5
+			const delta = 11
 			sc += delta
 			ln.Log(ctx, ln.F{
 				"action":  "efknockr_detected",
@@ -240,7 +239,6 @@ func scoreCleveland(c *irc.Client, m *irc.Message) {
 				"user":    m.Prefix.String(),
 				"channel": m.Params[0],
 				"delta":   delta,
-				"svclog":  true,
 			})
 		}
 	}
@@ -253,8 +251,6 @@ func scoreCleveland(c *irc.Client, m *irc.Message) {
 			"channel": m.Params[0],
 			"user":    m.Prefix.String(),
 			"score":   sc,
-			"svclog":  true,
-			"ping":    "Xena",
 		})
 	}
 
@@ -392,4 +388,8 @@ var efknockr = []string{
 	"Voice your opinions at https://webchat.freenode.net/?channels=#freenode",
 	"This message was brought to you by Private Internet Access. Voice your opinions at https://webchat.freenode.net/?channels=%23freenode",
 	"<script type=\"text/javascript\" src=\"http://web.nba1001.net:8888/tj/tongji.js\"></script>",
+	"Interested in reasonably priced GLOBAL IRC ADVERTISING? Contact me on twitter https://twitter.com/nenolod or linkedin https://www.linkedin.com/in/nenolod",
+	"Want IRC ads? https://williampitcock.com/",
+	"With our IRC ad service you can reach a global audience of entrepreneurs and fentanyl addicts with extraordinary engagement rates! https://williampitcock.com/",
+	"Make sure to report this IP to any DNSBLs you might think of! That'll totally stop the flood. https://dronebl.org/ I also recommend installing https://github.com/kaniini/antissh",
 }
diff --git a/mastodon/almarid/main.go b/mastodon/almarid/main.go
index 500a241..f261b41 100644
--- a/mastodon/almarid/main.go
+++ b/mastodon/almarid/main.go
@@ -83,12 +83,12 @@ func main() {
 		if first {
 			first = false
 		} else {
-			time.Sleep(5 * time.Minute)
+			time.Sleep(600 * time.Minute)
 		}
 
 		txt := fmt.Sprintf("%s is not doing, allah is doing", words[i])
 
-		st, err := c.PostStatus(txt, 0, nil, false, "", "public")
+		st, err := c.PostStatus(txt, 0, nil, false, "", "private")
 		if err != nil {
 			ln.Log(ln.F{
 				"err":    err,
diff --git a/tg/pbot/main.go b/tg/pbot/main.go
index 00a342d..47f532f 100644
--- a/tg/pbot/main.go
+++ b/tg/pbot/main.go
@@ -68,8 +68,16 @@ func stepImg(img image.Image, count int) image.Image {
 func renderImg(bot *tgbotapi.BotAPI, ps string, update tgbotapi.Update) error {
 	msg := update.Message
 
+	if msg == nil {
+		return nil
+	}
+
 	// ignore chats without photos
-	if len(*msg.Photo) == 0 {
+	if *msg.Photo == nil {
+		return nil
+	}
+
+	if m := *msg.Photo; len(m) == 0 {
 		return nil
 	}
 
diff --git a/tg/pbot/vendor/gopkg.in/telegram-bot-api.v4/bot.go b/tg/pbot/vendor/gopkg.in/telegram-bot-api.v4/bot.go
index 72f7a34..24d7777 100644
--- a/tg/pbot/vendor/gopkg.in/telegram-bot-api.v4/bot.go
+++ b/tg/pbot/vendor/gopkg.in/telegram-bot-api.v4/bot.go
@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/technoweenie/multipartstreamer"
 	"io/ioutil"
 	"log"
 	"net/http"
@@ -15,8 +16,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/technoweenie/multipartstreamer"
 )
 
 // BotAPI allows you to interact with the Telegram Bot API.
@@ -449,7 +448,7 @@ func (bot *BotAPI) GetWebhookInfo() (WebhookInfo, error) {
 }
 
 // GetUpdatesChan starts and returns a channel for getting updates.
-func (bot *BotAPI) GetUpdatesChan(config UpdateConfig) (chan Update, error) {
+func (bot *BotAPI) GetUpdatesChan(config UpdateConfig) (<-chan Update, error) {
 	updatesChan := make(chan Update, 100)
 
 	go func() {
diff --git a/tools/license/main.go b/tools/license/main.go
index 9fc9cbd..6840912 100644
--- a/tools/license/main.go
+++ b/tools/license/main.go
@@ -10,6 +10,7 @@ import (
 	"text/template"
 	"time"
 
+	"github.com/Xe/x/internal"
 	"github.com/Xe/x/tools/license/licenses"
 )
 
@@ -35,6 +36,8 @@ func init() {
 func main() {
 	flag.Parse()
 
+	internal.HandleLicense()
+
 	if *showAll {
 		fmt.Println("Licenses available:")
 		for license, _ := range licenses.List {