126 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Pika	d14a825e5a	Fix for confirmation triggering send	2018-03-08 21:22:51 -05:00
Pika	52159b213b	Adds two things; see description ... 1. Adds an indicator for moderators whenever they receive modmail 2. Adds a confirmation message for both modmail commands, confirming with the user to send the message	2018-03-08 20:31:46 -05:00
superwhiskers	db7dae1b9b	Merge pull request #22 from ThatNerdyPikachu/patch-12 ... Fix Yamamura in DMs (yes, again)	2018-03-08 16:57:47 -06:00
Pika	8b9ca1576d	Fix Yamamura in DMs (yes, again)	2018-03-08 17:54:41 -05:00
superwhiskers	3763cb62a5	merge for superwhiskers	2018-03-08 14:24:44 -06:00
Pika	4dba5b7832	final changes	2018-03-08 14:22:52 -05:00
Pika	77f25d1499	It's right here?	2018-03-08 11:56:54 -05:00
Pika	7769cc199f	Actually fixes bot this time ... 100% tested and working	2018-03-08 10:04:55 -05:00
superwhiskers	a9f72d2a8f	Merge pull request #20 from ThatNerdyPikachu/patch-10 ... Fixed whole bot	2018-03-07 19:09:57 -06:00
Pika	21ee2a1706	add status to help since i accidentally removed it	2018-03-07 18:29:23 -05:00
Pika	7a4013370a	Fixed whole bot	2018-03-07 18:24:50 -05:00
superwhiskers	3bd15d9581	Merge pull request #18 from m1guelpf/patch-1 ... Revert #17	2018-03-07 16:04:53 -06:00
Miguel Piedrafita	1341f158b5	Revert #17 ... This won't fix linux (GNU/Linux), but will make the rest of the bot work (or it should)	2018-03-07 23:03:45 +01:00
superwhiskers	61b211a729	Merge pull request #17 from ThatNerdyPikachu/patch-9 ... Fixes linux	2018-03-07 15:56:20 -06:00
Pika	57fe4b73a2	Fixes linux	2018-03-07 16:55:41 -05:00
superwhiskers	71880a76fd	Merge pull request #15 from ThatNerdyPikachu/patch-7 ... Added status command	2018-03-07 15:51:33 -06:00
superwhiskers	0bd49a61e8	Merge pull request #16 from ThatNerdyPikachu/patch-8 ... Fixes Yamamura not working in DMs	2018-03-07 15:51:19 -06:00
Pika	5be5d8293d	Update Yamamura.py	2018-03-07 16:47:53 -05:00
Pika	ce4eb16f0b	Jon doesn't return JSON!? Fine, I'll deal with his "text/html" shit /s	2018-03-07 15:28:30 -05:00
Pika	22a11b5ed5	happy?	2018-03-07 15:23:50 -05:00
Pika	54fe4fe5a8	Fixes me being dumb ... Thanks @Netux for the head up	2018-03-07 15:11:55 -05:00
superwhiskers	d10b0f1ba7	make yamamura not send memes in spam channels (excluding the ayy message)	2018-03-07 13:10:10 -06:00
Pika	4811176516	Add the command to `help`	2018-03-07 12:10:52 -05:00
Pika	f6f7e4886c	Kill status command in this PR to remove merge conflicts	2018-03-07 11:58:52 -05:00
Pika	bc655c4263	Fixes Yamamura not working in DMs ... Thanks to Mario for reporting this!	2018-03-07 11:28:06 -05:00
superwhiskers	37c2a2db80	hey, added your other pr	2018-03-07 09:44:23 -06:00
Pika	9f7da93b97	Added status command ... MORE. PRS! MOOOOOORRRRRRREEEEEEEEE! (Coo, this command checks the status of the offical Pretendo servers!)	2018-03-07 10:43:50 -05:00
superwhiskers	e77fd4dc20	hey, added your other pr	2018-03-07 09:43:14 -06:00
superwhiskers	d4a97e2ffd	hey, added your pr	2018-03-07 09:41:12 -06:00
Pika	b60cd77fd0	Changes strings to ints in config example	2018-03-07 10:22:16 -05:00
Pika	3b6fa7eeda	Fix logging and Unicode characters not liking each other	2018-03-07 10:21:34 -05:00
superwhiskers	695412ac1f	Merge pull request #12 from ThatNerdyPikachu/patch-4 ... wam bam fix dm errors mam	2018-03-06 19:18:48 -06:00
Pika	f01b1cdef5	wam bam fix dm errors mam ... Fixes the log error with DMs, where it would fail, since ``discord.DMChannel`` does not have an attribute of ``name``.	2018-03-06 20:17:31 -05:00
superwhiskers	8229baed0b	Merge pull request #11 from ThatNerdyPikachu/patch-3 ... Fix playing status	2018-03-06 18:48:10 -06:00
Pika	2402e9619c	Fix playing status	2018-03-06 19:47:11 -05:00
superwhiskers	f6dd9b960c	Merge pull request #9 from ThatNerdyPikachu/patch-2 ... Rewrite™	2018-03-06 17:06:58 -06:00
Pika	b5c5bfb53a	Update README.md	2018-03-06 17:46:16 -05:00
Pika	176655c721	Ayy, it's the rewrite!	2018-03-06 17:45:19 -05:00
Pika	1d59b69511	Change d.py to rewrite	2018-03-06 08:29:39 -05:00
superwhiskers	ea9315ea39	Merge pull request #7 from netux/def-coo ... Tag command fixes and coo(channel, target_user, response)	2018-03-05 21:00:00 -06:00
Martín (Netux) Rodríguez	30f42884da	Added coo(channel, target_user, response) ... - Replaces the repeated `bot.send_message(channel, f"Coo, { target_user }, response")` Also, fixed tag command: - Fixed tag lookup (whoops) - Made subcommands case sensitive - Added tons of subcommand aliases	2018-03-05 23:57:57 -03:00
superwhiskers	b7ccb3dc17	Merge pull request #6 from netux/tag-command ... Added tag command	2018-03-05 19:24:59 -06:00
Martín (Netux) Rodríguez	76369b5cc7	Changed Yamamura.py's line-endings to LF ... I noticed an incosistency on my last commit.	2018-03-05 19:48:15 -03:00
Martín (Netux) Rodríguez	aac568f691	Fixed security issue with is_mod(user)	2018-03-05 19:14:09 -03:00
Martín (Netux) Rodríguez	70f57cbd32	Added tag command ... - Added spam channels config, works with channel IDs - Defined `is_mod(user)` to replace repeated `cfg["moderators"]` checks - Writes tags as a name-tag map to tags.json - Ability to create a tag (mods only) - Ability to delete a tag (mods only) - Ability to see all tags (DM if channel isn't a spam channel)	2018-03-05 19:12:58 -03:00
superwhiskers	f050c126c8	add a better logreader that doesn't update each second	2018-03-05 14:00:15 -06:00
superwhiskers	889dac9977	fix it	2018-03-04 21:27:41 -06:00
superwhiskers	f8941e005f	Merge pull request #5 from ThatNerdyPikachu/patch-1 ... Add gud meme	2018-03-04 21:17:55 -06:00
Pika	1a33d12a04	Final changes	2018-03-04 22:16:17 -05:00
Pika	7cc07d38e5	Add gud meme ... Written on my phone	2018-03-04 22:07:19 -05:00