From 56ad654a025d0c7edec60cdaa5bbcbb448c2c4ef Mon Sep 17 00:00:00 2001
From: cel <107010984+orchidsage@users.noreply.github.com>
Date: Wed, 17 Aug 2022 17:35:45 +0100
Subject: [PATCH 01/45] Add Fediverse, Matrix and XMPP social links (#2044)
---
models/socialHandle.go | 12 ++
webroot/img/platformlogos/fediverse.svg | 162 +++++++++++++++++++
webroot/img/platformlogos/matrix.svg | 14 ++
webroot/img/platformlogos/xmpp.svg | 120 ++++++++++++++
webroot/js/components/platform-logos-list.js | 2 +-
5 files changed, 309 insertions(+), 1 deletion(-)
create mode 100644 webroot/img/platformlogos/fediverse.svg
create mode 100644 webroot/img/platformlogos/matrix.svg
create mode 100644 webroot/img/platformlogos/xmpp.svg
diff --git a/models/socialHandle.go b/models/socialHandle.go
index 0f024d8e9..9c0aefd6a 100644
--- a/models/socialHandle.go
+++ b/models/socialHandle.go
@@ -20,6 +20,18 @@ func GetSocialHandle(platform string) *SocialHandle {
// GetAllSocialHandles will return a list of all the social platforms we support.
func GetAllSocialHandles() map[string]SocialHandle {
socialHandlePlatforms := map[string]SocialHandle{
+ "fediverse": {
+ Platform: "Fediverse",
+ Icon: "/img/platformlogos/fediverse.svg",
+ },
+ "matrix": {
+ Platform: "Matrix",
+ Icon: "/img/platformlogos/matrix.svg",
+ },
+ "xmpp": {
+ Platform: "XMPP",
+ Icon: "/img/platformlogos/xmpp.svg",
+ },
"bandcamp": {
Platform: "Bandcamp",
Icon: "/img/platformlogos/bandcamp.svg",
diff --git a/webroot/img/platformlogos/fediverse.svg b/webroot/img/platformlogos/fediverse.svg
new file mode 100644
index 000000000..1af05f6d6
--- /dev/null
+++ b/webroot/img/platformlogos/fediverse.svg
@@ -0,0 +1,162 @@
+
+
+
+
diff --git a/webroot/img/platformlogos/matrix.svg b/webroot/img/platformlogos/matrix.svg
new file mode 100644
index 000000000..784896156
--- /dev/null
+++ b/webroot/img/platformlogos/matrix.svg
@@ -0,0 +1,14 @@
+
+
+
diff --git a/webroot/img/platformlogos/xmpp.svg b/webroot/img/platformlogos/xmpp.svg
new file mode 100644
index 000000000..849a52f77
--- /dev/null
+++ b/webroot/img/platformlogos/xmpp.svg
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/webroot/js/components/platform-logos-list.js b/webroot/js/components/platform-logos-list.js
index d5c051e56..63c431195 100644
--- a/webroot/js/components/platform-logos-list.js
+++ b/webroot/js/components/platform-logos-list.js
@@ -33,7 +33,7 @@ function SocialIcon(props) {
return html`
From cb71fc06cbbb75cb950cead71ed3eab5d0d4eea4 Mon Sep 17 00:00:00 2001
From: gabek
Date: Wed, 17 Aug 2022 16:36:23 +0000
Subject: [PATCH 02/45] Prettified Code!
---
webroot/js/components/platform-logos-list.js | 106 +++++++++----------
1 file changed, 53 insertions(+), 53 deletions(-)
diff --git a/webroot/js/components/platform-logos-list.js b/webroot/js/components/platform-logos-list.js
index 63c431195..7a4142c4c 100644
--- a/webroot/js/components/platform-logos-list.js
+++ b/webroot/js/components/platform-logos-list.js
@@ -5,66 +5,66 @@ import { classNames } from '../utils/helpers.js';
const html = htm.bind(h);
function SocialIcon(props) {
- const { platform, icon, url } = props;
- const iconSupplied = !!icon;
- const name = platform;
+ const { platform, icon, url } = props;
+ const iconSupplied = !!icon;
+ const name = platform;
- const finalIcon = iconSupplied ? icon : '/img/platformlogos/default.svg';
+ const finalIcon = iconSupplied ? icon : '/img/platformlogos/default.svg';
- const style = `background-image: url(${finalIcon});`;
+ const style = `background-image: url(${finalIcon});`;
- const itemClass = classNames({
- 'user-social-item': true,
- flex: true,
- 'justify-start': true,
- 'items-center': true,
- 'm-1': true,
- });
- const labelClass = classNames({
- 'platform-label': true,
- 'visually-hidden': !!finalIcon,
- 'text-indigo-800': true,
- 'text-xs': true,
- uppercase: true,
- 'max-w-xs': true,
- 'inline-block': true,
- });
+ const itemClass = classNames({
+ 'user-social-item': true,
+ flex: true,
+ 'justify-start': true,
+ 'items-center': true,
+ 'm-1': true,
+ });
+ const labelClass = classNames({
+ 'platform-label': true,
+ 'visually-hidden': !!finalIcon,
+ 'text-indigo-800': true,
+ 'text-xs': true,
+ uppercase: true,
+ 'max-w-xs': true,
+ 'inline-block': true,
+ });
- return html`
-
-
- Find me on ${name}
-
- `;
+ return html`
+
+
+ Find me on ${name}
+
+ `;
}
export default function (props) {
- const { handles } = props;
- if (handles == null) {
- return null;
- }
+ const { handles } = props;
+ if (handles == null) {
+ return null;
+ }
- const list = handles.map(
- (item, index) => html`
-
- <${SocialIcon}
- platform=${item.platform}
- icon=${item.icon}
- url=${item.url}
- />
-
- `
- );
+ const list = handles.map(
+ (item, index) => html`
+
+ <${SocialIcon}
+ platform=${item.platform}
+ icon=${item.icon}
+ url=${item.url}
+ />
+
+ `
+ );
- return html` `;
+ return html` `;
}
From 757b1beb2fb009ead4628674102a90b55058bd33 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 20 Aug 2022 05:30:34 +0000
Subject: [PATCH 03/45] Update module github.com/aws/aws-sdk-go to v1.44.81
---
go.mod | 2 +-
go.sum | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/go.mod b/go.mod
index beeaf12ff..be4a3b68d 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.17
require (
github.com/amalfra/etag v1.0.0
- github.com/aws/aws-sdk-go v1.44.78
+ github.com/aws/aws-sdk-go v1.44.81
github.com/go-fed/activity v1.0.1-0.20210803212804-d866ba75dd0f
github.com/go-fed/httpsig v1.1.0
github.com/go-ole/go-ole v1.2.6 // indirect
diff --git a/go.sum b/go.sum
index 20ebbffbd..84001dd3a 100644
--- a/go.sum
+++ b/go.sum
@@ -62,6 +62,8 @@ github.com/aws/aws-sdk-go v1.44.77 h1:m5rTfdv04/swD+vTuS2zn4NEwKX3yEJPMhiVCFDL/m
github.com/aws/aws-sdk-go v1.44.77/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
github.com/aws/aws-sdk-go v1.44.78 h1:B/V28YXFLmxjMQqJeyCt7NDRIJdep0sJixIAeee2BF0=
github.com/aws/aws-sdk-go v1.44.78/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
+github.com/aws/aws-sdk-go v1.44.81 h1:C8oBZ+a+ka0qk3Q24MohQIFq0tkbO8IAu5tfpAMKVWE=
+github.com/aws/aws-sdk-go v1.44.81/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
From 8bd222e8472a16a485a923891282cbd5a359cb6a Mon Sep 17 00:00:00 2001
From: Gabe Kangas
Date: Sat, 20 Aug 2022 12:08:18 -0700
Subject: [PATCH 04/45] Do not run tests on web-only changes
---
.github/workflows/automated-end-to-end-api.yaml | 4 +---
.github/workflows/javascript-formatting.yml | 1 +
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/automated-end-to-end-api.yaml b/.github/workflows/automated-end-to-end-api.yaml
index 826bb18b4..0dae5e191 100644
--- a/.github/workflows/automated-end-to-end-api.yaml
+++ b/.github/workflows/automated-end-to-end-api.yaml
@@ -4,9 +4,7 @@ on:
push:
paths-ignore:
- 'webroot/**'
- pull_request:
- paths-ignore:
- - 'webroot/**'
+ - 'web/**'
jobs:
api:
diff --git a/.github/workflows/javascript-formatting.yml b/.github/workflows/javascript-formatting.yml
index d5e298b87..11d9fc33f 100644
--- a/.github/workflows/javascript-formatting.yml
+++ b/.github/workflows/javascript-formatting.yml
@@ -18,6 +18,7 @@ jobs:
# Make sure the actual branch is checked out when running on pull requests
ref: ${{ github.head_ref }}
fetch-depth: 0
+ pull: --rebase --autostash
- name: Prettify code
uses: creyD/prettier_action@v4.2
From 94d52dde57ad9fe322ef2c318604c870620e7e15 Mon Sep 17 00:00:00 2001
From: Gabe Kangas
Date: Sun, 21 Aug 2022 16:16:05 -0700
Subject: [PATCH 05/45] Update bug-report-feature-request.md
---
.github/ISSUE_TEMPLATE/bug-report-feature-request.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/ISSUE_TEMPLATE/bug-report-feature-request.md b/.github/ISSUE_TEMPLATE/bug-report-feature-request.md
index f4220d88c..938718130 100644
--- a/.github/ISSUE_TEMPLATE/bug-report-feature-request.md
+++ b/.github/ISSUE_TEMPLATE/bug-report-feature-request.md
@@ -3,7 +3,7 @@ name: Bug report or feature request
about: Having problems or have ideas? We'd love to know what you think and help you out.
---
-Thanks for helping by reporting issues and sharing ideas you might have!
+Thanks for helping by reporting issues and sharing ideas you might have! Please delete this message before submitting your issue, this is just a note to help.
## Feature requests
From 9a1d1873acbad80e3fa552c4ead5d0062cddb43f Mon Sep 17 00:00:00 2001
From: Gabe Kangas
Date: Sun, 21 Aug 2022 22:47:15 -0700
Subject: [PATCH 06/45] Migrate issue template to be a form
---
.../ISSUE_TEMPLATE/bug-report-feature-request.md | 12 ------------
.../ISSUE_TEMPLATE/bug-report-feature-request.yml | 15 +++++++++++++++
2 files changed, 15 insertions(+), 12 deletions(-)
delete mode 100644 .github/ISSUE_TEMPLATE/bug-report-feature-request.md
create mode 100644 .github/ISSUE_TEMPLATE/bug-report-feature-request.yml
diff --git a/.github/ISSUE_TEMPLATE/bug-report-feature-request.md b/.github/ISSUE_TEMPLATE/bug-report-feature-request.md
deleted file mode 100644
index 938718130..000000000
--- a/.github/ISSUE_TEMPLATE/bug-report-feature-request.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-name: Bug report or feature request
-about: Having problems or have ideas? We'd love to know what you think and help you out.
----
-
-Thanks for helping by reporting issues and sharing ideas you might have! Please delete this message before submitting your issue, this is just a note to help.
-
-## Feature requests
-
-While no idea is a bad idea, some might make more sense for Owncast than others.
-
-Take a look at the [Owncast product definition](https://github.com/owncast/owncast/blob/develop/docs/product-definition.md) to see what our focus is and how your requests might align.
diff --git a/.github/ISSUE_TEMPLATE/bug-report-feature-request.yml b/.github/ISSUE_TEMPLATE/bug-report-feature-request.yml
new file mode 100644
index 000000000..284516e6c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report-feature-request.yml
@@ -0,0 +1,15 @@
+name: Bug report or feature request
+description: Submit a bug you encountered or share an idea you have for the project.
+body:
+ - type: markdown
+ attributes:
+ value: |
+ Thanks for helping by reporting issues and sharing ideas you might have!
+ While no idea is a bad idea, some might make more sense for Owncast than others.
+ Take a look at the [Owncast product definition](https://github.com/owncast/owncast/blob/develop/docs/product-definition.md) to see what our focus is and how your requests might align.
+
+ - type: textarea
+ id: issue-body
+ attributes:
+ label: Share your bug report, feature request, or comment.
+ description: Please include as much detail as possible.
From bafb34c50a543a9d5a52f0f154ad8a56267ce39f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 22 Aug 2022 10:34:38 +0000
Subject: [PATCH 07/45] Lock file maintenance
---
build/javascript/package-lock.json | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/build/javascript/package-lock.json b/build/javascript/package-lock.json
index 5bc732d91..f729d856c 100644
--- a/build/javascript/package-lock.json
+++ b/build/javascript/package-lock.json
@@ -126,9 +126,9 @@
}
},
"@popperjs/core": {
- "version": "2.11.5",
- "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz",
- "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw=="
+ "version": "2.11.6",
+ "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
+ "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="
},
"@trysound/sax": {
"version": "0.2.0",
@@ -350,9 +350,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001374",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001374.tgz",
- "integrity": "sha512-mWvzatRx3w+j5wx/mpFN5v5twlPrabG8NqX2c6e45LCpymdoGqNvRkRutFUqpRTXKFQFNQJasvK0YT7suW6/Hw=="
+ "version": "1.0.30001381",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001381.tgz",
+ "integrity": "sha512-fEnkDOKpvp6qc+olg7+NzE1SqyfiyKf4uci7fAU38M3zxs0YOyKOxW/nMZ2l9sJbt7KZHcDIxUnbI0Iime7V4w=="
},
"chalk": {
"version": "4.1.2",
@@ -458,9 +458,9 @@
}
},
"colord": {
- "version": "2.9.2",
- "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz",
- "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==",
+ "version": "2.9.3",
+ "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+ "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
"dev": true
},
"commander": {
@@ -645,9 +645,9 @@
}
},
"electron-to-chromium": {
- "version": "1.4.211",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.211.tgz",
- "integrity": "sha512-BZSbMpyFQU0KBJ1JG26XGeFI3i4op+qOYGxftmZXFZoHkhLgsSv4DHDJfl8ogII3hIuzGt51PaZ195OVu0yJ9A=="
+ "version": "1.4.225",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.225.tgz",
+ "integrity": "sha512-ICHvGaCIQR3P88uK8aRtx8gmejbVJyC6bB4LEC3anzBrIzdzC7aiZHY4iFfXhN4st6I7lMO0x4sgBHf/7kBvRw=="
},
"emoji-regex": {
"version": "8.0.0",
@@ -2127,9 +2127,9 @@
"integrity": "sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA=="
},
"videojs-vtt.js": {
- "version": "0.15.3",
- "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.15.3.tgz",
- "integrity": "sha512-5FvVsICuMRx6Hd7H/Y9s9GDeEtYcXQWzGMS+sl4UX3t/zoHp3y+isSfIPRochnTH7h+Bh1ILyC639xy9Z6kPag==",
+ "version": "0.15.4",
+ "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.15.4.tgz",
+ "integrity": "sha512-r6IhM325fcLb1D6pgsMkTQT1PpFdUdYZa1iqk7wJEu+QlibBwATPfPc9Bg8Jiym0GE5yP1AG2rMLu+QMVWkYtA==",
"requires": {
"global": "^4.3.1"
}
From b1376497ca4488e1fbb042d077f2fc66df659d4e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 23 Aug 2022 02:08:26 +0000
Subject: [PATCH 08/45] Update module github.com/aws/aws-sdk-go to v1.44.82
---
go.mod | 2 +-
go.sum | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/go.mod b/go.mod
index be4a3b68d..45e0d9572 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.17
require (
github.com/amalfra/etag v1.0.0
- github.com/aws/aws-sdk-go v1.44.81
+ github.com/aws/aws-sdk-go v1.44.82
github.com/go-fed/activity v1.0.1-0.20210803212804-d866ba75dd0f
github.com/go-fed/httpsig v1.1.0
github.com/go-ole/go-ole v1.2.6 // indirect
diff --git a/go.sum b/go.sum
index 84001dd3a..526c48a5f 100644
--- a/go.sum
+++ b/go.sum
@@ -64,6 +64,8 @@ github.com/aws/aws-sdk-go v1.44.78 h1:B/V28YXFLmxjMQqJeyCt7NDRIJdep0sJixIAeee2BF
github.com/aws/aws-sdk-go v1.44.78/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
github.com/aws/aws-sdk-go v1.44.81 h1:C8oBZ+a+ka0qk3Q24MohQIFq0tkbO8IAu5tfpAMKVWE=
github.com/aws/aws-sdk-go v1.44.81/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
+github.com/aws/aws-sdk-go v1.44.82 h1:Miji7nHIMxTWfa831nZf8XAcMWGLaT+PvsS6CdbMG7M=
+github.com/aws/aws-sdk-go v1.44.82/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
From 87ca4c94340191da312fe8964d2e83d58c1fecdf Mon Sep 17 00:00:00 2001
From: Gabe Kangas
Date: Fri, 26 Aug 2022 14:27:37 -0700
Subject: [PATCH 09/45] Do not run go linting on web-only changes
---
.github/workflows/lint.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 568f4df49..67108b294 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,7 +1,9 @@
name: lint
on:
push:
- pull_request:
+ paths-ignore:
+ - 'webroot/**'
+ - 'web/**'
permissions:
contents: read
From 7541250d8e2beccd88a6ca4cabecdf2f8e87bb77 Mon Sep 17 00:00:00 2001
From: Gabe Kangas
Date: Fri, 26 Aug 2022 19:20:45 -0700
Subject: [PATCH 10/45] Remove unused linter
---
.golangci.yml | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/.golangci.yml b/.golangci.yml
index 6a0c6a4db..65483ec55 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -48,9 +48,7 @@ linters:
- nakedret
- cyclop
- gosimple
- - varcheck
- unused
- - deadcode
- exportloopref
- gocritic
- forbidigo
@@ -71,9 +69,9 @@ linters-settings:
gosimple:
# Select the Go version to target. The default is '1.13'.
- go: "1.17"
+ go: '1.17'
# https://staticcheck.io/docs/options#checks
- checks: ["all"]
+ checks: ['all']
gocritic:
disabled-checks:
@@ -83,7 +81,7 @@ linters-settings:
forbidigo:
# Forbid the following identifiers (identifiers are written using regexp):
forbid:
- # Logging via Print bypasses our logging framework.
+ # Logging via Print bypasses our logging framework.
- ^(fmt\.Print(|f|ln)|print|println)
- ^panic.*$
From 20e6b87a355c4ee725cd36cd06b43f06edb16f88 Mon Sep 17 00:00:00 2001
From: Gabe Kangas
Date: Fri, 26 Aug 2022 19:26:51 -0700
Subject: [PATCH 11/45] Remove package-comments rule
---
.golangci.yml | 5 +++++
core/transcoder/fileWriterReceiverService.go | 1 +
2 files changed, 6 insertions(+)
diff --git a/.golangci.yml b/.golangci.yml
index 65483ec55..b781ec6fd 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -78,6 +78,11 @@ linters-settings:
- ifElseChain
- exitAfterDefer
+ revive:
+ rules:
+ - name: package-comments
+ disabled: true
+
forbidigo:
# Forbid the following identifiers (identifiers are written using regexp):
forbid:
diff --git a/core/transcoder/fileWriterReceiverService.go b/core/transcoder/fileWriterReceiverService.go
index 4561db6c8..29722865a 100644
--- a/core/transcoder/fileWriterReceiverService.go
+++ b/core/transcoder/fileWriterReceiverService.go
@@ -43,6 +43,7 @@ func (s *FileWriterReceiverService) SetupFileWriterReceiverService(callbacks Fil
config.InternalHLSListenerPort = listenerPort
log.Traceln("Transcoder response service listening on: " + listenerPort)
go func() {
+ //nolint: gosec
if err := http.Serve(listener, httpServer); err != nil {
log.Fatalln("Unable to start internal video writing service", err)
}
From 513af0590612a9397134001b640d7f8fce4a2590 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Aug 2022 10:28:24 +0000
Subject: [PATCH 12/45] Lock file maintenance
---
build/javascript/package-lock.json | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/build/javascript/package-lock.json b/build/javascript/package-lock.json
index f729d856c..c24904a43 100644
--- a/build/javascript/package-lock.json
+++ b/build/javascript/package-lock.json
@@ -350,9 +350,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001381",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001381.tgz",
- "integrity": "sha512-fEnkDOKpvp6qc+olg7+NzE1SqyfiyKf4uci7fAU38M3zxs0YOyKOxW/nMZ2l9sJbt7KZHcDIxUnbI0Iime7V4w=="
+ "version": "1.0.30001384",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001384.tgz",
+ "integrity": "sha512-BBWt57kqWbc0GYZXb47wTXpmAgqr5LSibPzNjk/AWMdmJMQhLqOl3c/Kd4OAU/tu4NLfYkMx8Tlq3RVBkOBolQ=="
},
"chalk": {
"version": "4.1.2",
@@ -645,9 +645,9 @@
}
},
"electron-to-chromium": {
- "version": "1.4.225",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.225.tgz",
- "integrity": "sha512-ICHvGaCIQR3P88uK8aRtx8gmejbVJyC6bB4LEC3anzBrIzdzC7aiZHY4iFfXhN4st6I7lMO0x4sgBHf/7kBvRw=="
+ "version": "1.4.233",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.233.tgz",
+ "integrity": "sha512-ejwIKXTg1wqbmkcRJh9Ur3hFGHFDZDw1POzdsVrB2WZjgRuRMHIQQKNpe64N/qh3ZtH2otEoRoS+s6arAAuAAw=="
},
"emoji-regex": {
"version": "8.0.0",
From 2cc7f88cfcdea8983145a22256683542a048c102 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 4 Sep 2022 20:25:23 +0000
Subject: [PATCH 13/45] Update golang.org/x/net digest to 83b083e
---
go.mod | 2 +-
go.sum | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/go.mod b/go.mod
index 45e0d9572..8b2b76c3b 100644
--- a/go.mod
+++ b/go.mod
@@ -35,7 +35,7 @@ require (
github.com/tklauser/numcpus v0.4.0 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
- golang.org/x/net v0.0.0-20220812174116-3211cb980234
+ golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b
golang.org/x/sys v0.0.0-20220804214406-8e32c043e418 // indirect
)
diff --git a/go.sum b/go.sum
index 526c48a5f..90872f7c4 100644
--- a/go.sum
+++ b/go.sum
@@ -439,6 +439,8 @@ golang.org/x/net v0.0.0-20220809184613-07c6da5e1ced h1:3dYNDff0VT5xj+mbj2XucFst9
golang.org/x/net v0.0.0-20220809184613-07c6da5e1ced/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E=
golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b h1:ZmngSVLe/wycRns9MKikG9OWIEjGcGAkacif7oYQaUY=
+golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
From f89bfb9c871253d40b61baf86e50c0bdec5091dc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Sep 2022 00:01:00 +0000
Subject: [PATCH 14/45] Update module github.com/aws/aws-sdk-go to v1.44.91
---
go.mod | 2 +-
go.sum | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/go.mod b/go.mod
index 8b2b76c3b..8d2b37e63 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.17
require (
github.com/amalfra/etag v1.0.0
- github.com/aws/aws-sdk-go v1.44.82
+ github.com/aws/aws-sdk-go v1.44.91
github.com/go-fed/activity v1.0.1-0.20210803212804-d866ba75dd0f
github.com/go-fed/httpsig v1.1.0
github.com/go-ole/go-ole v1.2.6 // indirect
diff --git a/go.sum b/go.sum
index 90872f7c4..a3132d76d 100644
--- a/go.sum
+++ b/go.sum
@@ -66,6 +66,8 @@ github.com/aws/aws-sdk-go v1.44.81 h1:C8oBZ+a+ka0qk3Q24MohQIFq0tkbO8IAu5tfpAMKVW
github.com/aws/aws-sdk-go v1.44.81/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
github.com/aws/aws-sdk-go v1.44.82 h1:Miji7nHIMxTWfa831nZf8XAcMWGLaT+PvsS6CdbMG7M=
github.com/aws/aws-sdk-go v1.44.82/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
+github.com/aws/aws-sdk-go v1.44.91 h1:SRWmuX7PTyhBdLuvSfM7KWrWISJsrRsUPcFDSFduRxY=
+github.com/aws/aws-sdk-go v1.44.91/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
From 79f171e24df7b63f41605e27d7b095c06eddd6d5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Sep 2022 01:24:20 +0000
Subject: [PATCH 15/45] Update module github.com/microcosm-cc/bluemonday to
v1.0.20
---
go.mod | 2 +-
go.sum | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/go.mod b/go.mod
index 8d2b37e63..db71d9326 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,7 @@ require (
github.com/grafov/m3u8 v0.11.1
github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
github.com/mattn/go-sqlite3 v1.14.15
- github.com/microcosm-cc/bluemonday v1.0.19
+ github.com/microcosm-cc/bluemonday v1.0.20
github.com/mssola/user_agent v0.5.3
github.com/nareix/joy5 v0.0.0-20210317075623-2c912ca30590
github.com/oschwald/geoip2-golang v1.8.0
diff --git a/go.sum b/go.sum
index a3132d76d..05b492b16 100644
--- a/go.sum
+++ b/go.sum
@@ -228,6 +228,8 @@ github.com/microcosm-cc/bluemonday v1.0.18 h1:6HcxvXDAi3ARt3slx6nTesbvorIc3QeTzB
github.com/microcosm-cc/bluemonday v1.0.18/go.mod h1:Z0r70sCuXHig8YpBzCc5eGHAap2K7e/u082ZUpDRRqM=
github.com/microcosm-cc/bluemonday v1.0.19 h1:OI7hoF5FY4pFz2VA//RN8TfM0YJ2dJcl4P4APrCWy6c=
github.com/microcosm-cc/bluemonday v1.0.19/go.mod h1:QNzV2UbLK2/53oIIwTOyLUSABMkjZ4tqiyC1g/DyqxE=
+github.com/microcosm-cc/bluemonday v1.0.20 h1:flpzsq4KU3QIYAYGV/szUat7H+GPOXR0B2JU5A1Wp8Y=
+github.com/microcosm-cc/bluemonday v1.0.20/go.mod h1:yfBmMi8mxvaZut3Yytv+jTXRY8mxyjJ0/kQBTElld50=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
From dfdd78df7c8da79d8f533a72fc275a8915fcfd43 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Sep 2022 03:49:05 +0000
Subject: [PATCH 16/45] Update module github.com/yuin/goldmark to v1.4.14
---
go.mod | 2 +-
go.sum | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/go.mod b/go.mod
index db71d9326..aa8d7bb75 100644
--- a/go.mod
+++ b/go.mod
@@ -20,7 +20,7 @@ require (
github.com/schollz/sqlite3dump v1.3.1
github.com/sirupsen/logrus v1.9.0
github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569
- github.com/yuin/goldmark v1.4.13
+ github.com/yuin/goldmark v1.4.14
golang.org/x/mod v0.5.1
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9
mvdan.cc/xurls v1.1.0
diff --git a/go.sum b/go.sum
index 05b492b16..063e841d6 100644
--- a/go.sum
+++ b/go.sum
@@ -341,6 +341,8 @@ github.com/yuin/goldmark v1.4.12 h1:6hffw6vALvEDqJ19dOJvJKOoAOKe4NDaTqvd2sktGN0=
github.com/yuin/goldmark v1.4.12/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/yuin/goldmark v1.4.14 h1:jwww1XQfhJN7Zm+/a1ZA/3WUiEBEroYFNTiV3dKwM8U=
+github.com/yuin/goldmark v1.4.14/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
From 5f1ffd570ffecf418cf8e177ffaf698bae9031bc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Sep 2022 05:24:15 +0000
Subject: [PATCH 17/45] Update module github.com/shirou/gopsutil/v3 to v3.22.8
---
go.mod | 2 +-
go.sum | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/go.mod b/go.mod
index aa8d7bb75..0b318ca75 100644
--- a/go.mod
+++ b/go.mod
@@ -57,7 +57,7 @@ require (
require (
github.com/nakabonne/tstorage v0.3.5
- github.com/shirou/gopsutil/v3 v3.22.7
+ github.com/shirou/gopsutil/v3 v3.22.8
)
require github.com/SherClockHolmes/webpush-go v1.2.0
diff --git a/go.sum b/go.sum
index 063e841d6..c348a135e 100644
--- a/go.sum
+++ b/go.sum
@@ -304,6 +304,8 @@ github.com/shirou/gopsutil/v3 v3.22.6 h1:FnHOFOh+cYAM0C30P+zysPISzlknLC5Z1G4EAEl
github.com/shirou/gopsutil/v3 v3.22.6/go.mod h1:EdIubSnZhbAvBS1yJ7Xi+AShB/hxwLHOMz4MCYz7yMs=
github.com/shirou/gopsutil/v3 v3.22.7 h1:flKnuCMfUUrO+oAvwAd6GKZgnPzr098VA/UJ14nhJd4=
github.com/shirou/gopsutil/v3 v3.22.7/go.mod h1:s648gW4IywYzUfE/KjXxUsqrqx/T2xO5VqOXxONeRfI=
+github.com/shirou/gopsutil/v3 v3.22.8 h1:a4s3hXogo5mE2PfdfJIonDbstO/P+9JszdfhAHSzD9Y=
+github.com/shirou/gopsutil/v3 v3.22.8/go.mod h1:s648gW4IywYzUfE/KjXxUsqrqx/T2xO5VqOXxONeRfI=
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
From cc0c48a9a582e9d574e674804679db85baa50f42 Mon Sep 17 00:00:00 2001
From: Gabe Kangas
Date: Mon, 12 Sep 2022 14:53:14 -0700
Subject: [PATCH 18/45] Add workflow to auto-comment good first issues.
---
.github/workflows/auto-comment-on-label.yaml | 37 ++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 .github/workflows/auto-comment-on-label.yaml
diff --git a/.github/workflows/auto-comment-on-label.yaml b/.github/workflows/auto-comment-on-label.yaml
new file mode 100644
index 000000000..cc5f0c428
--- /dev/null
+++ b/.github/workflows/auto-comment-on-label.yaml
@@ -0,0 +1,37 @@
+name: Add comment on good first issues
+on:
+ issues:
+ types:
+ - labeled
+jobs:
+ add-comment:
+ if: github.event.label.name == 'good first issue' || github.event.label.name == 'help wanted' || github.event.label.name == 'hacktoberfest'
+ runs-on: ubuntu-latest
+ permissions:
+ issues: write
+ steps:
+ - name: Add comment
+ uses: peter-evans/create-or-update-comment@a35cf36e5301d70b76f316e867e7788a55a31dae
+ with:
+ issue-number: ${{ github.event.issue.number }}
+ body: |
+ ## Good First Issue
+
+ This item was marked as a good first issue or help wanted. Because of the following:
+
+ - It's self contained as a single feature or change.
+ - Is clear when it's complete.
+ - You do not need deep knowledge of Owncast to accomplish it.
+ -
+
+ ### Next Steps
+
+ 1. Comment on this issue before starting work so it can be assigned to you. Also, this issue may have been filed with limited detail or changes may have occured that are worth sharing with you before you start work.
+ 2. Drop by our [community chat](https://owncast.rocket.chat/) if you'd like to be involved in more real-time discussion around Owncast to talk about this change.
+ 3. Make sure you can [build and run the project from source](https://owncast.online/docs/building/).
+
+ ### Notes
+
+ - Current web work is taking place in the [`webv2` branch](https://github.com/owncast/owncast/tree/webv2) and it is very much work in progress. Read the [README](https://github.com/owncast/owncast/blob/webv2/web/README.md) for this branch to get the web project running. But it's mostly just a `npm install` and `npm run dev`.
+ - We use Storybook for testing and developing React components. `npm run storybook`.
+ - If you need to install the Go programming language to run the Owncast backend it's simple from [here](https://go.dev/dl/).
From a7e8fb6659ce68dbd0f512a9b32278fe54b09d1f Mon Sep 17 00:00:00 2001
From: Gabe Kangas
Date: Mon, 12 Sep 2022 14:56:12 -0700
Subject: [PATCH 19/45] Update message
---
.github/workflows/auto-comment-on-label.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/auto-comment-on-label.yaml b/.github/workflows/auto-comment-on-label.yaml
index cc5f0c428..0d72c0a77 100644
--- a/.github/workflows/auto-comment-on-label.yaml
+++ b/.github/workflows/auto-comment-on-label.yaml
@@ -17,12 +17,12 @@ jobs:
body: |
## Good First Issue
- This item was marked as a good first issue or help wanted. Because of the following:
+ This item was marked as a good first issue because of the following:
- It's self contained as a single feature or change.
- Is clear when it's complete.
- You do not need deep knowledge of Owncast to accomplish it.
- -
+
### Next Steps
From e87ece671102cff787cab28194407b8b21f3be69 Mon Sep 17 00:00:00 2001
From: Gabe Kangas
Date: Mon, 12 Sep 2022 15:33:40 -0700
Subject: [PATCH 20/45] Mention t-shirts.
---
.github/workflows/auto-comment-on-label.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/auto-comment-on-label.yaml b/.github/workflows/auto-comment-on-label.yaml
index 0d72c0a77..60adeb766 100644
--- a/.github/workflows/auto-comment-on-label.yaml
+++ b/.github/workflows/auto-comment-on-label.yaml
@@ -35,3 +35,4 @@ jobs:
- Current web work is taking place in the [`webv2` branch](https://github.com/owncast/owncast/tree/webv2) and it is very much work in progress. Read the [README](https://github.com/owncast/owncast/blob/webv2/web/README.md) for this branch to get the web project running. But it's mostly just a `npm install` and `npm run dev`.
- We use Storybook for testing and developing React components. `npm run storybook`.
- If you need to install the Go programming language to run the Owncast backend it's simple from [here](https://go.dev/dl/).
+ - Active contributors get an Owncast t-shirt! Ask about it if you feel like you've been contributing and haven't yet been given one.
From 6110d93acf9c700db52f97a4adf88b36a6900ede Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 12 Sep 2022 16:17:14 -0700
Subject: [PATCH 21/45] Update peter-evans/create-or-update-comment digest to
6fcd282 (#2106)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
.github/workflows/auto-comment-on-label.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/auto-comment-on-label.yaml b/.github/workflows/auto-comment-on-label.yaml
index 60adeb766..0da1fd587 100644
--- a/.github/workflows/auto-comment-on-label.yaml
+++ b/.github/workflows/auto-comment-on-label.yaml
@@ -11,7 +11,7 @@ jobs:
issues: write
steps:
- name: Add comment
- uses: peter-evans/create-or-update-comment@a35cf36e5301d70b76f316e867e7788a55a31dae
+ uses: peter-evans/create-or-update-comment@6fcd282399b3c9ad0bd9bd8025b8fb2c18b085dd
with:
issue-number: ${{ github.event.issue.number }}
body: |
From 9ef0548e12508aa16d24deeeb36780d100e20e0e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 12 Sep 2022 23:19:41 +0000
Subject: [PATCH 22/45] Lock file maintenance
---
build/javascript/package-lock.json | 36 +++++++++++++++---------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/build/javascript/package-lock.json b/build/javascript/package-lock.json
index c24904a43..55d77787e 100644
--- a/build/javascript/package-lock.json
+++ b/build/javascript/package-lock.json
@@ -5,9 +5,9 @@
"requires": true,
"dependencies": {
"@babel/runtime": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz",
- "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.0.tgz",
+ "integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==",
"requires": {
"regenerator-runtime": "^0.13.4"
}
@@ -350,9 +350,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001384",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001384.tgz",
- "integrity": "sha512-BBWt57kqWbc0GYZXb47wTXpmAgqr5LSibPzNjk/AWMdmJMQhLqOl3c/Kd4OAU/tu4NLfYkMx8Tlq3RVBkOBolQ=="
+ "version": "1.0.30001397",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001397.tgz",
+ "integrity": "sha512-SW9N2TbCdLf0eiNDRrrQXx2sOkaakNZbCjgNpPyMJJbiOrU5QzMIrXOVMRM1myBXTD5iTkdrtU/EguCrBocHlA=="
},
"chalk": {
"version": "4.1.2",
@@ -474,9 +474,9 @@
"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
},
"css-declaration-sorter": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.0.tgz",
- "integrity": "sha512-OGT677UGHJTAVMRhPO+HJ4oKln3wkBTwtDFH0ojbqm+MJm6xuDMHp2nkhh/ThaBqq20IbraBQSWKfSLNHQO9Og==",
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz",
+ "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==",
"dev": true
},
"css-select": {
@@ -645,9 +645,9 @@
}
},
"electron-to-chromium": {
- "version": "1.4.233",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.233.tgz",
- "integrity": "sha512-ejwIKXTg1wqbmkcRJh9Ur3hFGHFDZDw1POzdsVrB2WZjgRuRMHIQQKNpe64N/qh3ZtH2otEoRoS+s6arAAuAAw=="
+ "version": "1.4.248",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.248.tgz",
+ "integrity": "sha512-qShjzEYpa57NnhbW2K+g+Fl+eNoDvQ7I+2MRwWnU6Z6F0HhXekzsECCLv+y2OJUsRodjqoSfwHkIX42VUFtUzg=="
},
"emoji-regex": {
"version": "8.0.0",
@@ -676,9 +676,9 @@
"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
},
"fast-glob": {
- "version": "3.2.11",
- "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
- "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+ "version": "3.2.12",
+ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+ "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
"dev": true,
"requires": {
"@nodelib/fs.stat": "^2.0.2",
@@ -2076,9 +2076,9 @@
"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
},
"update-browserslist-db": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz",
- "integrity": "sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==",
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.8.tgz",
+ "integrity": "sha512-GHg7C4M7oJSJYW/ED/5QOJ7nL/E0lwTOBGsOorA7jqHr8ExUhPfwAotIAmdSw/LWv3SMLSNpzTAgeLG9zaZKTA==",
"requires": {
"escalade": "^3.1.1",
"picocolors": "^1.0.0"
From f1f85fb3e349802f6c25cdd9c92fbca2e8828f81 Mon Sep 17 00:00:00 2001
From: Gabe Kangas
Date: Tue, 13 Sep 2022 23:08:47 -0700
Subject: [PATCH 23/45] Update link in comment.
---
.github/workflows/auto-comment-on-label.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/auto-comment-on-label.yaml b/.github/workflows/auto-comment-on-label.yaml
index 0da1fd587..efde85eb6 100644
--- a/.github/workflows/auto-comment-on-label.yaml
+++ b/.github/workflows/auto-comment-on-label.yaml
@@ -28,7 +28,7 @@ jobs:
1. Comment on this issue before starting work so it can be assigned to you. Also, this issue may have been filed with limited detail or changes may have occured that are worth sharing with you before you start work.
2. Drop by our [community chat](https://owncast.rocket.chat/) if you'd like to be involved in more real-time discussion around Owncast to talk about this change.
- 3. Make sure you can [build and run the project from source](https://owncast.online/docs/building/).
+ 3. Follow the project's getting started tips to make sure you can [build and run the project from source](https://owncast.online/development).
### Notes
From 9242585225a9d51699d56f3cdc7f7dfb0d46fabb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 15 Sep 2022 22:36:28 +0000
Subject: [PATCH 24/45] Update golang.org/x/net digest to bea034e
---
go.mod | 2 +-
go.sum | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/go.mod b/go.mod
index 0b318ca75..c0e0103b2 100644
--- a/go.mod
+++ b/go.mod
@@ -35,7 +35,7 @@ require (
github.com/tklauser/numcpus v0.4.0 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
- golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b
+ golang.org/x/net v0.0.0-20220909164309-bea034e7d591
golang.org/x/sys v0.0.0-20220804214406-8e32c043e418 // indirect
)
diff --git a/go.sum b/go.sum
index c348a135e..3ff44ad67 100644
--- a/go.sum
+++ b/go.sum
@@ -449,6 +449,8 @@ golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO
golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b h1:ZmngSVLe/wycRns9MKikG9OWIEjGcGAkacif7oYQaUY=
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20220909164309-bea034e7d591 h1:D0B/7al0LLrVC8aWF4+oxpv/m8bc7ViFfVS8/gXGdqI=
+golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
From 1332e1040ac9b5e0aad31f392fb5a25dbcce0575 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 15 Sep 2022 21:36:27 -0700
Subject: [PATCH 25/45] Update module github.com/aws/aws-sdk-go to v1.44.99
(#2122)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
go.mod | 2 +-
go.sum | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/go.mod b/go.mod
index c0e0103b2..2945ec178 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.17
require (
github.com/amalfra/etag v1.0.0
- github.com/aws/aws-sdk-go v1.44.91
+ github.com/aws/aws-sdk-go v1.44.99
github.com/go-fed/activity v1.0.1-0.20210803212804-d866ba75dd0f
github.com/go-fed/httpsig v1.1.0
github.com/go-ole/go-ole v1.2.6 // indirect
diff --git a/go.sum b/go.sum
index 3ff44ad67..04d85f011 100644
--- a/go.sum
+++ b/go.sum
@@ -68,6 +68,8 @@ github.com/aws/aws-sdk-go v1.44.82 h1:Miji7nHIMxTWfa831nZf8XAcMWGLaT+PvsS6CdbMG7
github.com/aws/aws-sdk-go v1.44.82/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
github.com/aws/aws-sdk-go v1.44.91 h1:SRWmuX7PTyhBdLuvSfM7KWrWISJsrRsUPcFDSFduRxY=
github.com/aws/aws-sdk-go v1.44.91/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
+github.com/aws/aws-sdk-go v1.44.99 h1:ITZ9q/fmH+Ksaz2TbyMU2d19vOOWs/hAlt8NbXAieHw=
+github.com/aws/aws-sdk-go v1.44.99/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
From b9fcca941d1fc3c45a583902621b11759f7397e7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 19 Sep 2022 09:54:13 +0000
Subject: [PATCH 26/45] Lock file maintenance
---
build/javascript/package-lock.json | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/build/javascript/package-lock.json b/build/javascript/package-lock.json
index 55d77787e..e17d54673 100644
--- a/build/javascript/package-lock.json
+++ b/build/javascript/package-lock.json
@@ -317,14 +317,14 @@
}
},
"browserslist": {
- "version": "4.21.3",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz",
- "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==",
+ "version": "4.21.4",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
+ "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
"requires": {
- "caniuse-lite": "^1.0.30001370",
- "electron-to-chromium": "^1.4.202",
+ "caniuse-lite": "^1.0.30001400",
+ "electron-to-chromium": "^1.4.251",
"node-releases": "^2.0.6",
- "update-browserslist-db": "^1.0.5"
+ "update-browserslist-db": "^1.0.9"
}
},
"bytes": {
@@ -350,9 +350,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001397",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001397.tgz",
- "integrity": "sha512-SW9N2TbCdLf0eiNDRrrQXx2sOkaakNZbCjgNpPyMJJbiOrU5QzMIrXOVMRM1myBXTD5iTkdrtU/EguCrBocHlA=="
+ "version": "1.0.30001406",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001406.tgz",
+ "integrity": "sha512-bWTlaXUy/rq0BBtYShc/jArYfBPjEV95euvZ8JVtO43oQExEN/WquoqpufFjNu4kSpi5cy5kMbNvzztWDfv1Jg=="
},
"chalk": {
"version": "4.1.2",
@@ -645,9 +645,9 @@
}
},
"electron-to-chromium": {
- "version": "1.4.248",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.248.tgz",
- "integrity": "sha512-qShjzEYpa57NnhbW2K+g+Fl+eNoDvQ7I+2MRwWnU6Z6F0HhXekzsECCLv+y2OJUsRodjqoSfwHkIX42VUFtUzg=="
+ "version": "1.4.254",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.254.tgz",
+ "integrity": "sha512-Sh/7YsHqQYkA6ZHuHMy24e6TE4eX6KZVsZb9E/DvU1nQRIrH4BflO/4k+83tfdYvDl+MObvlqHPRICzEdC9c6Q=="
},
"emoji-regex": {
"version": "8.0.0",
@@ -2076,9 +2076,9 @@
"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
},
"update-browserslist-db": {
- "version": "1.0.8",
- "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.8.tgz",
- "integrity": "sha512-GHg7C4M7oJSJYW/ED/5QOJ7nL/E0lwTOBGsOorA7jqHr8ExUhPfwAotIAmdSw/LWv3SMLSNpzTAgeLG9zaZKTA==",
+ "version": "1.0.9",
+ "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz",
+ "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==",
"requires": {
"escalade": "^3.1.1",
"picocolors": "^1.0.0"
From 5dafdb479dcbbde5fbf557321932a5ae2596af50 Mon Sep 17 00:00:00 2001
From: Matt Owens
Date: Wed, 21 Sep 2022 13:03:16 -0400
Subject: [PATCH 27/45] Sanitize user submitted values before logging (#2134)
* strip line breaks from user-submitted values before logging
* finish comment
---
core/chat/events.go | 10 +++++++++-
core/chat/server.go | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/core/chat/events.go b/core/chat/events.go
index 6ea148248..5213eba64 100644
--- a/core/chat/events.go
+++ b/core/chat/events.go
@@ -36,7 +36,7 @@ func (s *Server) userNameChanged(eventData chatClientEvent) {
normalizedName = strings.ToLower(normalizedName)
if strings.Contains(normalizedName, proposedUsername) {
// Denied.
- log.Debugln(eventData.client.User.DisplayName, "blocked from changing name to", proposedUsername, "due to blocked name", normalizedName)
+ log.Debugln(logSanitize(eventData.client.User.DisplayName), "blocked from changing name to", logSanitize(proposedUsername), "due to blocked name", normalizedName)
message := fmt.Sprintf("You cannot change your name to **%s**.", proposedUsername)
s.sendActionToClient(eventData.client, message)
@@ -138,3 +138,11 @@ func (s *Server) userMessageSent(eventData chatClientEvent) {
eventData.client.MessageCount++
_lastSeenCache[event.User.ID] = time.Now()
}
+
+func logSanitize(userValue string) string {
+ // strip carriage return and newline from user-submitted values to prevent log injection
+ sanitizedValue := strings.Replace(userValue, "\n", "", -1)
+ sanitizedValue = strings.Replace(sanitizedValue, "\r", "", -1)
+
+ return fmt.Sprintf("userSuppliedValue(%s)", sanitizedValue)
+}
diff --git a/core/chat/server.go b/core/chat/server.go
index ac22864dd..02c1c318b 100644
--- a/core/chat/server.go
+++ b/core/chat/server.go
@@ -355,7 +355,7 @@ func (s *Server) eventReceived(event chatClientEvent) {
s.userNameChanged(event)
default:
- log.Debugln(eventType, "event not found:", typecheck)
+ log.Debugln(logSanitize(fmt.Sprint(eventType)), "event not found:", logSanitize(fmt.Sprint(typecheck)))
}
}
From 8ca53c6063c0443a402c29e1c401c8c30829ffd1 Mon Sep 17 00:00:00 2001
From: James Young
Date: Wed, 21 Sep 2022 19:04:56 +0200
Subject: [PATCH 28/45] docs: add a new GH PR template for PRs for #2119
(#2133)
---
...ic-refactor-pull-request-for-issue-2119.md | 23 +++++++++++++++++++
.../standard-pull-request.md} | 0
2 files changed, 23 insertions(+)
create mode 100644 .github/PULL_REQUEST_TEMPLATE/atomic-refactor-pull-request-for-issue-2119.md
rename .github/{PULL_REQUEST_TEMPLATE.md => PULL_REQUEST_TEMPLATE/standard-pull-request.md} (100%)
diff --git a/.github/PULL_REQUEST_TEMPLATE/atomic-refactor-pull-request-for-issue-2119.md b/.github/PULL_REQUEST_TEMPLATE/atomic-refactor-pull-request-for-issue-2119.md
new file mode 100644
index 000000000..ecd61f609
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/atomic-refactor-pull-request-for-issue-2119.md
@@ -0,0 +1,23 @@
+
+
+# Description
+
+
+This PR is for updating/adding a component following the atomic design pattern set out in #2119.
+
+
+
+---
+
+Extra Info
+
+
+- Component name in [kanban board](https://collab.owncast.tv/kanban/#/2/kanban/edit/omLI2N+LcnP+elmdT7qW9GHD/): `________`
+
+Checklist:
+- [] The component follows the [design guide](../../web/components/_COMPONENT_HOW_TO.md).
+- [] Moved the component to the correct `atoms` / `molecules` / `organisms` / `templates` directory.
+- [] Added an explanation to this PR for any major changes you made.
+- [] Replaced any [`defaultProps`](https://www.reactjstutorials.com/react-basics/17/react-default-props) with default args.
+- [] Added a (short) JSDoc description to the component.
+- [] Removed the component's Storybook description text with if it's not needed.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE/standard-pull-request.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE.md
rename to .github/PULL_REQUEST_TEMPLATE/standard-pull-request.md
From 4ed563beed903b46cb53d53d12f6613ec043875b Mon Sep 17 00:00:00 2001
From: Gabe Kangas
Date: Wed, 21 Sep 2022 10:22:44 -0700
Subject: [PATCH 29/45] Make linter run on pull_request events
---
.github/workflows/lint.yml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 67108b294..0ba4bc773 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -4,6 +4,10 @@ on:
paths-ignore:
- 'webroot/**'
- 'web/**'
+ pull_request:
+ paths-ignore:
+ - 'webroot/**'
+ - 'web/**'
permissions:
contents: read
From 99d034b1a5393e43c61892f22bd0d83167623c5c Mon Sep 17 00:00:00 2001
From: Gabe Kangas
Date: Wed, 21 Sep 2022 10:24:16 -0700
Subject: [PATCH 30/45] Replace -> ReplaceAll
---
core/chat/events.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/chat/events.go b/core/chat/events.go
index 5213eba64..dec9a5aea 100644
--- a/core/chat/events.go
+++ b/core/chat/events.go
@@ -141,8 +141,8 @@ func (s *Server) userMessageSent(eventData chatClientEvent) {
func logSanitize(userValue string) string {
// strip carriage return and newline from user-submitted values to prevent log injection
- sanitizedValue := strings.Replace(userValue, "\n", "", -1)
- sanitizedValue = strings.Replace(sanitizedValue, "\r", "", -1)
+ sanitizedValue := strings.ReplaceAll(userValue, "\n", "")
+ sanitizedValue = strings.ReplaceAll(sanitizedValue, "\r", "")
return fmt.Sprintf("userSuppliedValue(%s)", sanitizedValue)
}
From 769c1bdf233ea59daa5e64972d02422af6aec258 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 10:59:01 +0000
Subject: [PATCH 31/45] Lock file maintenance
---
build/javascript/package-lock.json | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/build/javascript/package-lock.json b/build/javascript/package-lock.json
index e17d54673..17ce5d227 100644
--- a/build/javascript/package-lock.json
+++ b/build/javascript/package-lock.json
@@ -350,9 +350,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001406",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001406.tgz",
- "integrity": "sha512-bWTlaXUy/rq0BBtYShc/jArYfBPjEV95euvZ8JVtO43oQExEN/WquoqpufFjNu4kSpi5cy5kMbNvzztWDfv1Jg=="
+ "version": "1.0.30001412",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001412.tgz",
+ "integrity": "sha512-+TeEIee1gS5bYOiuf+PS/kp2mrXic37Hl66VY6EAfxasIk5fELTktK2oOezYed12H8w7jt3s512PpulQidPjwA=="
},
"chalk": {
"version": "4.1.2",
@@ -645,9 +645,9 @@
}
},
"electron-to-chromium": {
- "version": "1.4.254",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.254.tgz",
- "integrity": "sha512-Sh/7YsHqQYkA6ZHuHMy24e6TE4eX6KZVsZb9E/DvU1nQRIrH4BflO/4k+83tfdYvDl+MObvlqHPRICzEdC9c6Q=="
+ "version": "1.4.262",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.262.tgz",
+ "integrity": "sha512-Ckn5haqmGh/xS8IbcgK3dnwAVnhDyo/WQnklWn6yaMucYTq7NNxwlGE8ElzEOnonzRLzUCo2Ot3vUb2GYUF2Hw=="
},
"emoji-regex": {
"version": "8.0.0",
From 427c6f94cdddf9e6ddf8821ee283aaffe2213533 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 28 Sep 2022 23:27:00 +0000
Subject: [PATCH 32/45] fix(deps): update golang.org/x/net digest to f486391
---
go.mod | 2 +-
go.sum | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/go.mod b/go.mod
index 2945ec178..69a4500d3 100644
--- a/go.mod
+++ b/go.mod
@@ -35,7 +35,7 @@ require (
github.com/tklauser/numcpus v0.4.0 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
- golang.org/x/net v0.0.0-20220909164309-bea034e7d591
+ golang.org/x/net v0.0.0-20220927171203-f486391704dc
golang.org/x/sys v0.0.0-20220804214406-8e32c043e418 // indirect
)
diff --git a/go.sum b/go.sum
index 04d85f011..518b3aae9 100644
--- a/go.sum
+++ b/go.sum
@@ -453,6 +453,8 @@ golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b h1:ZmngSVLe/wycRns9MKikG9OWI
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/net v0.0.0-20220909164309-bea034e7d591 h1:D0B/7al0LLrVC8aWF4+oxpv/m8bc7ViFfVS8/gXGdqI=
golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20220927171203-f486391704dc h1:FxpXZdoBqT8RjqTy6i1E8nXHhW21wK7ptQ/EPIGxzPQ=
+golang.org/x/net v0.0.0-20220927171203-f486391704dc/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
From 99e29e14d3899ebba976821b235f3c258a8610ad Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 01:43:00 +0000
Subject: [PATCH 33/45] fix(deps): update golang.org/x/time digest to f3bd1da
---
go.mod | 2 +-
go.sum | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/go.mod b/go.mod
index 69a4500d3..4e9812fb9 100644
--- a/go.mod
+++ b/go.mod
@@ -22,7 +22,7 @@ require (
github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569
github.com/yuin/goldmark v1.4.14
golang.org/x/mod v0.5.1
- golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9
+ golang.org/x/time v0.0.0-20220922220347-f3bd1da661af
mvdan.cc/xurls v1.1.0
)
diff --git a/go.sum b/go.sum
index 518b3aae9..fbab8e2ad 100644
--- a/go.sum
+++ b/go.sum
@@ -544,6 +544,8 @@ golang.org/x/time v0.0.0-20220609170525-579cf78fd858 h1:Dpdu/EMxGMFgq0CeYMh4fazT
golang.org/x/time v0.0.0-20220609170525-579cf78fd858/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 h1:ftMN5LMiBFjbzleLqtoBZk7KdJwhuybIU+FckUHgoyQ=
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20220922220347-f3bd1da661af h1:Yx9k8YCG3dvF87UAn2tu2HQLf2dt/eR1bXxpLMWeH+Y=
+golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
From 0563a220ee65de55ff3608d21525664078f39305 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 01:52:54 +0000
Subject: [PATCH 34/45] fix(deps): update module github.com/aws/aws-sdk-go to
v1.44.107
---
go.mod | 2 +-
go.sum | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/go.mod b/go.mod
index 4e9812fb9..c14761923 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.17
require (
github.com/amalfra/etag v1.0.0
- github.com/aws/aws-sdk-go v1.44.99
+ github.com/aws/aws-sdk-go v1.44.107
github.com/go-fed/activity v1.0.1-0.20210803212804-d866ba75dd0f
github.com/go-fed/httpsig v1.1.0
github.com/go-ole/go-ole v1.2.6 // indirect
diff --git a/go.sum b/go.sum
index fbab8e2ad..0521754e5 100644
--- a/go.sum
+++ b/go.sum
@@ -70,6 +70,8 @@ github.com/aws/aws-sdk-go v1.44.91 h1:SRWmuX7PTyhBdLuvSfM7KWrWISJsrRsUPcFDSFduRx
github.com/aws/aws-sdk-go v1.44.91/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
github.com/aws/aws-sdk-go v1.44.99 h1:ITZ9q/fmH+Ksaz2TbyMU2d19vOOWs/hAlt8NbXAieHw=
github.com/aws/aws-sdk-go v1.44.99/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
+github.com/aws/aws-sdk-go v1.44.107 h1:VP7Rq3wzsOV7wrfHqjAAKRksD4We58PaoVSDPKhm8nw=
+github.com/aws/aws-sdk-go v1.44.107/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
From e20b092aa22802722464f7fcbd39b390acc9caf2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 03:47:34 +0000
Subject: [PATCH 35/45] fix(deps): update module github.com/yuin/goldmark to
v1.5.2
---
go.mod | 2 +-
go.sum | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/go.mod b/go.mod
index c14761923..d6844d2eb 100644
--- a/go.mod
+++ b/go.mod
@@ -20,7 +20,7 @@ require (
github.com/schollz/sqlite3dump v1.3.1
github.com/sirupsen/logrus v1.9.0
github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569
- github.com/yuin/goldmark v1.4.14
+ github.com/yuin/goldmark v1.5.2
golang.org/x/mod v0.5.1
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af
mvdan.cc/xurls v1.1.0
diff --git a/go.sum b/go.sum
index 0521754e5..cb04122c1 100644
--- a/go.sum
+++ b/go.sum
@@ -349,6 +349,8 @@ github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/yuin/goldmark v1.4.14 h1:jwww1XQfhJN7Zm+/a1ZA/3WUiEBEroYFNTiV3dKwM8U=
github.com/yuin/goldmark v1.4.14/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/yuin/goldmark v1.5.2 h1:ALmeCk/px5FSm1MAcFBAsVKZjDuMVj8Tm7FFIlMJnqU=
+github.com/yuin/goldmark v1.5.2/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
From a080fa1524fb419965cff0f98db4b6853b610c29 Mon Sep 17 00:00:00 2001
From: luzpaz
Date: Fri, 30 Sep 2022 12:42:54 -0400
Subject: [PATCH 36/45] Fix various typos (#2149)
* Fix various typos
Found via `codespell -q 3`
* Commit updated API documentation
Co-authored-by: Owncast
---
.github/workflows/auto-comment-on-label.yaml | 2 +-
docs/api/index.html | 538 ++++++++++--------
openapi.yaml | 8 +-
.../js/components/external-action-modal.js | 2 +-
webroot/styles/standalone-chat-readonly.css | 2 +-
webroot/styles/video-only.css | 2 +-
6 files changed, 295 insertions(+), 259 deletions(-)
diff --git a/.github/workflows/auto-comment-on-label.yaml b/.github/workflows/auto-comment-on-label.yaml
index efde85eb6..2f5e7d0da 100644
--- a/.github/workflows/auto-comment-on-label.yaml
+++ b/.github/workflows/auto-comment-on-label.yaml
@@ -26,7 +26,7 @@ jobs:
### Next Steps
- 1. Comment on this issue before starting work so it can be assigned to you. Also, this issue may have been filed with limited detail or changes may have occured that are worth sharing with you before you start work.
+ 1. Comment on this issue before starting work so it can be assigned to you. Also, this issue may have been filed with limited detail or changes may have occurred that are worth sharing with you before you start work.
2. Drop by our [community chat](https://owncast.rocket.chat/) if you'd like to be involved in more real-time discussion around Owncast to talk about this change.
3. Follow the project's getting started tips to make sure you can [build and run the project from source](https://owncast.online/development).
diff --git a/docs/api/index.html b/docs/api/index.html
index d290056f9..9b252e7a2 100644
--- a/docs/api/index.html
+++ b/docs/api/index.html
@@ -13,27 +13,27 @@
}