Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
165 commits
Select commit Hold shift + click to select a range
38b1241
Merge everything that is mergeable, and pray
crim-dev Aug 28, 2021
0df3986
Update economy.json to prevent git cry
crim-dev Aug 28, 2021
be81dfa
Ready commands.js for modular update
crim-dev Aug 28, 2021
54e2c1c
MODULAR UPDATE!! (incomplete & partially tested)
crim-dev Aug 28, 2021
2fb5bab
Update files from Felix-44/Xilef
crim-dev Aug 28, 2021
83331d0
fix(driller): remove warning about ore log length
crim-dev Aug 29, 2021
63157b8
fix: actually use DrillerGame.max_health instead of unexistent local …
crim-dev Aug 29, 2021
05213fa
update: module values are no longer hex-encoded to avoid possible con…
crim-dev Aug 29, 2021
53700a7
Stuff, I just wanna update my fork man
crim-dev Aug 29, 2021
ad29b5f
Merge branch 'master' of https://github.com/Felix-44/Xilef into Felix…
crim-dev Aug 29, 2021
aeab938
Merge branch 'Felix-44-master'
crim-dev Aug 29, 2021
e45042c
test: add 1 to poly's money
crim-dev Oct 19, 2021
9fbdbf4
remote test: add 10 to poly's money
crim-dev Oct 19, 2021
d366832
local test: add 20 to poly's money
crim-dev Oct 19, 2021
56f0f0f
local test: fix merging issues
crim-dev Oct 19, 2021
2348729
Update economy.json
crim-dev Oct 19, 2021
87994e6
chore(auto-update): record changes in src/Data
crim-dev Oct 19, 2021
4cf98c0
chore(auto-update): merging
crim-dev Oct 19, 2021
ddc3ab7
delete everything
crim-dev Dec 15, 2021
75a7e7d
import command files from old xilef + add a test command
crim-dev Dec 16, 2021
54776e6
update gitignore
crim-dev Dec 16, 2021
69c60b4
add the new structures
crim-dev Dec 16, 2021
717cdc9
Add the new main structure, LocalClient, which handles 70% of the bot…
crim-dev Dec 16, 2021
a4e2448
add index.js
crim-dev Dec 16, 2021
9c2d92c
add main events
crim-dev Dec 16, 2021
22a764e
feat: add fs support to logger; add a doc typedef
crim-dev Dec 17, 2021
5c0bda0
change: loading commands and events now are filesystem operations (lo…
crim-dev Dec 17, 2021
90264e7
cleanup: delete src/commands/test.js
crim-dev Dec 17, 2021
9754f54
feat: add "clientReady" event;
crim-dev Dec 17, 2021
7cfe04e
feat: only use log files when not debugging
crim-dev Dec 17, 2021
3c69a87
cleanup: remove meaningless comment
crim-dev Dec 17, 2021
fa49e98
feat: some more logging for ready.js
crim-dev Dec 17, 2021
6b55bdc
rewrite(cmd): help command done
crim-dev Dec 17, 2021
be7c63b
feat: now log the amount of loaded commands
crim-dev Dec 17, 2021
ef2300a
feat: delete src/data/logs if bigger than 4MB
crim-dev Dec 17, 2021
48be812
fix: remove useless import of Event to prevent circular dependency;
crim-dev Dec 17, 2021
7ff7af8
feat: add the "category" element to Command
crim-dev Dec 17, 2021
013795c
fix: import client.js into event.js
crim-dev Dec 17, 2021
5a1ea2c
feat: create info.js
crim-dev Dec 17, 2021
984983c
create dice.js
crim-dev Dec 17, 2021
5876150
feat(cmd) + refactor: command files now can export multiple commands
crim-dev Dec 17, 2021
db1ac0a
rewrite: create images.js + jokes.js
crim-dev Dec 17, 2021
3309a28
rewrite: merge dice.js into math.js, add clown cmd
crim-dev Dec 17, 2021
93cb828
fix: Discord.MessageAttachment = MessageAttachment now
crim-dev Dec 17, 2021
e9127cc
fix: if no permissions defined then set permissions to 0
crim-dev Dec 17, 2021
9a5d5b6
skill issue
crim-dev Dec 17, 2021
db35ca4
fix: correct paths in images.js
crim-dev Dec 17, 2021
07816d3
fix: shift args so we can actually use the correct argument without m…
crim-dev Dec 17, 2021
589e2af
move: merge info.js into utility.js (create a src/commands/ file for …
crim-dev Dec 17, 2021
720075a
syntax: forgot a bracket
crim-dev Dec 17, 2021
ceb0a61
tweak: export Logger class from logger.js instead of create()
crim-dev Dec 17, 2021
e8f9ba5
remove create() from logger.js ?
crim-dev Dec 17, 2021
88a3a08
dependency-add: install bson format library
crim-dev Dec 18, 2021
96567fe
major rewrite: (see full commit message)
crim-dev Dec 18, 2021
7f0d47f
feat: add a "miscInfo" key to loggableEvents;
crim-dev Dec 18, 2021
beaeef2
fix: EconomySystem.users was being overwritten as an array due to stu…
crim-dev Dec 18, 2021
e1dda3d
feat: now log each loaded key from economy.bson;
crim-dev Dec 18, 2021
0103861
feat: (unfinished) create src/commands/economy.js
crim-dev Dec 18, 2021
9d7ea43
cleanup: remove unused class 'Balance'
crim-dev Dec 19, 2021
2c827e4
feat: add achievement "pool" to LocalClient
crim-dev Dec 19, 2021
4818fec
import LocalClient for easier command editing
crim-dev Dec 19, 2021
c4eaa3e
feat: create equivalent of FlagSystem;
crim-dev Dec 19, 2021
e3d3c32
feat: add the new vgot format to &stats (in-progress)
crim-dev Dec 19, 2021
352b6d2
fix&cleanup: remove unused Command import
crim-dev Dec 19, 2021
9432784
actually use colors.reset in logger
crim-dev Dec 19, 2021
bc46d39
cleanup: remove unnecessary code (check later commits)
crim-dev Dec 19, 2021
24f2c59
hotfix: add v_s to client
crim-dev Dec 19, 2021
9a05ad4
fix: now use Long instead of Number as it works a
crim-dev Dec 19, 2021
f9c7e9c
Merge
crim-dev Dec 19, 2021
66f7405
merge
crim-dev Dec 19, 2021
69f2c84
Correctly ignore directories? (yes)
crim-dev Dec 19, 2021
5d9f75f
remove src/data
crim-dev Dec 19, 2021
4baaa1f
Merge pull request #71 from unholy-codeism/rewrite-from-scratch
crim-dev Dec 19, 2021
c393f81
fix: remove conflict markers
crim-dev Dec 20, 2021
8f19b97
feat: a user may only run one command at a time;
crim-dev Dec 20, 2021
0265c0a
feat: introduce a &sleep command (test async cmd)
crim-dev Dec 20, 2021
d08f9c3
fix: send v_s in a separate embed
crim-dev Dec 21, 2021
f42fab8
fix: make UserBinaryData a string;
crim-dev Dec 21, 2021
18624b6
untrack economy.bson
crim-dev Dec 21, 2021
c6893e7
feature: add subcommands and required args
crim-dev Dec 21, 2021
11ccf16
Merge pull request #9 from unholy-codeism/subcommands
crim-dev Dec 21, 2021
e72e7c1
Merge branch 'master' into rewrite-from-scratch
crim-dev Dec 21, 2021
6e7201d
Merge branch 'master' into rewrite-from-scratch
crim-dev Dec 21, 2021
fd9ef0e
fix: do not respond to DM commands
crim-dev Dec 21, 2021
30fdde6
docs: add docs to RequiredArg;
crim-dev Dec 21, 2021
f3acb10
feat(cmd): create crew.js
crim-dev Dec 21, 2021
5808796
refactor: check the code changes there's too many
crim-dev Dec 21, 2021
eb6eb2e
cleanup: remove debug code
crim-dev Dec 21, 2021
434f511
fix: copy array with spread operator (crewNames)
crim-dev Dec 21, 2021
809aeb0
feat(cmdhandler): add proper error exposing
crim-dev Dec 21, 2021
115a6e4
Merge branch 'Felix-44:rewrite-from-scratch' into rewrite-from-scratch
crim-dev Dec 22, 2021
c427479
Merge branch 'rewrite-from-scratch' of https://github.com/unholy-code…
crim-dev Dec 22, 2021
2492ebe
cleanup: remove unused imports (index)
crim-dev Dec 23, 2021
8a21516
feat: introduce logplease as a future replacement for logger
crim-dev Dec 23, 2021
18ca6e4
feat: (re)create constants.js
crim-dev Dec 23, 2021
fee89d7
feat: move images to ./assets
crim-dev Dec 24, 2021
30ea16f
Merge pull request #17 from unholy-codeism/assets
crim-dev Dec 24, 2021
e192f14
fix: crass error - forgot to update images.js
crim-dev Dec 24, 2021
f026765
fix: skill issue
crim-dev Dec 24, 2021
383f66f
cleanup: remove unused requires in index.js
crim-dev Dec 24, 2021
64a7a36
Merge branch 'rewrite-from-scratch' of https://github.com/unholy-code…
crim-dev Dec 25, 2021
c94ebdd
feat(cmd): implement &help
crim-dev Dec 25, 2021
3e869de
feat: more loggers, more options;
crim-dev Dec 25, 2021
af00b32
Merge branch 'rewrite-from-scratch' of https://github.com/unholy-code…
crim-dev Dec 25, 2021
dcef970
feat(logger): implement logger for events
crim-dev Dec 25, 2021
50e1fa1
feat(logger): implement logger for LocalClient
crim-dev Dec 25, 2021
65c2c58
feat(logger): implement logger for economy.js
crim-dev Dec 25, 2021
9447595
fix: add the rest of the begin execution msg;
crim-dev Dec 25, 2021
60d3446
tweak: add guild name before channel name in exec
crim-dev Dec 25, 2021
a7369de
Merge pull request #18 from unholy-codeism/logplease
crim-dev Dec 25, 2021
0134d7b
cleanup: remove unused file src/logger.js
crim-dev Dec 25, 2021
97de5aa
patch: handle absence of subcommands
crim-dev Dec 25, 2021
b89155e
feat: move achievements and vs to constants.js
crim-dev Dec 25, 2021
b104cee
Merge branch 'rewrite-from-scratch' of https://github.com/unholy-code…
crim-dev Dec 25, 2021
658e863
tweak: add brainfuck and clash achievements
crim-dev Dec 25, 2021
7b25624
tweak: adapt cmd/economy to new achv. location
crim-dev Dec 25, 2021
650f258
minor: remove extra spaces from messageCreate
crim-dev Dec 25, 2021
8286e54
Merge pull request #19 from unholy-codeism/constants
crim-dev Dec 25, 2021
1891cae
rename: XilefUser -> XilefUserData
crim-dev Dec 25, 2021
586bcab
cleanup: remove debug code
crim-dev Dec 25, 2021
15b8829
Merge branch 'rewrite-from-scratch' into user-system-rewrite
crim-dev Dec 25, 2021
0159594
rewrite economy.js (read full commit msg):
crim-dev Dec 26, 2021
6651e89
tweak(cmd): adapt commands to new user system
crim-dev Dec 26, 2021
72a9918
fix: use rmdirSync -> rmSync as docs recommend
crim-dev Dec 26, 2021
4a911ae
fix: introduce user data check in ES.setUser()
crim-dev Dec 26, 2021
ab0e9b9
hotfix: introduce maxchangecount (see #21)
crim-dev Dec 26, 2021
dba1196
fix: export UserBinaryData
crim-dev Dec 26, 2021
d059378
major rewrite, read full commit msg:
crim-dev Dec 26, 2021
4bd9ed5
Merge pull request #23 from unholy-codeism/user-system-rewrite
crim-dev Dec 26, 2021
19d888e
tweak: remove validValues default in rArg ctor
crim-dev Dec 26, 2021
ccff2a8
style: uniformize style in cmd exec start log
crim-dev Dec 26, 2021
660c4d7
cleanup+fix: messageCreate.js
crim-dev Dec 26, 2021
93771f5
rewrite: crew.js now is complete
crim-dev Dec 26, 2021
5433dec
organisation: create src/structures
crim-dev Dec 26, 2021
c5275ba
feat: create parser.js
crim-dev Dec 26, 2021
6d44109
feat: add parser to index.js
crim-dev Dec 26, 2021
528fd62
fix: adjust incorrect paths due to src/structures
crim-dev Dec 26, 2021
b731902
Merge branch 'rewrite-from-scratch' into parser
crim-dev Dec 26, 2021
926d8cc
fix: saveFilePath now returns arg;
crim-dev Dec 26, 2021
419c24e
tweak(parser): implement parser in constants.js
crim-dev Dec 26, 2021
b6d3b44
implement parser in economy.js; bugfix: actually reset counter after …
crim-dev Dec 26, 2021
a7d6588
implement parser in client.js
crim-dev Dec 26, 2021
8a1c779
update testbot.bat
crim-dev Dec 26, 2021
07f3625
fix: replace `-` with nothing for convenience;
crim-dev Dec 26, 2021
bf93103
fix: saveFilePath now uses args instead of default
crim-dev Dec 26, 2021
14c21bc
logging: add some padding to command load log
crim-dev Dec 26, 2021
fa36ec5
Merge pull request #25 from unholy-codeism/parser
crim-dev Dec 26, 2021
4178106
fix(cmd): help
crim-dev Dec 26, 2021
bcd26e0
feat: introduce a checkValue function to reqArg
crim-dev Dec 26, 2021
87d71bd
syntax: typo
crim-dev Dec 27, 2021
eb14925
npm: add basic run scripts
crim-dev Dec 27, 2021
576ed9a
cleanup(bloat): remove command permissions
crim-dev Dec 27, 2021
070fe77
fix: on cmd error, unset runners[author.id]
crim-dev Dec 27, 2021
ccebb72
fix: catch copy exception due to new CLI args
crim-dev Dec 27, 2021
beb3ca0
feat: implement rArg.checkValue()
crim-dev Dec 27, 2021
da0dc39
(&help command improvements) :
crim-dev Jan 13, 2022
de39dd5
cleanup: remove batchfiles (replaced with npm scripts
crim-dev Jan 13, 2022
96d6d26
feature: introduce matrix.js
crim-dev Jan 14, 2022
22074ad
crim-dev Feb 14, 2022
61cb47a
feat(cmd): create matrix-test
crim-dev Feb 14, 2022
078b7bb
Merge pull request #27 from unholy-codeism/matrix
crim-dev Feb 14, 2022
4fd2cec
peek mafia
crim-dev Feb 14, 2022
a54c5b1
Merge pull request #73 from unholy-codeism/rewrite-from-scratch
Volas171 Jun 11, 2022
c6c85df
Merge branch 'master' into rewrite-from-scratch
Volas171 Jun 11, 2022
8d6c738
Revert "Merge branch 'master' into rewrite-from-scratch"
Volas171 Jun 11, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ dist
.pnp.*

# Data files
src/Data
src/data/

# Lua stuff
src/Lua
src/lua/
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Small bot with minigames, an economy system and miscellaneous commands

# Notice
This bot is kinda inactive on development, any help is appreciated.
This bot is in active development.

# Our Discord server
Official discord server join link : https://discord.gg/Qyz5HgrxWg
Expand All @@ -16,5 +16,5 @@ Official discord server join link : https://discord.gg/Qyz5HgrxWg
- Reversi : A (slightly) rarer board game played with two people.
- Roshambo : Simply rock paper scissors.
- BrainFuck: Figure out this esoteric language!
- Clash: build a small village and fight other's!
- More coming soon.
- Clash: build a small village and fight other's! (COMING SOON)
- Mafia: Among Us with roles (and other players) (COMING SOON)
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
113 changes: 112 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,16 @@
"description": "a funi bot",
"main": "src/index.js",
"scripts": {
"test": "test"
"start": "node src/index.js loglvl=INFO savePath=./src/data/production/economy.bson",
"help": "node src/index.js help",
"dev": "node src/index.js debug=true loglvl=DEBUG safter=1"
},
"author": "Felix44",
"license": "gpl3",
"dependencies": {
"bson": "^4.6.0",
"discord.js": "^13.3.0",
"dotenv": "^10.0.0"
"dotenv": "^10.0.0",
"logplease": "^1.2.15"
}
}
117 changes: 0 additions & 117 deletions src/Minigames/brainfuck.js

This file was deleted.

Loading