session.rb in agig-0.1.0

- old
+ new

@@ -1,59 +1,32 @@
-require 'rubygems'
-require 'net/irc'
-require 'nokogiri'
-require 'certified'
-
-require 'open-uri'
 require 'ostruct'
 require 'time'
+require 'net/irc'
+require 'octokit'
 
 class Agig::Session < Net::IRC::Server::Session
-  EVENTS = {
-    'DownloadEvent' => '6',
-    'GistEvent'     => '10',
-    'WatchEvent'    => '15',
-    'FollowEvent'   => '15',
-    'CreateEvent'   => '13',
-    'ForkEvent'     => '3',
-    'PushEvent'     => '14',
-  }
-
-  CHANNEL_SELECTOR = {
-    'GistEvent'                     => '#activity',
-    'ForkEvent'                     => '#activity',
-    'FollowEvent'                   => '#activity',
-    'WatchEvent'                    => '#activity',
-    'PullRequestEvent'              => '#pull_requests',
-    'PullRequestReviewCommentEvent' => '#pull_requests',
-  }
-
   def server_name
     "github"
   end
 
   def server_version
     "0.0.0"
   end
 
-  def main_channel
-    @opts.main_channel || "#github"
+  def channel
+    "#github"
   end
 
-  def channels
-    CHANNEL_SELECTOR.values.uniq << main_channel
-  end
-
-  def channel(type)
-    CHANNEL_SELECTOR[type] || main_channel
-  end
-
   def initialize(*args)
     super
-    @last_retrieved = Time.now
+    @last_retrieved = Time.now.utc
   end
 
+  def client
+    @client ||= Octokit::Client.new(login: @nick, password: @pass)
+  end
+
   def on_disconnected
     @retrieve_thread.kill rescue nil
   end
 
   def on_user(m)
@@ -67,34 +40,28 @@
                       when /\A\d+\z/                then value.to_i
                       when /\A(?:\d+\.\d*|\.\d+)\z/ then value.to_f
                       else                               value
                       end
     }
-    channels.each {|c| post @nick, JOIN, c }
+    post @nick, JOIN, channel
 
     @retrieve_thread = Thread.start do
       loop do
         begin
           @log.info 'retrieveing feed...'
-          atom = open("https://github.com/#{@nick}.private.atom?token=#{@pass}").read
-          ns  = {'a' => 'http://www.w3.org/2005/Atom'}
-          entries = Nokogiri::XML(atom).xpath('/a:feed/a:entry', ns).map do |entry|
-            {
-              :datetime => Time.parse(entry.xpath('string(a:published)', ns)),
-              :id       => entry.xpath('string(a:id)', ns),
-              :title    => entry.xpath('string(a:title)', ns),
-              :author   => entry.xpath('string(a:author/a:name)', ns),
-              :link     => entry.xpath('string(a:link/@href)', ns),
-            }
-          end
 
-          entries.reverse_each do |entry|
-            next if entry[:datetime].utc <= @last_retrieved.utc
-            type = entry[:id][%r|tag:github.com,2008:(.+?)/\d+|, 1]
-            post entry[:author], PRIVMSG, channel(type), "\003#{EVENTS[type] || '5'}#{entry[:title]}\017 \00314#{entry[:link]}\017"
+          entries = client.notifications
+
+          entries.sort_by(&:updated_at).reverse_each do |entry|
+            updated_at = Time.parse(entry[:updated_at]).utc
+            next if updated_at <= @last_retrieved
+
+            subject = entry['subject']
+            post entry['repository']['owner']['login'], PRIVMSG, "#github", "\0035#{subject['title']}\017 \00314#{subject['latest_comment_url']}\017"
+
+            @last_retrieved = updated_at
           end
 
-          @last_retrieved = entries.first[:datetime]
           @log.info 'sleep'
           sleep 30
         rescue Exception => e
           @log.error e.inspect
           e.backtrace.each do |l|