git: add nicer repo addition & gitea support

Also added an `!unset` command for configurations.

config/config.go

@@ -108,6 +108,23 @@ func (c *Config) GetArray(key string, fallback []string) []string {
 	return strings.Split(val, ";;")
 }
 
+func (c *Config) Unset(key string) error {
+	q := `delete from config where key=?`
+	tx, err := c.Begin()
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec(q, key)
+	if err != nil {
+		return err
+	}
+	err = tx.Commit()
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 // Set changes the value for a configuration in the database
 // Note, this is always a string. Use the SetArray for an array helper
 func (c *Config) Set(key, value string) error {

go.mod

@@ -38,6 +38,7 @@ require (
 	golang.org/x/exp v0.0.0-20191014171548-69215a2ee97e // indirect
 	golang.org/x/net v0.0.0-20191014212845-da9a3fd4c582 // indirect
 	gonum.org/v1/gonum v0.6.0 // indirect
+	gopkg.in/go-playground/webhooks.v5 v5.13.0
 	gopkg.in/sourcemap.v1 v1.0.5 // indirect
 	gopkg.in/yaml.v2 v2.2.4 // indirect
 )

go.sum

@@ -138,6 +138,8 @@ gonum.org/v1/gonum v0.6.0/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU=
 gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
 gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/go-playground/webhooks.v5 v5.13.0 h1:e9vtkQZK464+UdL3YjRox2yR8JSmh2094PUBMvdriFs=
+gopkg.in/go-playground/webhooks.v5 v5.13.0/go.mod h1:LZbya/qLVdbqDR1aKrGuWV6qbia2zCYSR5dpom2SInQ=
 gopkg.in/sourcemap.v1 v1.0.5 h1:inv58fC9f9J3TK2Y2R1NPntXEn3/wjWHkonhIUODNTI=
 gopkg.in/sourcemap.v1 v1.0.5/go.mod h1:2RlvNNSMglmRrcvhfuzp4hQHwOtjxlbjX7UPY/GXb78=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=

main.go

@@ -30,6 +30,7 @@ import (
 	"github.com/velour/catbase/plugins/fact"
 	"github.com/velour/catbase/plugins/first"
 	"github.com/velour/catbase/plugins/fuck"
+	"github.com/velour/catbase/plugins/git"
 	"github.com/velour/catbase/plugins/inventory"
 	"github.com/velour/catbase/plugins/leftpad"
 	"github.com/velour/catbase/plugins/nerdepedia"
@@ -131,6 +132,7 @@ func main() {
 	b.AddPlugin(stock.New(b))
 	b.AddPlugin(newsbid.New(b))
 	b.AddPlugin(twitter.New(b))
+	b.AddPlugin(git.New(b))
 	b.AddPlugin(cli.New(b))
 	// catches anything left, will always return true
 	b.AddPlugin(fact.New(b))

plugins/admin/admin.go

@@ -90,8 +90,18 @@ func (p *AdminPlugin) message(conn bot.Connector, k bot.Kind, message msg.Messag
 	if parts[0] == "set" && len(parts) > 2 && forbiddenKeys[parts[1]] {
 		p.bot.Send(conn, bot.Message, message.Channel, "You cannot access that key")
 		return true
+	} else if parts[0] == "unset" && len(parts) > 1 {
+		if err := p.cfg.Unset(parts[1]); err != nil {
+			p.bot.Send(conn, bot.Message, message.Channel, fmt.Sprintf("Unset error: %s", err))
+			return true
+		}
+		p.bot.Send(conn, bot.Message, message.Channel, fmt.Sprintf("Unset %s", parts[1]))
+		return true
 	} else if parts[0] == "set" && len(parts) > 2 {
-		p.cfg.Set(parts[1], strings.Join(parts[2:], " "))
+		if err := p.cfg.Set(parts[1], strings.Join(parts[2:], " ")); err != nil {
+			p.bot.Send(conn, bot.Message, message.Channel, fmt.Sprintf("Set error: %s", err))
+			return true
+		}
 		p.bot.Send(conn, bot.Message, message.Channel, fmt.Sprintf("Set %s", parts[1]))
 		return true
 	}

plugins/beers/beers.go

@@ -322,7 +322,7 @@ type Beers struct {
 
 func (p *BeersPlugin) pullUntappd() ([]checkin, error) {
 	token := p.Bot.Config().Get("Untappd.Token", "NONE")
-	if token == "NONE" {
+	if token == "NONE" || token == "" {
 		return []checkin{}, fmt.Errorf("No untappd token")
 	}
 

plugins/git/git.go

@@ -0,0 +1,231 @@
+package git
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strings"
+
+	"github.com/velour/catbase/bot/msg"
+
+	"github.com/rs/zerolog/log"
+	"gopkg.in/go-playground/webhooks.v5/github"
+	"gopkg.in/go-playground/webhooks.v5/gitlab"
+
+	"github.com/velour/catbase/bot"
+	"github.com/velour/catbase/config"
+)
+
+type GitPlugin struct {
+	b      bot.Bot
+	c      *config.Config
+	glhook *gitlab.Webhook
+	ghhook *github.Webhook
+}
+
+func New(b bot.Bot) *GitPlugin {
+	glhook, err := gitlab.New()
+	if err != nil {
+		log.Error().Err(err).Msg("could not initialize hook")
+		glhook = nil
+	}
+	ghhook, err := github.New()
+	if err != nil {
+		log.Error().Err(err).Msg("could not initialize hook")
+		ghhook = nil
+	}
+	p := &GitPlugin{
+		b:      b,
+		c:      b.Config(),
+		glhook: glhook,
+		ghhook: ghhook,
+	}
+	p.registerWeb()
+	b.Register(p, bot.Message, p.message)
+	return p
+}
+
+func validService(service string) bool {
+	return service == "gitea" || service == "gitlab" || service == "github"
+}
+
+func (p *GitPlugin) message(c bot.Connector, kind bot.Kind, message msg.Message, args ...interface{}) bool {
+	body := message.Body
+	lower := strings.ToLower(body)
+	parts := strings.Split(lower, " ")
+
+	if !strings.HasPrefix(lower, "regrepo") || len(parts) != 2 {
+		return false
+	}
+	u := parts[1]
+	u = strings.ReplaceAll(u, "/", ".")
+	uparts := strings.Split(u, ".")
+	if len(uparts) != 3 || !validService(uparts[0]) {
+		m := "Valid formats are: `service.owner.repo` and valid services are one of gitea, gitlab, or github."
+		p.b.Send(c, bot.Message, message.Channel, m)
+		return true
+	}
+	chs := p.c.GetArray(u+".channels", []string{})
+	for _, ch := range chs {
+		if ch == message.Channel {
+			p.b.Send(c, bot.Message, message.Channel, "That's already registered here.")
+			return true
+		}
+	}
+	chs = append(chs, message.Channel)
+	p.c.SetArray(u+".channels", chs)
+	p.b.Send(c, bot.Message, message.Channel, "Registered new repository.")
+	return true
+}
+
+func (p *GitPlugin) registerWeb() {
+	http.HandleFunc("/git/gitea/event", p.giteaEvent)
+	http.HandleFunc("/git/github/event", p.githubEvent)
+	http.HandleFunc("/git/gitlab/event", p.gitlabEvent)
+	p.b.RegisterWeb("/git", "Git")
+}
+
+func (p *GitPlugin) giteaEvent(w http.ResponseWriter, r *http.Request) {
+	evt := GiteaPush{}
+	dec := json.NewDecoder(r.Body)
+	err := dec.Decode(&evt)
+	if err != nil {
+		log.Error().Err(err).Msg("could not decode gitea push")
+		w.WriteHeader(500)
+		fmt.Fprintf(w, "Error parsing event: %s", err)
+		return
+	}
+	org := evt.Repository.Owner.Username
+	repo := evt.Repository.Name
+
+	msg := ""
+	for _, c := range evt.Commits {
+		m := strings.Split(c.Message, "\n")[0]
+		msg += fmt.Sprintf("%s pushed to %s (<%s|%s>) %s",
+			c.Author.Name,
+			repo,
+			c.URL,
+			c.ID[:7],
+			m,
+		)
+	}
+
+	chs := p.c.GetArray(fmt.Sprintf("gitea.%s.%s.channels", org, repo), []string{})
+	for _, ch := range chs {
+		p.b.Send(p.b.DefaultConnector(), bot.Message, ch, msg)
+	}
+}
+
+func (p *GitPlugin) gitlabEvent(w http.ResponseWriter, r *http.Request) {
+	if p.glhook == nil {
+		log.Error().Msg("gitlab hook not initialized")
+		w.WriteHeader(500)
+		fmt.Fprint(w, "not initialized")
+		return
+	}
+	payload, err := p.glhook.Parse(r,
+		gitlab.PushEvents,
+	)
+	if err != nil {
+		log.Error().Err(err).Msg("unknown event")
+		w.WriteHeader(500)
+		fmt.Fprintf(w, "unknown event: %s", err)
+		return
+	}
+	msg, repo, owner := "", "", ""
+	switch payload.(type) {
+	case gitlab.PushEventPayload:
+		push := payload.(gitlab.PushEventPayload)
+		repo = push.Repository.Name
+		owner = strings.ReplaceAll(push.Project.PathWithNamespace, "/", ".")
+		commits := ""
+		for _, c := range push.Commits {
+			m := strings.Split(c.Message, "\n")[0]
+			commits += fmt.Sprintf("%s pushed to %s (<%s|%s>) %s\n",
+				c.Author.Name,
+				repo,
+				c.URL,
+				c.ID[:7],
+				m,
+			)
+		}
+		msg = commits
+	default:
+		w.WriteHeader(500)
+		fmt.Fprintf(w, "unknown payload: %+v", payload)
+		return
+	}
+	chs := p.c.GetArray(fmt.Sprintf("gitlab.%s.channels", owner), []string{})
+	for _, ch := range chs {
+		p.b.Send(p.b.DefaultConnector(), bot.Message, ch, msg)
+	}
+}
+
+func (p *GitPlugin) githubEvent(w http.ResponseWriter, r *http.Request) {
+	if p.ghhook == nil {
+		log.Error().Msg("github hook not initialized")
+		w.WriteHeader(500)
+		fmt.Fprintf(w, "not initialized")
+		return
+	}
+	payload, err := p.ghhook.Parse(r,
+		github.PushEvent,
+		github.PullRequestEvent,
+		github.PingEvent,
+	)
+	if err != nil {
+		log.Error().Err(err).Msg("unknown event")
+		w.WriteHeader(500)
+		fmt.Fprintf(w, "unknown event: %+v", err)
+		return
+	}
+	msg, repo, owner := "", "", ""
+	switch payload.(type) {
+	case github.PushPayload:
+		push := payload.(github.PushPayload)
+		repo = push.Repository.Name
+		owner = push.Repository.Owner.Login
+		commits := ""
+		for _, c := range push.Commits {
+			m := strings.Split(c.Message, "\n")[0]
+			commits += fmt.Sprintf("%s pushed to %s (<%s|%s>) %s\n",
+				c.Author.Name,
+				repo,
+				c.URL,
+				c.ID[:7],
+				m,
+			)
+		}
+		msg = commits
+	case github.PullRequestPayload:
+		pr := payload.(github.PullRequestPayload)
+		if pr.Action != "opened" {
+			w.WriteHeader(200)
+			fmt.Fprintf(w, "ignoring action %s", pr.Action)
+			return
+		}
+		repo = pr.Repository.Name
+		owner = pr.Repository.Owner.Login
+		msg = fmt.Sprintf("%s opened new pull request \"%s\" on %s: %s",
+			pr.PullRequest.User.Login,
+			pr.PullRequest.Title,
+			pr.Repository.Name,
+			pr.PullRequest.URL,
+		)
+	case github.PingPayload:
+		ping := payload.(github.PingPayload)
+		repo = ping.Repository.Name
+		owner = ping.Repository.Owner.Login
+		msg = fmt.Sprintf("Got a ping request on %s", repo)
+	default:
+		log.Error().Interface("payload", payload).Msg("unknown event payload")
+		w.WriteHeader(500)
+		fmt.Fprintf(w, "unknown event payload: %+v", payload)
+		return
+	}
+
+	chs := p.c.GetArray(fmt.Sprintf("github.%s.%s.channels", owner, repo), []string{})
+	for _, ch := range chs {
+		p.b.Send(p.b.DefaultConnector(), bot.Message, ch, msg)
+	}
+}

plugins/git/gitea.go

@@ -0,0 +1,68 @@
+package git
+
+type GiteaPush struct {
+	Secret     string `json:"secret"`
+	Ref        string `json:"ref"`
+	Before     string `json:"before"`
+	After      string `json:"after"`
+	CompareURL string `json:"compare_url"`
+	Commits    []struct {
+		ID      string `json:"id"`
+		Message string `json:"message"`
+		URL     string `json:"url"`
+		Author  struct {
+			Name     string `json:"name"`
+			Email    string `json:"email"`
+			Username string `json:"username"`
+		} `json:"author"`
+		Committer struct {
+			Name     string `json:"name"`
+			Email    string `json:"email"`
+			Username string `json:"username"`
+		} `json:"committer"`
+		Timestamp string `json:"timestamp"`
+	} `json:"commits"`
+	Repository struct {
+		ID    int `json:"id"`
+		Owner struct {
+			ID        int    `json:"id"`
+			Login     string `json:"login"`
+			FullName  string `json:"full_name"`
+			Email     string `json:"email"`
+			AvatarURL string `json:"avatar_url"`
+			Username  string `json:"username"`
+		} `json:"owner"`
+		Name            string `json:"name"`
+		FullName        string `json:"full_name"`
+		Description     string `json:"description"`
+		Private         bool   `json:"private"`
+		Fork            bool   `json:"fork"`
+		HTMLURL         string `json:"html_url"`
+		SSHURL          string `json:"ssh_url"`
+		CloneURL        string `json:"clone_url"`
+		Website         string `json:"website"`
+		StarsCount      int    `json:"stars_count"`
+		ForksCount      int    `json:"forks_count"`
+		WatchersCount   int    `json:"watchers_count"`
+		OpenIssuesCount int    `json:"open_issues_count"`
+		DefaultBranch   string `json:"default_branch"`
+		CreatedAt       string `json:"created_at"`
+		UpdatedAt       string `json:"updated_at"`
+	} `json:"repository"`
+	Pusher struct {
+		ID        int    `json:"id"`
+		Login     string `json:"login"`
+		FullName  string `json:"full_name"`
+		Email     string `json:"email"`
+		AvatarURL string `json:"avatar_url"`
+		Username  string `json:"username"`
+	} `json:"pusher"`
+	Sender struct {
+		ID        int    `json:"id"`
+		Login     string `json:"login"`
+		FullName  string `json:"full_name"`
+		Email     string `json:"email"`
+		AvatarURL string `json:"avatar_url"`
+		Username  string `json:"username"`
+	} `json:"sender"`
+}