Commit Graph

234 Commits (d79eac6b57bb6113b7e509054caa6dbe05b13623)

Author SHA1 Message Date
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
knotteye ae603ddad6 Normalize discord messages into human-readable plaintext. 2020-07-04 03:09:32 -05:00
knotteye cd70d5d4ab Merge branch 'develop' into 'master'
Fix for not transcoding streams which aren't already mp4 encoded.

See merge request knotteye/satyr!9
2020-06-30 06:28:39 +00:00
knotteye 65894b6f2e Fix for not transcoding streams which aren't already mp4 encoded. 2020-06-30 06:26:42 +00:00
knotteye 94822cafb2 Merge branch 'develop' into 'master'
Develop -> Master

See merge request knotteye/satyr!8
2020-06-28 07:25:34 +00:00
knotteye 6073781457 Forgot to include twitch chat dependency 2020-06-27 23:45:47 -05:00
knotteye 0bde9e0b86 Update documentation 2020-06-27 23:39:57 -05:00
knotteye b2759c5298 Update documentation. 2020-06-27 23:27:47 -05:00
knotteye fc924816df Increment version. 2020-06-27 22:46:34 -05:00
knotteye 4bd10151f8 Switch from video.js to dash.js, it seems to be more consistent and hiccup less during streams.
This means transcoding to HLS is no longer an option.
Also add a bit of JS to reload the stream periodically if it hadn't started when the page was loaded.
That thing spits out errors fucking constantly, so hopefully it won't cause any problems.
2020-06-27 12:11:42 -05:00
knotteye ee6c902905 Change profile page to use textareas 2020-06-27 11:08:34 -05:00
knotteye b57e1d48e6 Fix bug where the profile page wouldn't set record flag. 2020-06-27 10:21:00 -05:00
knotteye 4628deec1c Add VOD management page and the ability to delete the user's own vods 2020-06-27 08:34:09 -05:00
knotteye 0b4a7d6321 Increment version 2020-06-27 07:41:38 -05:00
knotteye 19536d8b84 Add working twitch chat relay 2020-06-27 05:25:40 -05:00
knotteye 29d2090540 Add working IRC integration 2020-06-27 03:23:04 -05:00
knotteye 1ef736ca17 Working discord chat integration 2020-06-27 02:36:45 -05:00