ClassBot

Merge lp:~cjohnston/classbot/bugfix-lp-532406 into lp:classbot

  1. bugfix-lp-532406
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Nathan Handler
Approved revision: 29
Merge reported by: Nathan Handler
Merged at revision: not available
Proposed branch: lp:~cjohnston/classbot/bugfix-lp-532406
Merge into: lp:classbot
Diff against target: 55 lines (+8/-8)
1 file modified
classbot.pl (+8/-8)
To merge this branch: bzr merge lp:~cjohnston/classbot/bugfix-lp-532406
Reviewer Review Type Date Requested Status
Nathan Handler Approve
Review via email: mp+21336@code.launchpad.net

Description of the change

Added text about formatting questions in -chat /topic

To post a comment you must log in.
Revision history for this message
Nathan Handler (nhandler) :
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-03-12 04:14:34 +0000
3+++ classbot.pl 2010-03-14 23:16:24 +0000
4@@ -175,21 +175,21 @@
5 if($event !~ m/^\s*$/) { #If an event is going on
6 if($shortslides !~ m/^\s*$/) {
7 &topic($chan,"Welcome to the Ubuntu Classroom - http://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Event: $event - Current Session: $summary - Instructors: $leaders - Slides: $shortslides|| Questions in #ubuntu-classroom-chat");
8- &topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Event: $event - Current Session: $summary - Instructors: $leaders - Slides: $shortslides");
9+ &topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Event: $event - Current Session: $summary - Instructors: $leaders - Slides: $shortslides || Preface questions with QUESTION:");
10 }
11 else {
12 &topic($chan,"Welcome to the Ubuntu Classroom - http://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Event: $event - Current Session: $summary - Instructors: $leaders || Questions in #ubuntu-classroom-chat");
13- &topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Event: $event - Current Session: $summary - Instructors: $leaders");
14+ &topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Event: $event - Current Session: $summary - Instructors: $leaders || Preface questions with QUESTION:");
15 }
16 }
17 else {
18 if($shortslides !~ m/^\s*$/) {
19 &topic($chan,"Welcome to the Ubuntu Classroom - http://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Current Session: $summary - Instructors: $leaders - Slides: $shortslides || Questions in #ubuntu-classroom-chat");
20- &topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Current Session: $summary - Instructors: $leaders - Slides: $shortslides");
21+ &topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Current Session: $summary - Instructors: $leaders - Slides: $shortslides || Preface questions with QUESTION:");
22 }
23 else {
24 &topic($chan,"Welcome to the Ubuntu Classroom - http://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Current Session: $summary - Instructors: $leaders || Questions in #ubuntu-classroom-chat");
25- &topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Current Session: $summary - Instructors: $leaders");
26+ &topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Current Session: $summary - Instructors: $leaders || Preface questions with QUESTION:");
27 }
28 }
29 }
30@@ -197,21 +197,21 @@
31 if($event !~ m/^\s*$/) { #If an event is going on
32 if($shortslides !~ m/^\s*$/) {
33 &topic($chan,"Welcome to the Ubuntu Classroom - http://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Event: $event - Current Session: $summary - Instructor: $instructors - Slides: $shortslides || Questions in #ubuntu-classroom-chat");
34- &topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Event: $event - Current Session: $summary - Instructor: $instructors - Slides: $shortslides");
35+ &topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Event: $event - Current Session: $summary - Instructor: $instructors - Slides: $shortslides || Preface questions with QUESTION:");
36 }
37 else {
38 &topic($chan,"Welcome to the Ubuntu Classroom - http://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Event: $event - Current Session: $summary - Instructor: $instructors || Questions in #ubuntu-classroom-chat");
39- &topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Event: $event - Current Session: $summary - Instructor: $instructors");
40+ &topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Event: $event - Current Session: $summary - Instructor: $instructors || Preface questions with QUESTION:");
41 }
42 }
43 else {
44 if($shortslides !~ m/^\s*$/) {
45 &topic($chan,"Welcome to the Ubuntu Classroom - http://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Current Session: $summary - Instructor: $instructors - Slides: $shortslides || Questions in #ubuntu-classroom-chat");
46- &topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Current Session: $summary - Instructor: $instructors - Slides: $shortslides");
47+ &topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Current Session: $summary - Instructor: $instructors - Slides: $shortslides || Preface questions with QUESTION:");
48 }
49 else {
50 &topic($chan,"Welcome to the Ubuntu Classroom - http://wiki.ubuntu.com/Classroom || Support in #ubuntu || Upcoming Schedule: http://is.gd/8rtIi || Current Session: $summary - Instructor: $instructors || Questions in #ubuntu-classroom-chat");
51- &topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Current Session: $summary - Instructor: $instructors");
52+ &topic($qchan,"Sessions in #ubuntu-classroom, chat and questions related to sessions here || Upcoming Schedule in #ubuntu-classroom: http://is.gd/8rtIi || Current Session: $summary - Instructor: $instructors || Preface questions with QUESTION:");
53 }
54 }
55 }

Subscribers

People subscribed via source and target branches

to all changes: