Merge branch 'bugfixes-0.1.1'

Conflicts:
	docs/changelog.rst

Author: Pietro Albini

botogram/defaults.py

@@ -7,7 +7,6 @@
 """
 
 from . import utils
-from . import objects
 from . import components
 from . import decorators
 
@@ -142,7 +141,7 @@ def no_commands_hook(self, bot, chat, message):
         username = bot.itself.username
 
         mentioned = splitted[0] == "/%s@%s" % (command, username)
-        single_user = isinstance(chat, objects.User)
+        single_user = chat.type == "private"
         if mentioned or single_user:
             chat.send("\n".join([
                 bot._("Unknown command: /%(name)s", name=command),

botogram/syntaxes.py

@@ -9,23 +9,23 @@
 import re
 
 
-_markdown_re = re.compile(r"("
+_markdown_re = re.compile(r".*("
                           r"\*(.*)\*|"
                           r"_(.*)_|"
                           r"\[(.*)\]\((.*)\)|"
                           r"`(.*)`|"
                           r"```(.*)```"
-                          r")")
+                          r").*")
 
-_html_re = re.compile(r"("
+_html_re = re.compile(r".*("
                       r"<b>(.*)<\/b>|"
                       r"<strong>(.*)<\/strong>|"
                       r"<i>(.*)<\/i>|"
                       r"<em>(.*)<\/em>|"
                       r"<a\shref=\"(.*)\">(.*)<\/a>|"
                       r"<code>(.*)<\/code>|"
                       r"<pre>(.*)<\/pre>"
-                      r")")
+                      r").*")
 
 
 def is_markdown(message):

docs/changelog.rst

@@ -14,10 +14,23 @@ Here you can see what changed in every botogram release.
 botogram 0.2
 =============
 
-*Alpha release, not released yet!*
+*Alpha release, not yet released*
 
 No changes yet.
 
+.. _changelog-0.1.1:
+
+botogram 0.1.1
+==============
+
+*Bugfix release, not yet released*
+
+* Fix automatic syntax detector not working sometimes (`issue 26`_)
+* Fix "unknown command" message not showing up in private chats (`issue 25`_)
+
+.. _issue 25: https://github.com/pietroalbini/botogram/issues/25
+.. _issue 26: https://github.com/pietroalbini/botogram/issues/26
+
 .. _changelog-0.1:
 
 botogram 0.1

tests/test_syntaxes.py

@@ -16,8 +16,10 @@ def test_is_markdown():
 
     for delimiter in "*", "_", "`", "```":
         assert botogram.syntaxes.is_markdown(delimiter+"a"+delimiter)
+        assert botogram.syntaxes.is_markdown("!"+delimiter+"a"+delimiter+"!")
 
     assert botogram.syntaxes.is_markdown("[a](b)")
+    assert botogram.syntaxes.is_markdown("![a](b)!")
 
 
 def test_is_html():
@@ -26,10 +28,12 @@ def test_is_html():
 
     for tag in "b", "strong", "i", "em", "pre", "code":
         assert botogram.syntaxes.is_html("<"+tag+">a</"+tag+">")
+        assert botogram.syntaxes.is_html("!<"+tag+">a</"+tag+">!")
 
     assert not botogram.syntaxes.is_html("<a>a</a>")
     assert not botogram.syntaxes.is_html("<a test=\"b\">a</a>")
     assert botogram.syntaxes.is_html("<a href=\"b\">a</a>")
+    assert botogram.syntaxes.is_html("!<a href=\"b\">a</a>!")
 
 
 def test_guess_syntax():