diff --git a/.github/workflows/bump-and-release.yml b/.github/workflows/bump-and-release.yml index fbaa56de..ea93badd 100644 --- a/.github/workflows/bump-and-release.yml +++ b/.github/workflows/bump-and-release.yml @@ -13,7 +13,7 @@ jobs: fetch-depth: '0' - name: Bump version and push tag id: bump-version - uses: anothrNick/github-tag-action@1.34.0 + uses: anothrNick/github-tag-action@1.35.0 env: GITHUB_TOKEN: ${{ secrets.CI_PERSONAL_ACCESS_TOKEN }} DEFAULT_BUMP: patch diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index b92b2be3..06fb0739 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -35,7 +35,7 @@ jobs: uses: actions/checkout@v1 - name: Fetch videos from cache id: restore-videos - uses: actions/cache@v2.1.3 + uses: actions/cache@v2.1.4 with: path: assets/video key: ${{ runner.os }}-video-${{ hashFiles('assets/video/manifest.txt') }} diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml index 54f7b09e..424195ed 100644 --- a/.github/workflows/super-linter.yml +++ b/.github/workflows/super-linter.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: run-linters - uses: github/super-linter@v3 + uses: github/super-linter@v3.15.2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # disabled because it's not working with C libs @@ -24,3 +24,5 @@ jobs: VALIDATE_DOCKERFILE_HADOLINT: false # disabled cause they dont support CRDs rn VALIDATE_KUBERNETES_KUBEVAL: false + # disabled until we go through and fix the dupe code issues + VALIDATE_JSCPD: false diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index f984e13e..1fc51cf5 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -26,7 +26,7 @@ jobs: go-version: ${{ matrix.go-version }} - uses: actions/checkout@v2 - name: Restore Cache - uses: actions/cache@v2.1.3 + uses: actions/cache@v2.1.4 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} diff --git a/configs/obs-studio/Dashcam_Scenes.windows.json b/configs/obs-studio/Dashcam_Scenes.windows.json index b056f805..85a35d12 100644 --- a/configs/obs-studio/Dashcam_Scenes.windows.json +++ b/configs/obs-studio/Dashcam_Scenes.windows.json @@ -16,7 +16,7 @@ "monitoring_type": 0, "muted": true, "name": "Mic/Aux", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": { "mixer_hidden": true }, @@ -46,9 +46,9 @@ "id": "wasapi_output_capture", "mixers": 255, "monitoring_type": 0, - "muted": false, + "muted": true, "name": "Desktop Audio", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -62,7 +62,7 @@ "volume": 0.78617960214614868 }, "current_program_scene": "Dashcam", - "current_scene": "Full Screen", + "current_scene": "Dashcam", "current_transition": "Fade", "groups": [ { @@ -82,7 +82,7 @@ "monitoring_type": 0, "muted": false, "name": "Backup", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -175,7 +175,7 @@ "monitoring_type": 0, "muted": false, "name": "Webcam 2 2", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -260,15 +260,17 @@ "hotkeys": { "libobs.hide_scene_item.Stream Raiders Countdown": [], "libobs.hide_scene_item.Stream Raiders Game": [], + "libobs.hide_scene_item.Stream Raiders Overlay": [], "libobs.show_scene_item.Stream Raiders Countdown": [], - "libobs.show_scene_item.Stream Raiders Game": [] + "libobs.show_scene_item.Stream Raiders Game": [], + "libobs.show_scene_item.Stream Raiders Overlay": [] }, "id": "group", "mixers": 0, "monitoring_type": 0, "muted": false, "name": "Stream Raiders 2", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -303,7 +305,7 @@ "private_settings": {}, "rot": 0.0, "scale": { - "x": 0.6050000786781311, + "x": 0.60500019788742065, "y": 0.6050000786781311 }, "scale_filter": "disable", @@ -333,7 +335,7 @@ "rot": 0.0, "scale": { "x": 0.25156250596046448, - "y": 0.25138890743255615 + "y": 0.25138893723487854 }, "scale_filter": "disable", "visible": true @@ -356,7 +358,7 @@ "name": "Stream Raiders Overlay", "pos": { "x": 189.0, - "y": 60.0 + "y": 60.000022888183594 }, "private_settings": {}, "rot": 0.0, @@ -390,7 +392,7 @@ "monitoring_type": 0, "muted": false, "name": "Stream Raiders", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -483,7 +485,7 @@ "monitoring_type": 0, "muted": false, "name": "Webcam 2", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -570,17 +572,19 @@ "libobs.hide_scene_item.Bottom Overlay": [], "libobs.hide_scene_item.Fuel Gauge 100": [], "libobs.hide_scene_item.Middle Text": [], + "libobs.hide_scene_item.Timewarp Onscreen": [], "libobs.show_scene_item.Bottom Left Rotator": [], "libobs.show_scene_item.Bottom Overlay": [], "libobs.show_scene_item.Fuel Gauge 100": [], - "libobs.show_scene_item.Middle Text": [] + "libobs.show_scene_item.Middle Text": [], + "libobs.show_scene_item.Timewarp Onscreen": [] }, "id": "group", "mixers": 0, "monitoring_type": 0, "muted": false, "name": "ADL Overlays", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -787,6 +791,9 @@ "provider": "mssapi", "source": "" }, + "decklink_captions": { + "source": "" + }, "output-timer": { "autoStartRecordTimer": false, "autoStartStreamTimer": false, @@ -866,6 +873,39 @@ } ], "sources": [ + { + "balance": 0.5, + "deinterlace_field_order": 0, + "deinterlace_mode": 0, + "enabled": true, + "flags": 0, + "hotkeys": {}, + "id": "text_gdiplus", + "mixers": 0, + "monitoring_type": 0, + "muted": false, + "name": "Leaderboard", + "prev_ver": 436273153, + "private_settings": {}, + "push-to-mute": false, + "push-to-mute-delay": 0, + "push-to-talk": false, + "push-to-talk-delay": 0, + "settings": { + "file": "C:/tripbot/run/leaderboard.txt", + "font": { + "face": "Raleway Black", + "flags": 1, + "size": 36, + "style": "Black" + }, + "read_from_file": true, + "valign": "bottom" + }, + "sync": 0, + "versioned_id": "text_gdiplus_v2", + "volume": 1.0 + }, { "balance": 0.5, "deinterlace_field_order": 0, @@ -878,7 +918,7 @@ "monitoring_type": 0, "muted": false, "name": "GPS Onscreen", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -910,7 +950,7 @@ "monitoring_type": 0, "muted": false, "name": "Stream Raiders Overlay", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -947,7 +987,7 @@ "monitoring_type": 0, "muted": false, "name": "Desktop", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -1357,14 +1397,12 @@ "libobs.hide_scene_item.H5": [], "libobs.hide_scene_item.PuTTY": [], "libobs.hide_scene_item.Stream Raiders": [], - "libobs.hide_scene_item.Timewarp Onscreen": [], "libobs.hide_scene_item.Webcam 2": [], "libobs.show_scene_item.ADL Overlays": [], "libobs.show_scene_item.Car Sounds": [], "libobs.show_scene_item.H5": [], "libobs.show_scene_item.PuTTY": [], "libobs.show_scene_item.Stream Raiders": [], - "libobs.show_scene_item.Timewarp Onscreen": [], "libobs.show_scene_item.Webcam 2": [] }, "id": "scene", @@ -1372,7 +1410,7 @@ "monitoring_type": 0, "muted": false, "name": "Desktop w/ Cam", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -1870,7 +1908,7 @@ "monitoring_type": 0, "muted": false, "name": "PuTTY", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -1895,7 +1933,7 @@ "monitoring_type": 0, "muted": false, "name": "GoLand", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -1936,7 +1974,7 @@ "monitoring_type": 0, "muted": false, "name": "Coding w/ Cam", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -2227,7 +2265,7 @@ "monitoring_type": 0, "muted": false, "name": "Timewarp Onscreen", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -2271,7 +2309,7 @@ "monitoring_type": 0, "muted": false, "name": "Game Capture", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -2316,7 +2354,7 @@ "monitoring_type": 0, "muted": false, "name": "Full Screen w/ Cam", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -2637,7 +2675,6 @@ "libobs.hide_scene_item.H5": [], "libobs.hide_scene_item.PuTTY": [], "libobs.hide_scene_item.Stream Raiders": [], - "libobs.hide_scene_item.Timewarp Onscreen": [], "libobs.hide_scene_item.Webcam 2": [], "libobs.hide_scene_item.vlc-server": [], "libobs.show_scene_item.ADL Overlays": [], @@ -2645,7 +2682,6 @@ "libobs.show_scene_item.H5": [], "libobs.show_scene_item.PuTTY": [], "libobs.show_scene_item.Stream Raiders": [], - "libobs.show_scene_item.Timewarp Onscreen": [], "libobs.show_scene_item.Webcam 2": [], "libobs.show_scene_item.vlc-server": [] }, @@ -2654,7 +2690,7 @@ "monitoring_type": 0, "muted": false, "name": "Dashcam w/ Cam", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -3182,8 +3218,8 @@ "libobs.hide_scene_item.Car Sounds": [], "libobs.hide_scene_item.GPS Onscreen": [], "libobs.hide_scene_item.H5": [], + "libobs.hide_scene_item.Leaderboard": [], "libobs.hide_scene_item.Stream Raiders 2": [], - "libobs.hide_scene_item.Stream Raiders Overlay": [], "libobs.hide_scene_item.Timewarp Onscreen": [], "libobs.hide_scene_item.vlc-server": [], "libobs.show_scene_item.ADL Overlays": [], @@ -3191,8 +3227,8 @@ "libobs.show_scene_item.Car Sounds": [], "libobs.show_scene_item.GPS Onscreen": [], "libobs.show_scene_item.H5": [], + "libobs.show_scene_item.Leaderboard": [], "libobs.show_scene_item.Stream Raiders 2": [], - "libobs.show_scene_item.Stream Raiders Overlay": [], "libobs.show_scene_item.Timewarp Onscreen": [], "libobs.show_scene_item.vlc-server": [] }, @@ -3201,7 +3237,7 @@ "monitoring_type": 0, "muted": false, "name": "Dashcam", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -3209,7 +3245,7 @@ "push-to-talk-delay": 0, "settings": { "custom_size": false, - "id_counter": 18, + "id_counter": 19, "items": [ { "align": 5, @@ -3464,7 +3500,7 @@ "y": 0.0 }, "private_settings": { - "collapsed": true + "collapsed": false }, "rot": 0.0, "scale": { @@ -3497,7 +3533,7 @@ "private_settings": {}, "rot": 0.0, "scale": { - "x": 1.381250262260437, + "x": 1.3812505006790161, "y": 1.3816667795181274 }, "scale_filter": "disable", @@ -3527,7 +3563,7 @@ "rot": 0.0, "scale": { "x": 0.57433176040649414, - "y": 0.5741085410118103 + "y": 0.57410860061645508 }, "scale_filter": "disable", "visible": true @@ -3550,7 +3586,7 @@ "name": "Stream Raiders Overlay", "pos": { "x": 772.4979248046875, - "y": 248.02479553222656 + "y": 248.02484130859375 }, "private_settings": {}, "rot": 0.0, @@ -3592,6 +3628,35 @@ "scale_filter": "disable", "visible": false }, + { + "align": 5, + "bounds": { + "x": 354.0, + "y": 181.0 + }, + "bounds_align": 0, + "bounds_type": 2, + "crop_bottom": 0, + "crop_left": 0, + "crop_right": 0, + "crop_top": 0, + "group_item_backup": false, + "id": 19, + "locked": false, + "name": "Leaderboard", + "pos": { + "x": 13.0, + "y": 843.0 + }, + "private_settings": {}, + "rot": 0.0, + "scale": { + "x": 1.0, + "y": 1.0 + }, + "scale_filter": "disable", + "visible": true + }, { "align": 5, "bounds": { @@ -3737,7 +3802,7 @@ "y": 1.0 }, "scale_filter": "disable", - "visible": true + "visible": false }, { "align": 5, @@ -3789,7 +3854,7 @@ "monitoring_type": 0, "muted": false, "name": "Stream Raiders Game", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -3821,7 +3886,7 @@ "monitoring_type": 0, "muted": false, "name": "Stream Raiders Countdown", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -3846,7 +3911,7 @@ "monitoring_type": 0, "muted": false, "name": "Middle Text", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -3887,7 +3952,7 @@ "monitoring_type": 0, "muted": false, "name": "Fuel Gauge 100", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": { "mixer_hidden": true }, @@ -3921,7 +3986,7 @@ "monitoring_type": 0, "muted": false, "name": "Overwatch", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -3953,7 +4018,7 @@ "monitoring_type": 0, "muted": false, "name": "Intermission Camera", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -3993,7 +4058,7 @@ "monitoring_type": 0, "muted": false, "name": "Intermission Screen", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -4028,7 +4093,7 @@ "monitoring_type": 0, "muted": false, "name": "Intermission", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -4152,7 +4217,7 @@ "monitoring_type": 0, "muted": false, "name": "Ending Screen", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -4185,7 +4250,7 @@ "monitoring_type": 0, "muted": false, "name": "Ending", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -4280,7 +4345,7 @@ "monitoring_type": 0, "muted": false, "name": "Starting Soon Screen", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -4313,7 +4378,7 @@ "monitoring_type": 0, "muted": false, "name": "Starting Soon", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -4408,7 +4473,7 @@ "monitoring_type": 0, "muted": false, "name": "BRB Screen", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -4441,7 +4506,7 @@ "monitoring_type": 0, "muted": false, "name": "BRB", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -4536,7 +4601,7 @@ "monitoring_type": 0, "muted": false, "name": "Overlay", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -4571,7 +4636,7 @@ "monitoring_type": 0, "muted": false, "name": "Chroma Key", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -4595,7 +4660,7 @@ "monitoring_type": 0, "muted": true, "name": "Camera", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -4626,7 +4691,7 @@ "monitoring_type": 0, "muted": false, "name": "Display Capture", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -4655,7 +4720,7 @@ "monitoring_type": 0, "muted": false, "name": "Noise Suppression", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -4678,7 +4743,7 @@ "monitoring_type": 0, "muted": false, "name": "Compressor", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -4708,7 +4773,7 @@ "monitoring_type": 0, "muted": false, "name": "Noise Gate", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -4735,7 +4800,7 @@ "monitoring_type": 0, "muted": true, "name": "H5", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -4772,7 +4837,7 @@ "monitoring_type": 0, "muted": false, "name": "Full Screen", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -4912,17 +4977,17 @@ "crop_top": 0, "group_item_backup": false, "id": 15, - "locked": false, + "locked": true, "name": "Dashcam", "pos": { - "x": 1444.0, - "y": 812.0 + "x": 1436.0, + "y": 808.0 }, "private_settings": {}, "rot": 0.0, "scale": { - "x": 0.24791666865348816, - "y": 0.24814814329147339 + "x": 0.25208333134651184, + "y": 0.25185185670852661 }, "scale_filter": "disable", "visible": true @@ -4948,7 +5013,7 @@ "monitoring_type": 0, "muted": false, "name": "vlc-server", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -4960,7 +5025,7 @@ "capture_mode": "window", "limit_framerate": true, "priority": 2, - "window": "VLC (Direct3D11 output):VLC video main 000001A960E233C0:___2vlc_server_prod.exe" + "window": "VLC (Direct3D11 output):VLC video main 000002966F5856F0:vlc-server.exe" }, "sync": 0, "versioned_id": "game_capture", @@ -4987,7 +5052,7 @@ "monitoring_type": 0, "muted": false, "name": "Bottom Overlay", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": { "mixer_hidden": true }, @@ -5019,7 +5084,7 @@ "monitoring_type": 0, "muted": false, "name": "Bottom Left Rotator", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, @@ -5061,7 +5126,7 @@ "monitoring_type": 0, "muted": false, "name": "Car Sounds", - "prev_ver": 436207618, + "prev_ver": 436273153, "private_settings": {}, "push-to-mute": false, "push-to-mute-delay": 0, diff --git a/db/README.md b/db/README.md index e95c29cf..5ccb0916 100644 --- a/db/README.md +++ b/db/README.md @@ -54,3 +54,10 @@ devenv up seed \copy videos FROM 'db/seed/videos.csv' DELIMITER ',' CSV HEADER; ``` +#### Other + +Get leaderboard winners + +```sql +select users.username, scores.value from scoreboards, scores, users where scoreboards.name = 'guess_state_2021_01' and scores.user_id = users.id and scores.scoreboard_id = scoreboards.id ORDER BY scores.value DESC LIMIT 10; +``` diff --git a/go.mod b/go.mod index 3a6fdf76..e336e9ee 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/dimiro1/banner v1.1.0 github.com/gempir/go-twitch-irc/v2 v2.5.0 - github.com/getsentry/sentry-go v0.9.0 + github.com/getsentry/sentry-go v0.10.0 github.com/go-sql-driver/mysql v1.5.0 // indirect github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect github.com/gorilla/mux v1.8.0 diff --git a/go.sum b/go.sum index 5a9f79ce..fcd3df0e 100644 --- a/go.sum +++ b/go.sum @@ -136,8 +136,8 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc= github.com/gempir/go-twitch-irc/v2 v2.5.0 h1:aybXNoyDNQaa4vHhXb0UpIDmspqutQUmXIYUFsjgecU= github.com/gempir/go-twitch-irc/v2 v2.5.0/go.mod h1:120d2SdlRYg8tRnZwsyNPeS+mWPn+YmNEzB7Bv/CDGE= -github.com/getsentry/sentry-go v0.9.0 h1:KIfpY/D9hX3gWAEd3d8z6ImuHNWtqEsjlpdF8zXFsHM= -github.com/getsentry/sentry-go v0.9.0/go.mod h1:kELm/9iCblqUYh+ZRML7PNdCvEuw24wBvJPYyi86cws= +github.com/getsentry/sentry-go v0.10.0 h1:6gwY+66NHKqyZrdi6O2jGdo7wGdo9b3B69E01NFgT5g= +github.com/getsentry/sentry-go v0.10.0/go.mod h1:kELm/9iCblqUYh+ZRML7PNdCvEuw24wBvJPYyi86cws= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= diff --git a/infra/docker/obs/Dockerfile b/infra/docker/obs/Dockerfile index 5b6a87bb..17b0156d 100644 --- a/infra/docker/obs/Dockerfile +++ b/infra/docker/obs/Dockerfile @@ -101,16 +101,19 @@ ENV VNC_PASSWD=123456 WORKDIR /tmp +ENV OBS_VERSION=26.1.2 + # install obs and the obs-browser plugin -RUN git clone https://github.com/obsproject/obs-studio \ +#TODO: re-enable browser plugin +RUN git clone --depth 1 --branch $OBS_VERSION https://github.com/obsproject/obs-studio \ && cd obs-studio \ && wget https://cdn-fastly.obsproject.com/downloads/cef_binary_3770_linux64.tar.bz2 \ && tar xjf cef_binary_3770_linux64.tar.bz2 \ && rm cef_binary_3770_linux64.tar.bz2 \ - && git clone https://github.com/obsproject/obs-browser ./plugins/obs-browser \ + && git clone --depth 1 https://github.com/obsproject/obs-browser ./plugins/obs-browser \ && mkdir -p build \ && cd build \ - && cmake -DUNIX_STRUCTURE=1 -DBUILD_BROWSER=ON -DCEF_ROOT_DIR="../cef_binary_3770_linux64" .. \ + && cmake -DUNIX_STRUCTURE=1 -DBUILD_BROWSER=OFF -DCEF_ROOT_DIR="../cef_binary_3770_linux64" .. \ && make -j2 \ && make install #TODO: possibly add obs-vst? diff --git a/infra/docker/tripbot/Dockerfile b/infra/docker/tripbot/Dockerfile index 4de83ed2..f21657a3 100644 --- a/infra/docker/tripbot/Dockerfile +++ b/infra/docker/tripbot/Dockerfile @@ -1,5 +1,5 @@ # buster is the debian release, c.p. https://askubuntu.com/a/445496 -FROM golang:1.15.6-buster +FROM golang:1.16.0-buster WORKDIR /go/src/github.com/adanalife/tripbot diff --git a/pkg/config/tripbot/helpers.go b/pkg/config/tripbot/helpers.go index 94280ab8..d584bc65 100644 --- a/pkg/config/tripbot/helpers.go +++ b/pkg/config/tripbot/helpers.go @@ -71,11 +71,13 @@ var IgnoredUsers = []string{ "gowithhim", "havethis2", "icewizerds", + "ildelara", "jeffecorga", "jobi_essen", "jointeffortt", "kishintern", "konkky", + "lemonjuices12", "letsdothis_music", "logviewer", "lurxx", @@ -90,6 +92,7 @@ var IgnoredUsers = []string{ "p0lizei_", "prankcher", "rladmsdb88", + "rubberslayer", "sad_grl", "saddestkitty", "sillygnome225", @@ -100,6 +103,7 @@ var IgnoredUsers = []string{ "teresedirty", "teyyd", "tripbot4000", + "twitchdetails", "unixchat", "v_and_k", "violets_tv", diff --git a/pkg/server/server.go b/pkg/server/server.go index 2f6c5697..5c7a403f 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -28,7 +28,7 @@ func Start() { r := mux.NewRouter() // healthcheck endpoints - hp := r.PathPrefix("/health").Methods("GET").Subrouter() + hp := r.PathPrefix("/health").Methods("GET", "HEAD").Subrouter() hp.HandleFunc("/live", healthHandler) hp.HandleFunc("/ready", healthHandler) diff --git a/pkg/vlc-server/handlers.go b/pkg/vlc-server/handlers.go index e0ffbd95..74aac534 100644 --- a/pkg/vlc-server/handlers.go +++ b/pkg/vlc-server/handlers.go @@ -202,7 +202,6 @@ func onscreensLeaderboardHandler(w http.ResponseWriter, r *http.Request) { http.Error(w, "417 expectation failed", http.StatusExpectationFailed) return } - spew.Dump(base64content[0]) content, err := helpers.Base64Decode(base64content[0]) if err != nil { terrors.Log(err, "unable to decode string") diff --git a/pkg/vlc-server/server.go b/pkg/vlc-server/server.go index 86c5110e..f04604db 100644 --- a/pkg/vlc-server/server.go +++ b/pkg/vlc-server/server.go @@ -28,7 +28,7 @@ func Start() { // healthcheck endpoints //TODO: handle HEAD requests here too - hp := r.PathPrefix("/health").Methods("GET").Subrouter() + hp := r.PathPrefix("/health").Methods("GET", "HEAD").Subrouter() hp.HandleFunc("/", healthHandler) hp.HandleFunc("/live", healthHandler) hp.HandleFunc("/ready", healthHandler)