Merge branch 'develop' into refresh

Conflicts:
	plugins/mark.py

data/itemids.txt

@@ -1,21 +1,34 @@
  1 Stone
+ 1:1 Granite
+ 1:2 Polished Granite
+ 1:3 Diorite
+ 1:4 Polished Diorite
+ 1:5 Andesite
+ 1:6 Polished Andesite
  2 Grass
  3 Dirt
+ 3:1 Dirt (No Grass)
+ 3:2 Podzol
  4 Cobblestone
  5 Wooden Plank (Oak)
  5:1 Wooden Plank (Spruce)
  5:2 Wooden Plank (Birch)
  5:3 Wooden Plank (Jungle)
+ 5:4 Wooden Plank (Acacia)
+ 5:5 Wooden Plank (Dark Oak)
  6 Sapling (Oak)
  6:1 Sapling (Spruce)
  6:2 Sapling (Birch)
  6:3 Sapling (Jungle)
+ 6:4 Sapling (Acacia)
+ 6:5 Sapling (Dark Oak)
  7 Bedrock
  8 Water
  9 Water (No Spread)
  10 Lava
  11 Lava (No Spread)
  12 Sand
+ 12:1 Red Sand
  13 Gravel
  14 Gold Ore
  15 Iron Ore
@@ -24,6 +37,8 @@
  17:1 Wood (Spruce)
  17:2 Wood (Birch)
  17:3 Wood (Jungle)
+ 17:4 Wood (Oak 4)
+ 17:5 Wood (Oak 5)
  18 Leaves (Oak)
  18:1 Leaves (Spruce)
  18:2 Leaves (Birch)
@@ -38,8 +53,8 @@
  24:2 Sandstone (Smooth)
  25 Note Block
  26 Bed (Block)
-27 Powered Rail
+ 27 Rail (Powered)
-28 Detector Rail
+ 28 Rail (Detector)
  29 Sticky Piston
  30 Cobweb
  31 Tall Grass (Dead Shrub)
@@ -66,7 +81,14 @@
  35:15 Black Wool
  36 Piston (Moving)
  37 Dandelion
-38 Rose
+ 38 Poppy
+ 38:1 Blue Orchid
+ 38:2 Allium
+ 38:4 Red Tulip
+ 38:5 Orange Tulip
+ 38:6 White Tulip
+ 38:7 Pink Tulip
+ 38:8 Oxeye Daisy
  39 Brown Mushroom
  40 Red Mushroom
  41 Block of Gold
@@ -91,7 +113,7 @@
  44:7 Quartz Slab
  45 Brick
  46 TNT
-47 Bookcase
+ 47 Bookshelf
  48 Moss Stone
  49 Obsidian
  50 Torch
@@ -139,11 +161,29 @@
  92 Cake (Block)
  93 Redstone Repeater (Block Off)
  94 Redstone Repeater (Block On)
-95 Locked Chest
+ 95 Stained Glass (White)
+ 95:1 Stained Glass (Orange)
+ 95:2 Stained Glass (Magenta)
+ 95:3 Stained Glass (Light Blue)
+ 95:4 Stained Glass (Yellow)
+ 95:5 Stained Glass (Lime)
+ 95:6 Stained Glass (Pink)
+ 95:7 Stained Glass (Gray)
+ 95:8 Stained Glass (Light Grey)
+ 95:9 Stained Glass (Cyan)
+ 95:10 Stained Glass (Purple)
+ 95:11 Stained Glass (Blue)
+ 95:12 Stained Glass (Brown)
+ 95:13 Stained Glass (Green)
+ 95:14 Stained Glass (Red)
+ 95:15 Stained Glass (Black)
  96 Trapdoor
-97 Silverfish Stone
+ 97 Monster Egg (Stone)
-97:1 Silverfish Cobblestone
+ 97:1 Monster Egg (Cobblestone)
-97:2 Silverfish Stone Brick
+ 97:2 Monster Egg (Stone Brick)
+ 97:3 Monster Egg (Mossy Stone Brick)
+ 97:4 Monster Egg (Cracked Stone)
+ 97:5 Monster Egg (Chiseled Stone)
  98 Stone Bricks
  98:1 Mossy Stone Bricks
  98:2 Cracked Stone Bricks
@@ -178,11 +218,15 @@
  125:1 Spruce-Wood Slab (Double)
  125:2 Birch-Wood Slab (Double)
  125:3 Jungle-Wood Slab (Double)
+ 125:4 Acacia Wood Slab (Double)
+ 125:5 Dark Oak Wood Slab (Double)
  126 Oak-Wood Slab
  126:1 Spruce-Wood Slab
  126:2 Birch-Wood Slab
  126:3 Jungle-Wood Slab
-127 Coca Plant
+ 126:4 Acacia Wood Slab
+ 126:5 Dark Oak Wood Slab
+ 127 Cocoa Plant
  128 Sandstone Stairs
  129 Emerald Ore
  130 Ender Chest
@@ -221,7 +265,7 @@
  155:1 Chiseled Quartz Block
  155:2 Pillar Quartz Block
  156 Quartz Stairs
-157 Activator Rail
+ 157 Rail (Activator)
  158 Dropper
  159 Stained Clay (White)
  159:1 Stained Clay (Orange)
@@ -239,6 +283,27 @@
  159:13 Stained Clay (Green)
  159:14 Stained Clay (Red)
  159:15 Stained Clay (Black)
+ 160 Stained Glass Pane (White)
+ 160:1 Stained Glass Pane (Orange)
+ 160:2 Stained Glass Pane (Magenta)
+ 160:3 Stained Glass Pane (Light Blue)
+ 160:4 Stained Glass Pane (Yellow)
+ 160:5 Stained Glass Pane (Lime)
+ 160:6 Stained Glass Pane (Pink)
+ 160:7 Stained Glass Pane (Gray)
+ 160:8 Stained Glass Pane (Light Gray)
+ 160:9 Stained Glass Pane (Cyan)
+ 160:10 Stained Glass Pane (Purple)
+ 160:11 Stained Glass Pane (Blue)
+ 160:12 Stained Glass Pane (Brown)
+ 160:13 Stained Glass Pane (Green)
+ 160:14 Stained Glass Pane (Red)
+ 160:15 Stained Glass Pane (Black)
+ 162 Wood (Acacia Oak)
+ 162:1 Wood (Dark Oak)
+ 163 Wooden Stairs (Acacia)
+ 164 Wooden Stairs (Dark Oak)
+ 165 Slime Block
  170 Hay Bale
  171 Carpet (White)
  171:1 Carpet (Orange)
@@ -258,6 +323,13 @@
  171:15 Carpet (Black)
  172 Hardened Clay
  173 Block of Coal
+ 174 Packed Ice
+ 175 Sunflower
+ 175:1 Lilac
+ 175:2 Double Tallgrass
+ 175:3 Large Fern
+ 175:4 Rose Bush
+ 175:5 Peony
  256 Iron Shovel
  257 Iron Pickaxe
  258 Iron Axe
@@ -346,19 +418,25 @@
  339 Paper
  340 Book
  341 Slime Ball
-342 Storage Minecart
+ 342 Minecart (Storage)
-343 Powered Minecart
+ 343 Minecart (Powered)
  344 Egg
  345 Compass
  346 Fishing Rod
  347 Watch
  348 Glowstone Dust
  349 Raw Fish
+ 349:1 Raw Salmon
+ 349:2 Clownfish
+ 349:3 Pufferfish
  350 Cooked Fish
+ 350:1 Cooked Salmon
+ 350:2 Clownfish
+ 350:3 Pufferfish
  351 Ink Sack
  351:1 Rose Red Dye
  351:2 Cactus Green Dye
-351:3 Coca Bean
+ 351:3 Cocoa Bean
  351:4 Lapis Lazuli
  351:5 Purple Dye
  351:6 Cyan Dye
@@ -406,6 +484,7 @@
  373:8201 Strength Potion (3:00)
  373:8202 Slowness Potion (1:30)
  373:8204 Harming Potion
+ 373:8205 Water Breathing Potion (3:00)
  373:8206 Invisibility Potion (3:00)
  373:8225 Regeneration Potion II (0:22)
  373:8226 Swiftness Potion II (1:30)
@@ -421,6 +500,7 @@
  373:8264 Weakness Potion (4:00)
  373:8265 Strength Potion (8:00)
  373:8266 Slowness Potion (4:00)
+ 373:8269 Water Breathing Potion (8:00)
  373:8270 Invisibility Potion (8:00)
  373:8289 Regeneration Potion II (1:00)
  373:8290 Swiftness Potion II (4:00)
@@ -436,6 +516,7 @@
  373:16393 Strength Splash (2:15)
  373:16394 Slowness Splash (1:07)
  373:16396 Harming Splash
+ 373:16397 Breathing Splash (2:15)
  373:16398 Invisibility Splash (2:15)
  373:16417 Regeneration Splash II (0:16)
  373:16418 Swiftness Splash II (1:07)
@@ -451,6 +532,7 @@
  373:16456 Weakness Splash (3:00)
  373:16457 Strength Splash (6:00)
  373:16458 Slowness Splash (3:00)
+ 373:16461 Breathing Splash (6:00)
  373:16462 Invisibility Splash (6:00)
  373:16481 Regeneration Splash II (0:45)
  373:16482 Swiftness Splash II (3:00)
@@ -516,13 +598,14 @@
  404 Redstone Comparator
  405 Nether Brick (Item)
  406 Nether Quartz
-407 TNT Minecart
+ 407 Minecart (TNT)
-408 Hopper Minecart
+ 408 Minecart (Hopper)
  417 Iron Horse Armor
  418 Gold Horse Armor
  419 Diamond Horse Armor
  420 Lead
  421 Name Tag
+ 422 Minecart (Command Block)
  2256 Music Disk (13)
  2257 Music Disk (Cat)
  2258 Music Disk (Blocks)

data/recipes.txt

@@ -1,7 +1,7 @@
 //Minecraft Recipes List
 //Created by _303
 //Obtained from https://github.com/ClouDev/CloudBot/blob/develop/plugins/data/recipes.txt
-//Edited by _frozen
+//Edited by CHCMATT for Minecraft version: 1.7.4
 //
 //Summary of Use: Each column is seperated by a comma (,) and rows by a vertical bar (|). Order of Recipes & Categories taken from
 //www.minecraftwiki.net/wiki/Crafting for easier updating in the future (The Future!)
@@ -21,7 +21,10 @@
 1x Block of Gold: Gold Ingot, Gold Ingot, Gold Ingot | Gold Ingot, Gold Ingot, Gold Ingot | Gold Ingot, Gold Ingot, Gold Ingot
 1x Block of Iron: Iron Ingot, Iron Ingot, Iron Ingot | Iron Ingot, Iron Ingot, Iron Ingot | Iron Ingot, Iron Ingot, Iron Ingot
 1x Block of Diamond: Diamond, Diamond, Diamond | Diamond, Diamond, Diamond | Diamond, Diamond, Diamond
+1x Block of Coal: Coal, Coal, Coal | Coal, Coal, Coal | Coal, Coal, Coal
+1x Block of Redstone: Redstone Dust, Redstone Dust, Redstone Dust | Redstone Dust, Redstone Dust, Redstone Dust | Redstone Dust, Redstone Dust, Redstone Dust
 1x Lapis Lazuli Block: Lapis Lazuli, Lapis Lazuli, Lapis Lazuli | Lapis Lazuli, Lapis Lazuli, Lapis Lazuli | Lapis Lazuli, Lapis Lazuli, Lapis Lazuli
+1x Emerald Block: Emerald, Emerald, Emerald | Emerald, Emerald, Emerald | Emerald, Emerald, Emerald
 1x Glowstone: Glowstone Dust, Glowstone Dust | Glowstone Dust, Glowstone Dust
 1x Wool: String, String | String, String
 1x TNT: Gunpowder, Sand, Gunpowder | Sand, Gunpowder, Sand | Gunpowder, Sand, Gunpowder
@@ -117,6 +120,7 @@
 6x Powered Rail: Gold Ingot, None, Gold Ingot | Gold Ingot, Stick, Gold Ingot | Gold Ingot, Redstone, Gold Ingot
 6x Detector Rail: Iron Ingot, None, Iron Ingot | Iron Ingot, Pressure Plate, Iron Ingot | Iron Ingot, Redstone, Iron Ingot
 1x Boat: Wooden Planks, None, Wooden Planks | Wooden Planks, Wooden Planks, Wooden Planks
+1x Carrot On A Stick: Fishing Rod | None, Carrot
 //
 //Mechanism Recipes
 //
@@ -125,7 +129,8 @@
 2x Trapdoor: Wooden Planks, Wooden Planks, Wooden Planks | Wooden Planks, Wooden Planks, Wooden Planks
 1x Stone Pressure Plate: Stone, Stone
 1x Wooden Pressure Plate: Wooden Planks, Wooden Planks
-1x Button: Stone | Stone
+1x Stone Button: Stone
+1x Wooden Button: Wooden Planks
 1x Redstone Torch: Redstone | Stick
 1x Lever: Stick | Cobblestone
 1x Note Block: Wooden Planks, Wooden Planks, Wooden Planks | Wooden Planks, Redstone, Wooden Planks | Wooden Planks, Wooden Planks, Wooden Planks
@@ -133,8 +138,13 @@
 1x Dispenser: Cobblestone, Cobblestone, Cobblestone | Cobblestone, Bow, Cobblestone | Cobblestone, Redstone, Cobblestone
 1x Redstone Repeater: Redstone Torch, Redstone, Redstone Torch | Stone, Stone, Stone
 1x Piston: Wooden Planks, Wooden Planks, Wooden Planks | Cobblestone, Iron Ingot, Cobblestone | Cobblestone, Redstone, Cobblestone
-1x Sticky Piston: none, slime ball, none | none, piston, none
+1x Sticky Piston: Slime Ball | Piston
-1x Redstone Lamp: none, redstone dust, none | redstone dust, glowstone block, redstone | none, redstone dust, none
+1x Redstone Lamp: None, Redstone Dust, None | Redstone Dust, Glowstone Block, Redstone Dust | None, Redstone Dust, None
+1x Trapped Chest: Chest, Tripwire Hook
+1x Dropper: Cobblestone, Cobblestone, Cobblestone | Cobblestone, None, Cobblestone | Cobblestone, Redstone Dust, Cobblestone
+1x Weighted Pressure Plate (Heavy): Iron Ingot, Iron Ingot
+1x Weighted Pressure Plate (Light): Gold Ingot, Gold Ingot
+2x Tripwire Hook: Iron Ingot | Stick | Wooden Planks
 //
 //Food Recipes
 //
@@ -169,6 +179,11 @@
 9x Gold Nugget: Gold Ingot
 1x Gold Ingot: Gold Nugget, Gold Nugget, Gold Nugget | Gold Nugget, Gold Nugget, Gold Nugget | Gold Nugget, Gold Nugget, Gold Nugget
 1x Eye of Ender: Ender Pearl | Blaze Powder
+1x Item Frame: Stick, Stick, Stick | Stick, Leather, Stick | Stick, Stick, Stick
+1x Anvil: Block of Iron, Block of Iron, Block of Iron | None, Iron Ingot, None | Iron Ingot, Iron Ingot, Iron Ingot
+1x Ender Chest: Obsidian, Obsidian, Obsidian | Osbidian, Eye of Ender, Obsidian | Obsidian, Obsidian, Obsidian
+1x Flower Pot: Brick, None, Brick | None, Brick, None
+2x Lead: None, String, String | None, Slime Ball, String | String, None, None
 //
 //Dye Recipes
 //
@@ -215,3 +230,40 @@
 1x Glistering Melon: Melon Slice, Gold Nugget
 9x Gold Nugget: Gold Ingot
 1x Enchantment Table: None, Book, None | Diamond, Obsidian, Diamond | Obsidian, Obsidian, Obsidian
+//
+//Stained Glass Recipes
+//
+8x White Stained Glass: Glass, Glass, Glass | Glass, Bone Meal, Glass | Glass, Glass, Glass
+8x Orange Stained Glass: Glass, Glass, Glass | Glass, Orange Dye, Glass | Glass, Glass, Glass
+8x Magenta Stained Glass: Glass, Glass, Glass | Glass, Magenta Dye, Glass | Glass, Glass, Glass
+8x Light Blue Stained Glass: Glass, Glass, Glass | Glass, Light Blue Dye, Glass | Glass, Glass, Glass
+8x Yellow Stained Glass: Glass, Glass, Glass | Glass, Dandelion Yellow, Glass | Glass, Glass, Glass
+8x Lime Stained Glass: Glass, Glass, Glass | Glass, Lime Dye, Glass | Glass, Glass, Glass
+8x Pink Stained Glass: Glass, Glass, Glass | Glass, Pink Dye, Glass | Glass, Glass, Glass
+8x Gray Stained Glass: Glass, Glass, Glass | Glass, Gray Dye, Glass | Glass, Glass, Glass
+8x Light Gray Stained Glass: Glass, Glass, Glass | Glass, Light Gray Dye, Glass | Glass, Glass, Glass
+8x Cyan Stained Glass: Glass, Glass, Glass | Glass, Cyan Dye, Glass | Glass, Glass, Glass
+8x Purple Stained Glass: Glass, Glass, Glass | Glass, Purple Dye, Glass | Glass, Glass, Glass
+8x Blue Stained Glass: Glass, Glass, Glass | Glass, Lapis Lazuli, Glass | Glass, Glass, Glass
+8x Brown Stained Glass: Glass, Glass, Glass | Glass, Cocoa Beans, Glass | Glass, Glass, Glass
+8x Green Stained Glass: Glass, Glass, Glass | Glass, Cactus Green, Glass | Glass, Glass, Glass
+8x Red Stained Glass: Glass, Glass, Glass | Glass, Rose Red, Glass | Glass, Glass, Glass
+8x Black Stained Glass: Glass, Glass, Glass | Glass, Inc Sac, Glass | Glass, Glass, Glass
+//
+//Stained Glass Panes
+//
+16x White Stained Glass Panes: White Stained Glass, White Stained Glass, White Stained Glass | White Stained Glass, White Stained Glass, White Stained Glass
+16x Orange Stained Glass Panes: Orange Stained Glass, Orange Stained Glass, Orange Stained Glass | Orange Stained Glass, Orange Stained Glass, Orange Stained Glass
+16x Magenta Stained Glass Panes: Magenta Stained Glass, Magenta Stained Glass, Magenta Stained Glass | Magenta Stained Glass, Magenta Stained Glass, Magenta Stained Glass
+16x Light Blue Stained Glass Panes: Light Blue Stained Glass, Light Blue Stained Glass, Light Blue Stained Glass | Light Blue Stained Glass, Light Blue Stained Glass, Light Blue Stained Glass
+16x Yellow Stained Glass Panes: Yellow Stained Glass, Yellow Stained Glass, Yellow Stained Glass | Yellow Stained Glass, Yellow Stained Glass, Yellow Stained Glass
+16x Lime Stained Glass Panes: Lime Stained Glass, Lime Stained Glass, Lime Stained Glass | Lime Stained Glass, Lime Stained Glass, Lime Stained Glass
+16x Pink Stained Glass Panes: Pink Stained Glass, Pink Stained Glass, Pink Stained Glass | Pink Stained Glass, Pink Stained Glass, Pink Stained Glass
+16x Gray Stained Glass Panes: Gray Stained Glass, Gray Stained Glass, Gray Stained Glass | Gray Stained Glass, Gray Stained Glass, Gray Stained Glass
+16x Light Gray Stained Glass Panes: Light Gray Stained Glass, Light Gray Stained Glass, Light Gray Stained Glass | Light Gray Stained Glass, Light Gray Stained Glass, Light Gray Stained Glass
+16x Cyan Stained Glass Panes: Cyan Stained Glass, Cyan Stained Glass, Cyan Stained Glass | Cyan Stained Glass, Cyan Stained Glass, Cyan Stained Glass
+16x Purple Stained Glass Panes: Purple Stained Glass, Purple Stained Glass, Purple Stained Glass | Purple Stained Glass, Purple Stained Glass, Purple Stained Glass
+16x Blue Stained Glass Panes: Blue Stained Glass, Blue Stained Glass, Blue Stained Glass | Blue Stained Glass, Blue Stained Glass, Blue Stained Glass
+16x Brown Stained Glass Panes: Brown Stained Glass, Brown Stained Glass, Brown Stained Glass | Brown Stained Glass, Brown Stained Glass, Brown Stained Glass
+16x Green Stained Glass Panes: Green Stained Glass, Green Stained Glass, Green Stained Glass | Green Stained Glass, Green Stained Glass, Green Stained Glass
+16x Black Stained Glass Panes: Black Stained Glass, Black Stained Glass, Black Stained Glass | Black Stained Glass, Black Stained Glass, Black Stained Glass

data/slaps.json

@@ -29,6 +29,8 @@
          "diamond sword",
          "baguette",
          "physics textbook",
+         "toaster",
+         "portrait of Mark Harmon",
          "television",
          "mau5head",
          "five ton truck",

plugins/admin.py

@@ -131,8 +131,11 @@ def clearlogs(inp, input=None):
 @hook.command(permissions=["botcontrol"])
 def join(inp, conn=None, notice=None):
     """join <channel> -- Joins <channel>."""
-    notice("Attempting to join {}...".format(inp))
+    for target in inp.split(" "):
-    conn.join(inp)
+        if not target.startswith("#"):
+            target = "#{}".format(target)
+        notice("Attempting to join {}...".format(target))
+        conn.join(target)
 
 
 @hook.command(autohelp=False, permissions=["botcontrol"])
@@ -141,9 +144,12 @@ def part(inp, conn=None, chan=None, notice=None):
     If [channel] is blank the bot will leave the
     channel the command was used in."""
     if inp:
-        target = inp
+        targets = inp
     else:
-        target = chan
+        targets = chan
+    for target in targets.split(" "):
+        if not target.startswith("#"):
+            target = "#{}".format(target)
         notice("Attempting to leave {}...".format(target))
         conn.part(target)
 

plugins/correction.py

@@ -17,10 +17,10 @@ def correction(inp, message=None, input=None, notice=None, db=None):
         replace = splitinput[2]
         if find in last_message[1]:
             if "\x01ACTION" in last_message[1]:
-                message = last_message[1].replace("\x01ACTION ", "/me ").replace("\x01", "")
+                msg = last_message[1].replace("\x01ACTION ", "/me ").replace("\x01", "")
             else:
-                message = last_message[1]
+                msg = last_message[1]
-            message(u"{} meant to say: {}".format(message.replace(find, "\x02" + replace + "\x02"), nick))
+            message(u"Correction, <{}> {}".format(nick, msg.replace(find, "\x02" + replace + "\x02")))
         else:
             notice(u"{} can't be found in your last message".format(find))
     else:

plugins/newegg.py

@@ -86,8 +86,7 @@ def newegg(inp):
 
     # get the first result
     if r["ProductListItems"]:
-        item = r["ProductListItems"][0]
+        return format_item(r["ProductListItems"][0])
-        return format_item(item)
     else:
         return "No results found."
 

plugins/pre.py

@@ -0,0 +1,37 @@
+from util import hook, http, timesince
+import datetime
+
+
+@hook.command("scene")
+@hook.command
+def pre(inp):
+    'pre <query> -- searches scene releases using orlydb.com'
+
+    try:
+        h = http.get_html("http://orlydb.com/", q=inp)
+    except http.HTTPError as e:
+        return 'Unable to fetch results: {}'.format(e)
+
+    results = h.xpath("//div[@id='releases']/div/span[@class='release']/..")
+
+    if not results:
+        return "No results found."
+
+    result = results[0]
+
+    date = result.xpath("span[@class='timestamp']/text()")[0]
+    section = result.xpath("span[@class='section']//text()")[0]
+    name = result.xpath("span[@class='release']/text()")[0]
+
+    # parse date/time
+    date = datetime.datetime.strptime(date, "%Y-%m-%d %H:%M:%S")
+    date_string = date.strftime("%d %b %Y")
+    since = timesince.timesince(date)
+
+    size = result.xpath("span[@class='inforight']//text()")
+    if size:
+        size = ' - ' + size[0].split()[0]
+    else:
+        size = ''
+
+    return '{} - {}{} - {} ({} ago)'.format(section, name, size, date_string, since)

plugins/twitch.py

@@ -92,8 +92,9 @@ def twitch_lookup(location):
             views = views + "s" if not views[0:2] == "1 " else views
             return h.unescape(fmt.format(title, channel, playing, views))
     else:
-        data = http.get_json("http://api.justin.tv/api/stream/list.json?channel=" + channel)[0]
+        data = http.get_json("http://api.justin.tv/api/stream/list.json?channel=" + channel)
-        if data:
+        if data and len(data) >= 1:
+            data = data[0]
             title = data['title']
             playing = data['meta_game']
             viewers = "\x033\x02Online now!\x02\x0f " + str(data["channel_count"]) + " viewer"
@@ -102,7 +103,10 @@ def twitch_lookup(location):
             print viewers
             return h.unescape(fmt.format(title, channel, playing, viewers))
         else:
+            try:
                 data = http.get_json("https://api.twitch.tv/kraken/channels/" + channel)
+            except:
+                return
             title = data['status']
             playing = data['game']
             viewers = "\x034\x02Offline\x02\x0f"

requirements.txt

@@ -7,3 +7,4 @@ yql
 tweepy
 pygeoip
 BeautifulSoup4
+pycrypto