Commit Graph

217 Commits (814d826ec9e2f0f54926a5eabf93b993be048d3f)

Author SHA1 Message Date
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 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: #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 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 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