Skip to content

Commit

Permalink
Release 6/12/2021 (#195) #minor
Browse files Browse the repository at this point in the history
* Bump github.com/adrg/libvlc-go/v3 from 3.1.2 to 3.1.4

Bumps [github.com/adrg/libvlc-go/v3](https://github.com/adrg/libvlc-go) from 3.1.2 to 3.1.4.
- [Release notes](https://github.com/adrg/libvlc-go/releases)
- [Commits](adrg/libvlc-go@v3.1.2...v3.1.4)

Signed-off-by: dependabot[bot] <support@github.com>

* Adding more bots

* Adding sentry tracing

See: https://docs.sentry.io/platforms/go/guides/negroni/performance/

* Bump actions/cache from 2.1.5 to 2.1.6

Bumps [actions/cache](https://github.com/actions/cache) from 2.1.5 to 2.1.6.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](actions/cache@v2.1.5...v2.1.6)

Signed-off-by: dependabot[bot] <support@github.com>

* Bump golang from 1.16.4-buster to 1.16.5-buster in /infra/docker/tripbot

Bumps golang from 1.16.4-buster to 1.16.5-buster.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump github/super-linter from 3.17.1 to 4.2.2

Bumps [github/super-linter](https://github.com/github/super-linter) from 3.17.1 to 4.2.2.
- [Release notes](https://github.com/github/super-linter/releases)
- [Commits](github/super-linter@v3.17.1...v4.2.2)

---
updated-dependencies:
- dependency-name: github/super-linter
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Adding some more bots

* Bump github.com/nicklaw5/helix from 1.16.0 to 1.20.0

Bumps [github.com/nicklaw5/helix](https://github.com/nicklaw5/helix) from 1.16.0 to 1.20.0.
- [Release notes](https://github.com/nicklaw5/helix/releases)
- [Commits](nicklaw5/helix@v1.16.0...v1.20.0)

---
updated-dependencies:
- dependency-name: github.com/nicklaw5/helix
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Adding error catching to sentry

* One more location

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
dmerrick and dependabot[bot] authored Jun 12, 2021
1 parent 13adc0b commit 8e92922
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: actions/checkout@v1
- name: Fetch videos from cache
id: restore-videos
uses: actions/cache@v2.1.5
uses: actions/cache@v2.1.6
with:
path: assets/video
key: ${{ runner.os }}-video-${{ hashFiles('assets/video/manifest.txt') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/super-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: run-linters
uses: github/super-linter@v3.17.1
uses: github/super-linter@v4.2.2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# disabled because it's not working with C libs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
go-version: ${{ matrix.go-version }}
- uses: actions/checkout@v2
- name: Restore Cache
uses: actions/cache@v2.1.5
uses: actions/cache@v2.1.6
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.15

require (
cloud.google.com/go/logging v1.4.2
github.com/adrg/libvlc-go/v3 v3.1.2
github.com/adrg/libvlc-go/v3 v3.1.4
github.com/bradfitz/latlong v0.0.0-20170410180902-f3db6d0dff40
github.com/davecgh/go-spew v1.1.1
github.com/dimiro1/banner v1.1.0
Expand All @@ -25,7 +25,7 @@ require (
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mitchellh/go-ps v1.0.0
github.com/nathan-osman/go-sunrise v0.0.0-20201029015502-9a83cd1a5746
github.com/nicklaw5/helix v1.16.0
github.com/nicklaw5/helix v1.20.0
github.com/prometheus/client_golang v1.10.0
github.com/robfig/cron v1.2.0
github.com/sfreiberg/gotwilio v0.0.0-20200916182813-169c4cd5c691
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqR
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
github.com/adrg/libvlc-go/v3 v3.1.2 h1:Q5e0IT/ESWT+iHfjR22a6CGmSI8LE3tTZHeCGqJ/zE8=
github.com/adrg/libvlc-go/v3 v3.1.2/go.mod h1:xJK0YD8cyMDejnrTFQinStE6RYCV1nlfS8KmqTpszSc=
github.com/adrg/libvlc-go/v3 v3.1.4 h1:zWBln9eEuMzZbOFtgmvHpufYejAuelfmGpiWG9f0n24=
github.com/adrg/libvlc-go/v3 v3.1.4/go.mod h1:xJK0YD8cyMDejnrTFQinStE6RYCV1nlfS8KmqTpszSc=
github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
Expand Down Expand Up @@ -413,8 +413,8 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE
github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
github.com/nicklaw5/helix v1.16.0 h1:3mQwLWQ3VHoy67uGp3VrnaVzuwJ4ulSLcyBKRKdzsgc=
github.com/nicklaw5/helix v1.16.0/go.mod h1:XeeXY7oY5W+MVMu6wF4qGm8uvjZ1/Nss0FqprVkXKrg=
github.com/nicklaw5/helix v1.20.0 h1:qC76FVxeOOcqOJD2JijV97O37Wc3gqi9w1EUBLWFFFs=
github.com/nicklaw5/helix v1.20.0/go.mod h1:XeeXY7oY5W+MVMu6wF4qGm8uvjZ1/Nss0FqprVkXKrg=
github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
Expand Down
2 changes: 1 addition & 1 deletion infra/docker/tripbot/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# buster is the debian release, c.p. https://askubuntu.com/a/445496
FROM golang:1.16.4-buster
FROM golang:1.16.5-buster

WORKDIR /go/src/github.com/adanalife/tripbot

Expand Down
2 changes: 1 addition & 1 deletion pkg/chatbot/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ func runCommand(user *users.User, message string) {

// any of these should trigger the location command
//TODO: add support for: "where is this", "where are we", "where are you"
case "!tripbot", "!location", "!city", "!town", "!where", "!loacation", "!loation", "!loc", "!locatioin", "!locatoion", "!locaton", "!loclistion", "!locton", "1location", "¡location", "!locatiom", "!location!", "!locatio":
case "!tripbot", "!location", "!city", "!town", "!where", "!loacation", "!loation", "!loc", "!locatioin", "!locatoion", "!locaton", "!loclistion", "!locton", "1location", "¡location", "!locatiom", "!location!", "!locatio", "!lcoation":
if user.HasCommandAvailable() {
locationCmd(user)
} else {
Expand Down
9 changes: 9 additions & 0 deletions pkg/config/tripbot/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@ func UserIsIgnored(user string) bool {
// https://twitchinsights.net/bots
var IgnoredUsers = []string{
"0_applebadapple_0",
"1174",
"2020",
"abbottcostello",
"academyimpossible",
"angeloflight",
"anotherttvviewer",
"apricotdrupefruit",
Expand All @@ -52,16 +54,22 @@ var IgnoredUsers = []string{
"bingcortana",
"brokemystreamdeck",
"buglers",
"carbob14xyz",
"cartierlogic",
"cashiering",
"casinothanks",
"cleaning_the_house",
"clearyourbrowserhistory",
"comettunes",
"commanderroot",
"community4smallstreamers",
"communityshowcase",
"cristianepre",
"cyclemotion",
"d1sc0rdforsmallstreamers",
"d4rk_5how",
"d4rk_5ky",
"disc0rdforsma11streamers",
"discord_for_streamers",
"droopdoggg",
"electricallongboard",
Expand All @@ -72,6 +80,7 @@ var IgnoredUsers = []string{
"feuerwehr",
"flaskcopy",
"freddyybot",
"frw33d",
"ftopayr",
"ghrly",
"gingerne",
Expand Down
9 changes: 8 additions & 1 deletion pkg/errors/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package errors

import (
"errors"
"fmt"
"log"

"github.com/adanalife/tripbot/pkg/config"
Expand All @@ -14,7 +15,13 @@ var conf config.Config
// Initialize takes a Config interface and sets up a logger
func Initialize(c config.Config) {
// sentry options are picked up through ENV vars
sentry.Init(sentry.ClientOptions{})
err := sentry.Init(sentry.ClientOptions{
// enable tracing
TracesSampleRate: 0.2,
})
if err != nil {
fmt.Println(err)
}

conf = c
}
Expand Down

0 comments on commit 8e92922

Please sign in to comment.