hipchat_smart 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0f8fa0db1c04e003abf520a096e7f7ed39b932f4885ac9b6f3cbce0254a9f8e
-  data.tar.gz: 1cb3ec7012e6131d7e73fc50ea27a212fd47f7e9bf68cab74f92b1ee67ffef59
+  metadata.gz: c3e585b909e8904d242c669afb747002c50d72a1101ba5277fba3f486c61f4f6
+  data.tar.gz: d57b2218f543ff1aa916b57f91bba57c82a37bfe12521f9da1e0d45102e28aa2
 SHA512:
-  metadata.gz: 5e3fdeb06e15c5ec46278096f386646316390f70c0909991ceefbe5fd670f388fccd1a40275c6be773228b8267f3ce2c52a3a3f7c1e49f628732d8e9e70ec90b
-  data.tar.gz: 1b1f535401b836a64babfcdefed3c4899ede8cc5a62cfdbd66050aabc0b7103a093b74cbeaf15f2594a7d3b240d004c79a8b44e2c10cd7344df724712b8ed4c7
+  metadata.gz: edfceedc17b581e3be9b6a219ad1927faa073d6a94d11e1c5600635a6980f087140a47fef4d773306c76dc33ebb5388ddb63db7bbec5a503658669cee398dcc7
+  data.tar.gz: cd2f376978be01e117f610f04ded45075fa1c59be60ce51400e89033be6b4685f0fd0e423e64bd9d743ceccc3049ddad788d7adf66f46dcaa2b36bc71b829073

data/README.md

@@ -101,6 +101,8 @@ def rules(from, command, processed)
 end
 
 ```
+### How to access the bot
+You can access the bot directly on the MASTER ROOM, on a secondary room where the bot is running and directly by opening a private chat with the bot, in this case the conversation will be just between you and the bot.
 
 ### Available commands even when the bot is not listening to you
 Some of the commands are available always even when the bot is not listening to you but it is running

data/lib/hipchat_smart.rb

@@ -1,11 +1,14 @@
 require 'xmpp4r'
 require 'xmpp4r/muc/helper/simplemucclient'
 require 'xmpp4r/muc/helper/mucbrowser'
+require 'xmpp4r/roster'
+require 'hipchat'
 require 'open-uri'
 require 'cgi'
 require 'json'
-require 'hipchat'
 require 'logger'
+require 'fileutils'
+require 'open3'
 
 if ARGV.size==0
   ROOM = MASTER_ROOM
@@ -13,9 +16,8 @@ if ARGV.size==0
   ADMIN_USERS = MASTER_USERS
   RULES_FILE = "#{$0.gsub('.rb', '_rules.rb')}" unless defined?(RULES_FILE)
   unless File.exist?(RULES_FILE)
-	require 'fileutils'
-	default_rules=(__FILE__).gsub(".rb", "_rules.rb")
-	FileUtils.copy_file(default_rules, RULES_FILE)
+    default_rules=(__FILE__).gsub(".rb", "_rules.rb")
+    FileUtils.copy_file(default_rules, RULES_FILE)
   end
   STATUS_INIT = :on
 else
@@ -30,7 +32,7 @@ SHORTCUTS_FILE = "hipchat_smart_shortcuts_#{ROOM}.rb".gsub(" ", "_")
 
 class Bot
 
-  attr_accessor :config, :client, :muc, :muc_browser
+  attr_accessor :config, :client, :muc, :muc_browser, :roster
 
   def initialize(config)
     Dir.mkdir("./logs") unless Dir.exist?("./logs")
@@ -98,6 +100,9 @@ class Bot
     end
     config.delete(:password)
     client.send(Jabber::Presence.new.set_type(:available))
+
+    self.roster = Jabber::Roster::Helper.new(client)
+
     @status = STATUS_INIT
     @questions = Hash.new()
     @rooms_jid=Hash.new()
@@ -129,95 +134,119 @@ class Bot
     }
   end
 
+
   def listen
     @salutations = [config[:nick].split(/\s+/).first, "bot"]
 
     muc.on_message do |time, nick, text|
-      if nick==config[:nick] or nick==(config[:nick] + " · Bot") #if message is coming from the bot
-        begin
-          @logger.info "#{nick}: #{text}"
-          case text
-            when /^Bot has been killed by/
-              exit!
-            when /^Changed status on (.+) to :(.+)/i
-              room=$1
-              status=$2
-              @bots_created[room][:status]=status.to_sym
-              update_bots_file()
-          end
-          next #don't continue analyzing
-        rescue Exception => stack
-          @logger.fatal stack
-          next
-        end
+      jid_user = nil
+      res = process_first(time, nick, text, jid_user)
+      next if res.to_s=="next"
+    end
 
-      end
+    muc.join(config[:room] + '/' + config[:nick])
+    respond "Bot started"
 
-      if text.match?(/^\/(shortcut|sc)\s(.+)/i)
-        shortcut=text.scan(/\/\w+\s*(.+)\s*/i).join.downcase
-        if @shortcuts.keys.include?(nick) and @shortcuts[nick].keys.include?(shortcut)
-          text=@shortcuts[nick][shortcut]
-        elsif @shortcuts.keys.include?(:all) and @shortcuts[:all].keys.include?(shortcut)
-          text=@shortcuts[:all][shortcut]
-        else
-          respond "Shortcut not found"
-          next
+    #accept subscriptions from everyone
+    roster.add_subscription_request_callback do |item, pres|
+      roster.accept_subscription(pres.from)
+    end
+
+    client.add_message_callback do |m|
+      unless m.body.to_s==""
+        jid_user=m.from.node+"@"+m.from.domain
+        user=roster[jid_user]
+        unless user.nil?
+          res = process_first("", user.attributes["name"], m.body, jid_user)
+          next if res.to_s=="next"
         end
+      end
+    end
+
+    @logger.info "Bot listening"
+    self
+  end
 
+  def process_first(time, nick, text, jid_user)
+    if nick==config[:nick] or nick==(config[:nick] + " · Bot") #if message is coming from the bot
+      begin
+        @logger.info "#{nick}: #{text}"
+        case text
+          when /^Bot has been killed by/
+            exit!
+          when /^Changed status on (.+) to :(.+)/i
+            room=$1
+            status=$2
+            @bots_created[room][:status]=status.to_sym
+            update_bots_file()
+        end
+        return :next #don't continue analyzing
+      rescue Exception => stack
+        @logger.fatal stack
+        return :next
       end
 
-      if @questions.keys.include?(nick)
-        command=@questions[nick]
-        @questions[nick]=text
+    end
+
+    if text.match?(/^\/(shortcut|sc)\s(.+)/i)
+      shortcut=text.scan(/\/\w+\s*(.+)\s*/i).join.downcase
+      if @shortcuts.keys.include?(nick) and @shortcuts[nick].keys.include?(shortcut)
+        text=@shortcuts[nick][shortcut]
+      elsif @shortcuts.keys.include?(:all) and @shortcuts[:all].keys.include?(shortcut)
+        text=@shortcuts[:all][shortcut]
       else
-        command=text
+        respond "Shortcut not found", jid_user
+        return :next
       end
 
-      begin
-        t = Thread.new do
-          begin
-            processed = process(nick, command)
-            @logger.info "command: #{nick}> #{command}" if processed
-            if @status==:on and
-                ((@questions.keys.include?(nick) or
-                    @listening.include?(nick) or
-                    command.match?(/^@?#{@salutations.join("|")}:*\s+(.+)$/i) or
-                    command.match?(/^!(.+)$/)))
-              @logger.info "command: #{nick}> #{command}" unless processed
-              begin
-                eval(File.new(RULES_FILE).read) if File.exist?(RULES_FILE)
-              rescue Exception => stack
-                @logger.fatal "ERROR ON RULES FILE: #{RULES_FILE}"
-                @logger.fatal stack
-              end
-              if defined?(rules)
-                command[0]="" if command[0]=="!"
-                command.gsub!(/^@\w+:*\s*/, "")
-                rules(nick, command, processed)
-              else
-                @logger.warn "It seems like rules method is not defined"
-              end
+    end
+
+    if @questions.keys.include?(nick)
+      command=@questions[nick]
+      @questions[nick]=text
+    else
+      command=text
+    end
+
+    begin
+      t = Thread.new do
+        begin
+          processed = process(nick, command, jid_user)
+          @logger.info "command: #{nick}> #{command}" if processed
+          if @status==:on and
+              ((@questions.keys.include?(nick) or
+                  @listening.include?(nick) or
+                  command.match?(/^@?#{@salutations.join("|")}:*\s+(.+)$/i) or
+                  command.match?(/^!(.+)$/)))
+            @logger.info "command: #{nick}> #{command}" unless processed
+            begin
+              eval(File.new(RULES_FILE).read) if File.exist?(RULES_FILE)
+            rescue Exception => stack
+              @logger.fatal "ERROR ON RULES FILE: #{RULES_FILE}"
+              @logger.fatal stack
+            end
+            if defined?(rules)
+              command[0]="" if command[0]=="!"
+              command.gsub!(/^@\w+:*\s*/, "")
+              rules(nick, command, processed, jid_user)
+            else
+              @logger.warn "It seems like rules method is not defined"
             end
-          rescue Exception => stack
-            @logger.fatal stack
           end
-
+        rescue Exception => stack
+          @logger.fatal stack
         end
 
-      rescue => e
-        @logger.error "exception: #{e.inspect}"
       end
-    end
 
-    muc.join(config[:room] + '/' + config[:nick])
-    respond "Bot started"
-    @logger.info "Bot listening"
-    self
+    rescue => e
+      @logger.error "exception: #{e.inspect}"
+    end
   end
 
   #help: Commands you can use:
   #help:
-  def process(from, command)
+  def process(from, command, jid_user)
     firstname = from.split(/ /).first
     processed=true
 
@@ -231,7 +260,7 @@ class Bot
       when /^(Hello|Hallo|Hi|Hola|What's\sup|Hey|Zdravo|Molim|Hæ)\s(#{@salutations.join("|")})\s*$/i
         if @status==:on
           greetings=['Hello', 'Hallo', 'Hi', 'Hola', "What's up", "Hey", "Zdravo", "Molim", "Hæ"].sample
-          respond "#{greetings} #{firstname}"
+          respond "#{greetings} #{firstname}", jid_user
           @listening<<from unless @listening.include?(from)
         end
 
@@ -243,7 +272,7 @@ class Bot
       when /^(Bye|Bæ|Good\sBye|Adiós|Ciao|Bless|Bless\sBless|Zbogom|Adeu)\s(#{@salutations.join("|")})\s*$/i
         if @status==:on
           bye=['Bye', 'Bæ', 'Good Bye', 'Adiós', "Ciao", "Bless", "Bless bless", "Zbogom", "Adeu"].sample
-          respond "#{bye} #{firstname}"
+          respond "#{bye} #{firstname}", jid_user
           @listening.delete(from)
         end
 
@@ -257,15 +286,15 @@ class Bot
         if ON_MASTER_ROOM
           if ADMIN_USERS.include?(from) #admin user
             unless @questions.keys.include?(from)
-              ask("are you sure?", command, from)
+              ask("are you sure?", command, from, jid_user)
             else
               case @questions[from]
                 when /yes/i, /yep/i, /sure/i
-                  respond "Game over!"
-                  respond "Ciao #{firstname}!"
+                  respond "Game over!", jid_user
+                  respond "Ciao #{firstname}!", jid_user
                   @bots_created.each {|key, value|
                     value[:thread]=""
-                    send_msg(key, "Bot has been killed by #{from}")
+                    send_msg_room(key, "Bot has been killed by #{from}")
                     sleep 0.5
                   }
                   update_bots_file()
@@ -273,18 +302,18 @@ class Bot
                   exit!
                 when /no/i, /nope/i, /cancel/i
                   @questions.delete(from)
-                  respond "Thanks, I'm happy to be alive"
+                  respond "Thanks, I'm happy to be alive", jid_user
                 else
-                  respond "I don't understand"
-                  ask("are you sure do you want me to close? (yes or no)", "quit bot", from)
+                  respond "I don't understand", jid_user
+                  ask("are you sure do you want me to close? (yes or no)", "quit bot", from, jid_user)
               end
             end
           else
-            respond "Only admin users can kill me"
+            respond "Only admin users can kill me", jid_user
           end
 
         else
-          respond "To do this you need to be an admin user in the master room"
+          respond "To do this you need to be an admin user in the master room", jid_user
         end
 
       #help: start bot
@@ -294,14 +323,14 @@ class Bot
       #help:
       when /^start\s(this\s)?bot$/i
         if ADMIN_USERS.include?(from) #admin user
-          respond "This bot is running and listening from now on. You can pause again: pause this bot"
+          respond "This bot is running and listening from now on. You can pause again: pause this bot", jid_user
           @status=:on
           unless ON_MASTER_ROOM
             get_rooms_name_and_jid() unless @rooms_name.keys.include?(MASTER_ROOM) and @rooms_name.keys.include?(ROOM)
-            send_msg @rooms_name[MASTER_ROOM], "Changed status on #{@rooms_name[ROOM]} to :on"
+            send_msg_room @rooms_name[MASTER_ROOM], "Changed status on #{@rooms_name[ROOM]} to :on"
           end
         else
-          respond "Only admin users can change my status"
+          respond "Only admin users can change my status", jid_user
         end
 
 
@@ -312,15 +341,15 @@ class Bot
       #help:
       when /^pause\s(this\s)?bot$/i
         if ADMIN_USERS.include?(from) #admin user
-          respond "This bot is paused from now on. You can start it again: start this bot"
-          respond "zZzzzzZzzzzZZZZZZzzzzzzzz"
+          respond "This bot is paused from now on. You can start it again: start this bot", jid_user
+          respond "zZzzzzZzzzzZZZZZZzzzzzzzz", jid_user
           @status=:paused
           unless ON_MASTER_ROOM
             get_rooms_name_and_jid() unless @rooms_name.keys.include?(MASTER_ROOM) and @rooms_name.keys.include?(ROOM)
-            send_msg @rooms_name[MASTER_ROOM], "Changed status on #{@rooms_name[ROOM]} to :paused"
+            send_msg_room @rooms_name[MASTER_ROOM], "Changed status on #{@rooms_name[ROOM]} to :paused"
           end
         else
-          respond "Only admin users can put me on pause"
+          respond "Only admin users can put me on pause", jid_user
         end
 
 
@@ -329,12 +358,12 @@ class Bot
       #help:    If on master room and admin user also it will display info about bots created
       #help:
       when /^bot\sstatus/i
-        respond "Status: #{@status}. Rules file: #{File.basename RULES_FILE} "
+        respond "Status: #{@status}. Rules file: #{File.basename RULES_FILE} ", jid_user
         if @status==:on
-          respond "I'm listening to [#{@listening.join(", ")}]"
+          respond "I'm listening to [#{@listening.join(", ")}]", jid_user
           if ON_MASTER_ROOM and ADMIN_USERS.include?(from)
             @bots_created.each {|key, value|
-              respond "#{key}: #{value}"
+              respond "#{key}: #{value}", jid_user
             }
           end
         end
@@ -347,7 +376,7 @@ class Bot
         if ON_MASTER_ROOM
           room=$1
           if @bots_created.keys.include?(room)
-            respond "There is already a bot in this room: #{room}, kill it before"
+            respond "There is already a bot in this room: #{room}, kill it before", jid_user
           else
             rooms=Hash.new()
             muc_browser.muc_rooms(@xmpp_namespace).each {|jid, name|
@@ -355,6 +384,7 @@ class Bot
             }
             if rooms.keys.include?(room)
               jid=rooms[room]
+              @rooms_jid[room]=jid
               if jid!=config[:room]
                 jid=jid.to_s.gsub(/@.+/, '')
                 begin
@@ -366,7 +396,6 @@ class Bot
                     Dir.mkdir("rules/#{jid}") unless Dir.exist?("rules/#{jid}")
                     rules_file="./rules/#{jid}/" + rules_file
                   end
-                  require 'fileutils'
                   default_rules=(__FILE__).gsub(".rb", "_rules.rb")
                   File.delete(rules_file) if File.exist?(rules_file)
                   FileUtils.copy_file(default_rules, rules_file) unless File.exist?(rules_file)
@@ -386,24 +415,24 @@ class Bot
                       admins: admin_users.join(","),
                       thread: t
                   }
-                  respond "The bot has been created on room: #{room}. Rules file: #{File.basename rules_file}"
+                  respond "The bot has been created on room: #{room}. Rules file: #{File.basename rules_file}", jid_user
                   update_bots_file()
                 rescue Exception => stack
                   @logger.fatal stack
                   message="Problem creating the bot on room #{room}. Error: <#{stack}>."
                   @logger.error message
-                  respond message
+                  respond message, jid_user
                 end
               else
-                respond "There is already a bot in this room: #{room}, and it is the Master Room!"
+                respond "There is already a bot in this room: #{room}, and it is the Master Room!", jid_user
               end
 
             else
-              respond "There is no room with that name: #{room}, please be sure is written exactly the same"
+              respond "There is no room with that name: #{room}, please be sure is written exactly the same", jid_user
             end
           end
         else
-          respond "Sorry I cannot create bots from this room, please visit the master room"
+          respond "Sorry I cannot create bots from this room, please visit the master room", jid_user
         end
 
       #help: kill bot on ROOM_NAME
@@ -420,16 +449,16 @@ class Bot
               end
               @bots_created.delete(room)
               update_bots_file()
-              respond "Bot on room: #{room}, has been killed and deleted."
-              send_msg(room, "Bot has been killed by #{from}")
+              respond "Bot on room: #{room}, has been killed and deleted.", jid_user
+              send_msg_room(room, "Bot has been killed by #{from}")
             else
-              respond "You need to be the creator or an admin of that room"
+              respond "You need to be the creator or an admin of that room", jid_user
             end
           else
-            respond "There is no bot in this room: #{room}"
+            respond "There is no bot in this room: #{room}", jid_user
           end
         else
-          respond "Sorry I cannot kill bots from this room, please visit the master room"
+          respond "Sorry I cannot kill bots from this room, please visit the master room", jid_user
         end
 
       #help: bot help
@@ -439,8 +468,8 @@ class Bot
       when /^bot help/i, /^bot,? what can I do/i
         help_message = IO.readlines(__FILE__).join
         help_message_rules = IO.readlines(RULES_FILE).join
-        respond "/quote " + help_message.scan(/#\s*help\s*:(.*)/).join("\n")
-        respond "/quote " + help_message_rules.scan(/#\s*help\s*:(.*)/).join("\n")
+        respond "/quote " + help_message.scan(/#\s*help\s*:(.*)/).join("\n"), jid_user
+        respond "/quote " + help_message_rules.scan(/#\s*help\s*:(.*)/).join("\n"), jid_user
 
       else
         processed = false
@@ -482,31 +511,31 @@ class Bot
           @shortcuts[from]=Hash.new() unless @shortcuts.keys.include?(from)
 
           if !ADMIN_USERS.include?(from) and @shortcuts[:all].include?(shortcut_name) and !@shortcuts[from].include?(shortcut_name)
-            respond "Only the creator of the shortcut or an admin user can modify it"
+            respond "Only the creator of the shortcut or an admin user can modify it", jid_user
           elsif !@shortcuts[from].include?(shortcut_name)
             #new shortcut
             @shortcuts[from][shortcut_name]=command_to_run
             @shortcuts[:all][shortcut_name]=command_to_run if for_all.to_s!=""
             update_shortcuts_file()
-            respond "shortcut added"
+            respond "shortcut added", jid_user
           else
 
             #are you sure? to avoid overwriting existing
             unless @questions.keys.include?(from)
-              ask("The shortcut already exists, are you sure you want to overwrite it?", command, from)
+              ask("The shortcut already exists, are you sure you want to overwrite it?", command, from, jid_user)
             else
               case @questions[from]
                 when /^(yes|yep)/i
                   @shortcuts[from][shortcut_name]=command_to_run
                   @shortcuts[:all][shortcut_name]=command_to_run if for_all.to_s!=""
                   update_shortcuts_file()
-                  respond "shortcut added"
+                  respond "shortcut added", jid_user
                   @questions.delete(from)
                 when /^no/i
-                  respond "ok, I won't add it"
+                  respond "ok, I won't add it", jid_user
                   @questions.delete(from)
                 else
-                  respond "I don't understand, yes or no?"
+                  respond "I don't understand, yes or no?", jid_user
               end
             end
 
@@ -520,30 +549,30 @@ class Bot
           deleted=false
 
           if !ADMIN_USERS.include?(from) and @shortcuts[:all].include?(shortcut) and !@shortcuts[from].include?(shortcut)
-            respond "Only the creator of the shortcut or an admin user can delete it"
+            respond "Only the creator of the shortcut or an admin user can delete it", jid_user
           elsif (@shortcuts.keys.include?(from) and @shortcuts[from].keys.include?(shortcut)) or
               (ADMIN_USERS.include?(from) and @shortcuts[:all].include?(shortcut))
             #are you sure? to avoid deleting by mistake
             unless @questions.keys.include?(from)
-              ask("are you sure you want to delete it?", command, from)
+              ask("are you sure you want to delete it?", command, from, jid_user)
             else
               case @questions[from]
                 when /^(yes|yep)/i
-                  respond "shortcut deleted!"
-                  respond "#{shortcut}: #{@shortcuts[from][shortcut]}"
+                  respond "shortcut deleted!", jid_user
+                  respond "#{shortcut}: #{@shortcuts[from][shortcut]}", jid_user
                   @shortcuts[from].delete(shortcut)
                   @shortcuts[:all].delete(shortcut)
                   @questions.delete(from)
                   update_shortcuts_file()
                 when /^no/i
-                  respond "ok, I won't delete it"
+                  respond "ok, I won't delete it", jid_user
                   @questions.delete(from)
                 else
-                  respond "I don't understand, yes or no?"
+                  respond "I don't understand, yes or no?", jid_user
               end
             end
           else
-            respond "shortcut not found"
+            respond "shortcut not found", jid_user
           end
 
         #help: see shortcuts
@@ -556,7 +585,7 @@ class Bot
             @shortcuts[:all].each {|name, value|
               msg+="#{name}: #{value}\n"
             }
-            respond msg
+            respond msg, jid_user
           end
 
           if @shortcuts.keys.include?(from) and @shortcuts[from].keys.size>0
@@ -567,10 +596,10 @@ class Bot
               new_hash.each {|name, value|
                 msg+="#{name}: #{value}\n"
               }
-              respond msg
+              respond msg, jid_user
             end
           end
-          respond "No shortcuts found" if msg==""
+          respond "No shortcuts found", jid_user if msg==""
 
         #help: jid room ROOM_NAME
         #help:    shows the jid of a room name
@@ -579,9 +608,9 @@ class Bot
           room_name=$1
           get_rooms_name_and_jid()
           if @rooms_jid.keys.include?(room_name)
-            respond "the jid of #{room_name} is #{@rooms_jid[room_name]}"
+            respond "the jid of #{room_name} is #{@rooms_jid[room_name]}", jid_user
           else
-            respond "room: #{room_name} not found"
+            respond "room: #{room_name} not found", jid_user
           end
 
         # help: ruby RUBY_CODE
@@ -598,22 +627,21 @@ class Bot
               code.match?(/open3/i) or code.match?(/bundle/i) or code.match?(/gemfile/i) or code.include?("%x") or
               code.include?("ENV")
             begin
-              require 'open3'
               stdout, stderr, status = Open3.capture3("ruby -e \"#{code.gsub('"', '\"')}\"")
               if stderr==""
                 if stdout==""
-                  respond "Nothing returned. Remember you need to use p or puts to print"
+                  respond "Nothing returned. Remember you need to use p or puts to print", jid_user
                 else
-                  respond stdout
+                  respond stdout, jid_user
                 end
               else
-                respond stderr
+                respond stderr, jid_user
               end
             rescue Exception => exc
-              respond exc
+              respond exc, jid_user
             end
           else
-            respond "Sorry I cannot run this due security issues"
+            respond "Sorry I cannot run this due security issues", jid_user
           end
 
         else
@@ -625,28 +653,46 @@ class Bot
     return processed
   end
 
-  def respond(msg)
-    muc.send Jabber::Message.new(muc.room, msg)
+  def respond(msg,jid_user=nil)
+    if jid_user.nil?
+      muc.send Jabber::Message.new(muc.room, msg)
+    else #private message
+      send_msg_user(jid_user, msg)
+    end
   end
 
   #context: previous message
   #to: user that should answer
-  def ask(question, context, to)
-    muc.send Jabber::Message.new(muc.room, "#{to}: #{question}")
+  def ask(question, context, to, jid_user=nil)
+    if jid_user.nil?
+      muc.send Jabber::Message.new(muc.room, "#{to}: #{question}")
+    else #private message
+      send_msg_user(jid_user, "#{to}: #{question}")
+    end
     @questions[to]=context
   end
 
+
   # Uses the hipchat gem (REST)
   # to: (String) Room name
   # msg: (String) message to send
-  def send_msg(to, msg)
+  def send_msg_room(to, msg)
     unless msg==""
       hc_client=HipChat::Client.new(config[:token], :server_url => config[:jid].to_s.scan(/.+@(.+)\/.+/).join)
       hc_client[to].send("Bot", msg)
     end
-
   end
 
+  #to send messages without listening for a response to users
+  #to: jid
+  def send_msg_user(to, msg)
+    unless msg==""
+      to=to+"@chat."+@xmpp_namespace.scan(/\w+\.(.+)/).join unless to.include?("@")
+      message = Jabber::Message::new(to, msg)
+      message.type=:chat
+      client.send message
+    end
+  end
 
   def always
     loop {sleep 1}

data/lib/hipchat_smart_rules.rb

@@ -5,13 +5,13 @@ else
   @testing = true
   @questions = Hash.new()
 
-  def respond(message)
+  def respond(message, jid_user)
     puts message
   end
 
   #context: previous message
   #to: user that should answer
-  def ask(question, context, to)
+  def ask(question, context, to, jid_user)
     puts "Bot: #{question}"
     @questions[to]=context
   end
@@ -28,7 +28,7 @@ end
 # help:       @FIRST_NAME_BOT THE_COMMAND
 # help:       FIRST_NAME_BOT THE_COMMAND
 # help:
-def rules(from, command, processed)
+def rules(from, command, processed, jid_user)
   if @testing
     puts "#{from}: #{command}"
     if @questions.keys.include?(from)
@@ -44,32 +44,32 @@ def rules(from, command, processed)
     # help:     repeats SOMETHING
     # help:
     when /echo\s(.+)/i
-      respond $1
+      respond $1, jid_user
 
     # help: go to sleep
     # help:   it will sleep the bot for 10 seconds
     # help:
     when /go\sto\ssleep/i
       unless @questions.keys.include?(from)
-        ask("do you want me to take a siesta?", command, from)
+        ask("do you want me to take a siesta?", command, from, jid_user)
       else
         case @questions[from]
           when /yes/i, /yep/i, /sure/i
-            respond "zZzzzzzZZZZZZzzzzzzz!"
-            respond "I'll be sleeping for 10 secs... just for you"
+            respond "zZzzzzzZZZZZZzzzzzzz!", jid_user
+            respond "I'll be sleeping for 10 secs... just for you", jid_user
             sleep 10
           when /no/i, /nope/i, /cancel/i
             @questions.delete(from)
-            respond "Thanks, I'm happy to be awake"
+            respond "Thanks, I'm happy to be awake", jid_user
           else
-            respond "I don't understand"
-            ask("are you sure do you want me to sleep? (yes or no)", "go to sleep", from)
+            respond "I don't understand", jid_user
+            ask("are you sure do you want me to sleep? (yes or no)", "go to sleep", from, jid_user)
         end
       end
     else
       unless processed
         resp = %w{ what huh sorry }.sample
-        respond "#{firstname}: #{resp}?"
+        respond "#{firstname}: #{resp}?", jid_user
       end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hipchat_smart
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-15 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xmpp4r