matthew/satyr
1
0
Fork 0
mirror of https://git.waldn.net/git/knotteye/satyr.git synced 2026-04-13 21:20:16 +00:00
Code Issues Projects Releases Wiki Activity
235 Commits 2 Branches 11 Tags
a8a05a992e11dfa708699aab7e8dc3d8b839852e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
knotteye a8a05a992e Merge pull request 'Update package version for release' (#25) from develop into master 
Reviewed-on: https://git.waldn.net/git/knotteye/satyr/pulls/25
 2021-01-10 15:52:08 -06:00
knotteye ef52cbe629 Update package version for release 2021-01-10 15:49:40 -06:00
knotteye 67694cffd8 Merge pull request 'develop -> master' (#24) from develop into master 
Reviewed-on: https://git.waldn.net/git/knotteye/satyr/pulls/24
 2021-01-10 15:24:24 -06:00
knotteye 3701b0c8fa Merge branch 'master' into develop 2021-01-10 15:22:40 -06:00
knotteye 362381e7db Update documentation with hwaccleration issues 2021-01-10 15:20:45 -06:00
knotteye a3341d8b7d Disable CRF when using hwaccel 2021-01-10 15:09:42 -06:00
knotteye 8a33b80593 Map streams automatically instead of manually 2021-01-10 14:29:54 -06:00
knotteye c5921e4e08 Merge pull request 'experimental hardware acceleration' (#21) from hwaccel into develop 
Reviewed-on: https://git.waldn.net/git/knotteye/satyr/pulls/21
 2021-01-10 13:46:02 -06:00
knotteye 943c71d1e0 Add what I think is working hwaccel support 2021-01-10 13:42:52 -06:00
knotteye 1afd855e73 Clarify some documentation 2021-01-10 13:42:23 -06:00
knotteye 9df4b545ec Update config.ts to include hwaccel options 2021-01-10 13:42:12 -06:00
knotteye 364994decc Start work on hardware acceleration. 
Documentation first, code later.
 2021-01-10 12:46:45 -06:00
knotteye cccdc8838d Merge pull request 'Switch to using the actual database instead of bans.db' (#20) from bansdb into develop 
Reviewed-on: https://git.waldn.net/git/knotteye/satyr/pulls/20
 2021-01-10 12:34:19 -06:00
knotteye 69d81ec836 Switch to using MySQL instead of bans.db 2021-01-10 12:31:11 -06:00
knotteye 7156accbee Fix a bug where we weren't setting X-Auth-As on /api/register 
Also fix new users appearing to not exist until they update their bio/profile
 2021-01-10 11:26:52 -06:00
knotteye 814d826ec9 Modify the migration script to import existing data. 2021-01-10 11:01:28 -06:00
knotteye a882285bac Fix database functions regarding ch_bans since it's a special case 2021-01-10 10:13:29 -06:00
knotteye 57410dc969 Update database functions to create and destroy rows in new table. 2021-01-09 15:25:06 -06:00
knotteye 5c22c1a738 Add migration script for channel bans table in the database. 2021-01-09 15:22:23 -06:00
knotteye a1a101c0f1 Check if the video object still exists before restarting the timeout 2021-01-08 17:25:44 -06:00
knotteye 7f40690820 Update repository link 2021-01-08 17:14:16 -06:00
knotteye 4c1298cc5c Merge pull request 'develop -> master' (#19) from develop into master 
Reviewed-on: https://git.waldn.net/git/knotteye/satyr/pulls/19
 2021-01-08 16:30:46 -06:00
knotteye 1abb35f9ac Update version for release 2021-01-08 16:29:00 -06:00
knotteye 2ef1c80813 Merge pull request 'merge frontend-improvments' (#18) from frontend-improvments into develop 
Reviewed-on: https://git.waldn.net/git/knotteye/satyr/pulls/18
 2021-01-08 16:18:05 -06:00
knotteye 8cb78a7dd6 Add code for re-checking if a user has gone live since loading the page 
Also exempt static files from link rewriting in the SPA
There may be more in here.. It's been a long break halfway through this commit.
 2021-01-08 16:14:19 -06:00
knotteye f703d5af7f Stop accidentally capturing static file links 2021-01-08 15:39:03 -06:00
knotteye 2a121d27ee Merge pull request 'config-bugfix -> develop' (#13) from config-bugfix into develop 
Reviewed-on: https://pond.waldn.net/git/knotteye/satyr/pulls/13
 2020-10-30 07:40:20 -05:00
knotteye cc8c4915f9 Distinguish between errors when loading the config file. 2020-10-30 07:38:01 -05:00
knotteye d0e3507cc0 Merge pull request 'better-migration -> develop' (#12) from better-migration into develop 
Reviewed-on: https://pond.waldn.net/git/knotteye/satyr/pulls/12
 2020-10-30 07:27:55 -05:00
knotteye 33accfb8b7 Select scripts to run based on comparing version strings and script names. 
This means scripts need to insert a version value the same as their name to db_meta. This is nothing new, it just works better now.
 2020-10-30 07:20:23 -05:00
knotteye 3e073e7f66 Skip compiling templates when running migrations alone 2020-10-30 06:25:47 -05:00
knotteye 47e036cde6 Merge pull request 'web-player -> develop' (#8) from web-player into develop 
Reviewed-on: https://pond.waldn.net/git/knotteye/satyr/pulls/8
 2020-10-25 10:27:51 -05:00
knotteye a75a625cd3 Merge branch 'develop' into web-player 2020-10-25 10:27:29 -05:00
knotteye 7b5a498241 Fix manifest uri in user.njk 2020-10-25 10:26:07 -05:00
knotteye 2a5e8d6ec2 Add play button functionality for web player 2020-10-25 10:17:45 -05:00
knotteye 12e868456a Add play button for shaka player. Needs functionality. 2020-10-25 10:17:45 -05:00
knotteye 281d9c7922 Merge pull request 'master <- develop' (#7) from develop into master 
Reviewed-on: https://pond.waldn.net/git/knotteye/satyr/pulls/7
 2020-10-24 22:54:29 -05:00
knotteye fe3ec1bd75 Fix CORS issues in reccomended nginx config 2020-10-24 22:52:59 -05:00
knotteye 07cba66096 Fix a typo in the generated config file 2020-10-24 22:47:03 -05:00
knotteye 2de486da46 Switch to shaka-player and initialize it on pageload. 
Maybe todo: more testing and re-check if the stream has started after the page has already loaded
 2020-10-18 09:23:28 -05:00
knotteye 2c073a7cdb Update URLs with new repository 2020-10-18 09:25:54 +00:00
knotteye 8a71680971 Merge pull request 'Fix a bug with migrate.ts calling a function incorrectly' (#4) from migrate-bugfix into develop 2020-10-18 04:16:15 -05:00
knotteye 0900496d70 Fix a bug with migrate.ts calling a function incorrectly 2020-10-18 09:13:09 +00:00
knotteye 34d6fa91df Fix some typos in documentation 2020-10-18 02:16:54 -05:00
knotteye 97b6f50b7c Merge pull request 'master -> develop' (#2) from develop into master 
Reviewed-on: http://localhost:3000/git/knotteye/satyr/pulls/2
 2020-10-17 23:49:01 -05:00
knotteye 94f240d4d6 Merge branch 'master' into develop 2020-10-17 23:48:18 -05:00
knotteye d8b327752e Bump minor version 2020-10-17 23:41:37 -05:00
knotteye 7107cb4c8f Update documentation for new repository host 2020-10-17 23:37:34 -05:00
knotteye 90cce68581 Fix bug 2020-10-17 22:40:30 -05:00
knotteye 1fa6bf7e81 Update documentation 2020-10-17 22:23:05 -05:00
knotteye ab9a9b4585 Expose whether cluster mode is enabled over /api/instance/config 2020-10-17 22:08:56 -05:00
knotteye 01744df3cd Fix a bug where XMPP bridge would repeatedly ignore channels 2020-10-17 22:07:30 -05:00
knotteye ab082e5f95 Fix logging in cluster.ts 
Fix a bug calling the cluster process in index.ts
Set a default value for rtmp.cluster in config.ts
Update documentation
 2020-10-17 21:39:56 -05:00
knotteye de17128cd2 Merge branch 'xmpp-mirror' into 'develop' 
Xmpp mirror

See merge request knotteye/satyr!30
 2020-10-18 01:19:20 +00:00
knotteye cfa7c5ab13 Implement XMPP mirror 2020-10-17 20:17:24 -05:00
knotteye 81afb7493b Update config options for xmpp bridge 2020-10-17 18:30:38 -05:00
knotteye 9a6e5c8798 Add documentation for configuring XMPP bridge 2020-10-17 18:29:17 -05:00
knotteye 06dc05eb8b Add a dependency for xmpp mirroring and add configurability 2020-10-17 16:55:55 -05:00
knotteye dfd0bc4881 Commit a local.css file to get rid of some error messages 2020-10-17 16:15:49 -05:00
knotteye 30a62e6378 Handle back button when the user navigates to one of our own history events 2020-10-17 16:02:50 -05:00
knotteye cc3876ff4a Update URL when navigating to new pages and push state to history in client-side SPA 2020-10-17 15:39:19 -05:00
knotteye 56c4b94a80 Fix the start video function to avoid redudant calls 2020-10-17 05:26:31 -05:00
knotteye a5c1adfffc Return live flag as well when getting user info 2020-10-17 05:13:32 -05:00
knotteye 4d36c2c429 Merge branch 'develop' into 'master' 
Develop -> Master

See merge request knotteye/satyr!29
 2020-10-17 07:32:23 +00:00
knotteye 18d521a35b Merge branch 'cluster' into 'develop' 
Cluster

See merge request knotteye/satyr!28
 2020-10-17 07:29:31 +00:00
knotteye 5126bccbc7 Add configurability to cluster option 2020-10-17 02:17:10 -05:00
knotteye 80cf01ef30 Add unique ports per worker so that ffmpeg can reliably record. 2020-10-17 01:53:33 -05:00
knotteye 1ae7128b9d Update server code 2020-10-17 01:07:29 -05:00
knotteye 7806b34cfa Remove unused code 2020-10-17 01:03:20 -05:00
knotteye bdfac44e21 Add the beginnings of the ability to cluster RTMP servers. It looks like there won't be a way to reliably play RTMP streams like this without digging into node-media-server code. 
For now that means clustering will have the drawback of being able to do DASH only.

Still need to add a config option and reliable recording.
 2020-10-17 00:51:47 -05:00
knotteye 9e5b3f360c Merge branch 'client-templates' into 'develop' 
Client templates -> develop

See merge request knotteye/satyr!27
 2020-10-17 05:20:57 +00:00
knotteye 58e8be123c Intercept internal links and render the page without reloading 2020-10-17 00:11:24 -05:00
knotteye 54a891dac1 Update documentation 2020-10-16 22:25:24 -05:00
knotteye 95837beaf7 Make server side rendering fully configurable 2020-10-16 21:57:24 -05:00
knotteye 961b5fe648 Add config option to turn server side rendering off. 
Ensure templates are precompiled before starting the server.
 2020-10-16 21:31:23 -05:00
knotteye 4ec89d71f8 Bump major version. There were some breaking changes in there somewhere 2020-10-14 07:51:26 -05:00
knotteye 988e3473a7 Big commit. Implement handlers for everything that's currently rendered server side in the client-side frontend. 
Add compiled templates file to .gitignore, will work out a system for making sure templates are compiled later.
Fix a couple bugs in the API and templates.

TODO for client-side rendering:
Make sure templates get compiled before running the server.
Add a config option to switch between server-side and client-side rendering
Fancy SPA stuff like intercepting links to render changes without a page-reload
 2020-10-14 07:44:19 -05:00
knotteye 57d0b0f856 initial work on client-side templating 2020-10-14 00:03:45 -05:00
knotteye 99879fd91e Merge branch 'invite-codes' into 'develop' 
Invite codes

See merge request knotteye/satyr!26
 2020-10-13 21:31:24 +00:00
knotteye 1a410a597a Fix a bug checking the validity of invite codes 2020-10-13 16:29:13 -05:00
knotteye acce235812 Increment minor version due to backwards compatible API changes 2020-10-13 16:17:15 -05:00
knotteye eba53c3732 Rework invitation UI a bit, document API changes 2020-10-13 16:16:37 -05:00
knotteye 67de11e66b Add API handling of invite codes, add web page for inviting users. 2020-10-13 16:12:07 -05:00
knotteye 9605ff8c92 Add a way to generate invites from the command line. Add database migration script. 2020-10-13 15:48:39 -05:00
knotteye 8caad60a43 Add functions for generating and using invite codes 2020-10-13 15:29:47 -05:00
knotteye 987d837ee6 Update some dependency versions. 2020-10-13 15:07:30 -05:00
knotteye 444c3c8f7e Merge branch 'twitch-mirror' into 'develop' 
Twitch mirror

See merge request knotteye/satyr!25
 2020-10-13 01:57:25 +00:00
knotteye 7b84253fc1 Add some logging for twitch mirror 2020-10-12 20:53:22 -05:00
knotteye 93738d27bc Add sections in profile.njk for adjusting settings. 
Everything tested and working apart from the actual streaming functionality.
 2020-10-12 13:34:24 -05:00
knotteye d4bb2ceebe Update documentation for API. 
All that's left for twitch mirroring is a UI and then testing.
 2020-10-12 12:12:27 -05:00
knotteye 98927bd7b8 Add API functionality for twitch mirror. 2020-10-12 12:11:04 -05:00
knotteye 44cc3213ca Tweak config changes, add functionality in server.ts 
Still needs an API and a UI, then good to go.
 2020-10-12 11:14:59 -05:00
knotteye 4ff4a6329d Add configuration options for twitch mirror 2020-10-12 10:54:55 -05:00
knotteye 5fe4728c11 Add migration script and update remove and adduser functions. 
Needs a UI, API, and functionality.
 2020-10-10 16:35:05 -05:00
knotteye 7b25a7bc97 Increment minor version 2020-10-10 16:14:53 -05:00
knotteye 5ff40c7b37 Merge branch 'database-migrate' into 'develop' 
Implement database versioning and migration. It could not possibly be any...

See merge request knotteye/satyr!24
 2020-10-10 21:08:28 +00:00
knotteye ee3527f292 Implement database versioning and migration. It could not possibly be any simpler or easier to break, but it works. And it can be used to automatically migrate to a better system for migration later. 
For now, the way it works is by creating a new migration script with the name of the version (increment by one, whole numbers) in the src/db folder
On start up, it will compare version numbers and run new scripts. The user can also manually check for migrations and skip the automatic checking.
Added a bit of additional logging to see what's happening in the startup process as well.
 2020-10-10 15:55:32 -05:00
knotteye a36a49b70e Merge branch 'patch-1' into 'develop' 
Update REST.md

See merge request knotteye/satyr!23
 2020-08-31 01:31:15 +00:00
knotteye 50e96f2b25 Merge branch 'add-live-field' into 'develop' 
Add live field to /api/users/all

See merge request knotteye/satyr!22
 2020-08-31 01:28:27 +00:00
knotteye 2d7bc8204f Update REST.md 2020-08-31 01:26:43 +00:00