paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 04:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

emoji: Remove unnecessary duplicate regular expression from urls.py.

Browse Source 
Whether the emoji is valid is already being checked elsewhere, and
this duplicate regular expression makes it harder to understand what's
going on with Zulip's validation of emoji.
This commit is contained in:
Tim Abbott
2017-01-16 23:54:50 -08:00
parent 121b926962
commit 89212d9985
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/tests/test_reactions.py
View File

@@ -16,9 +16,9 @@ class ReactionEmojiTest(ZulipTestCase):
Sending reaction without emoji fails
"""
sender = 'hamlet@zulip.com'
result = self.client_put('/api/v1/messages/1/emoji_reactions',
result = self.client_put('/api/v1/messages/1/emoji_reactions/',
**self.api_auth(sender))
self.assertEqual(result.status_code, 404)
self.assertEqual(result.status_code, 400)
def test_add_invalid_emoji(self):
# type: () -> None

2
zproject/urls.py
View File

@@ -220,7 +220,7 @@ v1_api_and_json_patterns = [
# reactions -> zerver.view.reactions
# PUT adds a reaction to a message
# DELETE removes a reaction from a message
url(r'^messages/(?P<message_id>[0-9]+)/emoji_reactions/(?P<emoji_name>[+0-9a-zA-Z.\-_]+(?<![.\-_]))$',
url(r'^messages/(?P<message_id>[0-9]+)/emoji_reactions/(?P<emoji_name>.*)$',
rest_dispatch,
{'PUT': 'zerver.views.reactions.add_reaction_backend',
'DELETE': 'zerver.views.reactions.remove_reaction_backend'}),