Skip to content

Commit

Permalink
Merge pull request #89 from robbkidd/new-slack-gem
Browse files Browse the repository at this point in the history
Replace old slack gem with one that's supported.
  • Loading branch information
llimllib committed Feb 16, 2016
2 parents 15ca62a + 7a427e5 commit 8ee4c17
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ gem "octokit", "2.0.0.rc2"
gem "tzinfo"
gem "em-irc"
gem "rake"
gem "slack-api"
gem "slack-ruby-client"
gem "certifi"

group :dev do
Expand Down
18 changes: 9 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ GEM
eventmachine (1.0.7)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.9.1)
faraday_middleware (0.10.0)
faraday (>= 0.7.4, < 0.10)
faye-websocket (0.9.2)
faye-websocket (0.10.1)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
hpricot (0.8.6)
Expand Down Expand Up @@ -102,11 +102,11 @@ GEM
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
slack-api (1.1.0)
faraday (>= 0.7, <= 0.9)
faraday_middleware (~> 0.8)
faye-websocket (~> 0.9.2)
multi_json (~> 1.0, >= 1.0.3)
slack-ruby-client (0.3.1)
eventmachine
faraday
faraday_middleware
faye-websocket
slop (3.6.0)
sqlite3 (1.3.9)
stemmer (1.0.1)
Expand All @@ -121,7 +121,7 @@ GEM
tzinfo (1.2.2)
thread_safe (~> 0.1)
uri_template (0.5.3)
websocket-driver (0.5.4)
websocket-driver (0.6.3)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)

Expand All @@ -148,7 +148,7 @@ DEPENDENCIES
rspec
sanitize
sinatra
slack-api
slack-ruby-client
sqlite3
thin
twss
Expand Down
6 changes: 3 additions & 3 deletions connectors/slack.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ def initialize(options)

def start
Linkbot.log.info "Slack connector: Creating client"
@client = Slack.client
@client = Slack::Web::Client.new

Linkbot.log.info "Slack connector: Connection realtime client"
@rtc = @client.realtime
@rtc = Slack::RealTime::Client.new

Linkbot.log.info "Slack connector: Client connected"
@rtc.on :message do |data|
Expand All @@ -29,7 +29,7 @@ def start

update_users(@client.post("rtm.start")["users"])

@rtc.start
@rtc.start!
end

def update_users(users)
Expand Down

0 comments on commit 8ee4c17

Please sign in to comment.