<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>droids/merlin/modules/50-ip-geo</filename>
    </added>
    <added>
      <filename>droids/merlin/modules/50-page-title</filename>
    </added>
    <added>
      <filename>droids/merlin/modules/50-translate</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -21,8 +21,8 @@ sub base_ping
 }
 
 sub base_nick_in_use {
-#    $robot_nick .= '_';
-#    &amp;send_message([&quot;NICK $robot_nick&quot;]);
+    &amp;set_nickname(&amp;get_nickname().'_');
+    &amp;send_message([&quot;NICK &quot;.&amp;get_nickname()]);
 }
 
 </diff>
      <filename>droids/merlin/modules/00-base</filename>
    </modified>
    <modified>
      <diff>@@ -3,13 +3,23 @@
 use strict;
 use warnings;
 
+sub greeting_elect
+{
+    my @greetings = (
+        &quot;Hi, there&quot;,
+        &quot;What's up&quot;,
+        &quot;Hello, friend&quot;,
+        &quot;Hi, I am &quot;.&amp;get_nickname().&quot;. Can I help you?&quot;,
+    );
+    $greetings[rand @greetings];
+}
+
 sub greeting_privmsg
 {
     my ($from, $command, $target, $message) = @_;
 	my ($nick, undef, undef) = &amp;extract_nick;
-	if ($message =~ /^hello/) {
-		&amp;speak($target, $nick, &quot;hello, $nick&quot;);
-	}
+	&amp;speak($target, $nick, &amp;greeting_elect())
+		if $message =~ /^(hello|hi|welcome|what's up)\b/i;
 }
 
 &amp;register_message_func('PRIVMSG', \&amp;greeting_privmsg);</diff>
      <filename>droids/merlin/modules/50-greeting</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>80d3df393b61f1879db390ed728c0d417e336586</id>
    </parent>
  </parents>
  <author>
    <name>Jianing Yang</name>
    <email>jianingy.yang@gmail.com</email>
  </author>
  <url>http://github.com/jianingy/idroid/commit/66e8e53f318784fbbe64b7b07ab02f27f536ccc9</url>
  <id>66e8e53f318784fbbe64b7b07ab02f27f536ccc9</id>
  <committed-date>2009-10-31T18:34:25-07:00</committed-date>
  <authored-date>2009-10-31T18:34:25-07:00</authored-date>
  <message>added some modules</message>
  <tree>0055d82afb4634a087636dd907c359cbba949839</tree>
  <committer>
    <name>Jianing Yang</name>
    <email>jianingy.yang@gmail.com</email>
  </committer>
</commit>
