1246 Commits

Author SHA1 Message Date
Tyler Hodapp
c1aebe357e Merge branch 'fixing_danbooru' into 'master'
Fixing the way we retrieve images from danbooru

See merge request ldooks/dragon-bot!58
2018-03-07 21:03:02 +00:00
9a530ba0b7 Fixing the way we retrieve images from danbooru 2018-03-07 12:49:08 -08:00
f9ead69f04 Adding another subreddit 2018-03-07 10:46:10 -08:00
1e06ad09ee updating URLs that im posting images from 2018-03-07 10:39:31 -08:00
f9c02c67cf Adding more subreddits from the reddit 'hentai group' to the lewd function 2018-03-07 10:34:09 -08:00
Tyler Hodapp
83c390f6f6 Merge branch 'homepage' into 'master'
fixed a problem with homepage by parsing lists better

See merge request ldooks/dragon-bot!56
2018-02-07 05:09:47 +00:00
Tyler Hodapp
b418771218 fixed a problem with homepage by parsing lists better 2018-02-07 05:09:47 +00:00
e26886e858 Merge branch 'core_utils' into 'master'
Creating core utils for boiler plate code

See merge request ldooks/dragon-bot!55
2018-02-04 22:14:11 +00:00
69acbd7e42 Creating core utils for boiler plate code 2018-02-04 22:14:11 +00:00
44a6a2ee15 Fixing the interpolation of the emoji on upload 2017-12-17 10:42:04 -08:00
64b650a732 Merge branch 'emoji' into 'master'
Adding emoji functionality and updating the roles to match the new server

See merge request ldooks/dragon-bot!54
2017-12-17 18:23:48 +00:00
8afdad1850 Adding emoji functionality and updating the roles to match the new server 2017-12-17 18:23:48 +00:00
058e17f9e6 Merge branch 'master' of gitlab.com:ldooks/dragon-bot 2017-12-16 18:40:34 -08:00
51a81b1432 updating token for dragon bot 2017-12-16 18:40:22 -08:00
b1a74a1811 Merge branch 'requirements_file' into 'master'
Moving to using a requirements file, fixes #32

Closes #32

See merge request ldooks/dragon-bot!53
2017-10-08 18:39:12 +00:00
52daecc4e6 Moving to using a requirements file, fixes #32 2017-10-08 18:39:12 +00:00
Luke Robles
22ebd0973d dont post dog url videos, they dont embed in discord 2017-10-02 13:10:45 -07:00
Luke Robles
9313e125ff Change minecraft container to beyondreality 2017-10-02 10:50:18 -07:00
115f5e8772 Merge branch 'doggos' into 'master'
doggos, fixes #30

Closes #30

See merge request ldooks/dragon-bot!52
2017-10-02 17:49:14 +00:00
ce390acda9 doggos, fixes #30 2017-10-02 17:49:14 +00:00
Luke Robles
9c97460ff2 Cleanup is only allowed in the test channel 2017-09-30 15:53:31 -07:00
Luke Robles
64f498d229 Updated readme 2017-09-27 13:07:36 -07:00
Luke Robles
73f49bab47 upating readme 2017-09-26 15:22:05 -07:00
Luke Robles
2301e50264 Condensing the docker file in to fewer steps 2017-09-26 14:32:09 -07:00
53236615bd Merge branch 'stock' into 'master'
fixed?

See merge request ldooks/dragon-bot!49
2017-09-25 03:14:36 +00:00
Jason Ji
2fb9f4ea1a fixed? 2017-09-24 18:25:22 -07:00
Jason Ji
083be92413 Merge branch 'stock' into 'master'
stock

See merge request ldooks/dragon-bot!48
2017-09-25 01:04:59 +00:00
Jason Ji
03c365e0b0 stock help msg 2017-09-24 17:59:20 -07:00
Jason Ji
9402cfb7a0 stock plugin mk1 2017-09-24 17:31:03 -07:00
Jason Ji
1cd1a148f4 Merge branch 'weather' into 'master'
Weather

See merge request ldooks/dragon-bot!47
2017-09-24 21:13:37 +00:00
Jason Ji
a901b0b374 clean up clean up 2017-09-24 12:06:45 -07:00
Jason Ji
362458a853 Merge branch 'weather' of https://gitlab.com/ldooks/dragon-bot into weather 2017-09-24 12:00:12 -07:00
Jason Ji
b34acd125e code cleanup 2017-09-24 11:59:57 -07:00
Jason Ji
54e77d4cd2 Merge branch 'master' into 'weather'
# Conflicts:
#   app/dragon-bot.py
#   app/help_methods.py
2017-09-22 20:18:09 +00:00
Luke Robles
bf5343291c Smug faces yall 2017-09-22 13:00:22 -07:00
Jason Ji
2249e5a2d1 prints emoji for current status weather 2017-09-21 23:51:23 -07:00
Jason Ji
99ff1588be Merge branch 'pout' into 'master'
Adding pout

See merge request ldooks/dragon-bot!46
2017-09-22 06:42:37 +00:00
31ef6e965a Merge branch 'fix_help' into 'master'
Fixing the fucked up help output

See merge request ldooks/dragon-bot!45
2017-09-22 05:20:37 +00:00
0b954fc8ae Fixing the fucked up help output 2017-09-22 05:20:37 +00:00
Luke Robles
c2736e74bc Adding pout 2017-09-21 21:31:54 -07:00
6d305bdb34 Merge branch 'weather' into 'master'
Weather

See merge request ldooks/dragon-bot!44
2017-09-22 03:53:06 +00:00
Jason Ji
c134178456 Weather 2017-09-22 03:53:06 +00:00
Jason Ji
dd6db6b935 updated help for weather 2017-09-21 19:09:52 -07:00
Jason Ji
bfe662ddaa janky fix to handle messages 2017-09-21 18:40:46 -07:00
Jason Ji
b3434fa898 fixed variable name issue 2017-09-21 18:34:01 -07:00
Jason Ji
9e414eac17 handling string inputs properly 2017-09-21 18:31:34 -07:00
Jason Ji
a2f528e011 Merge branch 'weather' of https://gitlab.com/ldooks/dragon-bot into weather 2017-09-21 18:30:49 -07:00
Jason Ji
43003f7a6b handle string inputs 2017-09-21 18:30:34 -07:00
Jason Ji
8771c9e8ab fixed message handling for weather 2017-09-22 01:18:58 +00:00
Jason Ji
f19d3754f6 Merge remote-tracking branch 'refs/remotes/origin/weather' into weather 2017-09-21 18:08:18 -07:00