Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Stab #241

Open
wants to merge 393 commits into
base: gonzobot
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
393 commits
Select commit Hold shift + click to select a range
8b08ffc
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 7, 2015
c756613
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 8, 2015
4291918
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 11, 2015
8745d67
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 11, 2015
3cab79d
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 14, 2015
1e28d3c
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 14, 2015
42a83e7
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 14, 2015
d353d47
fix whitespace and extra json brace
edwardslabs Oct 14, 2015
b689350
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 14, 2015
0f2ffb3
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 14, 2015
16d366b
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 14, 2015
c9c64e6
fix merge conflict in foods.py
edwardslabs Oct 23, 2015
27411ad
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 24, 2015
d3e8531
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 1, 2015
2b5fa52
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 2, 2015
73af450
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 2, 2015
5deb5d5
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 6, 2015
45d2794
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 10, 2015
0c84f52
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 12, 2015
3c39394
fix typo and fuck with paradox
edwardslabs Nov 25, 2015
dcafba6
add whitelisted channels
edwardslabs Nov 30, 2015
894b151
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 30, 2015
76329c1
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 30, 2015
5162635
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 30, 2015
6c1f678
this is weird
edwardslabs Dec 3, 2015
4b43d0e
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Dec 3, 2015
8824122
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Dec 3, 2015
3e4b094
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Dec 4, 2015
b4245f8
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Dec 7, 2015
341f94a
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Dec 7, 2015
7df6ec7
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Dec 15, 2015
ceca213
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Dec 18, 2015
0420b2a
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Dec 21, 2015
5ff312a
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jan 6, 2016
fcc2c07
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jan 11, 2016
b799ffd
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jan 15, 2016
73a4ad8
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jan 15, 2016
c72cd77
syncing grab.py
edwardslabs Mar 9, 2016
c3f50ad
merging local changes
edwardslabs Mar 9, 2016
1bd7ac2
reset stuff
edwardslabs Apr 17, 2016
09f351a
fix merged data
edwardslabs Apr 17, 2016
4f93787
herald exclusion list update
edwardslabs Apr 21, 2016
1c9477e
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Apr 21, 2016
a6708e0
chan opt outs
edwardslabs May 13, 2016
32db83b
merging shit
edwardslabs May 14, 2016
b185a85
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs May 14, 2016
550ee94
added opt outs for the link announcer
edwardslabs May 15, 2016
311089c
merge regex change
edwardslabs May 15, 2016
e5c8412
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs May 15, 2016
fdc655d
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs May 17, 2016
69cd463
add in excluded channels
edwardslabs May 18, 2016
f68a0d5
fix the previous merge
edwardslabs May 21, 2016
d0b5d16
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs May 21, 2016
936df8a
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs May 22, 2016
80085b4
opt out #anxiety
edwardslabs May 22, 2016
a91740d
fix after merge
edwardslabs May 22, 2016
9f760f9
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs May 23, 2016
172a006
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs May 23, 2016
2ba6d2c
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jun 10, 2016
841e642
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jun 10, 2016
206602f
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jun 10, 2016
191c477
fixed bad merge
edwardslabs Jun 24, 2016
1a56e94
add changes to foods.py
edwardslabs Jun 24, 2016
5f0b08d
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jun 24, 2016
21cde65
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jun 24, 2016
97ce006
fix issue with messages not sending
edwardslabs Jun 25, 2016
62544f6
add #europa to the opt_out list
edwardslabs Jul 11, 2016
7463f76
fix merge conflict
edwardslabs Jul 11, 2016
5cdf231
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jul 17, 2016
2476ed6
turn off for some channels
edwardslabs Jul 17, 2016
c1b5109
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jul 17, 2016
c676847
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jul 17, 2016
caf2ddc
don't allow seen in anxiety
edwardslabs Jul 18, 2016
038ab50
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jul 18, 2016
096d8c1
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jul 26, 2016
e40f861
merge local changes
edwardslabs Jul 27, 2016
751ff4f
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jul 27, 2016
662c328
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jul 27, 2016
d366cbf
don't log
edwardslabs Aug 19, 2016
a911824
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Aug 19, 2016
8a6cb45
add local changes
edwardslabs Oct 2, 2016
6ed6c3a
fix a merge issue.
edwardslabs Oct 2, 2016
3567c21
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 3, 2016
dc6e0df
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 10, 2016
869be2f
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 12, 2016
b128d2e
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 29, 2016
72c095c
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 29, 2016
510d0df
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 29, 2016
6f19b52
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 29, 2016
2def9fb
fixing merge conflict
edwardslabs Nov 2, 2016
ee8a335
fix another merge conflict
edwardslabs Nov 2, 2016
4bcc5fe
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 3, 2016
99a64c9
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 6, 2016
1eb887b
fix merge conflict
edwardslabs Nov 13, 2016
eb1fada
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 13, 2016
6b4a1cd
merge local commits
edwardslabs Nov 13, 2016
95fd40d
hookup causes infinite loops
edwardslabs Nov 13, 2016
ab29830
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 13, 2016
ac93d34
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 14, 2016
62c6bd4
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 15, 2016
abf9237
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 15, 2016
9485733
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 15, 2016
6e09bad
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 15, 2016
3161143
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 16, 2016
15c1282
this is weird.
edwardslabs Nov 16, 2016
4a86efd
looks like this has cleaned things up.
edwardslabs Nov 16, 2016
ea1c2fa
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 17, 2016
884491f
remove command from #aspergers
edwardslabs Nov 17, 2016
292468b
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 17, 2016
ee545dd
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 18, 2016
435aa00
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 27, 2016
281f385
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 27, 2016
a5ff484
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Dec 2, 2016
c5e2b98
sync up local changes
edwardslabs Dec 7, 2016
8e87dbf
commit changes before pulling from master.
edwardslabs Dec 8, 2016
407df89
fix herald merge conflicts
edwardslabs Dec 8, 2016
a47da03
take away the disabled herald message.
edwardslabs Dec 8, 2016
078342d
actually enable heralds this time.
edwardslabs Dec 8, 2016
1311f0a
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Dec 13, 2016
cb88372
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Dec 13, 2016
2168ed4
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Dec 23, 2016
9717474
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Dec 23, 2016
1de1d39
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jan 2, 2017
e6521df
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jan 3, 2017
bfb1214
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jan 6, 2017
13e3aaf
bing is dying
edwardslabs Feb 1, 2017
96846f9
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Feb 1, 2017
457cc57
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Feb 1, 2017
4b9af27
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Feb 19, 2017
d2ba8ec
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Feb 19, 2017
a860b2f
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Feb 19, 2017
b42b07b
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Feb 19, 2017
455d380
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Feb 19, 2017
6b97e85
disable in lmr
edwardslabs Feb 20, 2017
ea2d3d3
fix merge conflict
edwardslabs Feb 20, 2017
ff7b44b
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Feb 20, 2017
06e66fc
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Feb 22, 2017
8c50292
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Feb 22, 2017
faae0f5
fixmerge
edwardslabs Feb 23, 2017
6a36a53
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Feb 23, 2017
cdb8efb
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Feb 24, 2017
ecb2e1f
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Mar 8, 2017
14ce35a
add opt_out channels for karma.
edwardslabs Mar 26, 2017
32c190d
fix merge conflict for karma.py
edwardslabs Mar 26, 2017
4fc3d8a
fix merge conflict for recipe.py
edwardslabs Mar 26, 2017
ac341cc
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Mar 26, 2017
3dfaed7
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Mar 28, 2017
f111949
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Apr 1, 2017
82a422a
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Apr 21, 2017
cb63b1f
add in local changes.
edwardslabs May 7, 2017
e868f53
resolve merge conflicts
edwardslabs May 7, 2017
43ff7f5
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs May 26, 2017
3808f3c
add channel changes
edwardslabs Jun 5, 2017
766975e
add a kero saying
edwardslabs Jun 18, 2017
7df011a
add refreshed version of commands
edwardslabs Jun 18, 2017
2d0edf6
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jun 18, 2017
9313827
added another kero gem.
edwardslabs Jun 22, 2017
57c0c86
fix merge conflicts
edwardslabs Jun 23, 2017
a364814
Merge branch 'gonzobot' of https://github.com/snoonetIRC/Cloudbot int…
edwardslabs Jul 3, 2017
2f72958
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jul 5, 2017
55d24be
made sending a tell to rdv or or shane respond with the same message
Jul 12, 2017
86b68bc
Merge branch 'shane-edit' into 'gonzobot'
edwardslabs Jul 12, 2017
1eb94e5
Merge branch 'gonzobot' of gitlab.com:snoonet-dev/gonzobot into gonzobot
edwardslabs Jul 12, 2017
911fe1e
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jul 13, 2017
7dc8093
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jul 13, 2017
0e203e8
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Jul 22, 2017
c5a55c2
add #pufftown to optout for grabs.
edwardslabs Jul 27, 2017
3945725
Added #portland to the list of optin channels
Jul 28, 2017
d349027
Added #sweden to the herald command opt out
Aug 3, 2017
ddc8e6a
Added #trackers to opt out at the request of Ketchup901
Aug 3, 2017
84558f1
opt out link_announcer for a channel. I can't even remember which one.
edwardslabs Aug 24, 2017
e9938c4
fix a small merge conflict in hookup.py to op out #anxiety.
edwardslabs Aug 24, 2017
23551d9
Merge branch 'portlandedit' into 'gonzobot'
edwardslabs Aug 24, 2017
a71f8b8
Merge branch '#sweden-edit' into 'gonzobot'
edwardslabs Aug 24, 2017
8368703
give people the penis they want and desearve.
edwardslabs Aug 24, 2017
fc1f06e
fix a small merge conflict because I took way too long to merge A_D's…
edwardslabs Aug 24, 2017
596ac48
fix merge issues
edwardslabs Sep 9, 2017
0ca0e70
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Sep 10, 2017
a708e86
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Sep 21, 2017
364e0a0
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Sep 22, 2017
7f02230
add .penis to #psychiccheeto
edwardslabs Sep 26, 2017
14b2a69
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 2, 2017
bdb1767
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 2, 2017
02fe788
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 2, 2017
35c3429
fix merge failures.
edwardslabs Oct 4, 2017
98fd961
enable .penis for #metalgigsscotland and #psychicart
edwardslabs Oct 6, 2017
64979d7
add .penis to ##prolesftw
edwardslabs Oct 6, 2017
66b63b1
add #duckfuck to .penis.
edwardslabs Oct 8, 2017
4ec6130
some change to correction.py that I forgot to commit before and am to…
edwardslabs Oct 10, 2017
7f0c006
fix merge conflits on plugins/check_conn.py and plugins/attacks.py
edwardslabs Oct 10, 2017
3d58239
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 10, 2017
725ead1
fix merge conflicts you forgot to fix dumbass.
edwardslabs Oct 10, 2017
2ad3300
chan parameter got wiped in merge. added chan so channels can opt out…
edwardslabs Oct 10, 2017
90c6a5a
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Oct 11, 2017
8313708
add penis to #textfriends, remove heralds from #talk
edwardslabs Oct 17, 2017
c6979f8
turn off herald for some channel.
edwardslabs Oct 25, 2017
4bc7a2b
fix merge issues with grab.py and attacks.py
edwardslabs Oct 25, 2017
0eb936e
really fix the merge error this time.
edwardslabs Oct 25, 2017
9745520
fix merge conflicts
edwardslabs Nov 14, 2017
ee709d8
Merge branch 'gonzobot' of https://github.com/snoonetIRC/Cloudbot int…
edwardslabs Nov 14, 2017
0ad757c
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 14, 2017
dc4a781
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 14, 2017
dfcea50
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 14, 2017
d7dc8ac
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 15, 2017
70614fb
I dunno what was changed just syncing up the gitlab repo.
edwardslabs Nov 15, 2017
21da481
Remove channels from opt out lists that have migrated to new system
linuxdaemon Nov 16, 2017
35dcd0d
Remove empty optouts
linuxdaemon Nov 16, 2017
24ef8bd
Remove #sandersforpresident optouts since the channel is dead
linuxdaemon Nov 17, 2017
5afde22
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 17, 2017
0ffc06b
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 17, 2017
a44cff5
Remove more empty optouts
linuxdaemon Nov 18, 2017
b8f55bb
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 21, 2017
187589a
send hook errors to ##gonzobot
edwardslabs Nov 21, 2017
469d659
rename reactionmacros.json to reaction_macros.json
edwardslabs Nov 21, 2017
d846b7c
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 21, 2017
d344571
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 21, 2017
e0a9ecc
update commands.md
edwardslabs Nov 21, 2017
1324927
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 21, 2017
26177fc
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 24, 2017
75eb6bd
fix merge conflicts for herald nad wouldyou
edwardslabs Nov 26, 2017
762f9a7
fix merge conflicts with herald.py.
edwardslabs Nov 26, 2017
7a1b79b
Merge branch 'gonzobot' into gonzobot+remove-optouts
linuxdaemon Nov 26, 2017
f873070
Remove #anxiety from old optout system
linuxdaemon Nov 26, 2017
4805bd1
Remove empty optouts
linuxdaemon Nov 26, 2017
a8bc65b
Remove herald optout for #xboxone
linuxdaemon Nov 26, 2017
482b562
Remove herald optout for #britishpolitics
linuxdaemon Nov 26, 2017
2ca7d91
Remove optouts for #showgoat and #toolbox
linuxdaemon Nov 26, 2017
8c8c776
Migrate old optouts to the new system and fix differences from upstre…
linuxdaemon Nov 26, 2017
67dd4eb
fix merge conflicts
edwardslabs Nov 27, 2017
b68b142
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 27, 2017
8cbb8e4
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 27, 2017
8b93d2b
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 27, 2017
e64cbcd
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 27, 2017
61f28ba
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 27, 2017
24f1c3a
fix merge conflicts in correction.py
edwardslabs Nov 29, 2017
4f5d283
Merge branch 'gonzobot' of https://github.com/edwardslabs/CloudBot in…
edwardslabs Nov 29, 2017
6ee620e
Merge branch 'gonzobot' into 'gonzobot+remove-optouts'
leonthemisfit Nov 30, 2017
0cb5490
Merge branch 'gonzobot+remove-optouts' into 'gonzobot'
edwardslabs Dec 7, 2017
bfc4a9a
remove optin for penis.py
edwardslabs Dec 7, 2017
a6a248a
fix merge conflicts
edwardslabs Dec 12, 2017
e8fd4ef
Fix NameError in horoscope.py
linuxdaemon Dec 13, 2017
d4ecbc3
Merge branch 'gonzobot+fix-horoscope' into 'gonzobot'
edwardslabs Dec 13, 2017
7d60310
fix merge conflicts
edwardslabs Jan 3, 2018
dc61e62
fix some minor merge conflicts
edwardslabs Jan 3, 2018
1323144
Merge branch 'gonzobot' of github.com:snoonetIRC/CloudBot into gonzobot
edwardslabs Jan 3, 2018
657e787
Merge branch 'gonzobot' of github.com:snoonetIRC/CloudBot into gonzobot
edwardslabs Jan 3, 2018
7ba6581
Merge branch 'gonzobot' of github.com:snoonetIRC/CloudBot into gonzobot
edwardslabs Jan 3, 2018
640429f
Merge branch 'gonzobot' of github.com:snoonetIRC/CloudBot into gonzobot
edwardslabs Jan 4, 2018
4c68e10
fix odd merge conflict
edwardslabs Jan 5, 2018
8a5f1a6
Added Stab
Vault108 Jan 11, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
584 changes: 443 additions & 141 deletions docs/user/commands.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion plugins/attacks.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ def __init__(self, name, doc, *commands, action=None, file=None, response=RespTy


ATTACKS = (
BasicAttack("stab", "<user> - Stabs <user>"),
BasicAttack("lart", "<user> - LARTs <user>"),
BasicAttack(
"flirt", "<user> - flirts with <user>", "flirt", "sexup", "jackmeoff", action="flirt with",
Expand Down Expand Up @@ -125,7 +126,6 @@ def func(text, conn, nick, action, message, reply, is_nick_valid):

if is_self(conn, target):
target = nick
nick = conn.nick

out = basic_format(nick, target, attack_data[attack.name])

Expand Down
3 changes: 3 additions & 0 deletions plugins/correction.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
unescape_re = re.compile(r'\\(.)')


def shorten_msg(msg):
out = (msg[:500]) if len(msg) > 500 else msg
return out
@hook.regex(correction_re)
def correction(match, conn, nick, chan, message):
"""
Expand Down
2 changes: 2 additions & 0 deletions plugins/duckhunt.py
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,8 @@ def attack(nick, chan, message, db, conn, notice, attack):
if not random.random() <= chance and chance > .05:
out = random.choice(miss) + " You can try again in 7 seconds."
scripters[nick.lower()] = shoot + 7
if nick.lower() == "paradox":
scripters[nick.lower()] = shoot + 864000
return out

if chance == .05:
Expand Down
1 change: 1 addition & 0 deletions plugins/geoip.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ def check_db(loop):

@asyncio.coroutine
@hook.on_start
@hook.command(permissions=['botcontrol'])
def load_geoip(loop):
async_util.wrap_future(check_db(loop), loop=loop)

Expand Down
1 change: 0 additions & 1 deletion plugins/google.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ def api_get(kind, query):
# @hook.command("googleimage", "gis", "image")
def googleimage(text):
"""<query> - returns the first google image result for <query>"""

parsed = api_get('images', text)
if not 200 <= parsed['responseStatus'] < 300:
raise IOError('error searching for images: {}: {}'.format(parsed['responseStatus'], ''))
Expand Down
2 changes: 1 addition & 1 deletion plugins/google_cse.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def gse_gis(text):
result = parsed['items'][0]
metadata = parsed['items'][0]['image']
except KeyError:
return "No results found."
return "No results found or I am out of free searches for the day. Try .bis or .gif"

dimens = '{}x{}px'.format(metadata['width'], metadata['height'])
size = filesize.size(int(metadata['byteSize']))
Expand Down
6 changes: 6 additions & 0 deletions plugins/huntblock.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from cloudbot import hook

@hook.command("duckkic", "starthun", "stophun", autohelp=False)
def huntfoil():
"""dummmy command to make sure people use the full command so OPS can block it if they need to."""
return "please use the full command."
10 changes: 10 additions & 0 deletions plugins/jokes.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@ def boobies(text):
return "Sorry I couldn't turn anything in '{}' into boobs for you.".format(out)
return out

@hook.command("zombs", autohelp=False)
def zombs(conn, chan):
"""prints some fucked up shit."""
out = "\u2299\u2299\u0505\u0F0D\u0020\u0E88\u0020\u25DE\u0C6A\u25DF\u0E88\u0020\u0F0D\u0648"
return out

@hook.command("awesome", "iscool", "cool")
def awesome(text, is_nick_valid):
Expand Down Expand Up @@ -135,3 +140,8 @@ def kero(text):
def lawyerjoke(message):
"""- returns a lawyer joke, so lawyers know how much we hate them"""
message(random.choice(lawyerjoke))

@hook.command("fuck", autohelp=False)
def fuck(text):
"""returns something funny."""
return("something funny.")
1 change: 0 additions & 1 deletion plugins/link_announcer.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

MAX_RECV = 1000000


@hook.regex(url_re, priority=Priority.LOW, action=Action.HALTTYPE, only_no_match=True)
def print_url_title(message, match):
with closing(requests.get(match.group(), headers=HEADERS, stream=True, timeout=3)) as r:
Expand Down
1 change: 0 additions & 1 deletion plugins/monsterhunt.py
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,6 @@ def friends(text, chan, conn, db):
url = web.paste(json.dumps(topfriends, indent=4))
out += ' • '.join(["{}: {}".format('\x02' + k[:1] + u'\u200b' + k[1:] + '\x02', str(v)) for k, v in topfriends])
out = smart_truncate(out)
out += " " + url
return out


Expand Down
2 changes: 1 addition & 1 deletion plugins/password.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def word_password(text, notice):
try:
length = int(text)
except ValueError:
length = 3
length = 4

if length > 10:
notice("Maximum length is 50 characters.")
Expand Down
18 changes: 18 additions & 0 deletions plugins/penis.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import random

from cloudbot import hook

balls = ['(_)_)', '8', 'B', '(___)__)', '(_)(_)', '(@)@)', '3']
shaft = ['=', '==', '===', '====', '=====', '========', '/////////////////////////', '|||||||||||||', '\u2248\u2248\u2248']
head = ['D', 'Q', '>', '|\u2283' '\u22d1', '\u22d9', '\u22d7']
emission = ['~ ~ ~ ~', '~ * ~ &', '', '*~* *~* %']
bodypart = ['face', 'glasses', 'thigh', 'tummy', 'back', 'hiney', 'hair', 'boobs', 'tongue']

@hook.command("penis", "bepis", autohelp=False)
def penis(text, message, nick):
"""much dongs, very ween, add a user nick as an arguement for slightly different 'output'"""
if not text:
message("{}{}{}".format(random.choice(balls), random.choice(shaft), random.choice(head)))
else:
person = text.split(' ')[0]
message("{}{}{}{} all over {}'s {}".format(random.choice(balls), random.choice(shaft), random.choice(head),random.choice(emission), person, random.choice(bodypart)))
1 change: 1 addition & 0 deletions plugins/profiling.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ def get_thread_dump():
if line:
code.append(" {}".format(line.strip()))
code.append("") # new line
return "\n".join(code)
return web.paste("\n".join(code), ext='txt')


Expand Down
2 changes: 1 addition & 1 deletion plugins/recipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
RANDOM_URL = SEARCH_URL + "/surprise"

# set this to true to censor this plugin!
CENSOR = True
CENSOR = False
PHRASES = [
"EAT SOME FUCKING \x02{}\x02",
"YOU WON'T NOT MAKE SOME FUCKING \x02{}\x02",
Expand Down
2 changes: 2 additions & 0 deletions plugins/tell.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ def tell_cmd(text, nick, db, notice, conn, notice_doc, is_nick_valid):
query = text.split(' ', 1)
if query[0].lower() == "paradox":
return "Paradox doesn't want to hear from me. Just send him a fucking message."
if query[0].lower() in ["rdv", "shane"]:
return "rdv doesn't want to hear from me, if you need something done please ask in #help."
if len(query) != 2:
notice_doc()
return
Expand Down