Archive

Signed-off-by: Etzelia <etzelia@hotmail.com>

.drone.yml

@@ -0,0 +1,42 @@
+---
+kind: pipeline
+name: compliance
+trigger:
+  event:
+    - pull_request
+steps:
+  - name: build
+    pull: always
+    image: golang:1.15
+    commands:
+      - make test
+      - make build
+  - name: check
+    pull: always
+    image: golang:1.15
+    commands:
+      - make vet
+
+---
+kind: pipeline
+name: release
+trigger:
+  event:
+    - push
+  branch:
+    - master
+steps:
+  - name: build
+    pull: always
+    image: golang:1.15
+    commands:
+      - make build
+  - name: gitea-release
+    pull: always
+    image: jolheiser/drone-gitea-main:latest
+    settings:
+      token:
+        from_secret: gitea_token
+      base: https://git.etztech.xyz
+      files:
+        - "lurk"

README.md

@@ -1,6 +1,8 @@
 # lurk
 
-A reddit lurker used to notify a Discord channel via webhook 
+### This repository is archived, development has moved to https://gitea.com/jolheiser/lurk
+
+A lurker used to notify a Discord channel via webhook 
 whenever a matching submission is made.
 
 See the [example config](lurk.sample.toml).

config.go

@@ -1,107 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"regexp"
-	"strings"
-
-	"github.com/BurntSushi/toml"
-	"go.jolheiser.com/beaver"
-)
-
-type Config struct {
-	SubReddits []*SubReddit          `toml:"subreddit"`
-	Map        map[string]*SubReddit `toml:"-"`
-
-	// Agent file
-	AppName string `toml:"app_name"`
-	Version string `toml:"version"`
-
-	ClientID     string `toml:"client_id"`
-	ClientSecret string `toml:"client_secret"`
-
-	Username string `toml:"username"`
-	Password string `toml:"password"`
-}
-
-type SubReddit struct {
-	Name             string           `toml:"name"`
-	IconURL          string           `toml:"icon_url"`
-	FlairWhitelist   []string         `toml:"flair_whitelist"`
-	FlairWhitelistRe []*regexp.Regexp `toml:"-"`
-	FlairBlacklist   []string         `toml:"flair_blacklist"`
-	FlairBlacklistRe []*regexp.Regexp `toml:"-"`
-	TitleWhitelist   []string         `toml:"title_whitelist"`
-	TitleWhitelistRe []*regexp.Regexp `toml:"-"`
-	TitleBlacklist   []string         `toml:"title_blacklist"`
-	TitleBlacklistRe []*regexp.Regexp `toml:"-"`
-	TitleLimit       int              `toml:"title_limit"`
-	BodyWhitelist    []string         `toml:"body_whitelist"`
-	BodyWhitelistRe  []*regexp.Regexp `toml:"-"`
-	BodyBlacklist    []string         `toml:"body_blacklist"`
-	BodyBlacklistRe  []*regexp.Regexp `toml:"-"`
-	BodyLimit        int              `toml:"body_limit"`
-	Webhook          string           `toml:"webhook"`
-}
-
-func (c *Config) UserAgent() string {
-	return fmt.Sprintf("%s/%s by /u/%s", c.AppName, c.Version, c.Username)
-}
-
-func (c *Config) SubRedditNames() []string {
-	names := make([]string, len(c.SubReddits))
-	for idx, sub := range c.SubReddits {
-		names[idx] = sub.Name
-	}
-	return names
-}
-
-func (c *Config) load() {
-	for _, sub := range c.SubReddits {
-		c.Map[strings.ToLower(sub.Name)] = sub
-		if sub.TitleLimit == 0 || sub.TitleLimit > 253 {
-			sub.TitleLimit = 253
-		}
-		if sub.BodyLimit == 0 || sub.BodyLimit > 2045 {
-			sub.BodyLimit = 2045
-		}
-		sub.FlairWhitelistRe = make([]*regexp.Regexp, len(sub.FlairWhitelist))
-		for idx, f := range sub.FlairWhitelist {
-			sub.FlairWhitelistRe[idx] = regexp.MustCompile(f)
-		}
-		sub.FlairBlacklistRe = make([]*regexp.Regexp, len(sub.FlairBlacklist))
-		for idx, f := range sub.FlairBlacklist {
-			sub.FlairBlacklistRe[idx] = regexp.MustCompile(f)
-		}
-		sub.TitleWhitelistRe = make([]*regexp.Regexp, len(sub.TitleWhitelist))
-		for idx, t := range sub.TitleWhitelist {
-			sub.TitleWhitelistRe[idx] = regexp.MustCompile(t)
-		}
-		sub.TitleBlacklistRe = make([]*regexp.Regexp, len(sub.TitleBlacklist))
-		for idx, t := range sub.TitleBlacklist {
-			sub.TitleBlacklistRe[idx] = regexp.MustCompile(t)
-		}
-		sub.BodyWhitelistRe = make([]*regexp.Regexp, len(sub.BodyWhitelist))
-		for idx, b := range sub.BodyWhitelist {
-			sub.BodyWhitelistRe[idx] = regexp.MustCompile(b)
-		}
-		sub.BodyBlacklistRe = make([]*regexp.Regexp, len(sub.BodyBlacklist))
-		for idx, b := range sub.BodyBlacklist {
-			sub.BodyBlacklistRe[idx] = regexp.MustCompile(b)
-		}
-	}
-}
-
-func LoadConfig() (*Config, error) {
-	cfg := &Config{
-		Map: make(map[string]*SubReddit),
-	}
-
-	if _, err := toml.DecodeFile(configPath, &cfg); err != nil {
-		return nil, err
-	}
-
-	cfg.load()
-	beaver.Debug(cfg)
-	return cfg, nil
-}

config/config.go

@@ -0,0 +1,71 @@
+package config
+
+import (
+	"regexp"
+	"strings"
+
+	"github.com/pelletier/go-toml"
+	"go.jolheiser.com/beaver"
+)
+
+type Config struct {
+	Reddit  RedditConfig  `toml:"reddit"`
+	Twitter TwitterConfig `toml:"twitter"`
+}
+
+func (c *Config) loadReddit() {
+	for _, sub := range c.Reddit.SubReddits {
+		c.Reddit.Map[strings.ToLower(sub.Name)] = sub
+		if sub.TitleLimit == 0 || sub.TitleLimit > 253 {
+			sub.TitleLimit = 253
+		}
+		if sub.BodyLimit == 0 || sub.BodyLimit > 2045 {
+			sub.BodyLimit = 2045
+		}
+		sub.FlairAllowlistRe = make([]*regexp.Regexp, len(sub.FlairAllowlist))
+		for idx, f := range sub.FlairAllowlist {
+			sub.FlairAllowlistRe[idx] = regexp.MustCompile(f)
+		}
+		sub.FlairBlocklistRe = make([]*regexp.Regexp, len(sub.FlairBlocklist))
+		for idx, f := range sub.FlairBlocklist {
+			sub.FlairBlocklistRe[idx] = regexp.MustCompile(f)
+		}
+		sub.TitleAllowlistRe = make([]*regexp.Regexp, len(sub.TitleAllowlist))
+		for idx, t := range sub.TitleAllowlist {
+			sub.TitleAllowlistRe[idx] = regexp.MustCompile(t)
+		}
+		sub.TitleBlocklistRe = make([]*regexp.Regexp, len(sub.TitleBlocklist))
+		for idx, t := range sub.TitleBlocklist {
+			sub.TitleBlocklistRe[idx] = regexp.MustCompile(t)
+		}
+		sub.BodyAllowlistRe = make([]*regexp.Regexp, len(sub.BodyAllowlist))
+		for idx, b := range sub.BodyAllowlist {
+			sub.BodyAllowlistRe[idx] = regexp.MustCompile(b)
+		}
+		sub.BodyBlocklistRe = make([]*regexp.Regexp, len(sub.BodyBlocklist))
+		for idx, b := range sub.BodyBlocklist {
+			sub.BodyBlocklistRe[idx] = regexp.MustCompile(b)
+		}
+	}
+}
+
+func Load(configPath string) (*Config, error) {
+	cfg := Config{
+		Reddit: RedditConfig{
+			Map: make(map[string]*SubReddit),
+		},
+	}
+
+	tree, err := toml.LoadFile(configPath)
+	if err != nil {
+		return nil, err
+	}
+
+	if err := tree.Unmarshal(&cfg); err != nil {
+		return nil, err
+	}
+
+	cfg.loadReddit()
+	beaver.Debug(cfg)
+	return &cfg, nil
+}

config/reddit.go

@@ -0,0 +1,53 @@
+package config
+
+import (
+	"fmt"
+	"regexp"
+)
+
+type RedditConfig struct {
+	SubReddits []*SubReddit          `toml:"sub"`
+	Map        map[string]*SubReddit `toml:"-"`
+
+	// Agent file
+	AppName string `toml:"app_name"`
+	Version string `toml:"version"`
+
+	ClientID     string `toml:"client_id"`
+	ClientSecret string `toml:"client_secret"`
+
+	Username string `toml:"username"`
+	Password string `toml:"password"`
+}
+
+type SubReddit struct {
+	Name             string           `toml:"name"`
+	IconURL          string           `toml:"icon_url"`
+	FlairAllowlist   []string         `toml:"flair_allowlist"`
+	FlairAllowlistRe []*regexp.Regexp `toml:"-"`
+	FlairBlocklist   []string         `toml:"flair_blocklist"`
+	FlairBlocklistRe []*regexp.Regexp `toml:"-"`
+	TitleAllowlist   []string         `toml:"title_allowlist"`
+	TitleAllowlistRe []*regexp.Regexp `toml:"-"`
+	TitleBlocklist   []string         `toml:"title_blocklist"`
+	TitleBlocklistRe []*regexp.Regexp `toml:"-"`
+	TitleLimit       int              `toml:"title_limit"`
+	BodyAllowlist    []string         `toml:"body_allowlist"`
+	BodyAllowlistRe  []*regexp.Regexp `toml:"-"`
+	BodyBlocklist    []string         `toml:"body_blocklist"`
+	BodyBlocklistRe  []*regexp.Regexp `toml:"-"`
+	BodyLimit        int              `toml:"body_limit"`
+	Webhook          string           `toml:"webhook"`
+}
+
+func (r *RedditConfig) UserAgent() string {
+	return fmt.Sprintf("%s/%s by /u/%s", r.AppName, r.Version, r.Username)
+}
+
+func (r *RedditConfig) SubRedditNames() []string {
+	names := make([]string, len(r.SubReddits))
+	for idx, sub := range r.SubReddits {
+		names[idx] = sub.Name
+	}
+	return names
+}

config/twitter.go

@@ -0,0 +1,18 @@
+package config
+
+type TwitterConfig struct {
+	ConsumerKey    string `toml:"consumer_key"`
+	ConsumerSecret string `toml:"consumer_secret"`
+	AccessToken    string `toml:"access_token"`
+	AccessSecret   string `toml:"access_secret"`
+
+	Filters []Filter `toml:"filter"`
+}
+
+type Filter struct {
+	Follows      []string `toml:"follows"`
+	FollowStrict bool     `toml:"follow_strict"`
+	Locations    []string `toml:"locations"`
+	Tracks       []string `toml:"tracks"`
+	Webhook      string   `toml:"webhook"`
+}

go.mod

@@ -1,9 +1,12 @@
 module go.etztech.xyz/lurk
 
-go 1.14
+go 1.16
 
 require (
-	github.com/BurntSushi/toml v0.3.1
+	github.com/dghubble/go-twitter v0.0.0-20200725221434-4bc8ad7ad1b4
+	github.com/dghubble/oauth1 v0.6.0
+	github.com/pelletier/go-toml v1.8.1
 	github.com/turnage/graw v0.0.0-20200404033202-65715eea1cd0
 	go.jolheiser.com/beaver v1.0.2
+	go.jolheiser.com/disco v0.0.2
 )

go.sum

@@ -1,19 +1,39 @@
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/cenkalti/backoff v2.1.1+incompatible h1:tKJnvO2kl0zmb/jA5UKAt4VoEVw1qxKWjE/Bpp46npY=
+github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dghubble/go-twitter v0.0.0-20200725221434-4bc8ad7ad1b4 h1:I60CX3+rWlBGPXR13jwxxBWB2GhlhZkEEh5o1eDLzJg=
+github.com/dghubble/go-twitter v0.0.0-20200725221434-4bc8ad7ad1b4/go.mod h1:xfg4uS5LEzOj8PgZV7SQYRHbG7jPUnelEiaAVJxmhJE=
+github.com/dghubble/oauth1 v0.6.0 h1:m1yC01Ohc/eF38jwZ8JUjL1a+XHHXtGQgK+MxQbmSx0=
+github.com/dghubble/oauth1 v0.6.0/go.mod h1:8pFdfPkv/jr8mkChVbNVuJ0suiHe278BtWI4Tk1ujxk=
+github.com/dghubble/sling v1.3.0 h1:pZHjCJq4zJvc6qVQ5wN1jo5oNZlNE0+8T/h0XeXBUKU=
+github.com/dghubble/sling v1.3.0/go.mod h1:XXShWaBWKzNLhu2OxikSNFrlsvowtz4kyRuXUG7oQKY=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
+github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/pelletier/go-toml v1.8.1 h1:1Nf83orprkJyknT6h7zbuEGUEjcyVlCxSUGTENmNCRM=
+github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/turnage/graw v0.0.0-20200404033202-65715eea1cd0 h1:ss0FREpyYvw5V9t5XWWWIvUJnRgWFzdftvCXd8WQNhU=
 github.com/turnage/graw v0.0.0-20200404033202-65715eea1cd0/go.mod h1:aAkq4I/q1izZSSwHvzhDn9NA+eGxgTSuibwP3MZRlQY=
 github.com/turnage/redditproto v0.0.0-20151223012412-afedf1b6eddb h1:qR56NGRvs2hTUbkn6QF8bEJzxPIoMw3Np3UigBeJO5A=
 github.com/turnage/redditproto v0.0.0-20151223012412-afedf1b6eddb/go.mod h1:GyqJdEoZSNoxKDb7Z2Lu/bX63jtFukwpaTP9ZIS5Ei0=
 go.jolheiser.com/beaver v1.0.2 h1:KA2D6iO8MQhZi1nZYi/Chak/f1Cxfrs6b1XO623+Khk=
 go.jolheiser.com/beaver v1.0.2/go.mod h1:7X4F5+XOGSC3LejTShoBdqtRCnPWcnRgmYGmG3EKW8g=
+go.jolheiser.com/disco v0.0.2 h1:UGYNqO7NQSBGB/OoS9WE5o/jYvmx1G0Bq3qQRM42Bkw=
+go.jolheiser.com/disco v0.0.2/go.mod h1:tY3HkJmMrzXH/bPgDWKHn1DUzDxkemD80OHLgHSA5uQ=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

handler.go

@@ -1,141 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"regexp"
-	"strings"
-	"time"
-
-	"github.com/turnage/graw/reddit"
-	"go.jolheiser.com/beaver"
-)
-
-var httpClient = &http.Client{Timeout: time.Minute}
-
-type Webhook struct {
-	Username  string  `json:"username"`
-	AvatarURL string  `json:"avatar_url"`
-	Embeds    []Embed `json:"embeds"`
-}
-
-type Embed struct {
-	Title       string    `json:"title"`
-	URL         string    `json:"url"`
-	Description string    `json:"description"`
-	Color       int64     `json:"color"`
-	Timestamp   time.Time `json:"timestamp"`
-	Author      Author    `json:"author"`
-}
-
-type Author struct {
-	Name string `json:"name"`
-	URL  string `json:"url"`
-}
-
-type lurker struct {
-	config *Config
-}
-
-func (l *lurker) Post(p *reddit.Post) error {
-	sub := l.config.Map[strings.ToLower(p.Subreddit)]
-
-	if err := checkPost(l.config, p); err != nil {
-		beaver.Debugf("%s: %v", p.Subreddit, err)
-		return nil
-	}
-
-	title := p.Title
-	if len(title) > sub.TitleLimit {
-		title = title[:sub.TitleLimit] + "..."
-	}
-	description := p.SelfText
-	if len(description) > sub.BodyLimit {
-		description = description[:sub.BodyLimit] + "..."
-	}
-
-	e := Webhook{
-		Username:  "/r/" + p.Subreddit,
-		AvatarURL: sub.IconURL,
-		Embeds: []Embed{
-			{
-				Title:       title,
-				URL:         p.URL,
-				Description: description,
-				Color:       16312092, // Yellow
-				Timestamp:   time.Now(),
-				Author: Author{
-					Name: "/u/" + p.Author,
-					URL:  fmt.Sprintf("https://reddit.com/user/%s", p.Author),
-				},
-			},
-		},
-	}
-	data, err := json.Marshal(e)
-	if err != nil {
-		beaver.Error(err)
-		return nil
-	}
-	beaver.Debug(string(data))
-
-	if sub.Webhook == "" {
-		beaver.Errorf("no webhook for %s", p.Subreddit)
-		return nil
-	}
-
-	payload := bytes.NewBuffer(data)
-	resp, err := httpClient.Post(sub.Webhook, "application/json", payload)
-	if err != nil {
-		beaver.Error(err)
-		return nil
-	}
-
-	if resp.StatusCode != http.StatusNoContent {
-		beaver.Error(resp.Status)
-		return nil
-	}
-
-	return nil
-}
-
-func checkPost(c *Config, p *reddit.Post) error {
-	sub := c.Map[strings.ToLower(p.Subreddit)]
-
-	// Check blacklist first
-	// Any match means we ignore
-	if matchesAny(p.LinkFlairText, sub.FlairBlacklistRe) {
-		return fmt.Errorf("flair matched blacklisted regex: %s", p.LinkFlairText)
-	}
-	if matchesAny(p.Title, sub.TitleBlacklistRe) {
-		return fmt.Errorf("title matched blacklisted regex: %s", p.Title)
-	}
-	if matchesAny(p.SelfText, sub.BodyBlacklistRe) {
-		return fmt.Errorf("body matched blacklisted regex: %s", p.SelfText)
-	}
-
-	// Check whitelist
-	// Any match means we pass
-	// If no whitelist, pass
-	if len(sub.FlairWhitelistRe) > 0 && !matchesAny(p.LinkFlairText, sub.FlairWhitelistRe) {
-		return fmt.Errorf("flair didn't match any whitelisted regex: %s", p.LinkFlairText)
-	}
-	if len(sub.TitleWhitelistRe) > 0 && !matchesAny(p.Title, sub.TitleWhitelistRe) {
-		return fmt.Errorf("title didn't match any whitelisted regex: %s", p.Title)
-	}
-	if len(sub.BodyWhitelistRe) > 0 && !matchesAny(p.SelfText, sub.BodyWhitelistRe) {
-		return fmt.Errorf("body didn't match any whitelisted regex: %s", p.SelfText)
-	}
-
-	return nil
-}
-
-func matchesAny(input string, re []*regexp.Regexp) bool {
-	for _, r := range re {
-		if r.MatchString(input) {
-			return true
-		}
-	}
-	return false
-}

handler/reddit.go

@@ -0,0 +1,122 @@
+package handler
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"regexp"
+	"strings"
+	"time"
+
+	"go.etztech.xyz/lurk/config"
+
+	"github.com/turnage/graw/reddit"
+	"go.jolheiser.com/beaver"
+	"go.jolheiser.com/disco"
+)
+
+var httpClient = &http.Client{Timeout: time.Minute}
+
+type Reddit struct {
+	Config *config.Config
+}
+
+func (r *Reddit) Post(p *reddit.Post) error {
+	sub := r.Config.Reddit.Map[strings.ToLower(p.Subreddit)]
+
+	if err := checkPost(r.Config, p); err != nil {
+		beaver.Debugf("%s: %v", p.Subreddit, err)
+		return nil
+	}
+
+	title := p.Title
+	if len(title) > sub.TitleLimit {
+		title = title[:sub.TitleLimit] + "..."
+	}
+	description := p.SelfText
+	if len(description) > sub.BodyLimit {
+		description = description[:sub.BodyLimit] + "..."
+	}
+
+	e := disco.Webhook{
+		Username:  "/r/" + p.Subreddit,
+		AvatarURL: sub.IconURL,
+		Embeds: []*disco.Embed{
+			{
+				Title:       title,
+				URL:         p.URL,
+				Description: description,
+				Color:       0x007D96,
+				Timestamp:   disco.Now(),
+				Author: &disco.Author{
+					Name: "/u/" + p.Author,
+					URL:  fmt.Sprintf("https://reddit.com/user/%s", p.Author),
+				},
+			},
+		},
+	}
+
+	if sub.Webhook == "" {
+		beaver.Errorf("no webhook for %s", p.Subreddit)
+		return nil
+	}
+
+	req, err := e.Request(context.Background(), sub.Webhook)
+	if err != nil {
+		beaver.Error(err)
+		return nil
+	}
+
+	resp, err := httpClient.Do(req)
+	if err != nil {
+		beaver.Error(err)
+		return nil
+	}
+
+	if resp.StatusCode != http.StatusNoContent {
+		beaver.Error(resp.Status)
+		return nil
+	}
+
+	return nil
+}
+
+func checkPost(c *config.Config, p *reddit.Post) error {
+	sub := c.Reddit.Map[strings.ToLower(p.Subreddit)]
+
+	// Check blocklist first
+	// Any match means we ignore
+	if matchesAny(p.LinkFlairText, sub.FlairBlocklistRe) {
+		return fmt.Errorf("flair matched blocklisted regex: %s", p.LinkFlairText)
+	}
+	if matchesAny(p.Title, sub.TitleBlocklistRe) {
+		return fmt.Errorf("title matched blocklisted regex: %s", p.Title)
+	}
+	if matchesAny(p.SelfText, sub.BodyBlocklistRe) {
+		return fmt.Errorf("body matched blocklisted regex: %s", p.SelfText)
+	}
+
+	// Check allowlist
+	// Any match means we pass
+	// If no allowlist, pass
+	if len(sub.FlairAllowlistRe) > 0 && !matchesAny(p.LinkFlairText, sub.FlairAllowlistRe) {
+		return fmt.Errorf("flair didn't match any allowlisted regex: %s", p.LinkFlairText)
+	}
+	if len(sub.TitleAllowlistRe) > 0 && !matchesAny(p.Title, sub.TitleAllowlistRe) {
+		return fmt.Errorf("title didn't match any allowlisted regex: %s", p.Title)
+	}
+	if len(sub.BodyAllowlistRe) > 0 && !matchesAny(p.SelfText, sub.BodyAllowlistRe) {
+		return fmt.Errorf("body didn't match any allowlisted regex: %s", p.SelfText)
+	}
+
+	return nil
+}
+
+func matchesAny(input string, re []*regexp.Regexp) bool {
+	for _, r := range re {
+		if r.MatchString(input) {
+			return true
+		}
+	}
+	return false
+}

handler/twitter.go

@@ -0,0 +1,57 @@
+package handler
+
+import (
+	"context"
+	"fmt"
+
+	"go.etztech.xyz/lurk/config"
+
+	"github.com/dghubble/go-twitter/twitter"
+	"go.jolheiser.com/beaver"
+	"go.jolheiser.com/disco"
+)
+
+type Twitter struct {
+	Filter config.Filter
+	Stream *twitter.Stream
+}
+
+func (t *Twitter) Run() {
+	beaver.Debugf("setting up stream for %v", t.Filter)
+	demux := twitter.NewSwitchDemux()
+	demux.Tweet = t.Tweet
+
+	beaver.Debugf("streaming %v", t.Filter)
+	demux.HandleChan(t.Stream.Messages)
+	beaver.Debugf("disconnected from stream: %v", t.Filter)
+}
+
+func (t *Twitter) Tweet(tweet *twitter.Tweet) {
+	beaver.Debugf("new tweet for %v", t.Filter)
+
+	if t.Filter.FollowStrict {
+		if tweet.InReplyToStatusIDStr != "" {
+			beaver.Debug("tweet is a reply")
+			return
+		}
+		var match bool
+		for _, id := range t.Filter.Follows {
+			if id == tweet.User.IDStr {
+				match = true
+				break
+			}
+		}
+		if !match {
+			beaver.Debug("tweet did not match any follow IDs")
+			return
+		}
+	}
+
+	w := &disco.Webhook{
+		Username: tweet.User.Name,
+		Content:  fmt.Sprintf("https://twitter.com/%d/status/%d", tweet.User.ID, tweet.ID),
+	}
+	if _, err := w.Send(context.Background(), t.Filter.Webhook); err != nil {
+		beaver.Error(err)
+	}
+}

lurk.sample.toml

@@ -1,52 +1,48 @@
-# Reddit Agent Info
-app_name = "Lurk"
-version = "0.1"
+# Reddit information
+[reddit]
+    # Reddit Agent Info
+    app_name = "Lurk"
+    version = "0.1"
 
-# https://www.reddit.com/prefs/apps
-client_id = ""
-client_secret = ""
+    # https://www.reddit.com/prefs/apps
+    client_id = ""
+    client_secret = ""
 
-# Reddit credentials
-username = "24CC-Official"
-password = ""
+    # Reddit credentials
+    username = ""
+    password = ""
 
-# A list of subreddites to monitor
-# Empty fields are just for examples, they can be omitted in a real config
-[[subreddit]]
-name = "mcservers"
-icon_url = "https://styles.redditmedia.com/t5_2s3kg/styles/communityIcon_recbaq3ufjv01.png"
-flair_whitelist = []
-flair_blacklist = []
-title_whitelist = ["wanted"]
-title_blacklist = []
-title_limit = 0
-body_whitelist = []
-body_blacklist = []
-body_limit = 0
-webhook = ""
+    # A list of subreddites to monitor
+    # allow/blocklist can be omitted in real config if empty
+    [[reddit.sub]]
+    name = ""
+    icon_url = ""
+    flair_allowlist = []
+    flair_blocklist = []
+    title_allowlist = []
+    title_blocklist = []
+    title_limit = 0
+    body_allowlist = []
+    body_blocklist = []
+    body_limit = 0
+    webhook = ""
 
-[[subreddit]]
-name = "MinecraftBuddies"
-icon_url = "https://styles.redditmedia.com/t5_30nfs/styles/communityIcon_qcijaahdybz01.png"
-flair_whitelist = ["JAVA"]
-flair_blacklist = []
-title_whitelist = ["wanted", "vanilla"]
-title_blacklist = []
-title_limit = 0
-body_whitelist = []
-body_blacklist = []
-body_limit = 0
-webhook = ""
+# Twitter information
+[twitter]
+    # Auth
+    consumer_key = ""
+    consumer_secret = ""
+    access_token = ""
+    access_secret = ""
 
-[[subreddit]]
-name = "24CarrotCraft"
-icon_url = "https://styles.redditmedia.com/t5_3budc/styles/communityIcon_byu6k6o8omz01.png"
-flair_whitelist = []
-flair_blacklist = []
-title_whitelist = []
-title_blacklist = []
-title_limit = 0
-body_whitelist = []
-body_blacklist = []
-body_limit = 0
-webhook = ""
+    # A list of filters to watch for
+    # Empty fields can be omitted in a real config
+    [[twitter.filter]]
+    # follows must use a Twitter user's ID
+    # https://tweeterid.com/
+    follows = []
+    # strict mode means only original tweets will be ingested
+    follow_strict = false
+    locations = []
+    tracks = []
+    webhook = ""

main.go

@@ -2,7 +2,15 @@ package main
 
 import (
 	"flag"
+	"os"
+	"os/signal"
+	"syscall"
 
+	"go.etztech.xyz/lurk/config"
+	"go.etztech.xyz/lurk/handler"
+
+	"github.com/dghubble/go-twitter/twitter"
+	"github.com/dghubble/oauth1"
 	"github.com/turnage/graw"
 	"github.com/turnage/graw/reddit"
 	"go.jolheiser.com/beaver"
@@ -29,31 +37,82 @@ func main() {
 		beaver.Console.Level = beaver.DEBUG
 	}
 
-	cfg, err := LoadConfig()
+	cfg, err := config.Load(configPath)
 	if err != nil {
 		beaver.Fatal(err)
 	}
 
+	// Reddit
+	go lurkReddit(cfg)
+
+	// Twitter
+	go lurkTwitter(cfg)
+
+	beaver.Info("Lurk is ready to start lurking!")
+	ch := make(chan os.Signal)
+	signal.Notify(ch, syscall.SIGINT, syscall.SIGTERM)
+	<-ch
+}
+
+func lurkReddit(cfg *config.Config) {
 	bot, err := reddit.NewBot(reddit.BotConfig{
-		Agent: cfg.UserAgent(),
+		Agent: cfg.Reddit.UserAgent(),
 		App: reddit.App{
-			ID:       cfg.ClientID,
-			Secret:   cfg.ClientSecret,
-			Username: cfg.Username,
-			Password: cfg.Password,
+			ID:       cfg.Reddit.ClientID,
+			Secret:   cfg.Reddit.ClientSecret,
+			Username: cfg.Reddit.Username,
+			Password: cfg.Reddit.Password,
 		},
 	})
 	if err != nil {
 		beaver.Fatal(err)
 	}
 
-	_, wait, err := graw.Run(&lurker{cfg}, bot, graw.Config{Subreddits: cfg.SubRedditNames()})
+	_, wait, err := graw.Run(&handler.Reddit{
+		Config: cfg,
+	}, bot, graw.Config{
+		Subreddits: cfg.Reddit.SubRedditNames(),
+	})
 	if err != nil {
-		beaver.Fatal(err)
+		beaver.Errorf("could not run reddit bot: %v", err)
+		return
 	}
-
-	beaver.Info("Lurk is ready to start lurking!")
 	if err := wait(); err != nil {
 		beaver.Fatal(err)
 	}
 }
+
+func lurkTwitter(cfg *config.Config) {
+	twitterConfig := oauth1.NewConfig(cfg.Twitter.ConsumerKey, cfg.Twitter.ConsumerSecret)
+	token := oauth1.NewToken(cfg.Twitter.AccessToken, cfg.Twitter.AccessSecret)
+
+	httpClient := twitterConfig.Client(oauth1.NoContext, token)
+	client := twitter.NewClient(httpClient)
+
+	// Just to test if we have valid auth
+	_, _, err := client.Timelines.HomeTimeline(&twitter.HomeTimelineParams{
+		Count: 1,
+	})
+	if err != nil {
+		beaver.Fatal(err)
+	}
+
+	for _, filter := range cfg.Twitter.Filters {
+		stream, err := client.Streams.Filter(&twitter.StreamFilterParams{
+			Follow:        filter.Follows,
+			Locations:     filter.Locations,
+			StallWarnings: twitter.Bool(false),
+			Track:         filter.Tracks,
+		})
+		if err != nil {
+			beaver.Fatal(err)
+		}
+
+		lurker := &handler.Twitter{
+			Filter: filter,
+			Stream: stream,
+		}
+
+		go lurker.Run()
+	}
+}