diff options
| -rw-r--r-- | _pytest/test_linkifytext.py | 23 | ||||
| -rw-r--r-- | wee_slack.py | 6 |
2 files changed, 11 insertions, 18 deletions
diff --git a/_pytest/test_linkifytext.py b/_pytest/test_linkifytext.py index da672dc..da1586e 100644 --- a/_pytest/test_linkifytext.py +++ b/_pytest/test_linkifytext.py @@ -13,57 +13,50 @@ from wee_slack import linkify_text def test_linkifytext_does_partial_html_entity_encoding(realish_eventrouter): team = realish_eventrouter.teams.values()[0] - channel = team.channels.values()[0] - text = linkify_text('& < > \' "', team, channel) + text = linkify_text('& < > \' "', team) assert text == '& < > \' "' def test_linkifytext_names_with_paranthesis(realish_eventrouter): team = realish_eventrouter.teams.values()[0] - channel = team.channels.values()[0] - text = linkify_text('@JohnDoe(jdoe): my test message', team, channel) + text = linkify_text('@JohnDoe(jdoe): my test message', team) assert text == '@JohnDoe(jdoe): my test message' def test_linkifytext_names_with_accents(realish_eventrouter): team = realish_eventrouter.teams.values()[0] - channel = team.channels.values()[0] - text = linkify_text('@ÁrvíztűrőTükörfúrógép(atukorfurogep): my test message', team, channel) + text = linkify_text('@ÁrvíztűrőTükörfúrógép(atukorfurogep): my test message', team) assert text == '@ÁrvíztűrőTükörfúrógép(atukorfurogep): my test message' def test_linkifytext_formatting_characters(realish_eventrouter): team = realish_eventrouter.teams.values()[0] - channel = team.channels.values()[0] - text = linkify_text('\x02\x1Dmy test message\x1D\x02', team, channel) + text = linkify_text('\x02\x1Dmy test message\x1D\x02', team) assert text == '*_my test message_*' def test_linkifytext_with_many_paranthesis(realish_eventrouter): team = realish_eventrouter.teams.values()[0] - channel = team.channels.values()[0] - text = linkify_text('@k(o(v)a)())s: my(( test) message', team, channel) + text = linkify_text('@k(o(v)a)())s: my(( test) message', team) assert text == '@k(o(v)a)())s: my(( test) message' def test_linkifytext_names_with_apostrophe(realish_eventrouter): team = realish_eventrouter.teams.values()[0] - channel = team.channels.values()[0] - text = linkify_text('@O\'Connor: my test message', team, channel) + text = linkify_text('@O\'Connor: my test message', team) assert text == '@O\'Connor: my test message' def test_linkifytext_at_channel(realish_eventrouter): team = realish_eventrouter.teams.values()[0] - channel = team.channels.values()[0] - text = linkify_text('@channel: my test message', team, channel) + text = linkify_text('@channel: my test message', team) assert text == '<!channel>: my test message' @@ -71,6 +64,6 @@ def test_linkifytext_channel(realish_eventrouter): team = realish_eventrouter.teams.values()[0] channel = team.channels.values()[0] - text = linkify_text('#{}: my test message'.format(channel.name), team, channel) + text = linkify_text('#{}: my test message'.format(channel.name), team) assert text == '<#{}|{}>: my test message'.format(channel.id, channel.name) diff --git a/wee_slack.py b/wee_slack.py index fbde84e..75fe695 100644 --- a/wee_slack.py +++ b/wee_slack.py @@ -1619,7 +1619,7 @@ class SlackChannel(SlackChannelCommon): dbg("Problem processing buffer_prnt") def send_message(self, message, subtype=None, request_dict_ext={}): - message = linkify_text(message, self.team, self) + message = linkify_text(message, self.team) dbg(message) if subtype == 'me_message': s = SlackRequest(self.team.token, "chat.meMessage", @@ -2058,7 +2058,7 @@ class SlackThreadChannel(SlackChannelCommon): if subtype == 'me_message': w.prnt("", "ERROR: /me is not supported in threads") return w.WEECHAT_RC_ERROR - message = linkify_text(message, self.team, self) + message = linkify_text(message, self.team) dbg(message) request = {"type": "message", "text": message, "channel": self.parent_message.channel.identifier, @@ -2948,7 +2948,7 @@ def render(message_json, team, force=False): return text -def linkify_text(message, team, channel): +def linkify_text(message, team): # The get_username_map function is a bit heavy, but this whole # function is only called on message send.. usernames = team.get_username_map() |