From: Orillion <redacted>
Date: Wed, 3 Aug 2016 13:01:35 +0000 (+0200)
Subject: Add length limit on messages from wolfram alpha.
X-Git-Url: https://jfr.im/git/irc/rizon/acid.git/commitdiff_plain/refs/merge-requests/35/head

Add length limit on messages from wolfram alpha.
---

diff --git a/pyva/pypsd.example.yml b/pyva/pypsd.example.yml
index 00cd9b1..759ed32 100644
--- a/pyva/pypsd.example.yml
+++ b/pyva/pypsd.example.yml
@@ -61,6 +61,7 @@ internets:
   key_steam: xxx
   key_google: xxx
   outputlimit: 10
+  max_line_length: 500
   yt_parse_delay: 180
 
 limitserv:
diff --git a/pyva/pyva/src/main/python/internets/cmd_user.py b/pyva/pyva/src/main/python/internets/cmd_user.py
index 1270e39..f08f862 100644
--- a/pyva/pyva/src/main/python/internets/cmd_user.py
+++ b/pyva/pyva/src/main/python/internets/cmd_user.py
@@ -292,6 +292,8 @@ def command_calc(self, manager, opts, arg, channel, sender, userinfo):
 			lines = len(result[0].splitlines(True)) if result[1] is None else len(result[1].splitlines(True))
 			if lines > self.output_limit:
 				self.notice(sender, u'[W|A] {r[0]} = {r[1]}'.format(r=result))
+			else if max([len(x) for x in lines]) > self.max_line_length:
+				self.notice(sender, u'[W|A] {r[0]} = {r[1]}'.format(r=result))
 			else:
 				self.msg(channel, u'[W|A] {r[0]} = {r[1]}'.format(r=result))
 
diff --git a/pyva/pyva/src/main/python/internets/internets.py b/pyva/pyva/src/main/python/internets/internets.py
index 7082072..e7c21c6 100644
--- a/pyva/pyva/src/main/python/internets/internets.py
+++ b/pyva/pyva/src/main/python/internets/internets.py
@@ -78,6 +78,12 @@ class internets(
 			self.log.exception("Error reading 'internets:outputlimit' configuration option: %s" % err)
 			raise
 
+		try:
+			self.max_line_length = int(self.config.get('internets').get('maxlinelength'))
+		except Exception, err:
+			self.log.exception("Error reading 'internets:maxlinelength' configuration option: %s" % err)
+			raise
+
 		self.bind_admin_commands()
 
 	def start_threads(self):