cadey
/
h
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tag.py: add .untag, so each tag action has its own command

This commit is contained in:
Ryan Hitchman 2014-01-13 17:38:42 -08:00
parent ab88f2d50d
commit d7399e73fa
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/tag.py
View File

@ -135,16 +135,12 @@ def get_nicks_by_tagset(db, chan, tagset):
@hook.command @hook.command
def tag(inp, chan='', db=None): def tag(inp, chan='', db=None):
'.tag [add|del] <nick> <tag> -- marks/unmarks <nick> as <tag> {related: .tags, .tagged}' '.tag <nick> <tag> -- marks <nick> as <tag> {related: .untag, .tags, .tagged}'
db.execute('create table if not exists tag(chan, subject, nick)') db.execute('create table if not exists tag(chan, subject, nick)')
add = re.match(r'(?:a(?:dd)? )?(\S+) (.+)', inp) add = re.match(r'(\S+) (.+)', inp)
delete = re.match(r'd(?:el(?:ete)?)? (\S+) (.+)\s*$', inp)
if delete:
nick, del_tag = delete.groups()
return delete_tag(db, chan, nick, del_tag)
if add: if add:
nick, subject = add.groups() nick, subject = add.groups()
return add_tag(db, chan, nick, subject) return add_tag(db, chan, nick, subject)
@ -155,9 +151,21 @@ def tag(inp, chan='', db=None):
else: else:
return tag.__doc__ return tag.__doc__
@hook.command
def untag(inp, chan='', db=None):
'.untag <nick> <tag> -- unmarks <nick> as <tag> {related: .tag, .tags, .tagged}'
delete = re.match(r'(\S+) (.+)$', inp)
if delete:
nick, del_tag = delete.groups()
return delete_tag(db, chan, nick, del_tag)
else:
return untag.__doc__
@hook.command @hook.command
def tags(inp, chan='', db=None): def tags(inp, chan='', db=None):
'.tags <nick>/list -- get list of tags for <nick>, or a list of tags {related: .tag, .tagged}' '.tags <nick>/list -- get list of tags for <nick>, or a list of tags {related: .tag, .untag, .tagged}'
if inp == 'list': if inp == 'list':
return get_tag_counts_by_chan(db, chan) return get_tag_counts_by_chan(db, chan)
@ -170,7 +178,7 @@ def tags(inp, chan='', db=None):
@hook.command @hook.command
def tagged(inp, chan='', db=None): def tagged(inp, chan='', db=None):
'.tagged <tag> [& tag...] -- get nicks marked as <tag> (separate multiple tags with &) {related: .tag, .tags}' '.tagged <tag> [& tag...] -- get nicks marked as <tag> (separate multiple tags with &) {related: .tag, .untag, .tags}'
return get_nicks_by_tagset(db, chan, inp) return get_nicks_by_tagset(db, chan, inp)