jarno
/
hemppa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make short response all one line 

Fixes #138
This commit is contained in:
gammafn 2021-04-16 11:29:55 -05:00
parent ef061deaa1
commit 1c58f33c79
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/wa.py
View File

@ -1,6 +1,7 @@
import urllib.request import urllib.request
import wolframalpha import wolframalpha
from html import escape from html import escape
import json
from modules.common.module import BotModule from modules.common.module import BotModule
@ -40,7 +41,6 @@ class MatrixModule(BotModule):
elif short[0]: elif short[0]:
html, plain = short html, plain = short
else: else:
print(short)
plain = 'Could not find response for ' + query plain = 'Could not find response for ' + query
html = plain html = plain
await bot.send_html(room, html, plain) await bot.send_html(room, html, plain)
@ -91,23 +91,26 @@ class MatrixModule(BotModule):
if title: if title:
html = f'<strong>{escape(title)}</strong>: {escape(text)}' html = f'<strong>{escape(title)}</strong>: {escape(text)}'
text = f'title: text' text = f'{title}: {text}'
else: else:
html = escape(text) html = escape(text)
plain = text pod_htmls += html.split('\n')
pod_htmls += [f'<li>{s}</li>' for s in html.split('\n')] pod_texts += text.split('\n')
pod_texts += [f'- {s}' for s in text.split('\n')]
if pod_texts: if pod_texts:
title = pod.get('@title') title = pod.get('@title')
pod_html = '\n'.join([f'<p><strong>{escape(title)}</strong>\n<ul>'] + pod_htmls + ['</ul></p>']) pod_html = '\n'.join([f'<p><strong>{escape(title)}</strong>\n<ul>']
pod_text = '\n'.join([title] + pod_texts) + [f'<li>{s}</li>' for s in pod_htmls]
+ ['</ul></p>'])
pod_text = '\n'.join([title]
+ [f'- {s}' for s in pod_texts])
htmls.append(pod_html) htmls.append(pod_html)
texts.append(pod_text) texts.append(pod_text)
if not primary and self.is_primary(pod): if not primary and self.is_primary(pod):
primary = (pod_html, pod_text) primary = (f'<strong>{escape(title)}</strong>: ' + ' | '.join(pod_htmls),
f'{title}: ' + ' | '.join(pod_texts))
else: else:
fallback = fallback or (pod_html, pod_text) fallback = fallback or (' | '.join(pod_htmls), ' | '.join(pod_texts))
return (primary or fallback, ('\n'.join(htmls), '\n'.join(texts))) return (primary or fallback, ('\n'.join(htmls), '\n'.join(texts)))