.
This commit is contained in:
parent
6ae302bf48
commit
3b5fe6f4bb
1 changed files with 10 additions and 6 deletions
|
@ -1,10 +1,12 @@
|
||||||
from util import hook, web
|
from util import hook, web, text
|
||||||
|
|
||||||
|
|
||||||
@hook.command("feed")
|
@hook.command("feed")
|
||||||
@hook.command
|
@hook.command
|
||||||
def rss(inp, say=None):
|
def rss(inp, say=None):
|
||||||
|
|
||||||
|
limit = 3
|
||||||
|
|
||||||
# preset news feeds
|
# preset news feeds
|
||||||
strip = inp.lower().strip()
|
strip = inp.lower().strip()
|
||||||
if strip == "bukkit":
|
if strip == "bukkit":
|
||||||
|
@ -12,18 +14,20 @@ def rss(inp, say=None):
|
||||||
limit = 1
|
limit = 1
|
||||||
elif strip == "xkcd":
|
elif strip == "xkcd":
|
||||||
feed = "http://xkcd.com/rss.xml"
|
feed = "http://xkcd.com/rss.xml"
|
||||||
limit = 2
|
elif strip == "ars":
|
||||||
|
feed = "http://feeds.arstechnica.com/arstechnica/index"
|
||||||
else:
|
else:
|
||||||
feed = inp
|
feed = inp
|
||||||
limit = 3
|
|
||||||
|
|
||||||
query = "SELECT title, link FROM rss WHERE url=@feed LIMIT @limit"
|
query = "SELECT title, link FROM rss WHERE url=@feed LIMIT @limit"
|
||||||
result = web.query(query, {"feed": feed, "limit": limit or 3})
|
result = web.query(query, {"feed": feed, "limit": limit})
|
||||||
for row in result.rows:
|
for row in result.rows:
|
||||||
|
title = text.truncate_str(row["title"], 100)
|
||||||
link = web.isgd(row["link"])
|
link = web.isgd(row["link"])
|
||||||
say(u"{} - {}".format(row["title"], link))
|
say(u"{} - {}".format(title, link))
|
||||||
|
|
||||||
|
|
||||||
@hook.command
|
@hook.command
|
||||||
def rb(inp, say=None):
|
def rb(inp, say=None):
|
||||||
rss("bukkit", say)
|
"rb -- Shows the latest Craftbukkit recommended build"
|
||||||
|
rss("bukkit", say)
|
||||||
|
|
Reference in a new issue