Add proper issue sending

jsmnbom · jsmnbom · commit e5f4c4e7f6c9 · 2018-10-25T12:16:16.000+02:00
diff --git a/bot/github.py b/bot/github.py
@@ -6,14 +6,15 @@
 from bot.githubapi import github_api
 from bot.githubupdates import GithubAuthUpdate, GithubUpdate
 from bot.menu import edit_menu_by_id
-from bot.utils import github_cleaner
+from bot.utils import github_cleaner, link, truncate, encode_data_link
 
-GITHUB_API_ACCEPT = {'Accept': 'application/vnd.github.machine-man-preview+json'}
+TRUNCATED_MESSAGE = '\n<b>[Truncated message, open on GitHub to read more]</b>'
+REPLY_MESSAGE = '\n\n<i>Reply to this message to post a comment on GitHub.</i>'
 
 
 def render_github_markdown(markdown, context: str):
     html = github_api.markdown(markdown, context)
-    return github_cleaner.clean(html)
+    return github_cleaner.clean(html).strip('\n')
 
 
 class GithubHandler:
@@ -58,13 +59,23 @@ def issues(self, update, _):
         # Issue opened, edited, closed, reopened, assigned, unassigned, labeled,
         # unlabeled, milestoned, or demilestoned.
         # TODO: Possibly support editing, closing, reopening, etc. of issues
-        issue = update.payload['issue']
-        repo = update.payload['repository']
+        if update.payload['action'] == 'opened':
+            issue = update.payload['issue']
+            author = issue['user']
+            repo = update.payload['repository']
 
-        text = render_github_markdown(issue['body'], repo['full_name'])
+            text = render_github_markdown(issue['body'], repo['full_name'])
 
-        for chat_id in self._iter_chat_ids(repo):
-            self.dispatcher.bot.send_message(chat_id=chat_id, text=text, parse_mode=ParseMode.HTML)
+            issue_link = link(issue['html_url'], f'{repo["full_name"]}#{issue["number"]} {issue["title"]}')
+            author_link = link(author['html_url'], '@' + author['login'])
+            data_link = encode_data_link(('issue', repo['full_name'], issue['number'], author['login']))
+            text = f'{data_link}🐛 New Issue {issue_link}\nby {author_link}\n\n{text}'
+
+            text = truncate(text, TRUNCATED_MESSAGE, REPLY_MESSAGE)
+
+            for chat_id in self._iter_chat_ids(repo):
+                self.dispatcher.bot.send_message(chat_id=chat_id, text=text,
+                                                 parse_mode=ParseMode.HTML, disable_web_page_preview=True)
 
     def issue_comment(self, update, context):
         # Any time a comment on an issue is created, edited, or deleted.
diff --git a/bot/utils.py b/bot/utils.py
@@ -58,7 +58,7 @@ def secure_decode_65536(input_data, secret):
 
 
 def encode_data_link(data):
-    return f'<a href="{URL_BASE}{secure_encode_65536(data, HMAC_SECRET)}">​</a>'
+    return f'<a href="{URL_BASE}{secure_encode_65536(data, HMAC_SECRET)}">\u200b</a>'
 
 
 def decode_data_link(url):
@@ -146,14 +146,16 @@ def __iter__(self):
 
 
 class TelegramTruncator(Filter):
-    def __init__(self, source, truncated_message, suffix,
-                 max_entities=telegram.constants.MAX_MESSAGE_ENTITIES,
-                 max_length=telegram.constants.MAX_MESSAGE_LENGTH):
+    def __init__(self, source,
+                 truncated_message,
+                 suffix,
+                 max_entities=None,
+                 max_length=None):
         super().__init__(source)
         self.truncated_message = truncated_message or []
         self.suffix = suffix or []
-        self.max_entities = max_entities
-        self.max_length = max_length
+        self.max_entities = max_entities or telegram.constants.MAX_MESSAGE_ENTITIES
+        self.max_length = max_length or telegram.constants.MAX_MESSAGE_LENGTH
 
     def __iter__(self):
         for token in itertools.chain(self.truncated_message, self.suffix):
@@ -202,11 +204,15 @@ def __iter__(self):
         yield from iter(self.suffix)
 
 
-def truncate(html, truncated_message, suffix):
+def truncate(html, truncated_message, suffix, max_entities=None, max_length=None):
     walker = html5lib.getTreeWalker('etree')
     html_stream = walker(html5lib.parseFragment(html, treebuilder='etree'))
     truncated_message_stream = walker(html5lib.parseFragment(truncated_message, treebuilder='etree'))
     suffix_stream = walker(html5lib.parseFragment(suffix, treebuilder='etree'))
-    truncated = TelegramTruncator(html_stream, truncated_message=truncated_message_stream, suffix=suffix_stream)
-    return HTMLSerializer().render(truncated)
+    truncated = TelegramTruncator(html_stream, truncated_message=truncated_message_stream, suffix=suffix_stream,
+                                  max_entities=max_entities, max_length=max_length)
+    return HTMLSerializer().render(truncated).strip('\n')
 
+
+def link(url, text):
+    return f'<a href="{url}">{text}</a>'
