mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,756 Commits 11 Branches 0 Tags 63 MiB
3dbdcda6da
Commit Graph

769 Commits

Author SHA1 Message Date
Master Kwoth
1695bd5534 Merge pull request #806 from fkndean/mtg-api 
Magic The Gathering API
 2016-11-28 11:30:06 +01:00
Pg
e21767cc4a Re-add the credential.json 2016-11-28 02:28:53 +01:00
fkndean
c50e192dbe whoops accidentally removed Google. 2016-11-27 20:19:12 -05:00
fkndean
7ad43e8345 Just append card url instead of downloading. 2016-11-27 20:17:46 -05:00
Pg
3fbd52d74b Fix presenttation and change data connection 2016-11-28 02:15:08 +01:00
Pg
90c80c7bd9 Fix database creation 
Add the Table PokeGame to the database initialisation
 2016-11-28 02:14:29 +01:00
Kwoth
51c6743fec Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-11-28 01:12:15 +01:00
Kwoth
1e2d5ee6b7 Fixed greetdmmsg 2016-11-28 01:11:53 +01:00
Kwoth
2e7ff45bd5 removed expired token 2016-11-27 21:53:58 +01:00
fkndean
df71f020e2 Add formatting output with scr as well as the actual output reaction. 2016-11-27 13:02:39 -05:00
fkndean
d363af4dfe remove message output - kwoth request 2016-11-27 12:16:22 -05:00
fkndean
a32fd3a2cb Add card description in output message. 2016-11-27 12:12:40 -05:00
fkndean
ffc1f5a061 Add Magic The Gathering card search 2016-11-27 12:00:37 -05:00
Pg
21b2f1252a PokeGame work, initialisation of database unstable, need to do with sql-request 2016-11-27 03:51:10 +01:00
Pg
12dc9af8e6 Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-11-26 20:18:56 +01:00
samvaio
a02ace3165 Merge pull request #10 from Kwoth/dev 
update
 2016-11-26 22:05:07 +05:30
samvaio
9b47763886 Update Games.cs 2016-11-26 20:45:17 +05:30
samvaio
fdee8e4685 Update Games.cs 
- emojis added supporting on ios and android
 2016-11-26 20:35:56 +05:30
samvaio
5c72871eb8 Update Games.cs 2016-11-26 20:31:05 +05:30
Kwoth
ad84bf62cd Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-11-26 10:54:47 +01:00
Kwoth
2c4eb8e104 Slight change to how cash works 2016-11-26 10:54:33 +01:00
Pg
d82c399a5a Correction of location of file 
I added in the wrong module folder, now corrected.
 2016-11-26 03:33:56 +01:00
Pg
9dc3b33ed1 Change file name to match with class 2016-11-26 03:28:26 +01:00
Pg
ba5afa8da0 Add getter and setter for module 2016-11-26 03:12:20 +01:00
Pg
d5262fcb2c Change name of PokemonType.json to pokemon_types.json 
I notice the 'convention' in .json in nadeko. I change the name to follow this 'convention'.
 2016-11-26 02:43:07 +01:00
Pg
713363dcc0 Add PokemonType.json to the data of nadeko 2016-11-26 02:34:53 +01:00
Pg
5958580abe Update file in database models 2016-11-26 01:52:27 +01:00
samvaio
1373bfbb6e Revert "Revert "update"" 2016-11-25 19:06:34 +05:30
samvaio
9b5b6f95d1 Revert "update" 2016-11-25 18:43:08 +05:30
samvaio
590dca61e8 Merge pull request #4 from Kwoth/dev 
update
 2016-11-25 18:41:44 +05:30
samvaio
25f1d282ec Update Permissions.cs 2016-11-25 18:11:33 +05:30
samvaio
8c1865a234 Update CommandHandler.cs 
- changed `⚠️` to actual emoji ⚠️
 2016-11-25 17:53:02 +05:30
samvaio
046e0f34f6 Update CmdCdsCommands.cs 
- emojis added
 2016-11-25 17:45:27 +05:30
Kwoth
bf72a6c35d Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-11-25 13:14:52 +01:00
Kwoth
0bda2bad99 ImageProcessorcore -> ImageSharp 2016-11-25 13:14:44 +01:00
samvaio
5998a8dc93 Update FilterCommands.cs 
- emojis added
 2016-11-25 17:42:54 +05:30
samvaio
d7fe2fda9e Update Permissions.cs 
- added emojis
 2016-11-25 17:24:01 +05:30
Pg
2397f3ca30 Add the model and the module to bot 2016-11-25 01:20:18 +01:00
Pg
93f54d56cf Implementation of pokegame commands 
Added the commands, description and usage to Resources/commandStrings using the previous definition of commands in Nadeko 0.9
 2016-11-25 01:18:46 +01:00
Pg
b56975c2ff Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-11-25 00:49:44 +01:00
samvaio
e11a3e3051 Update Utility.cs 
- removed a white space from list servers
 2016-11-24 03:34:50 +05:30
Master Kwoth
d6250e2029 Merge pull request #795 from samdivaio/dev 
Few additions and fixes
 2016-11-23 20:14:14 +01:00
samvaio
3a046bbd2c done 2016-11-23 22:26:23 +05:30
samvaio
6224e6f59e thats it 2016-11-23 22:16:14 +05:30
samvaio
069d238136 done maybe 2016-11-23 22:03:33 +05:30
samvaio
1b88253ce0 done (almost done) 2016-11-23 21:47:57 +05:30
samvaio
6c1e467653 Update LogCommand.cs 2016-11-23 19:50:12 +05:30
samvaio
caddd7109f Update LogCommand.cs 2016-11-23 17:57:54 +05:30
samvaio
a716328b5a Update LogCommand.cs 2016-11-23 17:35:38 +05:30
samvaio
c51bd7f362 Update LogCommand.cs 2016-11-23 17:28:33 +05:30
samvaio
b123fcf37a Update LogCommand.cs 2016-11-23 17:23:38 +05:30
samvaio
828a2c98ca Update LogCommand.cs 2016-11-23 17:13:52 +05:30
samvaio
2ff403702e Update LogCommand.cs 2016-11-23 17:04:55 +05:30
samvaio
2ef1289fb1 Update LogCommand.cs 2016-11-23 16:56:41 +05:30
samvaio
815aa7459e Update LogCommand.cs 2016-11-23 16:49:09 +05:30
samvaio
0d3c616284 Update LogCommand.cs 2016-11-23 16:36:26 +05:30
samvaio
9491d7d5e0 Update LogCommand.cs 2016-11-23 16:32:04 +05:30
samvaio
23bfcb55d8 Update LogCommand.cs 2016-11-23 16:28:25 +05:30
samvaio
6467226fa6 Update LogCommand.cs 2016-11-23 16:04:04 +05:30
samvaio
91764ceee8 Update LogCommand.cs 2016-11-23 16:00:14 +05:30
samvaio
8fda7ad06a Update LogCommand.cs 2016-11-23 15:55:42 +05:30
samvaio
23a5801790 Update LogCommand.cs 
- added userID to deleted messages log to aid discord.net/ discord issue where bot can't identify username#discriminator
 2016-11-23 15:40:10 +05:30
samvaio
c4379e6500 Update LogCommand.cs 
- userid added to deleted messeges
 2016-11-23 15:36:09 +05:30
samvaio
fb7980566a Update QuoteCommands.cs 2016-11-23 05:09:41 +05:30
samvaio
c83c31e254 Update QuoteCommands.cs 2016-11-23 05:06:35 +05:30
samvaio
eea7020984 Update QuoteCommands.cs 2016-11-23 05:01:58 +05:30
samvaio
5211850536 Update QuoteCommands.cs 2016-11-23 04:48:51 +05:30
samvaio
9895f37c53 Update QuoteCommands.cs 2016-11-23 04:46:16 +05:30
samvaio
396f6b5524 Update QuoteCommands.cs 2016-11-23 04:40:39 +05:30
samvaio
84c811bcd1 Update QuoteCommands.cs 2016-11-23 04:36:35 +05:30
samvaio
6217ec9668 Update QuoteCommands.cs 2016-11-23 04:30:44 +05:30
samvaio
13d7ec2805 Update QuoteCommands.cs 2016-11-23 04:23:50 +05:30
samvaio
555779e3ca Update QuoteCommands.cs 2016-11-23 04:14:08 +05:30
samvaio
b3bca6c3c3 Update QuoteCommands.cs 2016-11-23 04:11:15 +05:30
samvaio
b0e92ea4d2 Update QuoteCommands.cs 2016-11-23 03:58:51 +05:30
samvaio
3939aefa56 Global Quotes 
- made quotes global
because its better to have quotes global while custom reaction can be both
 2016-11-23 03:48:18 +05:30
samvaio
511a643b8e Update LogCommand.cs 
- added better explaination to kick punisment
- changed just kick to (soft-ban and kick)
 2016-11-23 02:35:19 +05:30
samvaio
3097705163 Update LogCommand.cs 
- emojis to punishments
 2016-11-23 02:19:24 +05:30
samvaio
1330bd4883 Update LogCommand.cs 
better placements and emojis to
- user joined
- user left
- user unbanned
- user banned
- message deleted
- punishments
 2016-11-23 01:58:58 +05:30
samvaio
117f8136e7 Update LogCommand.cs 2016-11-23 00:59:38 +05:30
samvaio
d489b986d6 Update LogCommand.cs 2016-11-23 00:51:56 +05:30
samvaio
042160e163 Update LogCommand.cs 2016-11-23 00:42:16 +05:30
samvaio
f04ce0c317 Update LogCommand.cs 2016-11-23 00:18:38 +05:30
samvaio
a96d62d40c Update LogCommand.cs 2016-11-23 00:11:48 +05:30
samvaio
e602bbb7ab Update LogCommand.cs 2016-11-23 00:08:05 +05:30
samvaio
fc6adb824d Update LogCommand.cs 2016-11-23 00:03:25 +05:30
samvaio
4f55f7e236 check 2016-11-22 23:51:25 +05:30
samvaio
cb6089ca26 Update VoicePlusTextCommands.cs 
- added ✅ to .cv+t
 2016-11-22 18:31:22 +05:30
samvaio
3e5a7defea Update VoicePlusTextCommands.cs 
- emojis added or changed
- text bold and `highlighted`
 2016-11-22 18:27:38 +05:30
samvaio
c4986126ed Update ServerGreetCommands.cs 
- emojis added
- bold text added
- msg already set are now `highlighted` better.
 2016-11-22 17:59:19 +05:30
samvaio
7102914b49 Update SelfAssignedRolesCommand.cs 
- added emojis.
- improved `placements`.
 2016-11-22 17:27:39 +05:30
Kwoth
9397499b42 Woopsie 2016-11-22 12:31:55 +01:00
samvaio
9526f189e0 Merge pull request #2 from Kwoth/dev 
updates from kwoth
 2016-11-22 16:48:05 +05:30
samvaio
fdfaba5905 Update Administration.cs 
- better emoji for ban reasons and same for others.
- IDs are now `highlighted.`
- role mention has better __`highlighter`__
 2016-11-22 16:24:14 +05:30
Kwoth
62168ffedc Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-11-22 11:44:58 +01:00
Kwoth
0affabb557 Changed how greetdel and byedel work 2016-11-22 11:42:26 +01:00
samvaio
6139cb6eca reverted original quote emoji 2016-11-22 14:35:42 +05:30
samvaio
c6e5b20904 Update Gambling.cs 2016-11-22 14:08:10 +05:30
samvaio
ffe8625055 added a space betwn profile and link 2016-11-22 02:27:42 +05:30
samvaio
2a3fedec35 reverted last change 2016-11-22 02:16:24 +05:30
samvaio
b6811afb34 chaned time and days 
- days to day(s)
- months to month(s) etc
 2016-11-22 01:24:53 +05:30
samvaio
aa8d67a1db changed times 
- days to day(s)
- hours to hour(s)
- minutes to minute(s)
 2016-11-22 01:18:08 +05:30
samvaio
b403e804ff emojis and few other changes 2016-11-22 01:14:12 +05:30
samvaio
8d954e5050 added emojis 2016-11-22 01:01:28 +05:30
samvaio
9797aebdba two changes 
- 🆙 **Migration done.**
- ⚠️ **Error while migrating, check `logs` for more informations.**
 2016-11-22 00:52:28 +05:30
samvaio
62d5ed58c6 better repeat 
- emojis
- time is now `highlighted`
- text to repeat is now bold
 2016-11-21 23:50:49 +05:30
samvaio
1552c16707 added raffle ticket 
- added raffle ticket emoji.
- made raffle look nice.
 2016-11-21 22:12:55 +05:30
samvaio
8569d6bd8e emoji added to osu profile link 2016-11-21 21:53:17 +05:30
samvaio
29adf7213a changed brightness emoji to temperature 
for weather only. nothing else is changed
 2016-11-21 21:16:18 +05:30
samvaio
33b9681ba7 added emojis nothing much changed 2016-11-21 20:14:31 +05:30
samvaio
58ab9ad581 added emojis to totube 2016-11-21 19:47:29 +05:30
samvaio
7ee8dee3ee added emojis to quotes 2016-11-21 19:25:38 +05:30
Pg
926e8a33c8 Remove credential.json from tracked files 2016-11-21 13:21:39 +01:00
samvaio
0989309f89 reverted to last one 2016-11-21 06:57:35 +05:30
samvaio
720d13128b Update Utility.cs 2016-11-21 06:51:14 +05:30
samvaio
38c9d50646 Update Utility.cs 2016-11-21 06:42:13 +05:30
samvaio
85e5e5ba84 Update Utility.cs 2016-11-21 06:26:12 +05:30
samvaio
b692238ecb Update Utility.cs 2016-11-21 06:19:43 +05:30
samvaio
d66ada4df6 Update Utility.cs 2016-11-21 06:15:07 +05:30
samvaio
caa1666ef7 lot of changes 
- added colors
- added emojis
- changes few others
- added css to server info
 2016-11-21 05:54:15 +05:30
samvaio
51fd22c291 dm with markdown and emojis added 
- added emojis
- made dm forward support markdown.
 2016-11-21 03:19:33 +05:30
samvaio
11fe90d589 few changes 
- added emojis
- added bold to tests
- removed `highlight`.
- changed `Auto assigned role is set.` to ✅ **Auto assign role** on user join is now **enabled**. respect to its disabled text.
 2016-11-21 02:38:05 +05:30
samvaio
a51475fbed added emoji and words 
- emojis added to various responses.
- added `has been` to anti spam responses.
 2016-11-21 02:29:46 +05:30
samvaio
707f8e2318 Changed few emojis 
- changed emojis to respective tasks such as deletions now have trash emoji.
- removed `highlighting` from created/ deleted channel IDs to make it easier to copy without getting blank spaces or full-stop.
 2016-11-21 01:51:07 +05:30
Kevin
f3a645a65b Add SKK currency 2016-11-20 11:34:13 -05:00
Kwoth
4538afbc0b Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-11-20 12:11:33 +01:00
Kwoth
1df4aa7770 Updated .net core to 1.1, fixed #782 2016-11-20 12:11:23 +01:00
samvaio
4320e1177e Adds and fixes 
- added fullstops to deafen response.
- added word "voice" to make deletion of voice channel using `.dvch` more clear.
 2016-11-20 15:36:31 +05:30
samvaio
e98b2d3f68 added respective emojis to voice and chat mute 2016-11-20 15:01:48 +05:30
samvaio
23d9dfbb23 added few thing 
- changed "was" to "has been" for mute responses.
- made the important states of response bold.
 2016-11-20 14:34:42 +05:30
samvaio
04e7e284f6 Added emojis for server online afk dnd and offline 
- Added emojis supported by iOS and Android discord client
 2016-11-20 00:57:28 +05:30
samvaio
95b4bf4197 lil fix 2016-11-19 23:55:00 +05:30
samvaio
cb96837678 added colours to list of commands 2016-11-19 23:51:45 +05:30
samvaio
f00bedaecb added colour to list of modules 2016-11-19 23:49:10 +05:30
samvaio
d9b47fe590 changed id to ID 2016-11-19 22:42:26 +05:30
Kwoth
ae0a52d49d Merge remote-tracking branch 'origin/1.0' into dev 2016-11-19 16:52:28 +01:00
Kwoth
caffde33ad generated resource .cs files 2016-11-19 16:27:39 +01:00
samvaio
ca5ee70c97 lil fixes 
- added emojis
- changes id to ID and etc
- corrected few spells
 2016-11-19 20:32:43 +05:30
samvaio
906de4c590 added kwoth's tag 2016-11-19 20:16:53 +05:30
samvaio
aa4bc00d8c changed id to ID 2016-11-19 18:40:37 +05:30
samvaio
7125b7728c added emojis and fixed few other 2016-11-19 18:21:55 +05:30
samvaio
c0925cec3a added colours 2016-11-19 17:54:53 +05:30
samvaio
2d617ec0a8 add colours to stats 2016-11-19 17:52:49 +05:30
samvaio
3e6993b3e5 added emojis and fixes 2016-11-19 16:45:04 +05:30
samvaio
c53c5d878c added emojis and fixed older emojis 2016-11-19 15:48:51 +05:30
samvaio
2574ad72ca Update SelfCommands.cs 2016-11-19 14:29:39 +05:30
samvaio
c1de7dd02b Changed few emoji 2016-11-19 12:37:25 +05:30
samvaio
0964ea7111 added emoji details to command .uinfo 2016-11-19 12:25:04 +05:30
samvaio
3c9054d587 Update Help.cs 
missed one `"`
 2016-11-19 04:50:35 +05:30
samvaio
6e35c910f6 Update Help.cs 2016-11-19 04:16:50 +05:30
samvaio
1818856fb3 Update Help.cs 2016-11-19 04:14:34 +05:30
samvaio
817514345a some fixes and cleanup 
remove all the unnecessary left out texts and added underline to info
 2016-11-19 02:58:53 +05:30
samvaio
9f7823ee54 lil changes added emoji 2016-11-19 00:54:25 +05:30
Kwoth
fde76b6808 atfbooru removed, has some questionable material to say the least 2016-11-18 16:36:54 +01:00
Kwoth
5f797a9a60 .repeat is now usable only by users with manage messages 2016-11-16 05:36:38 +01:00
Kwoth
4db45cf3b2 split some greet message logic 2016-11-16 05:35:14 +01:00
Kwoth
4919edad8e fixed assembly stuff 2016-11-16 01:02:37 +01:00
Kwoth
0d9c4aeb86 Fixed client id bug 2016-11-15 12:02:23 +01:00
Kwoth
afb0da1170 Removed unnecessary usings, hopefuly fixed database problem when not loading db from the root of the project 2016-11-15 12:01:02 +01:00
Kwoth
a02531a16c Better errors during config load 2016-11-15 11:06:11 +01:00
Kwoth
bd0b668c0d Configurable connection string 2016-11-15 10:54:56 +01:00
Kwoth
12587a648e fix 2016-11-15 09:55:42 +01:00
Kwoth
46dadda759 Env vars now have to start with NadekoBot_ 2016-11-15 09:55:10 +01:00
Kwoth
1538364f00 Creds *should* now be loadable from environment variables starting with NadekoBot: 2016-11-15 09:42:06 +01:00
Kwoth
5d7ce508dd startup using runandblockasync 2016-11-15 01:32:23 +01:00
Kwoth
0943a44c28 runasync -> runandblockasync, runasync is not blocking now (unused) 2016-11-15 01:31:41 +01:00
Kwoth
b5fa858cbf Fixed bet saying you won 0 if there weren't enough participants 2016-11-15 01:06:07 +01:00
Kwoth
e76ec464d3 Fixed compile bug? 2016-11-15 00:17:27 +01:00
Kwoth
6e3c5cb6bd Fixed bug where playlist would not be loaded fully if atleast one song failed to load 2016-11-15 00:07:36 +01:00
fkndean
581ab1edeb Remove safeyandere. 2016-11-14 17:20:45 -05:00
fkndean
96dd0b6096 updated desc for cmd 2016-11-14 16:36:05 -05:00
fkndean
1ccc049655 Add Safeyandere, Moved Yandere to NSFW and added to 💣 2016-11-14 16:34:11 -05:00
fkndean
0e2a92c5d3 Merge remote-tracking branch 'upstream/1.0' into 1.0 2016-11-14 15:01:59 -05:00
Kwoth
2df3480f43 internal -> public 2016-11-14 12:19:58 +01:00
fkndean
fe346648f7 Merge remote-tracking branch 'upstream/1.0' into 1.0 2016-11-14 05:19:58 -05:00
fkndean
769d034eab Add Yande.re search 2016-11-14 05:17:50 -05:00
Master Kwoth
eab88e5051 Merge pull request #761 from fkndean/1.0 
Add BF3/BF4 API Searches (Online Players and User Search)
 2016-11-13 02:36:27 +01:00
fkndean
09d90e4a03 convert from sb to multiline strings 2016-11-12 18:50:39 -05:00
Kwoth
6b32a0321a .lcr all and .lcrg added 2016-11-12 20:58:33 +01:00
Kwoth
25735a679f Improved song bitrate from youtube 2016-11-12 16:44:31 +01:00
Kwoth
df07fbaffa Merge branch '1.0' of https://github.com/Kwoth/NadekoBot into 1.0 2016-11-11 20:46:51 +01:00
Kwoth
f8219178e5 Raffle now ignores only offline users (and unknown status) 2016-11-11 20:46:47 +01:00
fkndean
870c11526f Add BF3/BF4 API Searches (Online Players and User Search) 2016-11-11 08:05:52 -05:00
Master Kwoth
ba08409ce4 Merge pull request #758 from fearnlj01/1.0-fearnlj01 
Various changes ¯\_(ツ)_/¯
 2016-11-11 02:09:56 +01:00
Master Kwoth
c2434db854 Merge pull request #755 from Nitix/radio 
Fixed radio and slow connection Fix #601
 2016-11-11 02:03:03 +01:00
Jordan Fearnley
5c32062b2f Various changes ¯\_(ツ)_/¯ 
Summary of Changes:
- Betroll won't give you the greater than 90 bonus for rolling 90
anymore
- Send usage updated for clarity
- I missed some stuff when the  `config.json` stopped having "null"
everywhere, this fixes it, *I think.*
- more whitespacing in the linux guide for people like Kwoth who want to
just be able to copy paste commands

- I'm kinda just guessing this'll work so if it doesn't then, "woopsie"
 2016-11-11 00:54:53 +00:00
Kwoth
afe459feb6 More fixes to migration 2016-11-10 23:46:41 +01:00
Kwoth
98576311c1 Fixed migration of currency from 0.9 to 1.0 2016-11-10 22:31:15 +01:00
Kwoth
df8b67e3c8 Fixed a bugged answer in trivia 2016-11-10 21:12:43 +01:00
Nitix
49a629f869 Uncomment debug test 2016-11-10 02:12:56 +01:00
Nitix
ff34710ea6 Fixed radio and slow connection 2016-11-10 02:11:25 +01:00
Kwoth
c88d516345 updated version number to rc2 :D 2016-11-10 02:02:22 +01:00
Kwoth
cc08f71bc6 Improvements 2016-11-09 19:28:26 +01:00
Kwoth
72608fae28 More mistakes 2016-11-09 18:01:14 +01:00
Kwoth
1039983fa7 fixed mistake in merge 2016-11-09 17:59:44 +01:00
Kwoth
9687da3dd0 Merge branch 'fkndean-1.0' into 1.0 
Merged fkndean1.0 - wikia and minecraftquery
 2016-11-09 16:58:04 +01:00
Kwoth
4d73748cc5 merged 2016-11-09 16:50:40 +01:00
Kwoth
d7eca59a74 Added ~shorten, updated commandlist with fixed 2016-11-09 07:30:20 +01:00
Kwoth
47bc208826 changing mute role no longer requires restart of .antispam/.antiraid 2016-11-08 22:40:20 +01:00
Kwoth
b1b4afc0e8 Cleverbot now mentions person it is talking to 2016-11-08 22:31:46 +01:00