0.0.6 -> Master (#731)
* Implement webhook events for external integrations (#574) * Implement webhook events for external integrations Reference #556 * move message type to models and remove duplicate * add json header so content type can be determined * Pass at migrating webhooks to datastore + management apis (#589) * Pass at migrating webhooks to datastore + management apis * Support nil lastUsed timestamps and return back the new webhook on create * Cleanup from review feedback * Simplify a bit Co-authored-by: Aaron Ogle <aaron@geekgonecrazy.com> Co-authored-by: Gabe Kangas <gabek@real-ity.com> * Webhook query cleanup * Access tokens + Send system message external API (#585) * New add, get and delete access token APIs * Create auth token middleware * Update last_used timestamp when using an access token * Add auth'ed endpoint for sending system messages * Cleanup * Update api spec for new apis * Commit updated API documentation * Add auth'ed endpoint for sending user chat messages * Return access token string * Commit updated API documentation * Fix route * Support nil lastUsed time * Commit updated Javascript packages * Remove duplicate function post rebase * Fix msg id generation * Update controllers/admin/chat.go Co-authored-by: Aaron Ogle <geekgonecrazy@users.noreply.github.com> * Webhook query cleanup * Add SystemMessageSent to EventType Co-authored-by: Owncast <owncast@owncast.online> Co-authored-by: Aaron Ogle <geekgonecrazy@users.noreply.github.com> * Set webhook as used on completion. Closes #610 * Display webhook errors as errors * Commit updated API documentation * Add user joined chat event * Change integration API paths. Update API spec * Update development version of admin that supports integration apis * Commit updated API documentation * Add automated tests for external integration APIs * check error * quiet this test for now * Route up some additional 3rd party apis. #638 * Commit updated API documentation * Save username on user joined event * Add missing scope to valid scopes list * Add generic chat action event API for 3rd parties. Closes #666 * Commit updated API documentation * First pass at moving WIP config framework into project for #234 * Only support exported fields in custom types * Using YP get/set key as a first pass at using the data layer. Fixes + integration. * Ignore test db * Start adding getters and setters for config values * More get/set config work. Starting to populate api with data * Wire up some config edit endpoints * More endpoints * Disable cors middleware * Add more endpoints and add test to test them * Remove the in-memory change APIs * Add endpoint for changing tags * Add more config endpoints * Starting to point more things away from config file and to the datastore * Populate YP with db data * Create new util method for parsing page body markdown and return it in api * Verify proposed path to ffmpeg * For development purposes show the config key in logs * Move stats values to datastore * Moving over more values to the datastore * Move S3 config to datastore * First pass the config -> db migrator * Add the start of the video config apis * It builds pointing everything away from the config * Tweak ffmpeg path error message * Backup database every hour. Closes #549 * Config + defaults + migration work for db * Cleanup logging * Remove all the old config structs * Add descriptive info about migration * Tweak ffmpeg validation logic * Fix db backup path. backup on db version migration * Set video and s3 configurations * Update api spec with new config endpoints * Add migrator for stats file * Commit updated API documentation * Use a dynamic system port for internal HLS writes. Closes #577 (#626) * Use a dynamic system port for internal HLS writes. Closes #577 * Cleanup * YP key migration to datastore * Create a backup directory if needed before migrations * Remove config test that no longer makes sense. Cleanup. * Change number types from float32 to float64 * Update automated test suite * Allow restoring a database backup via command line flags. Closes #549 * Add new hls segment config api * Commit updated API documentation * Update apis to require a value container property * add socialHandles api * Commit updated API documentation * Add new latancy level setting to replace segment settings * Commit updated API documentation * Fix spelling * Commit updated API documentation * hardcode a json api of available social platforms * Add additional icons * Return social handles in server config api * Add socialhandles validation to test * Move list of hard coded social platforms to an api * Remove audio only code from transcoder since we do not use it * Add latency levels api + snapshot of video settings as current broadcast * Add config/serverurl endpoint * Return 404 on YP api if disabled * Surface stream title in YP response * Add stream title to web ui * Cleanup log message. Closes #520 * Rename ffmpeg package to transcoder * Add ws package for testing * Reduce chat backlog to past 5hrs, max 50. Closes #548 * Fix error formatting * Add endpoint for resetting yp registration * Add yp/reset to api spec. return status in response * Return zero viewer count if stream is offline. Closes #422 * Post-rebase fixes * Fix merge conflict in openapi file * Commit updated API documentation * Standardize controller names * Support setting the stream key via the command line. Closes #665 * Return social handles with YP data. First half of https://github.com/owncast/owncast-yp/issues/28 * Give the YP package access to server status regardless if enabled or not * Change delay in automated tests * Add stream title integration API. For #638 * Commit updated API documentation * Add storage to the migrator * Missing returning NSFW value in server config * Add flag to ignore websocket client. Closes #537 * Add error for parsing broadcaster metadata * Add support for a cli specified http server port. Closes #674 * Add cpu usage levels and a temporary mapping between it and libx264 presets * Test for valid url endpoint when saving s3 config * Re-configure storage on every stream to allow changing storage providers * After 5 minutes of a stream being stopped clear the stream title * Hide viewer count once stream goes offline instead of when player stops * Pull steamTitle from the status that gets updated instead of the config * Commit updated API documentation * Optionally show stream title in the header * Reset stream title when server starts * Show chat action when stream title is updated * Allow system messages to come back in persistence * Split out getting chat history for moderation + fix tests * Remove server title and standardize on name only * Commit updated API documentation * Bump github.com/aws/aws-sdk-go from 1.37.1 to 1.37.2 (#680) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.37.1 to 1.37.2. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Changelog](https://github.com/aws/aws-sdk-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go/compare/v1.37.1...v1.37.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add video variant and stream latency config file migrator * Remove mostly unused disable upgrade check bool * Commit updated API documentation * Allow bundling the admin from the 0.0.6 branch * Fix saving port numbers * Use name instead of old title on window focus * Work on latency levels. Fix test to use levels. Clean up transcoder to only reference levels * Another place where title -> name * Fix test * Bump github.com/aws/aws-sdk-go from 1.37.2 to 1.37.3 (#690) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.37.2 to 1.37.3. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Changelog](https://github.com/aws/aws-sdk-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go/compare/v1.37.2...v1.37.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update dependabot config * Bump github.com/aws/aws-sdk-go from 1.37.3 to 1.37.5 (#693) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.37.3 to 1.37.5. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Changelog](https://github.com/aws/aws-sdk-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go/compare/v1.37.3...v1.37.5) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump video.js from 7.10.2 to 7.11.4 in /build/javascript (#694) * Bump video.js from 7.10.2 to 7.11.4 in /build/javascript Bumps [video.js](https://github.com/videojs/video.js) from 7.10.2 to 7.11.4. - [Release notes](https://github.com/videojs/video.js/releases) - [Changelog](https://github.com/videojs/video.js/blob/main/CHANGELOG.md) - [Commits](https://github.com/videojs/video.js/compare/v7.10.2...v7.11.4) Signed-off-by: dependabot[bot] <support@github.com> * Commit updated Javascript packages Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Owncast <owncast@owncast.online> * Make the latency migrator dynamic so I can tweak values easier * Split out fetching ffmpeg path from validating the path so it can be changed in the admin * Some commenting and linter cleanup * Validate the path for a logo change and throw an error if it does not exist * Logo change requests have to be a real file now * Cleanup, making linter happy * Format javascript on push * Only format js in master * Tweak latency level values * Remove unused config file examples * Fix thumbnail generation after messing with the ffmpeg path getter * Reduce how often we report high hardware utilization warnings * Bundle the 0.0.6 branch version of the admin * Return validated ffmpeg path in admin server config * Change the logo to be stored in the data directory instead of webroot * Bump postcss from 8.2.4 to 8.2.5 in /build/javascript (#702) Bumps [postcss](https://github.com/postcss/postcss) from 8.2.4 to 8.2.5. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.2.4...8.2.5) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Default config file no longer used * don't show stream title when offline addresses https://github.com/owncast/owncast/issues/677 * Remove auto-clearing stream title. #677 * webroot -> data when using logo as thumbnail * Do not list websocket/access token create/delete as integration APIs * Commit updated API documentation * Bundle updated admin * Remove pointing to the 0.0.6 admin branch * Linter cleanup * Linter cleanup * Add donations and follow links to show up under social handles * Prettified Code! * More linter cleanup * Update admin bundle * Remove use of platforms.js and return icons with social handles. Closes #732 * Update admin bundle * Support custom config path for use in migration * Remove unused platform-logos.gif * Reduce log level of message * Remove unused logo files in static dir * Handle dev vs. release build info * Restore logo.png for initial thumbnail * Cleanup some files from the build process that are not needed * Fix incorrect build-time injection var * Fix missing file getting copied to the build * Remove console directory message. * Update admin bundle * Fix comment * Report storage setup error * add some value set error checking * Use validated dynamic ffmpeg path for animated gif preview * Make chat message links be white so they don't hide in the bg. Closes #599 * Restore conditional that was accidentally removed Co-authored-by: Aaron Ogle <geekgonecrazy@users.noreply.github.com> Co-authored-by: Owncast <owncast@owncast.online> Co-authored-by: Ginger Wong <omqmail@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: nebunez <uoj2y7wak869@opayq.net> Co-authored-by: gabek <gabek@users.noreply.github.com>
This commit is contained in:
Gabe Kangas
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
71
webroot/img/platformlogos/donate.svg
Normal file
71
webroot/img/platformlogos/donate.svg
Normal file
@@ -0,0 +1,71 @@
|
||||
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 501.9 501.9" style="enable-background:new 0 0 501.9 501.9;" xml:space="preserve">
|
||||
<g>
|
||||
<g>
|
||||
<path d="M501.8,270.1c-0.6-13.9-14.2-25-40.5-33c-20.4-6.1-46.3-9.8-74.3-10.4V120c-0.1-1.8-0.6-3.5-1.5-5
|
||||
c-2.8-12.1-16.3-21.9-40.2-29.1c-22.5-6.8-51.9-10.5-82.8-10.5c-30.8,0-59.9,3.7-82,10.5c-18.1,5.6-39.8,16-39.8,33.9
|
||||
c0,1.1,0.1,2.2,0.3,3.3l1.1,45.6c-65-12.4-127.7,30.3-140,95.2C0.7,271.3,0,278.7,0,286.2c0,66,53.7,119.7,119.7,119.7
|
||||
c27.5,0,54.1-9.4,75.4-26.8c18.7,4.4,40.7,6.8,64,7c5.1,27.7,65.1,40.4,121,40.4c30.8,0,59.9-3.8,82-10.7
|
||||
c18.1-5.6,39.8-16.1,39.8-34V272C501.9,271.4,501.9,270.7,501.8,270.1z M366.1,175.3c0,1.3-4.8,8.2-26.5,14.8
|
||||
c-20.3,6.1-48.4,9.7-77,9.7c-24.7,0-48.9-2.6-68.1-7.5c-0.3-0.1-0.5-0.1-0.8-0.2c-9.5-7.5-20-13.5-31.3-17.7l-0.7-28.2
|
||||
c6.9,3.5,14.1,6.3,21.6,8.3c21.7,6.3,49.8,9.7,79.3,9.7c30.8,0,60.3-3.7,82.8-10.5c7.5-2.2,14.8-5.1,21.7-8.7v26.2
|
||||
C366,172.6,366.1,173.9,366.1,175.3z M186.5,105.2c20.2-6.2,47.2-9.7,76-9.7c28.6,0,56.7,3.5,77,9.7c21.7,6.6,26.5,13.4,26.5,14.7
|
||||
c0,1.4-4.9,8.3-26.6,14.8c-20.3,6.1-48.3,9.6-76.9,9.6c-27.6,0-53.8-3.2-73.7-9c-21.5-6.2-27.5-13-28-15.2c0-0.2-0.1-0.2-0.1-0.2
|
||||
C160.8,118,165.4,111.6,186.5,105.2z M186.8,360C146.1,397,83,394.1,46,353.4s-34.1-103.8,6.6-140.8
|
||||
c18.3-16.7,42.3-25.9,67.1-25.9c10,0,19.9,1.5,29.5,4.4c34.7,10.8,60.8,39.6,68.2,75.1c1.3,6.6,2,13.4,2,20.1
|
||||
C219.5,314.4,207.6,341.1,186.8,360z M212.2,362.2c8.1-9.9,14.6-21,19.2-32.9c8.5,0.7,17.3,1.2,26.5,1.3v1.8l0.6,33.9
|
||||
C243,366.1,227.5,364.7,212.2,362.2z M238.9,274.4c5.8,0.4,11.9,0.6,18.1,0.7l0.6,35.4c-7-0.1-13.9-0.4-20.5-0.9
|
||||
c1.5-7.7,2.3-15.6,2.3-23.4C239.4,282.3,239.2,278.4,238.9,274.4z M263.5,255.2c-0.3,0-0.7,0-1,0c-9.6,0-18.9-0.4-27.5-1
|
||||
c-3.8-13.4-9.8-26-17.9-37.2c15,1.9,30.1,2.9,45.3,2.9c30.9,0,60.4-3.7,82.9-10.5c7.5-2.2,14.7-5.1,21.6-8.6V227
|
||||
C324,228.2,279.9,237.2,263.5,255.2z M276.7,271.1c0-0.1,0-0.2,0.1-0.4c0.9-2.7,8-9.3,28.7-15.1c19.4-5.5,44.7-8.5,71.3-8.5h1.7
|
||||
c28.6,0,56.6,3.3,77,9.5c21.3,6.4,26.3,13,26.4,14.5v0.1c-0.1,1.5-5.1,8.4-27.3,15c-20.5,6.1-47.5,9.4-76,9.4
|
||||
c-27.6,0-53.8-3.2-73.7-8.9c-21.5-6.2-27.4-13.1-28-15.2C276.7,271.1,276.7,271.1,276.7,271.1z M456.3,396.8
|
||||
c-20.2,6.3-47.3,9.8-76.1,9.8c-28.9,0-55.9-3.4-75.9-9.5c-21.1-6.5-25.5-13.2-25.5-14.7c0-0.1,0-0.1,0-0.2l-0.5-29
|
||||
c8,3.9,16.3,6.9,24.9,9.1c21,5.5,47.7,8.6,75.1,8.6c30.9,0,60.2-3.7,82.6-10.5c7.3-2.2,14.3-5.1,21-8.5v30h0.1
|
||||
C482,383.3,477.4,390.2,456.3,396.8z M482.1,323.2H482c0,1-0.6,2.2-0.6,3.3c0,1.4-4.7,8.2-26.3,14.8c-20.5,6.2-47.8,9.6-76.7,9.6
|
||||
c-55.4,0-92.7-12.5-100.5-22.2l-0.1-8.4l-0.4-23c7,3.5,14.3,6.3,21.8,8.4c21.7,6.3,49.8,9.7,79.3,9.7c30.4,0,59.4-3.6,81.7-10.2
|
||||
c7.6-2.1,14.9-5,21.9-8.6V323.2z"/>
|
||||
</g>
|
||||
</g>
|
||||
<g>
|
||||
<g>
|
||||
<path d="M156.1,300.4c-4.6-16.3-19.5-27.5-36.4-27.5c-9.8,0-17.8-7.9-17.8-17.7c0.1-9.9,8-17.8,17.8-17.8s17.8,8,17.8,17.8
|
||||
c0,5.5,4.5,10,10,10s10-4.5,10-10c0-16.9-11.2-31.8-27.5-36.4v-4.5c0-5.5-4.5-10-10-10s-10,4.5-10,10v4.3
|
||||
c-20.1,5.4-32.1,26.1-26.7,46.2c4.4,16.5,19.3,28,36.4,28c9.8,0,17.8,7.9,17.8,17.7s-7.9,17.8-17.7,17.8s-17.8-7.9-17.8-17.7
|
||||
c0-5.5-4.5-10-10-10s-10,4.5-10,10c0.1,17.1,11.5,32,28,36.5v8.7c0,5.5,4.5,10,10,10s10-4.5,10-10V347
|
||||
C150.1,341.3,161.8,320.5,156.1,300.4z"/>
|
||||
</g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 3.5 KiB |
48
webroot/img/platformlogos/follow.svg
Normal file
48
webroot/img/platformlogos/follow.svg
Normal file
@@ -0,0 +1,48 @@
|
||||
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
|
||||
<g>
|
||||
<g>
|
||||
<g>
|
||||
<path d="M492,127.5h-18v-18c0-11.046-8.954-20-20-20c-11.046,0-20,8.954-20,20v18h-18c-11.046,0-20,8.954-20,20s8.954,20,20,20
|
||||
h18v18c0,11.046,8.954,20,20,20c11.046,0,20-8.954,20-20v-18h18c11.046,0,20-8.954,20-20S503.046,127.5,492,127.5z"/>
|
||||
<path d="M315.409,249.231C345.854,225.711,365.5,188.86,365.5,147.5C365.5,76.645,307.855,19,237,19S108.5,76.645,108.5,147.5
|
||||
c0,41.359,19.646,78.211,50.091,101.731C68.293,280.793,0,367.427,0,473c0,11.046,8.954,20,20,20h434c11.046,0,20-8.954,20-20
|
||||
C474,367.401,405.656,280.775,315.409,249.231z M148.5,147.5c0-48.799,39.701-88.5,88.5-88.5s88.5,39.701,88.5,88.5
|
||||
S285.799,236,237,236S148.5,196.299,148.5,147.5z M41.008,453C51.061,353.73,135.123,276,237,276s185.939,77.73,195.992,177
|
||||
H41.008z"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.3 KiB |
1
webroot/img/platformlogos/link.svg
Normal file
1
webroot/img/platformlogos/link.svg
Normal file
@@ -0,0 +1 @@
|
||||
<svg height="512pt" viewBox="0 -20 512 512" width="512pt" xmlns="http://www.w3.org/2000/svg"><path d="m452 0h-392c-33.085938 0-60 26.914062-60 60v332c0 44.113281 35.886719 80 80 80h352c44.113281 0 80-35.886719 80-80 0-11.046875-8.953125-20-20-20s-20 8.953125-20 20c0 22.054688-17.945312 40-40 40h-352c-22.054688 0-40-17.945312-40-40v-271h432v171c0 11.046875 8.953125 20 20 20s20-8.953125 20-20v-232c0-33.085938-26.914062-60-60-60zm-81 40c11.027344 0 20 8.972656 20 20s-8.972656 20-20 20-20-8.972656-20-20 8.972656-20 20-20zm100 20c0 11.027344-8.972656 20-20 20s-20-8.972656-20-20 8.972656-20 20-20 20 8.972656 20 20zm-431 0c0-11.027344 8.972656-20 20-20h254.441406c-2.222656 6.261719-3.441406 12.988281-3.441406 20 0 7.386719 1.347656 14.460938 3.800781 21h-274.800781zm346.402344 246.671875c6.375-7.132813 9.605468-17.382813 9.597656-30.464844 0-2.765625-.15625-5.464843-.457031-8.023437l-.214844-1.804688c-.042969-.367187-.074219-.738281-.097656-1.109375-1.289063-8.125-4.257813-14.828125-8.832031-19.941406-10.566407-11.8125-28.546876-14.3125-41.765626-14.328125h-.375c-13.195312.011719-31.164062 2.507812-41.742187 14.328125-2.769531 3.097656-4.996094 7.027344-6.644531 11.671875h21.128906c11.046875 0 20 8.953125 20 20s-8.953125 20-20 20h-59.894531c-.890625 3.648438-1.757813 6.667969-2.222657 8.222656-.03125.105469-.0625.210938-.097656.316406-3.402344 10.761719-8.613281 20.113282-15.488281 27.800782-16.164063 18.070312-40.902344 27.636718-71.535156 27.660156h-.417969c-30.667969-.035156-55.402344-9.601562-71.554688-27.660156-10.222656-11.425782-16.558593-25.703125-18.832031-42.4375-.085937-.640625-.144531-1.28125-.167969-1.925782l-.054687-.464843c-.484375-4.105469-.730469-8.375-.734375-12.695313-.015625-23.226562 6.644531-42.460937 19.785156-57.152344 16.167969-18.070312 40.90625-27.636718 71.542969-27.660156h.410156c17.265625.019532 32.578125 2.957032 45.535157 8.726563 10.089843 4.496093 14.625 16.320312 10.128906 26.410156s-16.316406 14.625-26.40625 10.128906c-7.816406-3.480469-17.671875-5.253906-29.28125-5.269531h-.371094c-13.195312.011719-31.167969 2.507812-41.742188 14.328125-6.378906 7.132813-9.609374 17.382813-9.601562 30.464844.003906 2.765625.15625 5.464843.460938 8.023437l.210937 1.804688c.042969.367187.078125.738281.101563 1.109375 1.289062 8.125 4.253906 14.828125 8.828124 19.941406 10.566407 11.8125 28.546876 14.3125 41.769532 14.328125h.371094c13.195312-.011719 31.167968-2.507812 41.742187-14.328125 2.363281-2.644531 4.332031-5.890625 5.882813-9.671875h-18.367188c-11.046875 0-20-8.953125-20-20s8.953125-20 20-20h57.417969c1.046875-4.527344 2.152343-8.390625 2.699219-10.222656.03125-.105469.0625-.210938.097656-.3125 3.402344-10.765625 8.613281-20.117188 15.488281-27.804688 16.164063-18.070312 40.902344-27.632812 71.535156-27.660156h.417969c30.667969.035156 55.402344 9.601562 71.554688 27.660156 10.222656 11.429688 16.558593 25.707032 18.832031 42.4375.085937.640625.144531 1.28125.167969 1.925782l.054687.464843c.484375 4.105469.730469 8.375.734375 12.695313.015625 23.230468-6.644531 42.460937-19.785156 57.15625-16.167969 18.070312-40.90625 27.632812-71.542969 27.660156h-.410156c-17.265625-.023438-32.578125-2.960938-45.535157-8.730469-10.089843-4.496093-14.625-16.320312-10.128906-26.410156s16.316406-14.625 26.40625-10.128906c7.816406 3.480469 17.671875 5.253906 29.28125 5.269531h.371094c13.199219-.011719 31.167969-2.507812 41.746094-14.328125zm0 0"/></svg>
|
||||
|
After Width: | Height: | Size: 3.3 KiB |
@@ -12,7 +12,7 @@ export default class StandaloneChat extends Component {
|
||||
super(props, context);
|
||||
|
||||
this.state = {
|
||||
websocket: new Websocket(),
|
||||
websocket: new Websocket(true), // Send along the "ignoreClient" flag so this isn't counted as a viewer
|
||||
chatEnabled: true, // always true for standalone chat
|
||||
username: getLocalStorage(KEY_USERNAME) || generateUsername(),
|
||||
};
|
||||
@@ -35,6 +35,7 @@ export default class StandaloneChat extends Component {
|
||||
websocket=${websocket}
|
||||
username=${username}
|
||||
messagesOnly
|
||||
ignoreClient
|
||||
/>
|
||||
`
|
||||
);
|
||||
|
||||
@@ -177,8 +177,8 @@ export default class App extends Component {
|
||||
}
|
||||
|
||||
setConfigData(data = {}) {
|
||||
const { title, summary } = data;
|
||||
window.document.title = title;
|
||||
const { name, summary } = data;
|
||||
window.document.title = name;
|
||||
|
||||
this.setState({
|
||||
configData: {
|
||||
@@ -199,6 +199,7 @@ export default class App extends Component {
|
||||
viewerCount,
|
||||
online,
|
||||
lastConnectTime,
|
||||
streamTitle,
|
||||
} = status;
|
||||
|
||||
this.lastDisconnectTime = status.lastDisconnectTime;
|
||||
@@ -215,6 +216,7 @@ export default class App extends Component {
|
||||
viewerCount,
|
||||
lastConnectTime,
|
||||
streamOnline: online,
|
||||
streamTitle,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -263,7 +265,7 @@ export default class App extends Component {
|
||||
}
|
||||
|
||||
if (this.windowBlurred) {
|
||||
document.title = ` 🔴 ${this.state.configData && this.state.configData.title}`;
|
||||
document.title = ` 🔴 ${this.state.configData && this.state.configData.name}`;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -282,11 +284,12 @@ export default class App extends Component {
|
||||
playerActive: true,
|
||||
streamOnline: true,
|
||||
chatInputEnabled: true,
|
||||
streamTitle: '',
|
||||
streamStatusMessage: MESSAGE_ONLINE,
|
||||
});
|
||||
|
||||
if (this.windowBlurred) {
|
||||
document.title = ` 🟢 ${this.state.configData && this.state.configData.title}`;
|
||||
document.title = ` 🟢 ${this.state.configData && this.state.configData.name}`;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -362,7 +365,7 @@ export default class App extends Component {
|
||||
|
||||
handleWindowFocus() {
|
||||
this.windowBlurred = false;
|
||||
window.document.title = this.state.configData && this.state.configData.title;
|
||||
window.document.title = this.state.configData && this.state.configData.name;
|
||||
}
|
||||
|
||||
handleSpaceBarPressed(e) {
|
||||
@@ -396,6 +399,7 @@ export default class App extends Component {
|
||||
playerActive,
|
||||
streamOnline,
|
||||
streamStatusMessage,
|
||||
streamTitle,
|
||||
touchKeyboardActive,
|
||||
username,
|
||||
viewerCount,
|
||||
@@ -409,10 +413,9 @@ export default class App extends Component {
|
||||
version: appVersion,
|
||||
logo = TEMP_IMAGE,
|
||||
socialHandles = [],
|
||||
name: streamerName,
|
||||
summary,
|
||||
tags = [],
|
||||
title,
|
||||
name,
|
||||
extraPageContent,
|
||||
} = configData;
|
||||
|
||||
@@ -431,6 +434,10 @@ export default class App extends Component {
|
||||
)
|
||||
: null;
|
||||
|
||||
const viewerCountMessage = streamOnline && viewerCount > 0 ? (
|
||||
html`${viewerCount} ${pluralize('viewer', viewerCount)}`
|
||||
) : null;
|
||||
|
||||
const mainClass = playerActive ? 'online' : '';
|
||||
const isPortrait = this.hasTouchScreen && orientation === ORIENTATION_PORTRAIT;
|
||||
const shortHeight = windowHeight <= HEIGHT_SHORT_WIDE && !isPortrait;
|
||||
@@ -469,7 +476,7 @@ export default class App extends Component {
|
||||
<img class="logo visually-hidden" src=${OWNCAST_LOGO_LOCAL} alt="owncast logo" />
|
||||
</span>
|
||||
<span class="instance-title overflow-hidden truncate"
|
||||
>${title}</span
|
||||
>${(streamOnline && streamTitle) ? streamTitle : name}</span
|
||||
>
|
||||
</h1>
|
||||
<div
|
||||
@@ -515,7 +522,7 @@ export default class App extends Component {
|
||||
class="flex text-center flex-row justify-between font-mono py-2 px-8 bg-gray-900 text-indigo-200 shadow-md border-b border-gray-100 border-solid"
|
||||
>
|
||||
<span>${streamStatusMessage}</span>
|
||||
<span id="stream-viewer-count">${viewerCount} ${pluralize('viewer', viewerCount)}.</span>
|
||||
<span id="stream-viewer-count">${viewerCountMessage}</span>
|
||||
</section>
|
||||
</main>
|
||||
|
||||
@@ -532,9 +539,12 @@ export default class App extends Component {
|
||||
>
|
||||
<h2 class="font-semibold text-5xl">
|
||||
<span class="streamer-name text-indigo-600"
|
||||
>${streamerName}</span
|
||||
>${name}</span
|
||||
>
|
||||
</h2>
|
||||
<h3 class="font-semibold text-3xl">
|
||||
${streamOnline && streamTitle}
|
||||
</h3>
|
||||
<${SocialIconsList} handles=${socialHandles} />
|
||||
<div
|
||||
id="stream-summary"
|
||||
@@ -564,7 +574,7 @@ export default class App extends Component {
|
||||
websocket=${websocket}
|
||||
username=${username}
|
||||
chatInputEnabled=${chatInputEnabled}
|
||||
instanceTitle=${title}
|
||||
instanceTitle=${name}
|
||||
/>
|
||||
</div>
|
||||
`;
|
||||
|
||||
@@ -7,9 +7,9 @@ import '/js/web_modules/@justinribeiro/lite-youtube.js';
|
||||
import Message from './message.js';
|
||||
import ChatInput from './chat-input.js';
|
||||
import { CALLBACKS, SOCKET_MESSAGE_TYPES } from '../../utils/websocket.js';
|
||||
import { jumpToBottom, debounce } from '../../utils/helpers.js';
|
||||
import { jumpToBottom, debounce, getLocalStorage } from '../../utils/helpers.js';
|
||||
import { extraUserNamesFromMessageHistory } from '../../utils/chat.js';
|
||||
import { URL_CHAT_HISTORY, MESSAGE_JUMPTOBOTTOM_BUFFER } from '../../utils/constants.js';
|
||||
import { URL_CHAT_HISTORY, MESSAGE_JUMPTOBOTTOM_BUFFER, KEY_CUSTOM_USERNAME_SET } from '../../utils/constants.js';
|
||||
|
||||
export default class Chat extends Component {
|
||||
constructor(props, context) {
|
||||
@@ -126,7 +126,7 @@ export default class Chat extends Component {
|
||||
// extra user names
|
||||
const chatUserNames = extraUserNamesFromMessageHistory(data);
|
||||
this.setState({
|
||||
messages: data,
|
||||
messages: this.state.messages.concat(data),
|
||||
chatUserNames,
|
||||
});
|
||||
})
|
||||
@@ -136,6 +136,8 @@ export default class Chat extends Component {
|
||||
}
|
||||
|
||||
sendUsernameChange(oldName, newName) {
|
||||
clearTimeout(this.sendUserJoinedEvent);
|
||||
|
||||
const nameChange = {
|
||||
type: SOCKET_MESSAGE_TYPES.NAME_CHANGE,
|
||||
oldName,
|
||||
@@ -215,6 +217,11 @@ export default class Chat extends Component {
|
||||
this.setState({
|
||||
webSocketConnected: true,
|
||||
});
|
||||
|
||||
const hasPreviouslySetCustomUsername = getLocalStorage(KEY_CUSTOM_USERNAME_SET);
|
||||
if (hasPreviouslySetCustomUsername && !this.props.ignoreClient) {
|
||||
this.sendJoinedMessage();
|
||||
}
|
||||
}
|
||||
|
||||
websocketDisconnected() {
|
||||
@@ -236,6 +243,20 @@ export default class Chat extends Component {
|
||||
this.websocket.send(message);
|
||||
}
|
||||
|
||||
sendJoinedMessage() {
|
||||
const { username } = this.props;
|
||||
const message = {
|
||||
username: username,
|
||||
type: SOCKET_MESSAGE_TYPES.USER_JOINED,
|
||||
};
|
||||
|
||||
// Artificial delay so people who join and immediately
|
||||
// leave don't get counted.
|
||||
this.sendUserJoinedEvent = setTimeout(function() {
|
||||
this.websocket.send(message);
|
||||
}.bind(this), 5000);
|
||||
}
|
||||
|
||||
updateAuthorList(message) {
|
||||
const { type } = message;
|
||||
const nameList = this.state.chatUserNames;
|
||||
|
||||
@@ -24,6 +24,33 @@ export default function Message(props) {
|
||||
</div>
|
||||
`
|
||||
);
|
||||
} else if (type === SOCKET_MESSAGE_TYPES.USER_JOINED) {
|
||||
const { username } = message;
|
||||
return (
|
||||
html`
|
||||
<div class="message message-user-joined flex items-center justify-start p-3">
|
||||
<div class="message-content flex flex-row items-center justify-center text-sm w-full">
|
||||
<div class="text-white text-center opacity-50 overflow-hidden break-words">
|
||||
<span class="font-bold">${username}</span> joined the chat.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`
|
||||
);
|
||||
} else if (type === SOCKET_MESSAGE_TYPES.CHAT_ACTION) {
|
||||
const { author, body } = message;
|
||||
const formattedMessage = `${body}`
|
||||
return (
|
||||
html`
|
||||
<div class="message message-user-joined flex items-center justify-start p-3">
|
||||
<div class="message-content flex flex-row items-center justify-center text-sm w-full">
|
||||
<div class="text-white text-center opacity-50 overflow-hidden break-words">
|
||||
<span dangerouslySetInnerHTML=${{ __html: formattedMessage }}></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`
|
||||
);
|
||||
} else {
|
||||
console.log("Unknown message type:", type);
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ import htm from '/js/web_modules/htm.js';
|
||||
const html = htm.bind(h);
|
||||
|
||||
import { setLocalStorage } from '../../utils/helpers.js';
|
||||
import { KEY_USERNAME } from '../../utils/constants.js';
|
||||
import { KEY_USERNAME, KEY_CUSTOM_USERNAME_SET } from '../../utils/constants.js';
|
||||
|
||||
export default class UsernameForm extends Component {
|
||||
constructor(props, context) {
|
||||
@@ -51,6 +51,8 @@ export default class UsernameForm extends Component {
|
||||
newName = newName.trim();
|
||||
if (newName !== '' && newName !== curName) {
|
||||
setLocalStorage(KEY_USERNAME, newName);
|
||||
// So we know that the user has set a custom name
|
||||
setLocalStorage(KEY_CUSTOM_USERNAME_SET, true);
|
||||
if (onUsernameChange) {
|
||||
onUsernameChange(newName);
|
||||
}
|
||||
|
||||
@@ -1,18 +1,15 @@
|
||||
import {h} from '/js/web_modules/preact.js';
|
||||
import htm from '/js/web_modules/htm.js';
|
||||
import {SOCIAL_PLATFORMS} from '../utils/platforms.js';
|
||||
import {classNames} from '../utils/helpers.js';
|
||||
|
||||
const html = htm.bind(h);
|
||||
|
||||
function SocialIcon(props) {
|
||||
const {platform, icon, url} = props;
|
||||
const platformInfo = SOCIAL_PLATFORMS[platform.toLowerCase()];
|
||||
const inList = !!platformInfo;
|
||||
const iconSupplied = !!icon
|
||||
const name = inList ? platformInfo.name : platform;
|
||||
const name = platform;
|
||||
|
||||
const finalIcon = iconSupplied ? icon : (inList ? platformInfo.icon : '/img/platformlogos/default.svg')
|
||||
const finalIcon = iconSupplied ? icon : '/img/platformlogos/default.svg';
|
||||
|
||||
const style = `background-image: url(${finalIcon});`
|
||||
|
||||
@@ -22,7 +19,6 @@ function SocialIcon(props) {
|
||||
"justify-start": true,
|
||||
"items-center": true,
|
||||
"-mr-1": true,
|
||||
"use-default": !inList,
|
||||
});
|
||||
const labelClass = classNames({
|
||||
"platform-label": true,
|
||||
|
||||
@@ -24,6 +24,7 @@ export const PLAYER_VOLUME = 'owncast_volume';
|
||||
|
||||
|
||||
export const KEY_USERNAME = 'owncast_username';
|
||||
export const KEY_CUSTOM_USERNAME_SET = 'owncast_custom_username_set'
|
||||
export const KEY_CHAT_DISPLAYED = 'owncast_chat';
|
||||
export const KEY_CHAT_FIRST_MESSAGE_SENT = 'owncast_first_message_sent';
|
||||
export const CHAT_INITIAL_PLACEHOLDER_TEXT = 'Type here to chat, no account necessary.';
|
||||
|
||||
@@ -1,83 +0,0 @@
|
||||
export const SOCIAL_PLATFORMS = {
|
||||
default: {
|
||||
name: "default",
|
||||
icon: '/img/platformlogos/default.svg',
|
||||
},
|
||||
|
||||
facebook: {
|
||||
name: "Facebook",
|
||||
icon: '/img/platformlogos/facebook.svg',
|
||||
},
|
||||
twitter: {
|
||||
name: "Twitter",
|
||||
icon: '/img/platformlogos/twitter.svg',
|
||||
},
|
||||
instagram: {
|
||||
name: "Instagram",
|
||||
icon: '/img/platformlogos/instagram.svg',
|
||||
},
|
||||
snapchat: {
|
||||
name: "Snapchat",
|
||||
icon: '/img/platformlogos/snapchat.svg',
|
||||
},
|
||||
tiktok: {
|
||||
name: "TikTok",
|
||||
icon: '/img/platformlogos/tiktok.svg',
|
||||
},
|
||||
soundcloud: {
|
||||
name: "Soundcloud",
|
||||
icon: '/img/platformlogos/soundcloud.svg',
|
||||
},
|
||||
bandcamp: {
|
||||
name: "Bandcamp",
|
||||
icon: '/img/platformlogos/bandcamp.svg',
|
||||
},
|
||||
patreon: {
|
||||
name: "Patreon",
|
||||
icon: '/img/platformlogos/patreon.svg',
|
||||
},
|
||||
youtube: {
|
||||
name: "YouTube",
|
||||
icon: '/img/platformlogos/youtube.svg',
|
||||
},
|
||||
spotify: {
|
||||
name: "Spotify",
|
||||
icon: '/img/platformlogos/spotify.svg',
|
||||
},
|
||||
twitch: {
|
||||
name: "Twitch",
|
||||
icon: '/img/platformlogos/twitch.svg',
|
||||
},
|
||||
paypal: {
|
||||
name: "Paypal",
|
||||
icon: '/img/platformlogos/paypal.svg',
|
||||
},
|
||||
github: {
|
||||
name: "Github",
|
||||
icon: '/img/platformlogos/github.svg',
|
||||
},
|
||||
linkedin: {
|
||||
name: "LinkedIn",
|
||||
icon: '/img/platformlogos/linkedin.svg',
|
||||
},
|
||||
discord: {
|
||||
name: "Discord",
|
||||
icon: '/img/platformlogos/discord.svg',
|
||||
},
|
||||
mastodon: {
|
||||
name: "Mastodon",
|
||||
icon: '/img/platformlogos/mastodon.svg',
|
||||
},
|
||||
gitlab: {
|
||||
name: "Gitlab",
|
||||
icon: '/img/platformlogos/gitlab.svg',
|
||||
},
|
||||
kofi: {
|
||||
name: "Ko-Fi",
|
||||
icon: '/img/platformlogos/ko-fi.svg',
|
||||
},
|
||||
keyoxide: {
|
||||
name: "Key Oxide",
|
||||
icon: '/img/platformlogos/keyoxide.png',
|
||||
},
|
||||
};
|
||||
@@ -9,9 +9,13 @@ export const SOCKET_MESSAGE_TYPES = {
|
||||
PING: 'PING',
|
||||
NAME_CHANGE: 'NAME_CHANGE',
|
||||
PONG: 'PONG',
|
||||
SYSTEM: 'SYSTEM'
|
||||
SYSTEM: 'SYSTEM',
|
||||
USER_JOINED: 'USER_JOINED',
|
||||
CHAT_ACTION: 'CHAT_ACTION'
|
||||
};
|
||||
|
||||
const IGNORE_CLIENT_FLAG = 'IGNORE_CLIENT';
|
||||
|
||||
export const CALLBACKS = {
|
||||
RAW_WEBSOCKET_MESSAGE_RECEIVED: 'rawWebsocketMessageReceived',
|
||||
WEBSOCKET_CONNECTED: 'websocketConnected',
|
||||
@@ -21,7 +25,7 @@ export const CALLBACKS = {
|
||||
const TIMER_WEBSOCKET_RECONNECT = 5000; // ms
|
||||
|
||||
export default class Websocket {
|
||||
constructor() {
|
||||
constructor(ignoreClient) {
|
||||
this.websocket = null;
|
||||
this.websocketReconnectTimer = null;
|
||||
|
||||
@@ -33,11 +37,14 @@ export default class Websocket {
|
||||
this.createAndConnect = this.createAndConnect.bind(this);
|
||||
this.scheduleReconnect = this.scheduleReconnect.bind(this);
|
||||
|
||||
this.ignoreClient = ignoreClient;
|
||||
|
||||
this.createAndConnect();
|
||||
}
|
||||
|
||||
createAndConnect() {
|
||||
const ws = new WebSocket(URL_WEBSOCKET);
|
||||
const extraFlags = this.ignoreClient ? [IGNORE_CLIENT_FLAG] : [];
|
||||
const ws = new WebSocket(URL_WEBSOCKET, extraFlags);
|
||||
ws.onopen = this.onOpen.bind(this);
|
||||
ws.onclose = this.onClose.bind(this);
|
||||
ws.onerror = this.onError.bind(this);
|
||||
|
||||
@@ -132,7 +132,9 @@
|
||||
word-break: break-word;
|
||||
}
|
||||
.message-text a {
|
||||
color: #7f9cf5; /* indigo-400 */
|
||||
color: #ffffff;
|
||||
text-shadow: 0px 1px #0a0a0a75;
|
||||
font-size: 0.95rem;
|
||||
}
|
||||
.message-text a:hover {
|
||||
text-decoration: underline;
|
||||
|
||||
Reference in New Issue
Block a user