mirror of
https://github.com/oddluck/limnoria-plugins.git
synced 2025-05-01 07:51:10 -05:00
Tweety: add --nort option to tsearch
This commit is contained in:
parent
e3b05db876
commit
e038a805e1
@ -289,7 +289,7 @@ class Tweety(callbacks.Plugin):
|
|||||||
else: # bold otherwise.
|
else: # bold otherwise.
|
||||||
ret = "@{0}".format(self._bu(nick))
|
ret = "@{0}".format(self._bu(nick))
|
||||||
if verified:
|
if verified:
|
||||||
string = self._bold(ircutils.mircColor("✓", "white", "blue"))
|
string = self._bold(ircutils.mircColor("", "white", "blue"))
|
||||||
ret += "{}".format(string)
|
ret += "{}".format(string)
|
||||||
# show real name in tweet output?
|
# show real name in tweet output?
|
||||||
if not self.registryValue("hideRealName", msg.args[0]):
|
if not self.registryValue("hideRealName", msg.args[0]):
|
||||||
@ -498,7 +498,7 @@ class Tweety(callbacks.Plugin):
|
|||||||
trends = wrap(trends, [getopts({"exclude": ""}), optional("text")])
|
trends = wrap(trends, [getopts({"exclude": ""}), optional("text")])
|
||||||
|
|
||||||
def tsearch(self, irc, msg, args, optlist, optterm):
|
def tsearch(self, irc, msg, args, optlist, optterm):
|
||||||
"""[--num number] [--searchtype mixed|recent|popular] [--lang xx] [--new] <term>
|
"""[--num number] [--searchtype mixed|recent|popular] [--lang xx] [--nort] [--new] <term>
|
||||||
Searches Twitter for the <term> and returns the most recent results.
|
Searches Twitter for the <term> and returns the most recent results.
|
||||||
--num is number of results.
|
--num is number of results.
|
||||||
--searchtype being recent, popular or mixed. Popular is the default.
|
--searchtype being recent, popular or mixed. Popular is the default.
|
||||||
@ -560,14 +560,15 @@ class Tweety(callbacks.Plugin):
|
|||||||
tsearchArgs["since_id"] = self.since_id[msg.channel][
|
tsearchArgs["since_id"] = self.since_id[msg.channel][
|
||||||
"{0}".format(optterm)
|
"{0}".format(optterm)
|
||||||
]
|
]
|
||||||
|
if key == "nort":
|
||||||
|
tsearchArgs["q"] += " exclude:retweets"
|
||||||
# now build our API call.
|
# now build our API call.
|
||||||
data = self.twitterApi.ApiCall("search/tweets", parameters=tsearchArgs)
|
data = self.twitterApi.ApiCall("search/tweets", parameters=tsearchArgs)
|
||||||
if not data:
|
if not data:
|
||||||
if not new:
|
if not new:
|
||||||
irc.reply(
|
irc.reply(
|
||||||
"ERROR: Something went wrong trying to search Twitter. ({0})".format(
|
"ERROR: Something went wrong trying to search Twitter. ({0})"
|
||||||
data
|
.format(data)
|
||||||
)
|
|
||||||
)
|
)
|
||||||
log.error("Tweety: ERROR trying to search Twitter: {0}".format(data))
|
log.error("Tweety: ERROR trying to search Twitter: {0}".format(data))
|
||||||
return
|
return
|
||||||
@ -576,9 +577,8 @@ class Tweety(callbacks.Plugin):
|
|||||||
except:
|
except:
|
||||||
if not new:
|
if not new:
|
||||||
irc.reply(
|
irc.reply(
|
||||||
"ERROR: Something went wrong trying to search Twitter. ({0})".format(
|
"ERROR: Something went wrong trying to search Twitter. ({0})"
|
||||||
data
|
.format(data)
|
||||||
)
|
|
||||||
)
|
)
|
||||||
log.error("Tweety: ERROR trying to search Twitter: {0}".format(data))
|
log.error("Tweety: ERROR trying to search Twitter: {0}".format(data))
|
||||||
return
|
return
|
||||||
@ -617,13 +617,14 @@ class Tweety(callbacks.Plugin):
|
|||||||
[
|
[
|
||||||
getopts(
|
getopts(
|
||||||
{
|
{
|
||||||
"num": ("int"),
|
"num": "int",
|
||||||
"searchtype": ("literal", ("popular", "mixed", "recent")),
|
"searchtype": ("literal", ("popular", "mixed", "recent")),
|
||||||
"lang": ("somethingWithoutSpaces"),
|
"lang": "somethingWithoutSpaces",
|
||||||
"new": "",
|
"new": "",
|
||||||
|
"nort": "",
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
("text"),
|
"text",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -761,8 +762,8 @@ class Tweety(callbacks.Plugin):
|
|||||||
optnick, data
|
optnick, data
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
log.error: (
|
log.error: "Tweety: ERROR looking up Twitter for '{0}': {1}".format(
|
||||||
"Tweety: ERROR looking up Twitter for '{0}': {1}".format(optnick, data)
|
optnick, data
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
try:
|
try:
|
||||||
@ -774,8 +775,8 @@ class Tweety(callbacks.Plugin):
|
|||||||
optnick, data
|
optnick, data
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
log.error: (
|
log.error: "Tweety: ERROR looking up Twitter for '{0}': {1}".format(
|
||||||
"Tweety: ERROR looking up Twitter for '{0}': {1}".format(optnick, data)
|
optnick, data
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
# before anything, check for errors. errmsg is conditional.
|
# before anything, check for errors. errmsg is conditional.
|
||||||
@ -895,10 +896,10 @@ class Tweety(callbacks.Plugin):
|
|||||||
"id": "",
|
"id": "",
|
||||||
"url": "",
|
"url": "",
|
||||||
"new": "",
|
"new": "",
|
||||||
"num": ("int"),
|
"num": "int",
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
("somethingWithoutSpaces"),
|
"somethingWithoutSpaces",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user