468bc00cd2
emoji improvments
2021-08-22 08:08:20 -05:00
cb1bef27c6
fix?
2021-08-21 13:30:10 -05:00
2bb00f2d0e
fix
2021-08-21 13:20:08 -05:00
Your New SJW Waifu
d82d8f4b39
Merge pull request 'Remove meme size emojis' ( #5 ) from emojis into master
...
Reviewed-on: #5
2021-08-21 15:37:27 +02:00
f106259f4d
Remove meme size emojis
2021-08-21 08:34:59 -05:00
Your New SJW Waifu
e4ba5093d0
Merge pull request 'I'm a tard' ( #4 ) from more-emoji-formats into master
...
Reviewed-on: #4
2021-08-18 19:06:30 +02:00
17ad535b3c
I'm a tard
2021-08-18 12:04:52 -05:00
Your New SJW Waifu
1e9fb32852
Merge pull request 'Ugh I accidentally the jpg' ( #3 ) from more-emoji-formats into master
...
Reviewed-on: #3
2021-08-18 02:40:24 +02:00
85538e5957
Ugh I accidentally the jpg
2021-08-17 19:38:21 -05:00
Your New SJW Waifu
c6c6df08be
Merge pull request 'add support for jpg and svg emotes' ( #2 ) from more-emoji-formats into master
...
Reviewed-on: #2
2021-08-18 02:26:58 +02:00
92be1e9307
add support for jpg and svg emotes
2021-08-17 19:25:04 -05:00
6948550d18
update defaults
2021-08-17 18:40:51 -05:00
Your New SJW Waifu
1477b36339
Merge pull request 'add emojis' ( #1 ) from emojis into master
...
Reviewed-on: #1
2021-08-15 21:04:37 +02:00
3f357b6644
add emojis
2021-08-15 13:54:50 -05:00
Your New SJW Waifu
bc0c48994b
Merge remote-tracking branch 'upstream/master'
2021-08-15 12:18:38 -05:00
3396761efe
Merge pull request #158 from zorglube/makefile_bsd_rollback
...
Makefile bsd rollback
2021-06-26 11:04:46 -04:00
9f24f7b1ed
Merge pull request #156 from zorglube/viewers_stats
...
Stream Viewers stats
2021-06-26 10:56:01 -04:00
27fb0ddaf1
disclaimer
2021-03-28 10:13:43 -05:00
14a15fd64f
more clear example for average setup
2021-03-28 10:09:54 -05:00
1181f6ba14
better example
2021-03-28 10:07:04 -05:00
a652a6c3d3
Big wumbo jumbo update
2021-03-28 09:59:56 -05:00
4bfe5aba24
update readme
2021-03-28 09:57:29 -05:00
efbb284eb8
Zorch review, use `session.ID` to count running stream
2021-03-20 22:32:13 +01:00
73842dc93e
Merge branch 'makefile_bsd_rollback' of https://github.com/zorglube/MovieNight.git into makefile_bsd_rollback
2021-03-17 21:12:10 +01:00
3ab58eced2
Merge branch 'makefile_bsd_rollback' of
...
https://github.com/zorglube/MovieNight.git into makefile_bsd_rollback
2021-03-17 21:11:52 +01:00
4bc4c6852c
Merge branch 'makefile_bsd_rollback' of https://github.com/zorglube/MovieNight.git into makefile_bsd_rollback
2021-03-17 21:09:52 +01:00
2e45392f68
Finally found a way to correctly build on BSD, so remove BSD specific
...
Makefile.
2021-03-17 21:09:39 +01:00
43d95a25ae
Finally found a way to correctly build on BSD, so remove BSD specific
...
Makefile.
2021-03-17 00:07:44 +01:00
b2eea597bd
Merge branch 'viewers_stats' of
...
https://github.com/zorglube/MovieNight.git into viewers_stats
Conflicts:
handlers.go
2021-03-16 22:48:43 +01:00
afc9f19e36
Count the streams using the 'http' sessions instead of the 'IP'.
2021-03-16 22:48:18 +01:00
5a03e809ba
Count the streams using the 'http' sessions instead of the 'IP'.
2021-03-16 22:43:55 +01:00
bcd248ffb0
Merge branch 'viewers_stats' of https://github.com/zorglube/MovieNight into viewers_stats
2021-03-15 23:55:30 +01:00
6947d87f9f
Stream Viewers minimal statistics.
2021-03-15 23:55:18 +01:00
3a4dd41f75
Stream Viewers minimal statistics.
2021-03-15 23:48:41 +01:00
9ba472bb5b
Merge pull request #154 from zorglube/master
...
Update readme, FreeNAS plugin had been released
2021-03-13 14:11:58 -05:00
19438a1409
Update readme, FreeNAS plugin had been released
2021-03-13 20:08:11 +01:00
127fb4c3fa
Gracefully shutdown HTTP server
...
Rearranged how the RTMP and HTTP servers are started so they could be
gracefully shutdown easier.
Currently, only the HTTP server is gracefully shutdown. I'm unsure if
it is even possible for the RTMP server. The documentation for the RTMP
library is basically non-existent, so it's impossible to know for sure
without diving into the library code.
2021-02-07 15:55:51 -05:00
f76d184173
Don't hardcode emote size
...
Replaced the hardcoded height attribute in the emote img tags with a
class attribute. This allows the emotes to be resized with the change
of a CSS value instead of recompiling the server.
Resolves #150
2021-01-16 15:36:44 -05:00
d06e2251a4
Separate /live and / http handlers
...
Separate the /live and / (main) http handlers. This cleans up the
related code a little bit and makes it a lot easier to follow.
2021-01-16 15:29:23 -05:00
e051cade78
Allow the pin to be passed in via the URL
...
Instead of only prompting the user for a pin, also allow it to be passed
in as the URL parameter "pin".
2021-01-10 20:09:30 -05:00
ebc51f938c
Remove the /pin endpoint
...
This was never supposed to be in there.
2021-01-10 20:09:30 -05:00
58bd6e8a3a
Merge pull request #148 from Raz-Hemo/windows-cross-fix
...
fix windows cross compiling
2021-01-10 12:15:02 -05:00
238d80658b
Cleanup incoming stream handler
...
Cleaned up the incoming RTMP handler to close connections on error.
The code aquireing the RTMP channel was also rewritten to be more
idomatic and easier to follow.
2021-01-10 12:04:16 -05:00
b3b9255ea0
Merge pull request #147 from Bruno-DaSilva/master
...
Add unlocks to error cases in handlers::handlePublish()
2021-01-10 11:46:31 -05:00
faa0792e9c
fix windows cross compiling
2021-01-08 11:42:40 +02:00
ded51b2b20
Add unlocks to error cases in handlers::handlePublish()
...
In handlers::handlePublish(), the mutex for the rtmp stream is locked at the beginning of the function. The previous implementation checked for error cases (e.g. incorrect stream key), logging and immediately returning if an error case was found. The mutex, however, was not unlocked, leading to the server effectively 'freezing' as other interactions try and lock that mutex.
This MR adds mutex unlocks in each error case to ensure that the server continues to function in the event of a recoverable error.
2020-12-01 21:23:41 -08:00
9da46087e1
Merge pull request #144 from zorglube/master
...
Templated the chat messages.
2020-11-14 12:39:15 -05:00
0fa99f7ab4
Templated the chat messages.
2020-11-11 20:51:29 +01:00
e26ae33758
Fix building on non-windows machines
...
Don't default to windows if GOOS is not set. Likewise, don't default to
386 if GOARCH isn't set. Go will use the system's default values, or
any values set before running `make`.
2020-11-04 23:20:15 -05:00
a840f80f9a
Fix make recipe for wasm_exec.js file
...
Add GO_VERSION to the command that copies the wasm_exec.js file so it
will look in the correct folder when using an alternate version of Go.
2020-11-04 22:59:01 -05:00
Your New SJW Waifu
Your New SJW Waifu
Nick
sjw
Zorglube
Zorglube
Raz Hemo
Bruno-DaSilva