1
0
mirror of https://github.com/stryan/mumble-discord-bridge.git synced 2024-11-14 11:45:40 -05:00
Commit Graph

55 Commits

Author SHA1 Message Date
Tyler Stiene
cb5ca33b0c remove default case from mumble onAudioStream 2021-01-16 13:40:12 -05:00
b1132114c9 re-merge from upstream 2021-01-12 11:41:48 -05:00
0973c3bf25 make NICE option toggleable 2021-01-12 10:40:12 -05:00
5616814c83
Merge pull request #3 from stryan/state-revamp
State revamp
2021-01-12 10:37:23 -05:00
e035baa3e9 fix mutexes 2021-01-09 16:38:36 -05:00
2e83d6d515 lint cleanup, remove code duplication 2021-01-08 14:38:21 -05:00
78dca8d9dc Merge branch 'state-revamp' of github.com:stryan/mumble-discord-bridge into state-revamp 2021-01-08 11:37:50 -05:00
2f4bf65d20 add mutexs to prevent data races, re-organize a bit 2021-01-08 11:36:22 -05:00
301bc1b3d1 remove global conf and state variables 2021-01-08 11:35:47 -05:00
ef8af89893 discord event listeners use non-global state 2021-01-08 11:32:27 -05:00
83712bfe15 mumble event listeners use non-global state 2021-01-08 11:32:27 -05:00
f4cc9498cb add mutexs to prevent data races, re-organize a bit 2021-01-06 19:12:56 -05:00
8e2fe4f3b7 actually add users in initial run 2021-01-05 21:58:38 -05:00
ab1046838c integrate mutex fix 2021-01-05 21:56:37 -05:00
645c7676c1 remove extra debug code 2021-01-05 20:33:40 -05:00
db0af7edcd remove global conf and state variables 2021-01-05 20:25:38 -05:00
ac800167f6 discord event listeners use non-global state 2021-01-05 20:21:08 -05:00
bcd7ee97ba mumble event listeners use non-global state 2021-01-05 19:43:55 -05:00
f41a2706c9
Merge pull request #2 from stryan/mumble-thread-cleanup
Mumble thread cleanup
2021-01-05 19:10:34 -05:00
4ae6176991 use gumble.Client.Do for sending messages thread safely 2021-01-05 19:08:17 -05:00
1e8a0a4165 count how many users are actually in channel 2021-01-05 19:00:28 -05:00
c469a65ed6 begin switching to mumble event listeners 2021-01-05 13:16:03 -05:00
bf166f7a9c
Merge pull request #1 from stryan/mode-system
add proper mode system
2021-01-05 12:23:02 -05:00
d75fff08f2 readme update 2021-01-05 12:16:51 -05:00
b7b1065abb use mumble client more,finally get user count right 2021-01-05 11:41:33 -05:00
2aa1a32d64 don't add users before the bridge starts 2021-01-04 21:54:29 -05:00
Tyler Stiene
43cc6ad672
Merge pull request #5 from Stieneee/issue-4 2021-01-04 21:28:35 -05:00
Tyler Stiene
7947e93a6d fix mutex issue 2021-01-04 21:27:30 -05:00
Tyler Stiene
a735f3f62f attempt to set niceness 2021-01-04 21:23:52 -05:00
8f5caaf834 actually add user to set 2021-01-04 20:53:03 -05:00
04f56bd3e0 update readme 2021-01-03 21:20:01 -05:00
41e864a0f3 send message when user leaves too 2021-01-03 20:52:30 -05:00
b782efdf04 keep track of discord users in set 2021-01-03 20:48:34 -05:00
8257bf55ab only care about joins, not mutes/deafens 2021-01-03 20:29:56 -05:00
f1f59116b5 don't try to send message before we connect to mumble 2021-01-03 20:25:51 -05:00
a86586ba57 actually use MumbleChannel config option 2021-01-03 20:21:55 -05:00
f63b9d005c send message in mumble when user joins in discord 2021-01-03 20:20:03 -05:00
ba29c23cae remove legacy ping/status seperation 2021-01-03 19:49:12 -05:00
70b0a691b6 remove debug code 2021-01-03 16:23:27 -05:00
665d42fc51 close channels so that everything dies properly 2021-01-03 16:19:49 -05:00
77cf328955 add auto_mode flag 2021-01-03 15:45:12 -05:00
4b8e6eea55 use user counting, add discord buffer debuf, intial auto mode 2021-01-03 15:32:59 -05:00
Tyler Stiene
f8518176d5 check if fromDiscordMap channel is full 2020-12-31 22:11:08 -05:00
ca1ba1d099 more cleanup on manual linkage, attempts to get discord->mumble working 2020-12-29 18:19:44 -05:00
2df391f0d9 less channel span, add refresh command 2020-12-29 15:23:43 -05:00
5a96c488ee initial changes, make it manual linking, show mumble users in status 2020-12-29 15:14:19 -05:00
Tyler Stiene
d9d30929ff
Merge pull request #1 from broncotc/main
add insecure server support
fix readme.md minor command line error
2020-11-30 19:30:15 -05:00
Hoshikawa Erina
4ee627b786 add insecure server support
- add mumble-insecure parameter to readme
- fix readme.md minor command line error
2020-11-28 00:54:21 -08:00
Tyler Stiene
ce98bbf971 more recent golang for dockerhub build 2020-11-11 23:38:54 -05:00
Tyler Stiene
dfab413f87 dsicord timeout
suppress repeating discord errors
2020-11-11 22:57:51 -05:00