lib/slack-ruby-bot/client.rb in slack-ruby-bot-0.12.0 vs lib/slack-ruby-bot/client.rb in slack-ruby-bot-0.13.0
- old
+ new
@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
module SlackRubyBot
class Client < Slack::RealTime::Client
include Loggable
attr_accessor :aliases
attr_accessor :send_gifs
@@ -29,15 +31,16 @@
name && names.include?(name.downcase)
end
def send_gifs?
return false unless defined?(Giphy)
+
send_gifs.nil? ? SlackRubyBot::Config.send_gifs? : send_gifs
end
def name
- SlackRubyBot.config.user || (self.self && self.self.name)
+ SlackRubyBot.config.user || self.self&.name
end
def url
SlackRubyBot.config.url || super
end
@@ -49,12 +52,12 @@
# text
text = options.delete(:text)
if keywords && send_gifs?
gif = begin
Giphy.random(keywords)
- rescue StandardError => e
- logger.warn "Giphy.random: #{e.message}"
- nil
+ rescue StandardError => e
+ logger.warn "Giphy.random: #{e.message}"
+ nil
end
end
text = [text, gif && gif.image_url.to_s].compact.join("\n")
message({ text: text }.merge(options))
end