From 63a702ac5d61431da6de44926a2b96e0c0ac121d Mon Sep 17 00:00:00 2001
From: JosXa <joscha.goetzer@gmail.com>
Date: Tue, 12 Sep 2017 00:17:11 +0200
Subject: [PATCH 01/10] Added methods to quickly reply to a message with
 Markdown or HTML

---
 telegram/message.py | 46 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/telegram/message.py b/telegram/message.py
index 58098813885..b614e181eeb 100644
--- a/telegram/message.py
+++ b/telegram/message.py
@@ -23,10 +23,10 @@
 from telegram import (Audio, Contact, Document, Chat, Location, PhotoSize, Sticker, TelegramObject,
                       User, Video, Voice, Venue, MessageEntity, Game, Invoice, SuccessfulPayment,
                       VideoNote)
+from telegram import ParseMode
 from telegram.utils.deprecate import warn_deprecate_obj
 from telegram.utils.helpers import escape_html, escape_markdown, to_timestamp, from_timestamp
 
-
 _UNDEFINED = object()
 
 
@@ -408,6 +408,50 @@ def reply_text(self, *args, **kwargs):
         self._quote(kwargs)
         return self.bot.send_message(self.chat_id, *args, **kwargs)
 
+    def reply_markdown(self, *args, **kwargs):
+        """
+        Shortcut for::
+
+                ``bot.sendMessage(update.message.chat_id,
+                                  parse_mode=ParseMode.MARKDOWN,
+                                  *args, **kwargs)``
+
+        Sends a message with markdown formatting.
+
+        Keyword Args:
+            quote (Optional[bool]): If set to ``True``, the message is sent as an actual reply to
+                this message. If ``reply_to_message_id`` is passed in ``kwargs``, this parameter
+                will be ignored. Default: ``True`` in group chats and ``False`` in private chats.
+        """
+
+        kwargs['parse_mode'] = ParseMode.MARKDOWN
+
+        self._quote(kwargs)
+
+        return self.bot.sendMessage(self.chat_id, *args, **kwargs)
+
+    def reply_html(self, *args, **kwargs):
+        """
+        Shortcut for::
+
+                ``bot.sendMessage(update.message.chat_id,
+                                  parse_mode=ParseMode.HTML,
+                                  *args, **kwargs)``
+
+        Sends a message with HTML formatting.
+
+        Keyword Args:
+            quote (Optional[bool]): If set to ``True``, the message is sent as an actual reply to
+                this message. If ``reply_to_message_id`` is passed in ``kwargs``, this parameter
+                will be ignored. Default: ``True`` in group chats and ``False`` in private chats.
+        """
+
+        kwargs['parse_mode'] = ParseMode.HTML
+
+        self._quote(kwargs)
+
+        return self.bot.sendMessage(self.chat_id, *args, **kwargs)
+
     def reply_photo(self, *args, **kwargs):
         """Shortcut for::
 

From 06734c92bdd76ca1fcd3071db34b4e7d9b1d5653 Mon Sep 17 00:00:00 2001
From: JosXa <joscha.goetzer@gmail.com>
Date: Tue, 12 Sep 2017 00:17:11 +0200
Subject: [PATCH 02/10] Added methods to quickly reply to a message with
 Markdown or HTML

---
 telegram/message.py | 46 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/telegram/message.py b/telegram/message.py
index 58098813885..b614e181eeb 100644
--- a/telegram/message.py
+++ b/telegram/message.py
@@ -23,10 +23,10 @@
 from telegram import (Audio, Contact, Document, Chat, Location, PhotoSize, Sticker, TelegramObject,
                       User, Video, Voice, Venue, MessageEntity, Game, Invoice, SuccessfulPayment,
                       VideoNote)
+from telegram import ParseMode
 from telegram.utils.deprecate import warn_deprecate_obj
 from telegram.utils.helpers import escape_html, escape_markdown, to_timestamp, from_timestamp
 
-
 _UNDEFINED = object()
 
 
@@ -408,6 +408,50 @@ def reply_text(self, *args, **kwargs):
         self._quote(kwargs)
         return self.bot.send_message(self.chat_id, *args, **kwargs)
 
+    def reply_markdown(self, *args, **kwargs):
+        """
+        Shortcut for::
+
+                ``bot.sendMessage(update.message.chat_id,
+                                  parse_mode=ParseMode.MARKDOWN,
+                                  *args, **kwargs)``
+
+        Sends a message with markdown formatting.
+
+        Keyword Args:
+            quote (Optional[bool]): If set to ``True``, the message is sent as an actual reply to
+                this message. If ``reply_to_message_id`` is passed in ``kwargs``, this parameter
+                will be ignored. Default: ``True`` in group chats and ``False`` in private chats.
+        """
+
+        kwargs['parse_mode'] = ParseMode.MARKDOWN
+
+        self._quote(kwargs)
+
+        return self.bot.sendMessage(self.chat_id, *args, **kwargs)
+
+    def reply_html(self, *args, **kwargs):
+        """
+        Shortcut for::
+
+                ``bot.sendMessage(update.message.chat_id,
+                                  parse_mode=ParseMode.HTML,
+                                  *args, **kwargs)``
+
+        Sends a message with HTML formatting.
+
+        Keyword Args:
+            quote (Optional[bool]): If set to ``True``, the message is sent as an actual reply to
+                this message. If ``reply_to_message_id`` is passed in ``kwargs``, this parameter
+                will be ignored. Default: ``True`` in group chats and ``False`` in private chats.
+        """
+
+        kwargs['parse_mode'] = ParseMode.HTML
+
+        self._quote(kwargs)
+
+        return self.bot.sendMessage(self.chat_id, *args, **kwargs)
+
     def reply_photo(self, *args, **kwargs):
         """Shortcut for::
 

From fb2323fc2b7b63ffcb4db655cb8f806cf34ca7eb Mon Sep 17 00:00:00 2001
From: Eldin <pieter.schutz@gmail.com>
Date: Thu, 14 Sep 2017 18:00:59 +0200
Subject: [PATCH 03/10] fix docstrings

---
 telegram/message.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/telegram/message.py b/telegram/message.py
index b614e181eeb..3d7b348c7f7 100644
--- a/telegram/message.py
+++ b/telegram/message.py
@@ -419,9 +419,10 @@ def reply_markdown(self, *args, **kwargs):
         Sends a message with markdown formatting.
 
         Keyword Args:
-            quote (Optional[bool]): If set to ``True``, the message is sent as an actual reply to
-                this message. If ``reply_to_message_id`` is passed in ``kwargs``, this parameter
-                will be ignored. Default: ``True`` in group chats and ``False`` in private chats.
+            quote (:obj:`bool`, optional): If set to ``True``, the message is sent as an actual
+                reply to this message. If ``reply_to_message_id`` is passed in ``kwargs``, this
+                parameter will be ignored. Default: ``True`` in group chats and ``False`` in
+                private chats.
         """
 
         kwargs['parse_mode'] = ParseMode.MARKDOWN
@@ -441,9 +442,10 @@ def reply_html(self, *args, **kwargs):
         Sends a message with HTML formatting.
 
         Keyword Args:
-            quote (Optional[bool]): If set to ``True``, the message is sent as an actual reply to
-                this message. If ``reply_to_message_id`` is passed in ``kwargs``, this parameter
-                will be ignored. Default: ``True`` in group chats and ``False`` in private chats.
+            quote (:obj:`bool`, optional): If set to ``True``, the message is sent as an actual
+                reply to this message. If ``reply_to_message_id`` is passed in ``kwargs``, this
+                parameter will be ignored. Default: ``True`` in group chats and ``False`` in
+                private chats.
         """
 
         kwargs['parse_mode'] = ParseMode.HTML

From 572686334bf1e62ab12e7f79e0da0f42c1d7e9dc Mon Sep 17 00:00:00 2001
From: JosXa <joscha.goetzer@gmail.com>
Date: Mon, 18 Sep 2017 14:30:13 +0200
Subject: [PATCH 04/10] Added notice to contribution guidelines

---
 .github/ISSUE_TEMPLATE.md   |  5 +++++
 telegram/vendor/ptb_urllib3 |  2 +-
 tests/test_message.py       | 31 +++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 8945f449ecb..4a892c5005c 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,9 +1,14 @@
 <!--
+IMPORTANT NOTICE FOR NEW CONTRIBUTORS: This is the repository of the Python library 
+"python-telegram-bot". We do not respond to questions in other programming languages 
+or libraries such as "telepot" or "pyTelegramBotAPI".
+
 Thanks for reporting issues of python-telegram-bot!
 
 Use this template to notify us if you found a bug, or if you want to request a new feature.
 If you're looking for help with programming your bot using our library, feel free to ask your
 questions in out telegram group at: https://t.me/pythontelegrambotgroup
+We also get a lot of issues that could be answered by a quick question in the group, so please join us on Telegram.
 
 To make it easier for us to help you please enter detailed information below.
 
diff --git a/telegram/vendor/ptb_urllib3 b/telegram/vendor/ptb_urllib3
index 06d04e451f6..4c1693fb817 160000
--- a/telegram/vendor/ptb_urllib3
+++ b/telegram/vendor/ptb_urllib3
@@ -1 +1 @@
-Subproject commit 06d04e451f6beb5562057bf793218c4e363d8bc0
+Subproject commit 4c1693fb817aa511622298b3ce4873c57648f402
diff --git a/tests/test_message.py b/tests/test_message.py
index 1dc2a8e4942..0d93ba366ca 100644
--- a/tests/test_message.py
+++ b/tests/test_message.py
@@ -217,6 +217,37 @@ def test(*args, **kwargs):
         assert message.reply_text('test', quote=True)
         assert message.reply_text('test', reply_to_message_id=message.message_id, quote=True)
 
+    def test_reply_markdown(self, monkeypatch, message):
+        def test(*args, **kwargs):
+            id = args[1] == message.chat_id
+            markdown_text = args[2] == 'test'
+            if kwargs.get('reply_to_message_id'):
+                reply = kwargs['reply_to_message_id'] == message.message_id
+            else:
+                reply = True
+            return id and text and reply
+
+        monkeypatch.setattr('telegram.Bot.send_message', test)
+        assert message.reply_markdown('test')
+        assert message.reply_markdown('test', quote=True)
+        assert message.reply_markdown('test', reply_to_message_id=message.message_id, quote=True)
+
+    def test_reply_markdown(self):
+        message = self._bot.sendMessage(self._chat_id, '.')
+        text = 'Testing class method *with* _markdown_ `enabled`.'
+        message = message.reply_markdown(text)
+
+        self.assertTrue(self.is_json(message.to_json()))
+        self.assertEqual(message.text_markdown, text)
+
+    def test_reply_html(self):
+        message = self._bot.sendMessage(self._chat_id, '.')
+        text = 'Testing class method <b>with</b> <i>html</i> <code>enabled</code>.'
+        message = message.reply_html(text)
+ 
+        self.assertTrue(self.is_json(message.to_json()))
+        self.assertEqual(message.text_html, text)
+
     def test_reply_photo(self, monkeypatch, message):
         def test(*args, **kwargs):
             id = args[1] == message.chat_id

From 1b245b0fc85711d892c6fbe8372da2072a35f16e Mon Sep 17 00:00:00 2001
From: JosXa <joscha.goetzer@gmail.com>
Date: Mon, 2 Oct 2017 03:13:36 +0200
Subject: [PATCH 05/10] Added tests for reply_markdown and reply_html

---
 telegram/message.py   |   4 +-
 tests/test_message.py | 130 +++++++++++++++++++++++++++---------------
 2 files changed, 86 insertions(+), 48 deletions(-)

diff --git a/telegram/message.py b/telegram/message.py
index b614e181eeb..e9ad8c03641 100644
--- a/telegram/message.py
+++ b/telegram/message.py
@@ -428,7 +428,7 @@ def reply_markdown(self, *args, **kwargs):
 
         self._quote(kwargs)
 
-        return self.bot.sendMessage(self.chat_id, *args, **kwargs)
+        return self.bot.send_message(self.chat_id, *args, **kwargs)
 
     def reply_html(self, *args, **kwargs):
         """
@@ -450,7 +450,7 @@ def reply_html(self, *args, **kwargs):
 
         self._quote(kwargs)
 
-        return self.bot.sendMessage(self.chat_id, *args, **kwargs)
+        return self.bot.send_message(self.chat_id, *args, **kwargs)
 
     def reply_photo(self, *args, **kwargs):
         """Shortcut for::
diff --git a/tests/test_message.py b/tests/test_message.py
index 0d93ba366ca..5a4cc2d0fac 100644
--- a/tests/test_message.py
+++ b/tests/test_message.py
@@ -20,6 +20,7 @@
 
 import pytest
 
+from telegram import ParseMode
 from telegram import (Update, Message, User, MessageEntity, Chat, Audio, Document,
                       Game, PhotoSize, Sticker, Video, Voice, VideoNote, Contact, Location, Venue,
                       Invoice, SuccessfulPayment)
@@ -33,34 +34,52 @@ def message(bot):
 
 @pytest.fixture(scope='function',
                 params=[
-                    {'forward_from': User(99, 'forward_user', False),
-                     'forward_date': datetime.now()},
-                    {'forward_from_chat': Chat(-23, 'channel'),
-                     'forward_from_message_id': 101,
-                     'forward_date': datetime.now()},
+                    {
+                        'forward_from': User(99, 'forward_user', False),
+                        'forward_date': datetime.now()
+                    },
+                    {
+                        'forward_from_chat': Chat(-23, 'channel'),
+                        'forward_from_message_id': 101,
+                        'forward_date': datetime.now()
+                    },
                     {'reply_to_message': Message(50, None, None, None)},
                     {'edit_date': datetime.now()},
-                    {'test': 'a text message',
-                     'enitites': [MessageEntity('bold', 10, 4),
-                                  MessageEntity('italic', 16, 7)]},
-                    {'audio': Audio('audio_id', 12),
-                     'caption': 'audio_file'},
-                    {'document': Document('document_id'),
-                     'caption': 'document_file'},
-                    {'game': Game('my_game', 'just my game',
-                                  [PhotoSize('game_photo_id', 30, 30), ])},
-                    {'photo': [PhotoSize('photo_id', 50, 50)],
-                     'caption': 'photo_file'},
+                    {
+                        'test': 'a text message',
+                        'enitites': [MessageEntity('bold', 10, 4),
+                                     MessageEntity('italic', 16, 7)]
+                    },
+                    {
+                        'audio': Audio('audio_id', 12),
+                        'caption': 'audio_file'
+                    },
+                    {
+                        'document': Document('document_id'),
+                        'caption': 'document_file'
+                    },
+                    {
+                        'game': Game('my_game', 'just my game',
+                                     [PhotoSize('game_photo_id', 30, 30), ])
+                    },
+                    {
+                        'photo': [PhotoSize('photo_id', 50, 50)],
+                        'caption': 'photo_file'
+                    },
                     {'sticker': Sticker('sticker_id', 50, 50)},
-                    {'video': Video('video_id', 12, 12, 12),
-                     'caption': 'video_file'},
+                    {
+                        'video': Video('video_id', 12, 12, 12),
+                        'caption': 'video_file'
+                    },
                     {'voice': Voice('voice_id', 5)},
                     {'video_note': VideoNote('video_note_id', 20, 12)},
                     {'new_chat_members': [User(55, 'new_user', False)]},
                     {'contact': Contact('phone_numner', 'contact_name')},
                     {'location': Location(-23.691288, 46.788279)},
-                    {'venue': Venue(Location(-23.691288, 46.788279),
-                                    'some place', 'right here')},
+                    {
+                        'venue': Venue(Location(-23.691288, 46.788279),
+                                       'some place', 'right here')
+                    },
                     {'left_chat_member': User(33, 'kicked', False)},
                     {'new_chat_title': 'new title'},
                     {'new_chat_photo': [PhotoSize('photo_id', 50, 50)]},
@@ -72,9 +91,11 @@ def message(bot):
                     {'migrate_from_chat_id': -54321},
                     {'pinned_message': Message(7, None, None, None)},
                     {'invoice': Invoice('my invoice', 'invoice', 'start', 'EUR', 243)},
-                    {'successful_payment': SuccessfulPayment('EUR', 243, 'payload',
-                                                             'charge_id', 'provider_id',
-                                                             order_info={})},
+                    {
+                        'successful_payment': SuccessfulPayment('EUR', 243, 'payload',
+                                                                'charge_id', 'provider_id',
+                                                                order_info={})
+                    },
                     {'forward_signature': 'some_forward_sign'},
                     {'author_signature': 'some_author_sign'}
                 ],
@@ -201,7 +222,6 @@ def test_effective_attachment(self, message_params):
             item = None
         assert message_params.effective_attachment == item
 
-
     def test_reply_text(self, monkeypatch, message):
         def test(*args, **kwargs):
             id = args[1] == message.chat_id
@@ -218,35 +238,53 @@ def test(*args, **kwargs):
         assert message.reply_text('test', reply_to_message_id=message.message_id, quote=True)
 
     def test_reply_markdown(self, monkeypatch, message):
+        test_md_string = ('Test for <*bold*, _ita\_lic_, `code`, [links](http://github.com/) and '
+                          '```pre```. http://google.com')
+
         def test(*args, **kwargs):
-            id = args[1] == message.chat_id
-            markdown_text = args[2] == 'test'
+            cid = args[1] == message.chat_id
+            markdown_text = args[2] == test_md_string
+            markdown_enabled = kwargs['parse_mode'] == ParseMode.MARKDOWN
             if kwargs.get('reply_to_message_id'):
                 reply = kwargs['reply_to_message_id'] == message.message_id
             else:
                 reply = True
-            return id and text and reply
+            return all([cid, markdown_text, reply, markdown_enabled])
+
+        text_markdown = self.test_message.text_markdown
+        assert text_markdown == test_md_string
+
+        monkeypatch.setattr('telegram.Bot.send_message', test)
+        assert message.reply_markdown(self.test_message.text_markdown)
+        assert message.reply_markdown(self.test_message.text_markdown, quote=True)
+        assert message.reply_markdown(self.test_message.text_markdown,
+                                      reply_to_message_id=message.message_id,
+                                      quote=True)
+
+    def test_reply_html(self, monkeypatch, message):
+        test_html_string = ('Test for &lt;<b>bold</b>, <i>ita_lic</i>, <code>code</code>, '
+                            '<a href="http://github.com/">links</a> and <pre>pre</pre>. '
+                            'http://google.com')
+
+        def test(*args, **kwargs):
+            cid = args[1] == message.chat_id
+            html_text = args[2] == test_html_string
+            html_enabled = kwargs['parse_mode'] == ParseMode.HTML
+            if kwargs.get('reply_to_message_id'):
+                reply = kwargs['reply_to_message_id'] == message.message_id
+            else:
+                reply = True
+            return all([cid, html_text, reply, html_enabled])
+
+        text_html = self.test_message.text_html
+        assert text_html == test_html_string
 
         monkeypatch.setattr('telegram.Bot.send_message', test)
-        assert message.reply_markdown('test')
-        assert message.reply_markdown('test', quote=True)
-        assert message.reply_markdown('test', reply_to_message_id=message.message_id, quote=True)
-
-    def test_reply_markdown(self):
-        message = self._bot.sendMessage(self._chat_id, '.')
-        text = 'Testing class method *with* _markdown_ `enabled`.'
-        message = message.reply_markdown(text)
-
-        self.assertTrue(self.is_json(message.to_json()))
-        self.assertEqual(message.text_markdown, text)
-
-    def test_reply_html(self):
-        message = self._bot.sendMessage(self._chat_id, '.')
-        text = 'Testing class method <b>with</b> <i>html</i> <code>enabled</code>.'
-        message = message.reply_html(text)
- 
-        self.assertTrue(self.is_json(message.to_json()))
-        self.assertEqual(message.text_html, text)
+        assert message.reply_html(self.test_message.text_html)
+        assert message.reply_html(self.test_message.text_html, quote=True)
+        assert message.reply_html(self.test_message.text_html,
+                                  reply_to_message_id=message.message_id,
+                                  quote=True)
 
     def test_reply_photo(self, monkeypatch, message):
         def test(*args, **kwargs):

From 69d94198f7ffe95f9805c189d6c96c6bc0b8878f Mon Sep 17 00:00:00 2001
From: JosXa <joscha.goetzer@gmail.com>
Date: Mon, 2 Oct 2017 14:19:46 +0200
Subject: [PATCH 06/10] Removed mistaken urllib3 and files from another commit
 of mine

---
 telegram/utils/helpers.py   | 23 +++++++++++++++++++++++
 telegram/vendor/ptb_urllib3 |  2 +-
 tests/test_helpers.py       | 22 ++++++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/telegram/utils/helpers.py b/telegram/utils/helpers.py
index 9da126e0531..03f619306d4 100644
--- a/telegram/utils/helpers.py
+++ b/telegram/utils/helpers.py
@@ -21,6 +21,8 @@
 import re
 from datetime import datetime
 
+from ordered_set import OrderedSet
+
 try:
     from html import escape as escape_html  # noqa: F401
 except ImportError:
@@ -100,3 +102,24 @@ def mention_markdown(user_id, name):
     """
     if isinstance(user_id, int):
         return '[{}](tg://user?id={})'.format(escape_markdown(name), user_id)
+
+
+def extract_urls(message):
+    """
+    Extracts all Hyperlinks that are contained in a message.
+
+    Args:
+        message (:obj:`telegram.Message`) The message to extract from
+
+    Returns:
+        :obj:`list`: A list of URLs contained in the message
+    """
+    from telegram import MessageEntity
+
+    results = message.parse_entities(types=[
+        MessageEntity.URL,
+        MessageEntity.TEXT_LINK])
+    urls = list(OrderedSet(
+        [v if k.type == MessageEntity.URL else k.url for k, v in results.items()]
+    ))
+    return urls
diff --git a/telegram/vendor/ptb_urllib3 b/telegram/vendor/ptb_urllib3
index 4c1693fb817..06d04e451f6 160000
--- a/telegram/vendor/ptb_urllib3
+++ b/telegram/vendor/ptb_urllib3
@@ -1 +1 @@
-Subproject commit 4c1693fb817aa511622298b3ce4873c57648f402
+Subproject commit 06d04e451f6beb5562057bf793218c4e363d8bc0
diff --git a/tests/test_helpers.py b/tests/test_helpers.py
index 49cd7751d7b..1e69f3ab2f8 100644
--- a/tests/test_helpers.py
+++ b/tests/test_helpers.py
@@ -17,6 +17,8 @@
 # You should have received a copy of the GNU Lesser Public License
 # along with this program.  If not, see [http://www.gnu.org/licenses/].
 
+from telegram import Message
+from telegram import MessageEntity
 from telegram.utils import helpers
 
 
@@ -26,3 +28,23 @@ def test_escape_markdown(self):
         expected_str = '\*bold\*, \_italic\_, \`code\`, \[text\_link](http://github.com/)'
 
         assert expected_str == helpers.escape_markdown(test_str)
+
+    def test_extract_urls(self):
+        test_entities = [{'length': 6, 'offset': 0, 'type': 'text_link',
+                          'url': 'http://github.com/'},
+                         {'length': 17, 'offset': 23, 'type': 'url'},
+                         {'length': 14, 'offset': 43, 'type': 'text_link',
+                          'url': 'http://google.com'}]
+        test_text = 'Github can be found at http://github.com. Google is here.'
+        test_message = Message(message_id=1,
+                               from_user=None,
+                               date=None,
+                               chat=None,
+                               text=test_text,
+                               entities=[MessageEntity(**e) for e in test_entities])
+        result = helpers.extract_urls(test_message)
+
+        assert len(result) == 3
+        assert (test_entities[0]['url'] == result[0])
+        assert (result[1] == 'http://github.com')
+        assert (test_entities[2]['url'] == result[2])

From fb43963e443c7b5f86f06ddd5f8e2ec61e6d5b8c Mon Sep 17 00:00:00 2001
From: JosXa <joscha.goetzer@gmail.com>
Date: Mon, 2 Oct 2017 14:22:31 +0200
Subject: [PATCH 07/10] Reset old issue template

---
 .github/ISSUE_TEMPLATE.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 4a892c5005c..8945f449ecb 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,14 +1,9 @@
 <!--
-IMPORTANT NOTICE FOR NEW CONTRIBUTORS: This is the repository of the Python library 
-"python-telegram-bot". We do not respond to questions in other programming languages 
-or libraries such as "telepot" or "pyTelegramBotAPI".
-
 Thanks for reporting issues of python-telegram-bot!
 
 Use this template to notify us if you found a bug, or if you want to request a new feature.
 If you're looking for help with programming your bot using our library, feel free to ask your
 questions in out telegram group at: https://t.me/pythontelegrambotgroup
-We also get a lot of issues that could be answered by a quick question in the group, so please join us on Telegram.
 
 To make it easier for us to help you please enter detailed information below.
 

From 320a730123fa3946dea2f9481a755da0b3e8b3c6 Mon Sep 17 00:00:00 2001
From: JosXa <joscha.goetzer@gmail.com>
Date: Mon, 2 Oct 2017 14:24:14 +0200
Subject: [PATCH 08/10] Removed wrong files

---
 telegram/utils/helpers.py | 23 -----------------------
 tests/test_helpers.py     | 22 ----------------------
 2 files changed, 45 deletions(-)

diff --git a/telegram/utils/helpers.py b/telegram/utils/helpers.py
index 03f619306d4..9da126e0531 100644
--- a/telegram/utils/helpers.py
+++ b/telegram/utils/helpers.py
@@ -21,8 +21,6 @@
 import re
 from datetime import datetime
 
-from ordered_set import OrderedSet
-
 try:
     from html import escape as escape_html  # noqa: F401
 except ImportError:
@@ -102,24 +100,3 @@ def mention_markdown(user_id, name):
     """
     if isinstance(user_id, int):
         return '[{}](tg://user?id={})'.format(escape_markdown(name), user_id)
-
-
-def extract_urls(message):
-    """
-    Extracts all Hyperlinks that are contained in a message.
-
-    Args:
-        message (:obj:`telegram.Message`) The message to extract from
-
-    Returns:
-        :obj:`list`: A list of URLs contained in the message
-    """
-    from telegram import MessageEntity
-
-    results = message.parse_entities(types=[
-        MessageEntity.URL,
-        MessageEntity.TEXT_LINK])
-    urls = list(OrderedSet(
-        [v if k.type == MessageEntity.URL else k.url for k, v in results.items()]
-    ))
-    return urls
diff --git a/tests/test_helpers.py b/tests/test_helpers.py
index 1e69f3ab2f8..49cd7751d7b 100644
--- a/tests/test_helpers.py
+++ b/tests/test_helpers.py
@@ -17,8 +17,6 @@
 # You should have received a copy of the GNU Lesser Public License
 # along with this program.  If not, see [http://www.gnu.org/licenses/].
 
-from telegram import Message
-from telegram import MessageEntity
 from telegram.utils import helpers
 
 
@@ -28,23 +26,3 @@ def test_escape_markdown(self):
         expected_str = '\*bold\*, \_italic\_, \`code\`, \[text\_link](http://github.com/)'
 
         assert expected_str == helpers.escape_markdown(test_str)
-
-    def test_extract_urls(self):
-        test_entities = [{'length': 6, 'offset': 0, 'type': 'text_link',
-                          'url': 'http://github.com/'},
-                         {'length': 17, 'offset': 23, 'type': 'url'},
-                         {'length': 14, 'offset': 43, 'type': 'text_link',
-                          'url': 'http://google.com'}]
-        test_text = 'Github can be found at http://github.com. Google is here.'
-        test_message = Message(message_id=1,
-                               from_user=None,
-                               date=None,
-                               chat=None,
-                               text=test_text,
-                               entities=[MessageEntity(**e) for e in test_entities])
-        result = helpers.extract_urls(test_message)
-
-        assert len(result) == 3
-        assert (test_entities[0]['url'] == result[0])
-        assert (result[1] == 'http://github.com')
-        assert (test_entities[2]['url'] == result[2])

From c86e175e940e0cca3ed03866f3cb0b4d11495872 Mon Sep 17 00:00:00 2001
From: JosXa <joscha.goetzer@gmail.com>
Date: Thu, 1 Feb 2018 17:49:09 +0100
Subject: [PATCH 09/10] Requested docstring changes

---
 telegram/message.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/telegram/message.py b/telegram/message.py
index 2f01d94075a..ac19e40b459 100644
--- a/telegram/message.py
+++ b/telegram/message.py
@@ -430,7 +430,7 @@ def reply_text(self, *args, **kwargs):
     def reply_markdown(self, *args, **kwargs):
         """Shortcut for::
 
-            bot.sendMessage(update.message.chat_id, parse_mode=ParseMode.MARKDOWN, *args, **kwargs)
+            bot.send_message(update.message.chat_id, parse_mode=ParseMode.MARKDOWN, *args, **kwargs)
 
         Sends a message with markdown formatting.
 
@@ -450,7 +450,7 @@ def reply_markdown(self, *args, **kwargs):
     def reply_html(self, *args, **kwargs):
         """Shortcut for::
 
-            bot.sendMessage(update.message.chat_id, parse_mode=ParseMode.HTML, *args, **kwargs)
+            bot.send_message(update.message.chat_id, parse_mode=ParseMode.HTML, *args, **kwargs)
 
         Sends a message with HTML formatting.
 

From 8821292bc883ca6a34c323c6aeea5e45204d6ede Mon Sep 17 00:00:00 2001
From: JosXa <joscha.goetzer@gmail.com>
Date: Thu, 1 Feb 2018 20:44:16 +0100
Subject: [PATCH 10/10] Make flake8 happy

---
 telegram/message.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/telegram/message.py b/telegram/message.py
index ac19e40b459..d72d3d12f52 100644
--- a/telegram/message.py
+++ b/telegram/message.py
@@ -430,7 +430,8 @@ def reply_text(self, *args, **kwargs):
     def reply_markdown(self, *args, **kwargs):
         """Shortcut for::
 
-            bot.send_message(update.message.chat_id, parse_mode=ParseMode.MARKDOWN, *args, **kwargs)
+            bot.send_message(update.message.chat_id, parse_mode=ParseMode.MARKDOWN, *args,
+            **kwargs)
 
         Sends a message with markdown formatting.