From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qe7Fn-0008Bm-HM for garchives@archives.gentoo.org; Tue, 05 Jul 2011 15:09:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5EE7521C037; Tue, 5 Jul 2011 15:09:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2C77E21C037 for ; Tue, 5 Jul 2011 15:09:18 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A24891B4018 for ; Tue, 5 Jul 2011 15:09:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 095C78003D for ; Tue, 5 Jul 2011 15:09:17 +0000 (UTC) From: "Petteri Räty" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Petteri Räty" Message-ID: Subject: [gentoo-commits] proj/council-webapp:master commit in: bot/ircmeeting/ X-VCS-Repository: proj/council-webapp X-VCS-Files: bot/ircmeeting/agenda.py bot/ircmeeting/meeting.py X-VCS-Directories: bot/ircmeeting/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: ae6e10d99051e6e8930e2a816e6545b9f9edb3fa Date: Tue, 5 Jul 2011 15:09:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 74b2cd33f963f9fa169b049c0064f373 commit: ae6e10d99051e6e8930e2a816e6545b9f9edb3fa Author: Joachim Filip Ignacy Bartosik gmail com= > AuthorDate: Mon Jun 27 14:19:44 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Mon Jun 27 14:19:44 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/council-webap= p.git;a=3Dcommit;h=3Dae6e10d9 Bot posts log to the website --- bot/ircmeeting/agenda.py | 5 +++-- bot/ircmeeting/meeting.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bot/ircmeeting/agenda.py b/bot/ircmeeting/agenda.py index a77aafe..05e4a57 100644 --- a/bot/ircmeeting/agenda.py +++ b/bot/ircmeeting/agenda.py @@ -217,10 +217,11 @@ class Agenda(object): result =3D str.format(self.timelimit_missing_msg, message) return(result) =20 - def post_result(self): + def post_result(self, lines): if not self.conf.manage_agenda: return('') - data_dict =3D {'votes' : self._votes, 'agenda' : self._agenda} + data_dict =3D {'votes' : self._votes, 'agenda' : self._agenda, + 'lines' : "\n".join(lines)} data =3D urllib.quote(json.dumps(data_dict)) result_url =3D str.format(self.conf.result_url, self.conf.voting_results_user, diff --git a/bot/ircmeeting/meeting.py b/bot/ircmeeting/meeting.py index a86c782..a15b674 100644 --- a/bot/ircmeeting/meeting.py +++ b/bot/ircmeeting/meeting.py @@ -380,7 +380,7 @@ class MeetingCommands(object): for messageline in message.split('\n'): self.reply(messageline) self._meetingIsOver =3D True - self.config.agenda.post_result() + self.config.agenda.post_result(self.lines) def do_topic(self, nick, line, **kwargs): """Set a new topic in the channel.""" if not self.isChair(nick): return