From 2191b39af1046248fb2fc78faea032b7ea9418d4 Mon Sep 17 00:00:00 2001 From: rootcoma Date: Thu, 7 Nov 2013 10:26:44 -0800 Subject: [PATCH] Changed adding questions, humans have access to .addquestion, added .(accept/remove/show)tempquestion (triviamod+) and added new questions to report.php --- php/reports.php | 49 ++++++++++++++++++++- plugin.py | 114 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 158 insertions(+), 5 deletions(-) diff --git a/php/reports.php b/php/reports.php index 9f23528..5b2851f 100644 --- a/php/reports.php +++ b/php/reports.php @@ -112,7 +112,7 @@ query('SELECT tr.*, tq.question as original FROM triviareport tr INNER JOIN triviaquestion tq on tq.id=question_num LIMIT 10'); + $q = $db->query('SELECT tr.*, tq.question as original FROM triviareport tr INNER JOIN triviaquestion tq on tq.id=question_num ORDER BY id DESC LIMIT 10'); if ($q === false) { die("Error: database error: table does not exist\n"); } else { @@ -227,6 +227,53 @@ + + +
+
+
+ + Hide added questions + +
+
+
+
+
+

Added Questions

+ + + + + + + + + + query('SELECT tq.* FROM triviatemporaryquestion tq ORDER BY tq.id DESC LIMIT 10'); + if ($q === false) { + die("Error: database error: table does not exist\n"); + } else { + $result = $q->fetchAll(); + foreach($result as $res) { + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + } + } + } else { + die('Couldnt connect to db'); + } + ?> + +
#AuthorNew Question
' . $res['id'] . '' . $res['username'] . '' . $res['question'] . '
+
+
+
diff --git a/plugin.py b/plugin.py index cfca686..2c2fb1a 100644 --- a/plugin.py +++ b/plugin.py @@ -60,6 +60,8 @@ class TriviaTime(callbacks.Plugin): self.storage.makeReportTable() #self.storage.dropQuestionTable() self.storage.makeQuestionTable() + #self.storage.dropTemporaryQuestionTable() + self.storage.makeTemporaryQuestionTable() #self.storage.dropEditTable() self.storage.makeEditTable() #self.storage.insertUserLog('root', 1, 1, 10, 10, 30, 2013) @@ -148,18 +150,33 @@ class TriviaTime(callbacks.Plugin): irc.error('Question could not be found for this edit') acceptedit = wrap(acceptedit, ['user', ('checkChannelCapability', 'triviamod'), 'int']) + def accepttempquestion(self, irc, msg, arg, user, channel, num): + """[] + Accept a new question, and add it to the database. Channel is only necessary when editing from outside of the channel + """ + q = self.storage.getTemporaryQuestionById(num) + if len(q) < 1: + irc.error('Could not find that temp question') + else: + q = q[0] + self.storage.insertQuestionsBulk([(q[3], q[3])]) + self.storage.removeTemporaryQuestion(q[0]) + irc.reply('Question accepted!') + accepttempquestion = wrap(accepttempquestion, ['user', ('checkChannelCapability', 'triviamod'), 'int']) + def addquestion(self, irc, msg, arg, question): """ Adds a question to the database """ + username = ircutils.toLower(msg.nick) channel = ircutils.toLower(msg.args[0]) charMask = self.registryValue('charMask', channel) if charMask not in question: - irc.error('The question must include the separating character %s' % (charMask)) + irc.error(' The question must include the separating character %s ' % (charMask)) return - self.storage.insertQuestionsBulk([(question,question)]) - irc.reply('Added your question to the question database') - addquestion = wrap(addquestion, ['admin', 'text']) + self.storage.insertTemporaryQuestion(username, channel, question) + irc.reply(' Thank you for adding your question to the question database, it is awaiting approval. ') + addquestion = wrap(addquestion, ['text']) def addquestionfile(self, irc, msg, arg, filename): """[] @@ -348,6 +365,19 @@ class TriviaTime(callbacks.Plugin): irc.reply('Report %d removed!' % report[0]) removereport = wrap(removereport, ['user', ('checkChannelCapability', 'triviamod'), 'int']) + def removetempquestion(self, irc, msg, arg, user, channel, num): + """[] + Remove a temp question without accepting it. Channel is only necessary when editing from outside of the channel + """ + q = self.storage.getTemporaryQuestionById(num) + if len(q) < 1: + irc.error('Could not find that temp question') + else: + q = q[0] + self.storage.removeTemporaryQuestion(q[0]) + irc.reply('Temp question #%d removed!' % q[0]) + removetempquestion = wrap(removetempquestion, ['user', ('checkChannelCapability', 'triviamod'), 'int']) + def report(self, irc, msg, arg, roundNum, text): """ Provide a report for a bad question. Be sure to include the round number and any problems. @@ -546,6 +576,26 @@ class TriviaTime(callbacks.Plugin): irc.reply('type .showedit to see more information') showedit = wrap(showedit, ['user', ('checkChannelCapability', 'triviamod'), optional('int')]) + def showtempquestion(self, irc, msg, arg, num): + """[] + Show questions awaiting approval + """ + if num is not None: + q = self.storage.getTemporaryQuestionById(num) + if len(q) > 0: + q = q[0] + irc.reply('Temp Q #%d: %s'%(q[0], q[3])) + else: + irc.error('Temp Q #%d not found' % num) + else: + q = self.storage.getTemporaryQuestionTop3() + if len(q) < 1: + irc.reply('No temp questions found') + for ques in q: + irc.reply('Temp Q #%d: %s'%(ques[0], ques[3])) + irc.reply('type .showtempquestion to see more information') + showtempquestion = wrap(showtempquestion, [optional('int')]) + def start(self, irc, msg, args): """ Begins a round of Trivia inside of your current channel. @@ -1250,6 +1300,14 @@ class TriviaTime(callbacks.Plugin): pass c.close() + def dropTemporaryQuestionTable(self): + c = self.conn.cursor() + try: + c.execute('''drop table triviatemporaryquestion''') + except: + pass + c.close() + def dropEditTable(self): c = self.conn.cursor() try: @@ -1672,6 +1730,24 @@ class TriviaTime(callbacks.Plugin): c.close() return data + def getTemporaryQuestionTop3(self): + c = self.conn.cursor() + c.execute('select * from triviatemporaryquestion order by id desc limit 3') + data = [] + for row in c: + data.append(row) + c.close() + return data + + def getTemporaryQuestionById(self, id): + c = self.conn.cursor() + c.execute('select * from triviatemporaryquestion where id=? limit 1', (id,)) + data = [] + for row in c: + data.append(row) + c.close() + return data + def getEditById(self, id): c = self.conn.cursor() c.execute('select * from triviaedit where id=? limit 1', (id,)) @@ -1799,6 +1875,15 @@ class TriviaTime(callbacks.Plugin): self.conn.commit() c.close() + def insertTemporaryQuestion(self, username, channel, question): + c = self.conn.cursor() + username = str.lower(username) + channel = str.lower(channel) + c.execute('insert into triviatemporaryquestion values (NULL, ?, ?, ?)', + (username,channel,question)) + self.conn.commit() + c.close() + def makeUserTable(self): c = self.conn.cursor() try: @@ -1884,6 +1969,20 @@ class TriviaTime(callbacks.Plugin): self.conn.commit() c.close() + def makeTemporaryQuestionTable(self): + c = self.conn.cursor() + try: + c.execute('''create table triviatemporaryquestion ( + id integer primary key autoincrement, + username text, + channel text, + question text + )''') + except: + pass + self.conn.commit() + c.close() + def makeQuestionTable(self): c = self.conn.cursor() try: @@ -1955,6 +2054,13 @@ class TriviaTime(callbacks.Plugin): self.conn.commit() c.close() + def removeTemporaryQuestion(self, id): + c = self.conn.cursor() + c.execute('''delete from triviatemporaryquestion + where id=?''', (id,)) + self.conn.commit() + c.close() + def removeUserLogs(self, username): username = str.lower(username) c = self.conn.cursor()