X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=yoweb-scrape;h=840a6d913582b2aa6d32f783cecc756afce3bffb;hp=3ef87609e0d268087a07055557c4446dfc5646f1;hb=9e7b2a51983738ccfaac47f13142889fa6f9a7b0;hpb=612318e7d3e87d2373943fc13d8a9b9ab29f4aae diff --git a/yoweb-scrape b/yoweb-scrape index 3ef8760..840a6d9 100755 --- a/yoweb-scrape +++ b/yoweb-scrape @@ -794,8 +794,8 @@ class ChatLogTracker: if cmd == 'a': each = self._onboard_event elif cmd == 'd': each = disembark - else: each = lambda v,ts,tt,h: self._onboard_event( - None,ts,tt,h, jobber='applied') + else: each = lambda *l: self._onboard_event(*l, + **{'jobber':'applied'}) if cmdr == self._myself.name: dml.append('self') @@ -804,10 +804,16 @@ class ChatLogTracker: dml.append('other') how = 'cmd: %s %s' % (cmd,cmdr) - v = self._find_matching_vessel( - pattern, timestamp, cmdr, dml, create=True) + if cmd == 'j': + if pattern is not None: + return chat(chan) + v = None + else: + v = self._find_matching_vessel( + pattern, timestamp, cmdr, + dml, create=True) - if v is not None: + if cmd == 'j' or v is not None: targets = targets.strip().split(' ') dml.append(`len(targets)`) for target in targets: