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
201 Commits 2 Branches 11 Tags
a75a625cd375865141152d438a33133328832464
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
knotteye 108d7ad0b7 Fix /api/instance/config 2020-08-23 14:41:48 +00:00
knotteye b1d4de4af6 Merge branch 'develop' into 'master' 
Develop -> Master

See merge request knotteye/satyr!21
 2020-08-09 05:02:10 +00:00
knotteye 027b9e746a Increment minor version 2020-08-09 00:00:29 -05:00
knotteye 4baa07123f Merge branch 'chat_bugfix' into 'develop' 
Fix a bug with trying to update IRC channels when IRC is disabled.

See merge request knotteye/satyr!20
 2020-08-09 04:58:04 +00:00
knotteye 01e872c552 Fix a bug with trying to update IRC channels when IRC is disabled. 2020-08-08 23:50:57 -05:00
knotteye 4959391034 Increment minor version 
Remove debug code
 2020-08-08 23:37:10 -05:00
knotteye ac73eb2af3 Merge branch 'ffmpeg-tune' into 'develop' 
Tune ffmpeg commands

See merge request knotteye/satyr!19
 2020-08-09 04:14:05 +00:00
knotteye c9accda4eb Tune ffmpeg command to start playback and transcode faster 
Add option for custom flags
 2020-08-08 23:08:09 -05:00
knotteye 3c311ecf4e Update README.md 2020-08-03 10:05:09 +00:00
knotteye 9eec1241e2 Merge branch 'api-json-changes' into 'develop' 
Api json changes

See merge request knotteye/satyr!18
 2020-08-03 10:03:58 +00:00
knotteye 654b65640f Change API to set content-type headers. 
Rework some responses to make all responses in JSON.
Increment version because of major API changes.
 2020-08-03 05:01:20 -05:00
knotteye 0b7b040ade Merge branch 'api-bugix' into 'develop' 
Fix incorrect reporting of domain in the api

See merge request knotteye/satyr!17
 2020-08-01 01:53:23 +00:00
knotteye c55ccb75aa Fix incorrect reporting of domain in the api 2020-08-01 01:46:56 +00:00
knotteye d229947fc4 Merge branch 'develop' into 'master' 
Bump version.

See merge request knotteye/satyr!16
 2020-07-30 09:17:31 +00:00
knotteye eac5eaa035 Bump version. 
Add documentation for webchat.
 2020-07-30 04:13:07 -05:00
knotteye 3a06bae0c4 Merge branch 'develop' into 'master' 
Develop

Closes #8

See merge request knotteye/satyr!15
 2020-07-30 07:57:54 +00:00
knotteye cbcd1d8ba8 Document /api/users/live and /api/users/all and modify the documentation format 2020-07-30 02:55:33 -05:00
knotteye 09bf2a8ac1 Add paging and sorting to /api/users/live and /api/users/all calls 2020-07-30 02:49:02 -05:00
knotteye f7c7f05786 Implement an API call for getting the current stream key. 2020-07-30 01:34:22 -05:00
knotteye df51432a8f Fix /api/:user/config not returning all info for an authorized user. 2020-07-30 01:14:33 -05:00
knotteye db8d9dfe72 Add API function for getting a user's configuration. 2020-07-30 00:45:08 -05:00
knotteye c745572a7e Update list of restricted usernames to avoid collision in api 2020-07-30 00:03:05 -05:00
knotteye 5b4ef9b260 Merge branch 'develop' into 'master' 
Fix typo and add functions to be implemented.

See merge request knotteye/satyr!14
 2020-07-29 08:42:05 +00:00
knotteye fb6538a757 Fix typo and add functions to be implemented. 2020-07-29 03:40:53 -05:00
knotteye 5b5d471b7f Merge branch 'develop' into 'master' 
Add default value for a contact email

See merge request knotteye/satyr!13
 2020-07-29 08:27:11 +00:00
knotteye bd40c30114 Add default value for a contact email 
Add an api function to list a users vods
Document the existing REST API
 2020-07-29 03:24:19 -05:00
knotteye 95ae686145 Merge branch 'develop' into 'master' 
Develop

See merge request knotteye/satyr!12
 2020-07-20 09:35:26 +00:00
knotteye 1a9b7be318 Update readme 2020-07-20 04:25:01 -05:00
knotteye 0d2732a876 Update README.md 2020-07-04 15:09:06 +00:00
knotteye eacc32f171 Add contributing instructions 
That I will follow in the future..
 2020-07-04 10:06:52 -05:00
knotteye 303924e77e Merge branch 'develop' into 'master' 
Only join channels not already joined with twitchClient and ircClient

Closes #2

See merge request knotteye/satyr!11
 2020-07-04 14:59:24 +00:00
knotteye abd45c8346 Only join channels not already joined with twitchClient and ircClient 
Leave channels we don't need anymore as well.
 2020-07-04 09:53:12 -05:00
knotteye 94bcecfd0a Merge branch 'develop' into 'master' 
Develop

Closes #4

See merge request knotteye/satyr!10
 2020-07-04 08:16:29 +00:00
knotteye ec57e23e9c Increment package version 2020-07-04 03:14:46 -05:00