Commit Graph

766 Commits

Author SHA1 Message Date
Kwoth
d76b683052 Guildconfigs now only query what it needs. Possibly broke a lot of stuff 2016-12-03 14:14:37 +01:00
samvaio
68031183cd Update StreamNotificationCommands.cs 2016-12-03 18:18:51 +05:30
Kwoth
c273241773 woopsie 2 2016-12-03 04:10:22 +01:00
Kwoth
7468324f55 woopsie 2016-12-03 03:58:47 +01:00
Kwoth
fe2b73d5cb Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-12-03 03:37:02 +01:00
Kwoth
f2f7cb6418 Stream notification fixes, no more spam? 2016-12-03 03:36:02 +01:00
fkndean
c015b51901 add mashape yoda 2016-12-02 20:25:42 -05:00
fkndean
2c7820e9c3 Merge remote-tracking branch 'upstream/dev' into dev 2016-12-02 20:03:41 -05:00
Master Kwoth
becf870987 Merge pull request #839 from samdivaio/dev
avatar position changed
2016-12-02 01:52:28 +01:00
Kwoth
2c2485c8bd fixed ~safebooru image link 2016-12-01 23:19:19 +01:00
Kwoth
5583780fcb Added actual responses to .lcr all, not count 2016-12-01 19:59:17 +01:00
fkndean
7dab400809 Merge remote-tracking branch 'upstream/dev' into dev 2016-12-01 09:05:53 -05:00
samvaio
8e2d15e83f Merge pull request #19 from Kwoth/dev
removed atf completely, closes #832
2016-12-01 17:44:22 +05:30
samvaio
1fe6b2a411 Update Administration.cs 2016-12-01 17:39:08 +05:30
samvaio
c5915a45d6 Update Administration.cs 2016-12-01 17:24:08 +05:30
samvaio
7dcf4f5a60 Update Administration.cs 2016-12-01 17:21:57 +05:30
samvaio
bd70dc21fd Update Administration.cs 2016-12-01 17:20:27 +05:30
samvaio
2f1dedb33a Update Administration.cs 2016-12-01 17:14:05 +05:30
samvaio
fbb50d4df2 Update Administration.cs 2016-12-01 17:08:25 +05:30
Kwoth
d4985f26dd removed atf completely, closes #832 2016-12-01 12:33:52 +01:00
samvaio
c019ce3130 Update Administration.cs 2016-12-01 17:01:21 +05:30
samvaio
35f4725d0f Update Administration.cs 2016-12-01 16:58:06 +05:30
samvaio
41a8936b72 Update Administration.cs 2016-12-01 16:51:09 +05:30
samvaio
c0eaf39607 Update Administration.cs 2016-12-01 16:49:58 +05:30
samvaio
7315f5dc79 Update InfoCommands.cs 2016-12-01 16:22:13 +05:30
samvaio
2c8f85106f Update InfoCommands.cs 2016-12-01 16:01:14 +05:30
fkndean
ea379dcb9d Merge remote-tracking branch 'upstream/dev' into dev 2016-11-30 18:49:38 -05:00
Kwoth
140ec95e04 And proper return value 2016-12-01 00:45:39 +01:00
Kwoth
737fb09124 Fixed .greetdmmessage 2016-12-01 00:44:36 +01:00
fkndean
9f02a482ff Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
#	src/NadekoBot/Modules/Utility/Utility.cs
#	src/NadekoBot/Services/Impl/StatsService.cs
2016-11-30 18:41:27 -05:00
Kwoth
38c2dd3667 Cleverbot fixed 2016-11-30 20:34:31 +01:00
Kwoth
477a34a6ee .stats much prettier, .SendErrorAsync added for normalized error messages 2016-11-30 20:15:22 +01:00
Kevin
d43d5a1726 Fix null AvatarUrl issue 2016-11-30 07:59:48 -05:00
fkndean
2bc5062864 Merge remote-tracking branch 'upstream/dev' into dev 2016-11-30 01:01:48 -05:00
Kwoth
2099a0266a Show green color with OK embed responses 2016-11-30 02:28:51 +01:00
Kwoth
fff834f9db Weather changed a bit 2016-11-29 22:37:27 +01:00
Master Kwoth
35e508ca48 Merge pull request #818 from fkndean/patch-1
Embed Weather
2016-11-29 22:26:52 +01:00
Kwoth
156a28f3f4 changed links 2016-11-29 22:00:30 +01:00
Kevin
2c667c3fe2 remove color bs
bsbs
2016-11-29 15:27:49 -05:00
Kevin
c7b2d753c3 Embed Weather
/shrug
2016-11-29 15:26:13 -05:00
Kwoth
25e31faa6e EmbedAsync extension, ~ani and ~mang are wayyyyy cooler 2016-11-29 21:24:49 +01:00
fkndean
da21308345 Fix to match Kwoth's d.net changes. 2016-11-29 09:01:06 -05:00
fkndean
6c534f4233 Initial commit for rich embed change for message output. Started on .stats command. 2016-11-29 08:47:06 -05:00
FrostTheFox
603b3f297b
Best fix ever. 2016-11-28 20:17:00 -05:00
Master Kwoth
438fc97ae1 Merge pull request #807 from fkndean/dev
Add formatting output with scr as well as the actual output reaction.
2016-11-29 00:50:27 +01:00
Kwoth
9d4061265d Fix to .grdel and .byedel 2016-11-28 20:47:10 +01:00
fkndean
e90190ef2d Merge remote-tracking branch 'upstream/dev' into dev 2016-11-28 06:04:54 -05:00
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