Skip to content

Commit

Permalink
subcommand overhaul and added graceful logout
Browse files Browse the repository at this point in the history
  • Loading branch information
@ClementJ18
ClementJ18 committed Jul 24, 2017
1 parent 8d8dc70 commit 9bb9a30
Show file tree
Hide file tree
Showing 9 changed files with 315 additions and 215 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ data/token.txt
soup
*.pyc
adventure
selfbot
selfbot
__pycache__/var.cpython-36.pyc
Binary file modified __pycache__/var.cpython-36.pyc
View file
Binary file not shown.
321 changes: 162 additions & 159 deletions bot.py
View file

Large diffs are not rendered by default.

99 changes: 98 additions & 1 deletion data/logfile.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,4 +350,101 @@ Sat Jul 22 22:31:02 2017: Necro#6714 used <@317619283377258497> info <@271259290
Sat Jul 22 22:31:35 2017: Necro#6714 used <@317619283377258497> warn del <@271259290415792129> 0
Sat Jul 22 22:31:56 2017: Necro#6714 used <@317619283377258497> purge 10
Sat Jul 22 22:33:17 2017: Necro#6714 used <@317619283377258497> nick <@172002275412279296> Tatsu
Sat Jul 22 22:33:48 2017: Necro#6714 used n!kill
Sat Jul 22 22:33:48 2017: Necro#6714 used n!kill
Sat Jul 22 22:48:30 2017: Necro#6714 used n!wiki animeuproar Lord Chancellor
Sat Jul 22 23:11:42 2017: Necro#6714 used <@317619283377258497> wiki animeuproar Finrod
Sat Jul 22 23:12:54 2017: Necro#6714 used <@317619283377258497> wiki animeuproar Emilia
Sat Jul 22 23:13:37 2017: Necro#6714 used n!wiki animeuproar cookie
Sat Jul 22 23:13:56 2017: Necro#6714 used n!wiki animeuproar shatos
Sat Jul 22 23:20:17 2017: Necro#6714 used n!off
Sat Jul 22 23:20:46 2017: Necro#6714 used n!setRoles
Sat Jul 22 23:22:15 2017: Necro#6714 used n!off
Sat Jul 22 23:23:07 2017: Necro#6714 used n!setRoles
Sat Jul 22 23:47:18 2017: Necro#6714 used n!kill
Sun Jul 23 09:25:54 2017: Necro#6714 used n!setroles
Sun Jul 23 09:30:49 2017: Necro#6714 used n!off
Sun Jul 23 09:31:08 2017: Necro#6714 used n!lock <@!241942232867799040>
Sun Jul 23 09:31:29 2017: Necro#6714 used n!lock <@!241942232867799040>
Sun Jul 23 09:31:57 2017: Necro#6714 used n!lock <@!241942232867799040> 319612586171826197
Sun Jul 23 09:33:19 2017: Necro#6714 used n!off
Sun Jul 23 09:33:56 2017: Necro#6714 used n!lock <@!241942232867799040> 319612586171826197
Sun Jul 23 09:35:21 2017: Necro#6714 used n!off
Sun Jul 23 09:35:32 2017: Necro#6714 used n!lock <@!241942232867799040> 319612586171826197
Sun Jul 23 09:59:35 2017: Necro#6714 used n!off
Sun Jul 23 09:59:57 2017: Necro#6714 used n!lock <@!241942232867799040> 319612586171826197
Sun Jul 23 10:02:50 2017: Necro#6714 used n!off
Sun Jul 23 10:02:59 2017: Necro#6714 used n!lock <@!241942232867799040> 319612586171826197
Sun Jul 23 10:03:15 2017: Necro#6714 used n!lock <@!241942232867799040> Bot
Sun Jul 23 10:03:25 2017: Necro#6714 used n!lock <@!241942232867799040> bot
Sun Jul 23 14:29:31 2017: Necro#6714 used n!off
Sun Jul 23 14:29:58 2017: Necro#6714 used n!lock <@!241942232867799040> bot
Sun Jul 23 14:30:56 2017: Necro#6714 used n!lock <@!241942232867799040>
Sun Jul 23 14:31:07 2017: Necro#6714 used n!lock <@!241942232867799040>
Sun Jul 23 14:31:16 2017: Necro#6714 used n!lock <@!241942232867799040>
Sun Jul 23 14:31:22 2017: Necro#6714 used n!lock
Sun Jul 23 14:31:30 2017: Necro#6714 used n!lock <@!241942232867799040>
Sun Jul 23 14:31:41 2017: Necro#6714 used n!lock <@!241942232867799040>
Sun Jul 23 14:39:32 2017: Necro#6714 used n!off
Sun Jul 23 14:39:53 2017: Necro#6714 used n!off
Sun Jul 23 19:28:30 2017: Necro#6714 used <@317619283377258497> mute <@!172002275412279296>
Sun Jul 23 19:28:40 2017: Necro#6714 used <@317619283377258497> unmute <@!172002275412279296>
Sun Jul 23 19:29:03 2017: Necro#6714 used n!mute <@!172002275412279296> 10
Sun Jul 23 19:31:17 2017: Necro#6714 used n!off
Sun Jul 23 19:31:28 2017: Necro#6714 used n!mute <@!172002275412279296> 10
Sun Jul 23 19:35:07 2017: Necro#6714 used n!automod
Sun Jul 23 19:35:19 2017: Necro#6714 used n!automod info
Sun Jul 23 19:35:54 2017: Necro#6714 used n!automod del #triggerd_elfu
Sun Jul 23 19:58:59 2017: Necro#6714 used n!off
Sun Jul 23 19:59:43 2017: Necro#6714 used n!automod add <#321305756999745547>
Sun Jul 23 20:01:20 2017: Necro#6714 used n!off
Sun Jul 23 20:01:38 2017: Necro#6714 used n!automod add <#321305756999745547>
Sun Jul 23 20:02:28 2017: Necro#6714 used n!automod
Sun Jul 23 23:34:12 2017: Necro#6714 used n!kill
Mon Jul 24 00:12:15 2017: Necro#6714 used n!test <@317619283377258497> <#318465643420712962>
Mon Jul 24 00:13:29 2017: Necro#6714 used n!off
Mon Jul 24 00:13:54 2017: Necro#6714 used n!test_stuff <@317619283377258497> <#318465643420712962>
Mon Jul 24 00:14:04 2017: Necro#6714 used n!rr
Mon Jul 24 00:14:22 2017: Necro#6714 used n!off
Mon Jul 24 00:14:36 2017: Necro#6714 used n!test_stuff <@317619283377258497> <#318465643420712962>
Mon Jul 24 00:26:49 2017: Necro#6714 used n!off
Mon Jul 24 00:27:13 2017: Necro#6714 used n!test_stuff <@317619283377258497> <#318465643420712962>
Mon Jul 24 00:32:25 2017: Necro#6714 used n!off
Mon Jul 24 00:33:44 2017: Necro#6714 used n!test_stuff <@317619283377258497> <#318465643420712962>
Mon Jul 24 00:34:06 2017: Necro#6714 used n!test_stuff <@317619283377258497> <#318465643420712962> zibuizegbuzegibuze
Mon Jul 24 00:37:15 2017: Necro#6714 used n!off
Mon Jul 24 00:37:32 2017: Necro#6714 used n!autmod
Mon Jul 24 00:37:39 2017: Necro#6714 used n!automod
Mon Jul 24 00:38:12 2017: Necro#6714 used n!automod <@317619283377258497> <@!241942232867799040> <#321305756999745547> <#312902474753245184> <#312243558671450113>
Mon Jul 24 00:38:23 2017: Necro#6714 used n!automod add <@317619283377258497> <@!241942232867799040> <#321305756999745547> <#312902474753245184> <#312243558671450113>
Mon Jul 24 00:39:39 2017: Necro#6714 used n!off
Mon Jul 24 00:40:00 2017: Necro#6714 used n!automod add <@317619283377258497> <@!241942232867799040> <#321305756999745547> <#312902474753245184> <#312243558671450113>
Mon Jul 24 00:40:15 2017: Necro#6714 used n!automod
Mon Jul 24 00:42:34 2017: Necro#6714 used n!off
Mon Jul 24 00:43:24 2017: Necro#6714 used n!automod
Mon Jul 24 10:15:17 2017: Necro#6714 used n!automod add <#320689998087323649>
Mon Jul 24 10:17:22 2017: Necro#6714 used n!automod add <#320477096319254529>
Mon Jul 24 10:17:33 2017: Necro#6714 used n!automod del <#320477096319254529>
Mon Jul 24 10:17:52 2017: Necro#6714 used n!off
Mon Jul 24 10:28:58 2017: Necro#6714 used n!off
Mon Jul 24 10:29:36 2017: Necro#6714 used n!ignore
Mon Jul 24 10:30:01 2017: Necro#6714 used n!ignore add <#311789251190587392> <#312647665395433492> <#312184736166576129>
Mon Jul 24 10:30:16 2017: Necro#6714 used n!ignore add <@!172002275412279296>
Mon Jul 24 10:31:21 2017: Necro#6714 used n!off
Mon Jul 24 10:31:33 2017: Necro#6714 used n!ignore add <@!172002275412279296>
Mon Jul 24 10:45:43 2017: Necro#6714 used n!speak 31846564420712962 Hello, this is a message
Mon Jul 24 10:46:29 2017: Necro#6714 used n!speak 318465643420712962 test
Mon Jul 24 11:06:13 2017: Necro#6714 used n!off
Mon Jul 24 11:06:46 2017: Necro#6714 used n!warn
Mon Jul 24 11:07:05 2017: Necro#6714 used n!warn add <@317619283377258497> test warning 1
Mon Jul 24 11:07:35 2017: Necro#6714 used n!info <@317619283377258497>
Mon Jul 24 11:08:27 2017: Necro#6714 used n!off
Mon Jul 24 11:08:37 2017: Necro#6714 used n!warn add <@317619283377258497> test warning 1
Mon Jul 24 11:08:44 2017: Necro#6714 used n!info <@317619283377258497>
Mon Jul 24 11:09:38 2017: Necro#6714 used n!warn del <@317619283377258497> 1
Mon Jul 24 11:14:22 2017: Necro#6714 used n!off
Mon Jul 24 11:14:59 2017: Necro#6714 used n!giveme info
Mon Jul 24 11:15:07 2017: Necro#6714 used n!giveme_roles del Good
Mon Jul 24 11:15:16 2017: Necro#6714 used n!giveme_roles add Good
Mon Jul 24 11:17:03 2017: Necro#6714 used n!off
Mon Jul 24 11:17:42 2017: Necro#6714 used n!off
Mon Jul 24 11:21:55 2017: Necro#6714 used n!off
10 changes: 4 additions & 6 deletions data/setting.csv
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
311630847969198082,318738044515647498,311789251190587392,312902474753245184,312184736166576129,312647665395433492,313673657878708224,321305756999745547,318828760331845634,320477096319254529,320477031735230464
241942232867799040,317619283377258497,321305756999745547,320689998087323649
158563957555068928
Server Name,Server,Mute Role,Autmod Channel,Welcome Channel,Self Roles
The Land of Shadow,311630847969198082,TimeOut,318828760331845634,318738044515647498,",Good,Evil,Chaotic,Neutral,Lawful"
The Discord of discordness,236997924427530241,Time Out,320477031735230464,,
Cookie Kingdom,288255618341666827,bad cookie,320477096319254529,,
Server Name,Server,Mute Role,Autmod Channel,Welcome Channel,Self Roles,Automod Ignore,Commands Ignore
The Land of Shadow,311630847969198082,TimeOut,318828760331845634,318738044515647498,",Evil,Chaotic,Neutral,Lawful,Good",",311789251190587392,312647665395433492,312184736166576129,172002275412279296",",317619283377258497,241942232867799040,321305756999745547,312902474753245184,312243558671450113"
The Discord of discordness,236997924427530241,Time Out,320477031735230464,,,,",320689998087323649"
Cookie Kingdom,288255618341666827,bad cookie,320477096319254529,,,,
14 changes: 7 additions & 7 deletions data/userdata.csv
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
241942232867799040,65897,22,The Bot Smith,1510,"{'311630847969198082': 7, '236997924427530241': 7, '288255618341666827': 7}","test warning1, testwarning2,muted #1"
317619283377258497,698562,32, ,4667,"{'311630847969198082': 2, '236997924427530241': 0, '288255618341666827': 0}",
241942232867799040,65897,22,The Bot Smith,1939,"{'311630847969198082': 7, '236997924427530241': 7, '288255618341666827': 7}","test warning1, testwarning2,muted #1"
317619283377258497,698562,32, ,4667,"{'311630847969198082': 2, '236997924427530241': 0, '288255618341666827': 0}",test warning 1 by Necro#6714 on server The Land of Shadow
227589245731209217,2000,32, ,0,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
220502526393450497,2000,32, ,4,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
239182308110893056,2000,32, ,0,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
143040864346832897,2000,32,Best Trap,507,"{'311630847969198082': 0, '236997924427530241': 5, '288255618341666827': 0}",
143040864346832897,2000,32,Best Trap,520,"{'311630847969198082': 0, '236997924427530241': 5, '288255618341666827': 0}",
271821453836419074,2000,32, ,0,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
145617434278232074,2000,32, ,27,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
281127857315643392,2000,32, ,178,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
281127857315643392,2000,32, ,206,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
242322243235872768,2000,32, ,9,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
189702078958927872,2000,32, ,34,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
229344744206106624,2000,32, ,0,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
Expand All @@ -30,12 +30,12 @@
275989054082777088,2000,32, ,95,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
288715359048040449,2000,32, ,20,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
222820128734183435,2000,32, ,0,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
271259290415792129,2200,6, ,1778,"{'311630847969198082': 6, '236997924427530241': 6, '288255618341666827': 6}",too sexy (warning #2) by Necro#6714 on server The Land of Shadow
271259290415792129,2200,6, ,1819,"{'311630847969198082': 6, '236997924427530241': 6, '288255618341666827': 6}",too sexy (warning #2) by Necro#6714 on server The Land of Shadow
235142713123667978,2000,32, ,0,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
203015871378096128,2000,32, ,137,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
203015871378096128,2000,32, ,151,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
218447974554927105,2000,32, ,0,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
272435775436619776,2000,32, ,0,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
275815305660596225,2000,32, ,0,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
275815305660596225,2000,32, ,2,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
183633612925698048,2000,32, ,0,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
288366977011941376,2000,32, ,0,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
272426220397002753,2000,32, ,0,"{'311630847969198082': 0, '236997924427530241': 0, '288255618341666827': 0}",
Expand Down
Loading

0 comments on commit 9bb9a30

Please sign in to comment.