Merge lp:~cjohnston/ubuntu-classroom/help-update into lp:~ubuntu-classroom/ubuntu-classroom/classbot

Proposed by Chris Johnston
Status: Merged
Merge reported by: Nathan Handler
Merged at revision: not available
Proposed branch: lp:~cjohnston/ubuntu-classroom/help-update
Merge into: lp:~ubuntu-classroom/ubuntu-classroom/classbot
Diff against target: 24 lines (+11/-3)
1 file modified
classbot.pl (+11/-3)
To merge this branch: bzr merge lp:~cjohnston/ubuntu-classroom/help-update
Reviewer Review Type Date Requested Status
Nathan Handler Approve
Review via email: mp+19797@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) wrote :

Updated help section

Revision history for this message
Nathan Handler (nhandler) wrote :

Please use $chan and $qchan instead of #ubuntu-classroom and #ubuntu-classroom-chat. As this help is only able to be seen by people with access to irssi, it would probably make sense to include the admin-only commands in there as well.

review: Needs Fixing
17. By Chris Johnston

Updated to include admin commands and $chan/$qchan

Revision history for this message
Nathan Handler (nhandler) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'classbot.pl'
2--- classbot.pl 2010-02-20 22:10:26 +0000
3+++ classbot.pl 2010-02-21 04:49:12 +0000
4@@ -396,9 +396,17 @@
5 my($data, $server, $witem) = @_;
6
7 if($data=~m/^classbot$/i) {
8- Irssi::print("!question or !q: Review the next question in the queue.");
9- Irssi::print("!no [comment] or !n [comment]: Ignore the question being reviewed. If a comment is specified, it will be displayed in $qchan");
10- Irssi::print("!yes or !y: Approve the question being reviewed. It will be displayed in $chan");
11+ Irssi::print("User Interaction:");
12+ Irssi::print(" At the present time, the only possible user interaction is for a user to ask a question using the format QUESTION: in $qchan");
13+ Irssi::print("Instructor & Session Helper Interaction:");
14+ Irssi::print(" !question or !q: Review the next question in the queue.");
15+ Irssi::print(" !no [comment] or !n [comment]: Ignore the question being reviewed. If a comment is specified, it will be displayed in $qchan");
16+ Irssi::print(" !yes or !y: Approve the question being reviewed. It will be displayed in $chan");
17+ Irssi::print(" !moderate or !m: Toggles the moderate mode (+/-m) in $chan. Default is moderated (+m) during a session");
18+ Irssi::print("Admin Interaction:");
19+ Irssi::print(" An admin has all the rights listed above.");
20+ Irssi::print(" !voice or !v [nick]: This commands can be used with or without someones nick. If they are used with a nick, that user will be voiced, otherwise the admin running the command will be voiced.");
21+ Irssi::print(" !devoice or !dv [nick]: This commands can be used with or without someones nick. If they are used with a nick, that user will be devoiced, otherwise the admin running the command will be devoiced.");
22 Irssi::print("For more information about ClassBot visit: https://wiki.ubuntu.com/Classroom/ClassBot");
23 }
24 }

Subscribers

People subscribed via source and target branches

to all changes: