diff options
| author | Ben Kelly <bk@ancilla.ca> | 2017-11-07 11:18:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-07 11:18:04 -0500 |
| commit | 2410a868401f42e9e6f8a8f436e609fd6e226c01 (patch) | |
| tree | 15b499dbbe9398f9ce7ef4ee834352b0b42db085 | |
| parent | 3eff1de49d3aba1d991b7b6953e6b55a24fdecd9 (diff) | |
| parent | 8d7fcd0ccaf548cf4823c87f93baad4f417873d7 (diff) | |
| download | wee-slack-2410a868401f42e9e6f8a8f436e609fd6e226c01.tar.gz | |
Merge pull request #468 from ToxicFrog/toxicfrog/tags
Add irc_privmsg to message tags; remove unused "highlightme" tagset
| -rw-r--r-- | wee_slack.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/wee_slack.py b/wee_slack.py index c354bf5..e1f721a 100644 --- a/wee_slack.py +++ b/wee_slack.py @@ -1039,7 +1039,7 @@ class SlackTeam(object): return self.domain def buffer_prnt(self, data): - w.prnt_date_tags(self.channel_buffer, SlackTS().major, tag("backlog"), data) + w.prnt_date_tags(self.channel_buffer, SlackTS().major, tag("team"), data) def get_channel_map(self): return {v.slack_name: k for k, v in self.channels.iteritems()} @@ -2838,20 +2838,20 @@ def tag(tagset, user=None): else: default_tag = 'nick_unknown' tagsets = { + # messages in the team/server buffer, e.g. "new channel created" + "team": "irc_notice,notify_private,log3", # when replaying something old - "backlog": "no_highlight,notify_none,logger_backlog_end", + "backlog": "irc_privmsg,no_highlight,notify_none,logger_backlog", # when posting messages to a muted channel - "muted": "no_highlight,notify_none,logger_backlog_end", - # when my nick is in the message - "highlightme": "notify_highlight,log1", + "muted": "irc_privmsg,no_highlight,notify_none,log1", # when receiving a direct message - "dm": "notify_private,notify_message,log1,irc_privmsg", - "dmfromme": "notify_none,log1,irc_privmsg", + "dm": "irc_privmsg,notify_private,log1", + "dmfromme": "irc_privmsg,no_highlight,notify_none,log1", # when this is a join/leave, attach for smart filter ala: # if user in [x.strip() for x in w.prefix("join"), w.prefix("quit")] - "joinleave": "irc_smart_filter,no_highlight", + "joinleave": "irc_smart_filter,no_highlight,log4", # catchall ? - "default": "notify_message,log1", + "default": "irc_privmsg,notify_message,log1", } return default_tag + "," + tagsets[tagset] |