Commit Graph

337 Commits

Author SHA1 Message Date
Thomas Smyth
69096b00af ESLint & README Generation 2021-01-30 17:23:25 +00:00
Thomas Smyth
9b5603d2b7
Merge pull request #135 from 11TStudio/patch-4
Update scbl-info.js
2021-01-30 17:21:50 +00:00
Thomas Smyth
2da73e58d2 Sort plugins alphabetically 2021-01-30 17:01:52 +00:00
11T Studio
3d464cb4c7
Update scbl-info.js
if we have no info about the user than it should stop the code there.
2021-01-30 16:38:14 +01:00
Thomas Smyth
95b8baf560 Dynamically load plugins 2021-01-30 14:39:56 +00:00
Thomas Smyth
90540f0e09 Fix error in auto-tk-warn 2021-01-28 20:13:53 +00:00
Thomas Smyth
b5fb12e739
Merge pull request #134 from SeanWalsh95/admin-list-edits
Admin list edits
2021-01-28 18:18:19 +00:00
SeanWalsh95
6a1cce8720 prefer for loop for readability 2021-01-28 12:47:08 -05:00
SeanWalsh95
b965e4a1d6 admin list parse improvements 2021-01-28 12:41:13 -05:00
Thomas Smyth
f2717e0f62 Wrap SCBL API call in try catch 2021-01-15 10:27:58 +00:00
Thomas Smyth
a5f35d5915 Fix SCBL Info plugin's threshold option 2021-01-15 09:55:10 +00:00
Thomas Smyth
6f2c9507e3 Fix template literals for copyright message 2021-01-14 21:43:51 +00:00
Marek
dad56897f6
fixed terminology 2021-01-15 02:23:37 +06:00
werewolfboy13
8ea54b9f4f Updated Year For Copyright Message 2021-01-14 14:09:21 -06:00
SeanWalsh95
0937c528b3 ESLint & README Generation 2021-01-12 23:31:59 +00:00
SeanWalsh95
b51c100f55 fix for issue #124
lists use .includes not in
2021-01-12 18:30:02 -05:00
SeanWalsh95
0457464113 simplify tracking conditions 2021-01-12 16:21:33 -05:00
Thomas Smyth
b604ab9195
Merge pull request #125 from SeanWalsh95/kick-unassigned-patch
Auto-Kick-Unassigned patch
2021-01-12 17:08:58 +00:00
SeanWalsh95
c29d924524 fix refrence change per f67a8bb 2021-01-12 12:09:09 -05:00
SeanWalsh95
76129078c3 rm async/await on non asynchronous functions and calls 2021-01-12 12:02:38 -05:00
SeanWalsh95
4aa0412ee5 move adminList logic to pulling from server instead of storing copy on init
changes per https://github.com/Thomas-Smyth/SquadJS/pull/125#issuecomment-758783309
2021-01-12 11:59:08 -05:00
SeanWalsh95
5c5be9295c Fix bug whre getAdmin returns perms instead of S64IDs 2021-01-12 11:33:28 -05:00
SeanWalsh95
b17a411f8d move adminList gets to mount() 2021-01-12 11:17:55 -05:00
Thomas Smyth
90795883fd Update dependencies 2021-01-09 15:16:00 +00:00
Thomas Smyth
8ca9c0b38b Update SquadJS API requests 2021-01-09 14:51:59 +00:00
Thomas Smyth
62b857c391 Fix identation 2021-01-08 15:41:51 +00:00
werewolfboy13
59f93c6e67 fixed placing 2021-01-08 09:38:22 -06:00
werewolfboy13
88975c3b4d added examples 2021-01-08 09:22:47 -06:00
werewolfboy13
47ee70eaa8 fixed templates 2021-01-07 17:45:56 -06:00
Thomas Smyth
23518b4d97 Add SCBL plugin 2021-01-07 20:52:55 +00:00
Thomas Smyth
f67a8bba93 Rename readme 2021-01-07 16:38:59 +00:00
Thomas Smyth
2ea2ec7484 Improve logo on startup 2021-01-07 16:37:27 +00:00
Thomas Smyth
92d77e3712 Update axios 2021-01-05 00:02:13 +00:00
Thomas Smyth
cb5088d88a Fix gradient error 2021-01-04 22:51:32 +00:00
11T Studio
34e5118ac8
Forget return after condition is ment 2021-01-01 19:40:52 +01:00
Thomas Smyth
4a9521a8f9 Merge branch 'beta' into pr/112 2020-12-26 17:58:20 +00:00
Thomas Smyth
dd0c751315
Merge pull request #113 from SeanWalsh95/unassigned-kick-patch
Edits to auto-kick-unassigned docs
2020-12-26 17:11:19 +00:00
11T Studio
203f357888
Check only via layerclassname
This would fix the issues with showing the last played layer and not the current one.
2020-12-22 23:25:42 +01:00
SeanWalsh95
1dc32cb4b6 Change config to always use Seconds 2020-12-22 17:12:30 -05:00
SeanWalsh95
d1a4bd276a alter auto-kick-unassigned docs to be more clear 2020-12-22 13:52:42 -05:00
SeanWalsh95
a2e8c37934 fix db-log 2020-12-16 15:24:35 -05:00
SeanWalsh95
3a2c67474b make plugin options an unorderd list 2020-12-16 15:17:55 -05:00
SeanWalsh95
dff68be6bc small spelling fixes 2020-12-16 14:28:55 -05:00
SeanWalsh95
35f874daf1 rm legacy flag from config 2020-12-16 14:22:01 -05:00
SeanWalsh95
ba8bc215fb prefer relitive links 2020-12-16 14:21:31 -05:00
SeanWalsh95
9ea999cb13 rm second br 2020-12-16 14:07:41 -05:00
SeanWalsh95
1a8eface18 better formatting for github 2020-12-16 14:05:25 -05:00
SeanWalsh95
683d91de1c rm redundant hz rule 2020-12-16 14:03:50 -05:00
SeanWalsh95
7d37369de9 alternate cfg for FTP + readme changes
nested ftp config inside server cfg to pass entire cfg to LogParser, alterations are overridden as needed.

Formatted readme to be able to find relevent sections quicker by collapseing detailed content.

moved info about creating plugins to plugin folder and refrenced from main readme

Small changes to readme to support new formats in the cfg file
2020-12-16 14:00:40 -05:00
Thomas Smyth
58c3521679 Merge branch 'beta' of https://github.com/Thomas-Smyth/SquadJS into beta 2020-12-14 17:29:28 +00:00
Thomas Smyth
2ae4490829 Import DiscordTeamkill 2020-12-14 17:29:07 +00:00
Levent007
c787aa3565 Adding support for multi-ip rcon 2020-12-12 21:47:06 +01:00
Thomas Smyth
baf07a79b6 Refactor log parser 2020-12-10 20:46:29 +00:00
Thomas Smyth
f434e94199 Refactor RCON 2020-12-10 18:51:32 +00:00
Thomas Smyth
f6134e0659 Fix sequelize connection string config 2020-12-09 14:33:56 +00:00
SeanWalsh95
465a281828
I hate the web editor 2020-12-08 16:43:00 -05:00
SeanWalsh95
b9d18c690e
Update config-template.json 2020-12-08 16:40:26 -05:00
SeanWalsh95
f55df738cf
add nested logger settings to template 2020-12-08 16:36:34 -05:00
SeanWalsh95
238fcc79f4
update config references 2020-12-08 15:27:17 -05:00
Thomas Smyth
879a20a87a
Merge pull request #107 from SeanWalsh95/patch-1
SquadJS logging for MySQL
2020-12-08 20:20:51 +00:00
SeanWalsh95
2d70653609
Update factory.js 2020-12-08 15:01:21 -05:00
Thomas Smyth
fc904d37ca Correct reviver name type 2020-12-08 18:28:07 +00:00
Thomas Smyth
daee6f50db Add match to TickRate and PlayerCount 2020-12-08 17:58:31 +00:00
SeanWalsh95
362468c252
Log MySQL to logger
Sends Sequelize logging to Logger.verbose so that it is toggleable via SquadJS configs
2020-12-08 12:39:34 -05:00
Thomas Smyth
c350d767e6 Fix typo 2020-12-08 17:32:43 +00:00
Thomas Smyth
491c31ef56 Update readme with logDir info 2020-12-08 17:32:26 +00:00
Thomas Smyth
b156772cf0 Update readme with FTP info 2020-12-08 17:30:49 +00:00
Thomas Smyth
cef5e0d337 Replace loc with source 2020-12-08 17:26:31 +00:00
Thomas Smyth
09a919a328 Update readme 2020-12-08 17:22:36 +00:00
Thomas Smyth
8a29ad043f Fix out of date version system 2020-12-08 17:16:32 +00:00
Thomas Smyth
fb7ba533a9 Throw error on missing plugin 2020-12-08 16:52:44 +00:00
Thomas Smyth
255e9c7968 Convert AutoKickUnassigned & Tidy Code 2020-12-08 16:40:56 +00:00
Thomas Smyth
fae5dd4efa
Merge branch 'v2' into auto-kick-afk 2020-12-08 12:17:02 +00:00
Thomas Smyth
fc629ebc77 DBLog Plugin 2020-12-08 12:13:53 +00:00
SeanWalsh95
83fb25737e format object passed in event 2020-12-07 21:59:45 -05:00
Thomas Smyth
e02a5417f6 Add matches to DBLog 2020-12-06 23:09:33 +00:00
Thomas Smyth
3fb00b6dd1 Add player counts to DBLog 2020-12-06 21:45:06 +00:00
Thomas Smyth
915ec298f3 Lint 2020-12-06 21:23:05 +00:00
Thomas Smyth
6107612fb2 DBLog Plugin WIP 2020-12-06 21:21:41 +00:00
Thomas Smyth
ea72cd0666 Merge branch 'v2' of https://github.com/Thomas-Smyth/SquadJS into v2 2020-12-03 14:16:43 +00:00
Thomas Smyth
dd685ecd80 Rewrite of plugin system 2020-12-03 14:16:07 +00:00
SeanWalsh95
88edf5ca5b
small discord-rcon fix 2020-11-17 15:23:45 -05:00
SeanWalsh95
c7b2763cc7 AdminList suport for local files 2020-11-10 11:31:24 -05:00
Thomas Smyth
86d0878174 Add verbose shortcut to plugins 2020-11-10 13:04:38 +00:00
Thomas Smyth
3daf73de86 Add more logging from SquadServer 2020-11-09 21:10:32 +00:00
SeanWalsh95
4c902c3809 Logging changes 2020-11-09 13:42:19 -05:00
SeanWalsh95
9acd34ffb9 more logging 2020-11-07 20:23:21 -05:00
SeanWalsh95
1005c775be change to actual option name + sub count for length 2020-11-07 20:23:00 -05:00
Thomas Smyth
8de7368163 lint 2020-11-08 00:10:55 +00:00
SeanWalsh95
cfd245651d fix missing attr 2020-11-07 18:52:21 -05:00
SeanWalsh95
00370ec283
Merge branch 'v2' into auto-kick-afk 2020-11-07 18:50:40 -05:00
SeanWalsh95
584e0f8d44 rm queue option + reorder conditions 2020-11-07 18:48:16 -05:00
SeanWalsh95
e016f23f55 update to support new util admin lists 2020-11-07 18:43:28 -05:00
SeanWalsh95
11b8801c2f move fetching admin lists to util 2020-11-07 18:43:08 -05:00
Thomas Smyth
9d45d4c13d Refactor SquadServer factory 2020-11-07 12:03:25 +00:00
SeanWalsh95
6ad552b7b0 Descriptive Plugin Error Message
error message for the case where a plugin is defined in the config file but does not exist in the codebase
2020-11-05 11:32:25 -05:00
SeanWalsh95
013ace439f Merge branch 'v2' of https://github.com/Thomas-Smyth/SquadJS into Thomas-Smyth-v2 2020-11-05 11:02:16 -05:00
Thomas Smyth
d32d3000d9 Refactor template scripts 2020-11-04 23:17:21 +00:00
SeanWalsh95
d23e7e6d74 fix typo 2020-10-30 17:30:24 -04:00
SeanWalsh95
f63dfa26a4 move remoteAdmins to connectors 2020-10-30 17:17:53 -04:00
SeanWalsh95
7dd1e57953 rename afk => unassigned
+ typo
2020-10-30 15:58:31 -04:00
SeanWalsh95
9d3178ce2b more readable group matching 2020-10-29 13:14:20 -04:00
SeanWalsh95
579c0e2df2 formatting + ensure afk on kick 2020-10-28 17:03:46 -04:00
SeanWalsh95
7b1301ee73 consistent lint 2020-10-28 15:36:47 -04:00
SeanWalsh95
ce76895e10 add logging/ fix logic 2020-10-28 15:33:21 -04:00
SeanWalsh95
bd12bd9bfc refactor for readabliity
add comments and move functions from constructor to class
2020-10-28 14:43:22 -04:00
SeanWalsh95
0763f0ebab track warnings, emit event when kicking player 2020-10-27 19:02:55 -04:00
SeanWalsh95
602b8bf720 more descriptive option name 2020-10-27 18:09:11 -04:00
SeanWalsh95
490e4068e7 add ignoreAdmins 2020-10-27 17:48:09 -04:00
SeanWalsh95
41f9572986 add admins from remote adminlist 2020-10-27 17:31:05 -04:00
SeanWalsh95
a2793326b2 use objects instead of array 2020-10-26 03:03:45 -04:00
SeanWalsh95
ccecf1d9d7 fix loops 2020-10-25 20:44:05 -04:00
SeanWalsh95
e2e1c80a29
Merge branch 'v2' into auto-kick-afk 2020-10-25 20:39:34 -04:00
SeanWalsh95
a051358c60 round start grace period and remove tracking on server PLAYER_SQUAD_CHANGE event 2020-10-25 20:24:28 -04:00
SeanWalsh95
20f0e101eb add PLAYER_TEAM_CHANGE/PLAYER_SQUAD_CHANGE events 2020-10-25 20:15:08 -04:00
Thomas Smyth
359b0319da Rcon client rewrite 2020-10-26 00:11:47 +00:00
SeanWalsh95
1d3e6e8a5e add new logging 2020-10-25 19:31:46 -04:00
SeanWalsh95
c9278f99bb Merge branch 'auto-kick-afk' of https://github.com/SeanWalsh95/SquadJS into auto-kick-afk 2020-10-25 19:18:30 -04:00
SeanWalsh95
6a19fcf8c4 change to timers for warnings and kicks
test more when RCON for v2 is stable
2020-10-25 19:18:24 -04:00
SeanWalsh95
264d05c5b6
Merge branch 'v2' into auto-kick-afk 2020-10-25 13:42:30 -04:00
SeanWalsh95
54ec6ca8c0 comments 2020-10-25 13:38:18 -04:00
Thomas Smyth
0d5bd481f0 Add additional logging to LogParser 2020-10-25 14:28:36 +00:00
Thomas Smyth
7262533f0e Use Logger in LogParser and RCON 2020-10-25 14:24:48 +00:00
Thomas Smyth
e39d36d6d2 Refactor logging 2020-10-25 13:59:57 +00:00
Thomas Smyth
4189e4dc53 Send SquadJS version in API ping 2020-10-25 13:42:34 +00:00
Thomas Smyth
56b48b0dd4 Update SquadJS API route 2020-10-25 13:37:24 +00:00
Thomas Smyth
1bf1317800 Ping config information to SquadJS API 2020-10-23 11:38:06 +01:00
Thomas Smyth
861571c5b8 Add rawOptions and use this.server in plugins 2020-10-23 11:29:38 +01:00
Thomas Smyth
e29e8fc785 Rebase plugin options 2020-10-23 11:18:23 +01:00
SeanWalsh95
b784a9f4c9 add more options 2020-10-22 20:22:34 -04:00
Thomas Smyth
cb92d168ed Add outdated version warning 2020-10-22 23:30:43 +01:00
SeanWalsh95
de49addc95 init afk plugin for v2 2020-10-22 17:06:28 -04:00
Thomas Smyth
58ffc88085 Add support for useListForSize 2020-10-22 18:18:44 +01:00
Thomas Smyth
cfbebb4ad4 TeamRandomizer plugin 2020-10-21 22:49:07 +01:00
Thomas Smyth
d9e3d2b041 DiscordTeamkill plugin 2020-10-21 22:18:34 +01:00
Thomas Smyth
3f67128160 Accept config as environmental variable 2020-10-21 21:00:37 +01:00
Thomas Smyth
d6ccde4db6 DiscordRoundWinner plugin 2020-10-21 20:28:29 +01:00
Thomas Smyth
e30bacbfe0 DiscordServerStatus plugin 2020-10-16 16:57:22 +01:00
Thomas Smyth
a6f3db94be DiscordDebug plugin 2020-10-16 16:17:02 +01:00
Thomas Smyth
e0691cc0a7 DiscordPlaceholder plugin 2020-10-16 16:06:10 +01:00
Thomas Smyth
2ba158ca7a Improve DiscordSubsystemRestarter responses 2020-10-14 19:51:33 +01:00
Thomas Smyth
84762a4a5c DiscordAdminCamLogs & DiscordSubsystemRestarter plugins 2020-10-14 19:50:35 +01:00
Thomas Smyth
68c685ff19 Improve log parsing 2020-10-14 17:01:19 +01:00
Thomas Smyth
b8e9506cbf Minor bug fixes 2020-10-13 22:37:53 +01:00
Thomas Smyth
4c8364b86e Export DiscordChat plugin 2020-10-13 13:03:18 +01:00
Thomas Smyth
ce1f79bb6a Handle embed copyright in DiscordBasePlugin 2020-10-13 13:02:31 +01:00
Thomas Smyth
0cc1c9c01b DiscordBasePlugin & DiscordChat plugin 2020-10-13 12:59:07 +01:00
Thomas Smyth
7d7d4369f0 DiscordAdminRequest plugin 2020-10-13 12:08:21 +01:00
Thomas Smyth
c53347eea0 Remove local only message 2020-10-12 22:49:05 +01:00
Thomas Smyth
fc57fc0943 DiscordAdminBroadcast plugin 2020-10-12 22:39:56 +01:00
Thomas Smyth
6fcd26913a AutoTKWarn plugin 2020-10-12 22:12:36 +01:00
Thomas Smyth
2061429e42 DiscordRcon Permissions
Adaptation of https://github.com/Thomas-Smyth/SquadJS/pull/85

Co-Authored-By: SeanWalsh95 <14982667+SeanWalsh95@users.noreply.github.com>
2020-10-12 22:04:51 +01:00
Thomas Smyth
f923e9179e Add ftpHost option 2020-10-12 21:38:15 +01:00
Thomas Smyth
cfde3b2f6a Tidy DiscordRcon plugin 2020-10-05 23:18:03 +01:00
Thomas Smyth
47b8b3321a DiscordRcon plugin 2020-10-05 23:10:40 +01:00
Thomas Smyth
122a4a5ec0 Wrap intervalled data collection in try catch blocks 2020-10-05 22:53:24 +01:00
Thomas Smyth
4501ab9779 ChatCommands, IntervalledBroadcasts & SeedingMode plugins 2020-10-05 22:47:33 +01:00
Thomas Smyth
31edc04390 Fix plugin enabled option 2020-10-05 19:01:43 +01:00
Thomas Smyth
3f9040dc15 Fix SquadLayers call in updateLayerInformation 2020-10-05 18:58:24 +01:00
Thomas Smyth
39efc08a78 SquadJS v2.0 Initial Framework 2020-10-05 18:56:45 +01:00
Thomas Smyth
516d4512e1
Prevent refetching in getPlayerByName suffix 2020-10-03 20:10:59 +01:00
Thomas Smyth
25c92194bb
Add Linux support for round winner 2020-09-28 22:33:52 +01:00
Thomas Smyth
0f3259d14a Fix round winner nulling logic 2020-09-15 01:18:04 +01:00
IgnisAlienus
4246994ea0 Update Round Winner -4 2020-09-14 14:55:14 -05:00
IgnisAlienus
df12bd3040 Update Round Winner -3 2020-09-14 14:44:47 -05:00
IgnisAlienus
9788d60780 Update Round Winner Again 2020-09-14 14:34:14 -05:00
IgnisAlienus
83b2033b0f Update Round Winner 2020-09-14 14:25:18 -05:00
IgnisAlienus
6555ec7b8b round winner 2020-09-13 17:31:28 -05:00
Luis Martin Schick
a99aaf1167
Update events.js
Wrong event description
2020-09-09 16:28:01 +02:00
Thomas Smyth
d139a41f88 Rename events 2020-09-09 14:02:56 +01:00
Thomas Smyth
702a717833 Add SquadJS factory and refactor existing code 2020-08-20 21:21:03 +01:00
Thomas Smyth
f3760ebdd2 Add Admin Broadcast log parsing 2020-07-14 20:17:10 +01:00
Thomas Smyth
e0e44d6e4a Update ftp-tail 2020-06-30 19:15:50 +01:00
Thomas Smyth
bd0ff86d4a Add log parsing over FTP 2020-06-30 19:15:49 +01:00
Thomas Smyth
4445adf8f7 Increase line lengths 2020-06-14 12:58:27 +01:00
Thomas Smyth
aee900831c Revamp mapvote plugin 2020-06-13 15:33:44 +01:00
Thomas Smyth
b3acb396d1 Fix missing victim info from revives 2020-05-30 13:49:05 +01:00
Thomas Smyth
7229ba3fb9 Add more options to discord-teamkill 2020-05-30 12:13:01 +01:00
Thomas Smyth
90df3368ad Fix incorrect disconnect method in rcon 2020-05-28 20:41:18 +01:00
Thomas Smyth
45d81d6504 Fix UnPossess regexes on Linux 2020-05-21 22:08:07 +01:00
Thomas Smyth
a59b6dab8c Fix LOG_PARSER_PLAYER_WOUNDED event on Linux 2020-05-18 17:33:54 +01:00
Thomas Smyth
57ed25f07f Attempt to resolve memory leaks 2020-05-18 16:41:32 +01:00
Thomas Smyth
a469af2719 Improve the way the A2S player count is collected 2020-05-18 16:34:43 +01:00
Thomas Smyth
ef3184e41a Improve regex for layer collection via RCON 2020-05-15 21:41:44 +01:00
Thomas Smyth
398f36966a Improve admin cam usage detection 2020-05-15 20:23:16 +01:00
Thomas Smyth
6a85afadf2 Fix lack of updating of server information 2020-05-15 19:56:03 +01:00
Thomas Smyth
3eb53c2ada SquadJS v1 2020-05-15 18:42:39 +01:00