Skip to content

Commit db741b6

Browse files
linuxdaemonlinuxdaemon
committed
Merge branch 'gonzobot' into gonzobot+manual-load
2 parents d9a9a3a + 865576c commit db741b6

18 files changed

Lines changed: 988 additions & 134 deletions

File tree

‎.travis.yml‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
language: python
22
python:
33
- "3.4"
4+
- "3.5"
5+
- "3.6"
6+
- "3.7-dev"
47

58
install:
69
- "sudo apt-get update -q"
@@ -9,20 +12,11 @@ install:
912

1013
script:
1114
- "python ./travis/test_json.py"
15+
- "git diff --diff-filter=d --name-only ${TRAVIS_COMMIT_RANGE} | xargs pylint --rcfile=travis/pylintrc"
1216
- "py.test . -v --cov . --cov-report term-missing"
1317

1418
after_success:
1519
- "coveralls"
16-
20+
1721
env:
1822
- PYTHONPATH=.
19-
20-
notifications:
21-
irc:
22-
channels:
23-
- "irc.esper.net#cloudbot"
24-
template:
25-
- "%{repository}#%{build_number} (%{branch} - %{commit}) %{author}: %{message} - %{build_url}"
26-
on_failure: always
27-
on_success: change
28-
skip_join: true

‎cloudbot/clients/irc.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ def cmd(self, command, *params):
202202
:type command: str
203203
:type params: (str)
204204
"""
205-
params = list(params) # turn the tuple of parameters into a list
205+
params = list(map(str, params)) # turn the tuple of parameters into a list
206206
if params:
207207
params[-1] = ':' + params[-1]
208208
self.send("{} {}".format(command, ' '.join(params)))

‎cloudbot/plugin.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,10 +482,10 @@ def internal_launch(self, hook, event):
482482
try:
483483
out = yield from task
484484
ok = True
485-
except Exception as e:
485+
except Exception:
486486
logger.exception("Error in hook {}".format(hook.description))
487487
ok = False
488-
out = e
488+
out = sys.exc_info()
489489

490490
hook.plugin.tasks.remove(task)
491491

‎cloudbot/util/parsers/irc.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,11 @@ def __eq__(self, other):
7070

7171
return NotImplemented
7272

73+
def __hash__(self):
74+
return hash((self.name, self.value))
75+
7376
@staticmethod
74-
def parse(text: str):
77+
def parse(text):
7578
"""Parse a CAP entity from a string"""
7679
name, _, value = text.partition(CAP_VALUE_SEP)
7780
return Cap(name, value)
@@ -81,7 +84,7 @@ class CapList(Parseable, list):
8184
"""Represents a list of CAP entities"""
8285

8386
def __str__(self):
84-
return CAP_SEP.join(self)
87+
return CAP_SEP.join(map(str, self))
8588

8689
@staticmethod
8790
def parse(text):

‎data/food/wine.json‎

Lines changed: 232 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,232 @@
1+
{
2+
"templates": [
3+
"hands {user} a {size} of {wine}"
4+
],
5+
"parts": {
6+
"size": [
7+
"bottle",
8+
"glass"
9+
],
10+
"wine": [
11+
"Billecart-Salmon Rose Mareuil-sur-Ay NV.",
12+
"Le Mesnil Blanc de Blanc Le Mesnil sur Oger NV.",
13+
"Nicolas Feuillatte Brut Epernay NV.",
14+
"Perrier-Jouet Brut Epernay NV.",
15+
"Pierre Moncuit Brut Mesnil NV.",
16+
"Pierre Peters Blanc de Blanc Le Mesnil sur Oger NV.",
17+
"Pol Roger Brut Reserve Epernay NV.",
18+
"Roederer Estate Brut Anderson Valley NV.",
19+
"Schramsberg Rose North Coast.",
20+
"Veuve Cliquot Yellow Label, Reims NV.",
21+
"Veuve Cliquot Rose Reims NV.",
22+
"Babich Marlborough.",
23+
"Cakebread Napa.",
24+
"Chateau Carbonnieux Pessac-Leognan.",
25+
"Chateau La Gravelle Bordeaux.",
26+
"Domaine Dagueneau Cuvee Silex Pouilly Fume.",
27+
"Elizabeth Spencer Mendocino.",
28+
"Frog\u2019s Leap Rutherford.",
29+
"Groth Napa.",
30+
"Illumination Sonoma.",
31+
"Kim Crawford Spitfire Marlborough.",
32+
"Merry Edwards Russian River.",
33+
"Whitehaven Marlborough.",
34+
"Roblin Sancerre Loire Valley.",
35+
"Spottswoode Sonoma & Napa.",
36+
"Produttori del Barbaresco \u201cRio Scordo\u201d Piedmont.",
37+
"Recchia Amarone Valpolicella, Italy.",
38+
"Reyneke Capstone Blend South Africa.",
39+
"Susana Balbo Malbec Mendoza, Argentina.",
40+
"Susanna Balbo \u201cBrioso\u201d Mendoza, Argentina.",
41+
"The Prisoner Napa.",
42+
"Torre de O\u00f1a Rioja Reserva Spain.",
43+
"Tommasi Amarone Classico Valpolicella, Italy.",
44+
"Vietti BaroloCastiglione Piedmont, Italy.",
45+
"cabernet sauvignon.",
46+
"Altamura Napa.",
47+
"Caymus Napa.",
48+
"Caymus Special Selection Napa.",
49+
"Chappellet Napa.",
50+
"Charles Smith \u201cSubstance\u201d Washington.",
51+
"Chateau Montelena Calistoga.",
52+
"Chateau Sociando-Mallet Haut-Medoc, Bordeaux.",
53+
"Chimney Rock Stags Leap.",
54+
"Daou Reserve Paso Robles.",
55+
"Dunn Vineyards Howell Mountain.",
56+
"Frank Family Vineyards Reserve.",
57+
"Heitz Cellars Martha\u2019s Vineyard Napa.",
58+
"Hook & Ladder Chalk Hill, Sonoma.",
59+
"J. Lohr Seven Oaks Paso Robles.",
60+
"Joseph Phelps Insignia Napa.",
61+
"Justin Paso Robles.",
62+
"Nickel & Nickel C.C. Ranch Napa.",
63+
"Oakville Winery Oakville, Napa.",
64+
"Pied a Terre Sonoma.",
65+
"Robert Craig Howell Mountain, Napa.",
66+
"Spottswoode th Anniversary Napa.",
67+
"Stuhlmuller Alexander Valley, Sonoma.",
68+
"Terra Valentine Napa.",
69+
"Turley Estate Napa.",
70+
"Turnbull Napa.",
71+
"Cakebread Napa.",
72+
"Chateau Carbonnieux Pessac-Leognan.",
73+
"Chateau La Gravelle Bordeaux.",
74+
"Domaine Dagueneau Cuvee Silex Pouilly Fume.",
75+
"Elizabeth Spencer Mendocino.",
76+
"Frog\u2019s Leap Rutherford.",
77+
"Groth Napa.",
78+
"Illumination Sonoma.",
79+
"Kim Crawford Spitfire Marlborough.",
80+
"Merry Edwards Russian River.",
81+
"Whitehaven Marlborough.",
82+
"Roblin Sancerre Loire Valley.",
83+
"Spottswoode Sonoma & Napa.",
84+
"Brooks Runaway Pinot Blanc Oregon.",
85+
"Cantina Tramin Pinot Grigio Alto Adige, Italy.",
86+
"Donnhof Estate Riesling Nahe, Germany.",
87+
"Eroica Riesling Columbia Valley.",
88+
"Four Graces Pinot Blanc Willamette Valley.",
89+
"Jermann Pinot Grigio Venezia, Italy.",
90+
"Prager Riesling Smaragd Achleiten Austria.",
91+
"Robert Weil Riesling Kabinett Rheingau.",
92+
"Santa Margherita Pinot Grigio Valdadige.",
93+
"Trimbach Riesling R\u00e9serve Alsace.",
94+
"Willamete Pinot Gris Oregon.",
95+
"Aix De Province Ros\u00e9 Provence, France.",
96+
"d\u2019Arenberg Hermit Crab Mclaren Vale.",
97+
"Broglia Gavi di Gavi Piedmont, Italy.",
98+
"Domaine des Baumard Savennieres, France.",
99+
"Eberle Viognier Mill Road Vineyard, Paso Robles.",
100+
"Lagler Gr\u00fcner Veltliner Wachau, Austria.",
101+
"Licia Albarino Rias Baixas, Spain.",
102+
"R. Pichler Gruner Veltliner Smaragd Austria.",
103+
"Raats Old Vine Chenin Blanc Stellenbosch.",
104+
"Williamsburg Winery Viognier Virginia.",
105+
"Adelsheim Caitlin\u2019s Reserve Willamette.",
106+
"Arrowood Sonoma.",
107+
"Cakebread Napa.",
108+
"Chapellet Napa.",
109+
"Chateau Montelena Napa.",
110+
"Chehalem Inox Unoaked Willamete.",
111+
"De Whetshof Limestone Hill South Africa.",
112+
"Drouhin Chassagne-Montrachet Burgundy.",
113+
"Gilbert Picq Chablis Burgundy.",
114+
"Gundlach Bundschu Estates Sonoma.",
115+
"Jehan Emonin \u201cLes Narvaux\u201d Meursault.",
116+
"Kongsgaard Napa.",
117+
"La Crema Sonoma Coast.",
118+
"Picard Puligny-Montrachet er cru Burgundy.",
119+
"Olivier Leflaive Puligny-Montrachet Burgundy.",
120+
"Paul Hobbs Russian River.",
121+
"Ramey Ritchie Vineyard Russian River.",
122+
"Rombauer Carneros.",
123+
"Shea Wine Cellars Shea Vineyard Willamette.",
124+
"Sonoma-Cutrer Russian River.",
125+
"Talbott Kali Hart Monterey.",
126+
"Adelsheim Willamette.",
127+
"Arterberry Maresh Dundee Hills, Willamette.",
128+
"Belle Glos Clark & Telephone Santa Barbera.",
129+
"Bergstrom Cumberland Reserve Willamette.",
130+
"Domaine Poulleau Burgundy.",
131+
"Domaine Serene Evenstad Rsv. Willamette.",
132+
"Elouan Oregon.",
133+
"Flowers Sea View Ridge Sonoma.",
134+
"Gerard Seguin \u201cLa Place\u201d Fixin, France.",
135+
"La Crema Sonoma.",
136+
"Martinelli Bella Vigna Russian River.",
137+
"Paul Hobbs Russian River.",
138+
"Retour Willamette.",
139+
"Siduri Russian River.",
140+
"Soter Vineyards Yamhill-Carlton, Willamete.",
141+
"Vincent Ledy Haut-C\u00f4tes De Nuits, France.",
142+
"William Selyem Bucher Vineyard Sonoma.",
143+
"William Selyem Eastside Road Sonoma.",
144+
"William Selyem Hirsch Vineyard Sonoma.",
145+
"William Selyem Peay Vineyard Sonoma.",
146+
"Williams Selyem Russian River Sonoma.",
147+
"Chateau Petite-Freylon Cuvee Leah Boardeaux.",
148+
"Chateau Vignot Grand Cru St. Emilion.",
149+
"Franciscan Napa.",
150+
"Frogs Leap Rutherford, Napa.",
151+
"Grgich Hills Napa.",
152+
"Gundlach Bundschu Sonoma.",
153+
"Pentimento Saint Emilion, Bordeaux.",
154+
"Trefethen Oak Knoll District, Napa.",
155+
"E. Guigal Saint-Joseph Northern Rhone.",
156+
"Domaine Font de Michelle Chateauneuf-du-Pape.",
157+
"Howard Park Flint Rock Great Southern, Aus.",
158+
"Kongsgaard Napa.",
159+
"Maison La Berthaude Chateauneuf-du-Pape.",
160+
"Molly Dooker The Boxer McLaren Vale.",
161+
"Scala Dei \u201cPrior\u201d Priorat, Spain.",
162+
"St. Cosme C\u00f4te-R\u00f4tie Northern Rh\u00f4ne.",
163+
"Shingleback Davey Estate McLaren Vale.",
164+
"Stolpman Estate Ballard Canyon.",
165+
"Vieux Telegraph Chateauneuf-du-Pape.",
166+
"Biale Black Chicken Napa.",
167+
"Brown Estate Napa.",
168+
"Frogs Leap Napa.",
169+
"Joel Gott Napa.",
170+
"Prisoner Wine Co. \u201cSaldo\u201d Napa.",
171+
"Ridge Lytton Springs Dry Creek Valley.",
172+
"St. Francis Old Vine Sonoma.",
173+
"Seghesio Estate Sonoma.",
174+
"Sin Zin Alexander Valley.",
175+
"Venge Scout\u2019s Honor Calistoga.",
176+
"Armilla Brunello di Montalcino Tuscany.",
177+
"Bodega Gratia Malbec Mendoza, Argentina.",
178+
"Brandini Borolo La Morra, Italy.",
179+
"Ciacci Picolomini d\u2019Aragonia Vigna Pianrosso Brunello di Montalcino.",
180+
"Ciacci Picolomini d\u2019Aragonia Santa Catarina Riserva Brunello di Montalcino.",
181+
"Edi Simcic \u201cDuet\u201d Slovenia.",
182+
"Franciscan Magnificant Napa.",
183+
"Il Bruciato Bolgheri, Tuscany.",
184+
"La Jota Cabernet Franc Howell Mountain.",
185+
"La Rioja Alta Gran Reserva Haro, Rioja.",
186+
"Lang and Reed Cabernet Franc North Coast.",
187+
"Le Macchiole Bolgheri Rosso Tuscany.",
188+
"Maraia Barbera Del Monferrato Piedmont.",
189+
"Monsanto Chianti Classico Riserva Italy.",
190+
"Orin Swift \u201cMachete\u201d California.",
191+
"Ornellaia Bolgheri Superiore Tuscany, Italy.",
192+
"Opus One \u201cOverture\u201d Napa.",
193+
"Poliziano Rosso Di Montepulciano Tuscany, Italy.",
194+
"Produttori del Barbaresco \u201cRio Scordo\u201d Piedmont.",
195+
"Recchia Amarone Valpolicella, Italy.",
196+
"Reyneke Capstone Blend South Africa.",
197+
"Susana Balbo Malbec Mendoza, Argentina.",
198+
"Susanna Balbo \u201cBrioso\u201d Mendoza, Argentina.",
199+
"The Prisoner Napa.",
200+
"Torre de O\u00f1a Rioja Reserva Spain.",
201+
"Tommasi Amarone Classico Valpolicella, Italy.",
202+
"Vietti BaroloCastiglione Piedmont, Italy.",
203+
"cabernet sauvignon.",
204+
"Altamura Napa.",
205+
"Caymus Napa.",
206+
"Caymus Special Selection Napa.",
207+
"Chappellet Napa.",
208+
"Charles Smith \u201cSubstance\u201d Washington.",
209+
"Chateau Montelena Calistoga.",
210+
"Chateau Sociando-Mallet Haut-Medoc, Bordeaux.",
211+
"Chimney Rock Stags Leap.",
212+
"Daou Reserve Paso Robles.",
213+
"Dunn Vineyards Howell Mountain.",
214+
"Frank Family Vineyards Reserve.",
215+
"Heitz Cellars Martha\u2019s Vineyard Napa.",
216+
"Hook & Ladder Chalk Hill, Sonoma.",
217+
"J. Lohr Seven Oaks Paso Robles.",
218+
"Joseph Phelps Insignia Napa.",
219+
"Justin Paso Robles.",
220+
"Nickel & Nickel C.C. Ranch Napa.",
221+
"Oakville Winery Oakville, Napa.",
222+
"Pied a Terre Sonoma.",
223+
"Robert Craig Howell Mountain, Napa.",
224+
"Spottswoode th Anniversary Napa.",
225+
"Stuhlmuller Alexander Valley, Sonoma.",
226+
"Terra Valentine Napa.",
227+
"Turley Estate Napa.",
228+
"Turnbull Napa.",
229+
"Z D Reserve Napa"
230+
]
231+
}
232+
}

‎data/reaction_macros.json‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
{
2+
"deal_with_it_macros": [
3+
"https://i.imgur.com/WhgY2sX.gif",
4+
"https://i.imgur.com/eGInc.jpg",
5+
"https://i.imgur.com/KA3XSt5.gif",
6+
"https://i.imgur.com/rsuXB69.gif",
7+
"https://i.imgur.com/fFXmuSS.jpg",
8+
"https://j.gifs.com/L9mmYr.gif",
9+
"https://i.imgur.com/nxMBqb4.gif",
10+
"https://i.imgur.com/LZFE3y1.gif",
11+
"https://i.imgur.com/cky1KZB.gif",
12+
"https://i.imgur.com/ubPvLt4.jpg",
13+
"https://i.imgur.com/xMlks5p.jpg",
14+
"https://i.imgur.com/Awqpq.gif",
15+
"http://nerdist.com/wp-content/uploads/2016/04/Thanks-Obama-2.gif"
16+
],
17+
"facepalm_macros": [
18+
"https://i.imgur.com/iWKad22r.jpg",
19+
"https://i.imgur.com/3Jauxrw.jpg",
20+
"https://i.imgur.com/kFyKOgj.gif",
21+
"https://i.imgur.com/5JaFlhU.jpg?1",
22+
"https://i.imgur.com/qbnNXWy.gif",
23+
"https://i.imgur.com/h46ycmx.png",
24+
"https://i.imgur.com/gPNQzaf.jpg",
25+
"https://i.imgur.com/9I8A9C5.jpg",
26+
"https://i.imgur.com/pSVD0jZ.jpg",
27+
"https://i.imgur.com/2kX7tdb.jpg",
28+
"https://i.imgur.com/R7ZPh.png",
29+
"https://i.imgur.com/8p2VGIY.jpg",
30+
"https://i.imgur.com/8VYMSq8.gif",
31+
"https://i.imgur.com/WVn7B8O.jpg",
32+
"https://i.imgur.com/GTxRRuv.gif"
33+
],
34+
"head_desk_macros": [
35+
"https://i.imgur.com/Pg9nt.gif",
36+
"https://baudattitude.files.wordpress.com/2012/02/twilightsparkleheaddesk.gif",
37+
"https://i.imgur.com/LFzzTd8.gif",
38+
"https://i.imgur.com/DS0uEfv.jpg",
39+
"https://i.imgur.com/31ZJ2mT.jpg",
40+
"https://68.media.tumblr.com/20a0fe049b41d2be7562d19543fc9bf2/tumblr_inline_mq00ylPF1l1qz4rgp.gif",
41+
"https://i.imgur.com/RW2NAcQ.jpg",
42+
"https://i.imgur.com/1bmcUnj.gif",
43+
"https://i.imgur.com/r43WCSK.gif",
44+
"http://img.photobucket.com/albums/v642/StarRose/GIFS/headdesk.gif"
45+
],
46+
"fetish_macros": [
47+
"https://i.imgur.com/FFy1IEg.jpg",
48+
"https://i.imgur.com/RspJyHy.gif",
49+
"https://i.imgur.com/J6EB8vs.gif",
50+
"https://imgur.com/LoYBEhZ",
51+
"https://i.imgur.com/bn2pnT6.gif",
52+
"https://i.imgur.com/MfZydOB.gif",
53+
"https://i.imgur.com/8N3DmQ6.gif",
54+
"https://imgur.com/veDLZc6",
55+
"https://i.imgur.com/jRTllgX.gif",
56+
"https://i.imgur.com/r9187c5.gif",
57+
"https://i.imgur.com/HUW0L1q.jpg",
58+
"https://i.imgur.com/rDhDhIU.gif",
59+
"https://i.imgur.com/QYypuG1.gif",
60+
"https://i.imgur.com/SE0Wzjx.gif",
61+
"https://i.imgur.com/SUNo8wV.gif",
62+
"https://i.imgur.com/xcruehZ.gif",
63+
"https://i.imgur.com/dTtAQyI.gif",
64+
"https://i.imgur.com/DIK7Tpb.gif",
65+
"https://i.imgur.com/uDlBc7X.gif",
66+
"https://i.imgur.com/dIy5gdd.gif",
67+
"https://i.imgur.com/9TGDK39.jpg",
68+
"https://i.imgur.com/fSiBZOj.gif",
69+
"https://i.imgur.com/f5JMDGK.jpg",
70+
"https://i.imgur.com/Wy2URSw.gif",
71+
"https://i.imgur.com/CVfuIwe.jpg",
72+
"https://i.imgur.com/3xKiDnC.gif",
73+
"https://i.imgur.com/WDszWfj.gif",
74+
"https://i.imgur.com/1DRvg1V.gif",
75+
"https://i.imgur.com/WK723Wk.jpg",
76+
"https://i.imgur.com/DJiaI7L.png"
77+
]
78+
}

0 commit comments

Comments
 (0)