Prefer && and || over "and" and "or".

Author: stefansundin

.irbrc

@@ -1,5 +1,5 @@
 env = (ENV["IRB_PROMPT"] || ENV["APP_ENV"] || ENV["RACK_ENV"] || "unknown").upcase
-if env == "PRODUCTION" or env == "DEPLOYMENT"
+if env == "PRODUCTION" || env == "DEPLOYMENT"
   color = "31"
 else
   color = "33"

app.rb

@@ -73,11 +73,11 @@
 get "/twitter" do
   return "Insufficient parameters" if params[:q].empty?
 
-  if params[:q]["twitter.com/i/"] or params[:q]["twitter.com/who_to_follow/"]
+  if params[:q]["twitter.com/i/"] || params[:q]["twitter.com/who_to_follow/"]
     return "Unsupported url. Sorry."
   elsif params[:q]["twitter.com/hashtag/"]
     return "This app does not support hashtags. Sorry."
-  elsif /twitter\.com\/(?:#!\/|@)?(?<user>[^\/?#]+)/ =~ params[:q] or /@(?<user>[^\/?#]+)/ =~ params[:q]
+  elsif /twitter\.com\/(?:#!\/|@)?(?<user>[^\/?#]+)/ =~ params[:q] || /@(?<user>[^\/?#]+)/ =~ params[:q]
     # https://twitter.com/#!/infected
     # https://twitter.com/infected
     # @username
@@ -243,7 +243,7 @@
   else
     # it's probably a username
     user = params[:q]
-    user = "+#{user}" if user[0] != "+" and !user.numeric?
+    user = "+#{user}" if user[0] != "+" && !user.numeric?
   end
 
   response = Google.get("/plus/v1/people/#{CGI.escape(user)}")
@@ -291,7 +291,7 @@
     response = Vimeo.get("/videos/#{video_id}")
     raise(VimeoError, response) if !response.success?
     user_id = response.json["user"]["uri"][/\d+/]
-  elsif /vimeo\.com\/(?:channels\/)?(?<user>[^\/?&#]+)/ =~ params[:q] or user = params[:q]
+  elsif /vimeo\.com\/(?:channels\/)?(?<user>[^\/?&#]+)/ =~ params[:q] || user = params[:q]
     # it's probably a channel name
     response = Vimeo.get("/users", query: { query: user })
     raise(VimeoError, response) if !response.success?
@@ -420,7 +420,7 @@
           # This is not the best quality of the picture, but it will have to do
           url = CGI.unescapeHTML($&)
         end
-        if /<title[^>]*>(?<title>[^<]+)<\/title>/ =~ response.body and /data-utime="(?<utime>\d+)"/ =~ response.body
+        if /<title[^>]*>(?<title>[^<]+)<\/title>/ =~ response.body && /data-utime="(?<utime>\d+)"/ =~ response.body
           title = title.force_encoding("UTF-8").gsub(" | Facebook", "")
           created_time = Time.at(utime.to_i)
           fn = "#{created_time.to_date} - #{title}.#{url.url_ext}".to_filename
@@ -467,7 +467,7 @@
     # Filter posts if with=uid is supplied (property only exists on posts)
     if params[:with]
       ids = params[:with].split(",")
-      @data.select! { |post| post["with_tags"] and post["with_tags"]["data"].any? { |tag| ids.include?(tag["id"]) } }
+      @data.select! { |post| post["with_tags"] && post["with_tags"]["data"].any? { |tag| ids.include?(tag["id"]) } }
     elsif params.has_key?(:with)
       # If with is specified but is nil, then we just want to get posts that include someone else
       @data.select! { |post| post["with_tags"] }
@@ -477,7 +477,7 @@
     @data.each do |post|
       if post["properties"]
         post["properties"].each do |prop|
-          if prop["name"] == "Length" and /^(?<m>\d+):(?<s>\d+)$/ =~ prop["text"]
+          if prop["name"] == "Length" && /^(?<m>\d+):(?<s>\d+)$/ =~ prop["text"]
             post["length"] = 60*m.to_i + s.to_i
           end
         end
@@ -703,7 +703,7 @@
     uri = Addressable::URI.parse(response.json["location"])
     return "URL does not resolve to a user." if !uri.path.start_with?("/users/")
     id = uri.path[/\d+/]
-  elsif response.code == 404 and username.numeric?
+  elsif response.code == 404 && username.numeric?
     response = Soundcloud.get("/users/#{username}")
     return "Can't find a user with that id. Sorry." if response.code == 404
     raise(SoundcloudError, response) if !response.success?
@@ -822,7 +822,7 @@
   if /clips\.twitch\.tv\/(?:embed\?clip=)?(?<clip_slug>[^?&#]+)/ =~ params[:url]
     # https://clips.twitch.tv/majinphil/UnusualClamRaccAttack
     # https://clips.twitch.tv/embed?clip=majinphil/UnusualClamRaccAttack&autoplay=false
-  elsif /twitch\.tv\/videos\/(?<vod_id>\d+)/ =~ params[:url] or /twitch\.tv\/(?:[^\/]+)\/v\/(?<vod_id>\d+)/ =~ params[:url] or /(^|v)(?<vod_id>\d+)/ =~ params[:url]
+  elsif /twitch\.tv\/videos\/(?<vod_id>\d+)/ =~ params[:url] || /twitch\.tv\/(?:[^\/]+)\/v\/(?<vod_id>\d+)/ =~ params[:url] || /(^|v)(?<vod_id>\d+)/ =~ params[:url]
     # https://www.twitch.tv/videos/25133028
     # https://www.twitch.tv/gamesdonequick/v/34377308?t=53m40s
     # https://player.twitch.tv/?video=v103620362
@@ -870,7 +870,7 @@
   if /clips\.twitch\.tv\/(?:embed\?clip=)?(?<clip_slug>[^?&#]+)/ =~ params[:url]
     # https://clips.twitch.tv/majinphil/UnusualClamRaccAttack
     # https://clips.twitch.tv/embed?clip=majinphil/UnusualClamRaccAttack&autoplay=false
-  elsif /twitch\.tv\/videos\/(?<vod_id>\d+)/ =~ params[:url] or /twitch\.tv\/(?:[^\/]+)\/v\/(?<vod_id>\d+)/ =~ params[:url] or /(^|v)(?<vod_id>\d+)/ =~ params[:url]
+  elsif /twitch\.tv\/videos\/(?<vod_id>\d+)/ =~ params[:url] || /twitch\.tv\/(?:[^\/]+)\/v\/(?<vod_id>\d+)/ =~ params[:url] || /(^|v)(?<vod_id>\d+)/ =~ params[:url]
     # https://www.twitch.tv/videos/25133028
     # https://www.twitch.tv/gamesdonequick/v/34377308?t=53m40s
     # https://player.twitch.tv/?video=v103620362
@@ -1029,7 +1029,7 @@
 get "/dailymotion" do
   return "Insufficient parameters" if params[:q].empty?
 
-  if /dailymotion\.com\/video\/(?<video_id>[a-zA-Z0-9]+)/ =~ params[:q] or /dai\.ly\/(?<video_id>[a-zA-Z0-9]+)/ =~ params[:q]
+  if /dailymotion\.com\/video\/(?<video_id>[a-zA-Z0-9]+)/ =~ params[:q] || /dai\.ly\/(?<video_id>[a-zA-Z0-9]+)/ =~ params[:q]
     # http://www.dailymotion.com/video/x3r4xy2_recut-9-cultural-interchange_fun
     # http://www.dailymotion.com/video/k1ZotianZxwzm6fmny2
     # http://dai.ly/x4bzwj4?start=60
@@ -1089,7 +1089,7 @@
     # https://www.reddit.com/r/aww
     redirect "/imgur/r/#{subreddit}#{"?#{params[:type]}" if !params[:type].empty?}"
     return
-  elsif /(?<username>[a-zA-Z0-9]+)\.imgur\.com/ =~ params[:q] and username != "i"
+  elsif /(?<username>[a-zA-Z0-9]+)\.imgur\.com/ =~ params[:q] && username != "i"
     # https://thebookofgray.imgur.com/
   elsif /imgur\.com\/(gallery\/)?(?<image_id>[a-zA-Z0-9]+)/ =~ params[:q]
     # https://imgur.com/NdyrgaE
@@ -1137,7 +1137,7 @@
     # can't use user_id in this request unfortunately
     response = Imgur.get("/account/#{@username}/submissions")
   end
-  raise(ImgurError, response) if !response.success? or response.body.empty?
+  raise(ImgurError, response) if !response.success? || response.body.empty?
   @data = response.json["data"]
 
   if params[:animated]

config/initializers/05-airbrake.rb

@@ -12,6 +12,6 @@
 
   Airbrake.add_filter do |notice|
     # Bots gonna bot
-    notice.ignore! if notice[:errors].any? { |e| e[:type] == "Sinatra::NotFound" } and (/\/wp-(?:admin|includes|content|login)/ =~ notice[:context][:url] or /\/facebook\/\d+\/?$/ =~ notice[:context][:url])
+    notice.ignore! if notice[:errors].any? { |e| e[:type] == "Sinatra::NotFound" } && (/\/wp-(?:admin|includes|content|login)/ =~ notice[:context][:url] || /\/facebook\/\d+\/?$/ =~ notice[:context][:url])
   end
 end

config/initializers/05-integer.rb

@@ -16,7 +16,7 @@ def to_filesize(digits=2)
     units = %w[B kB MB GB TB PB EB ZB YB]
     n = self
     i = 0
-    while n > 1000 and i < units.length do
+    while n > 1000 && i < units.length do
       n = n / 1000.0
       i += 1
     end

config/initializers/05-string.rb

@@ -194,25 +194,25 @@ def linkify_and_embed(request=nil, embed_only="")
     result.gsub!(URL_REGEXP) do |url|
       dest = url.resolve_url
       html = dest.embed_html(request)
-      embeds.push(html) if html and !embeds.include?(html)
+      embeds.push(html) if html && !embeds.include?(html)
       "<a href='#{dest.esc}' title='#{url.esc}' rel='noreferrer'>#{dest.esc}</a>"
     end
     embed_only.scan(URL_REGEXP) do |url|
       dest = url.resolve_url
       html = dest.embed_html(request)
-      embeds.push(html) if html and !embeds.include?(html)
+      embeds.push(html) if html && !embeds.include?(html)
     end
     return result + embeds.map { |html| "\n" + html }.join
   end
 
   def embed_html(request=nil)
     root_url = request ? request.root_url : ""
-    if %r{^https?://www\.facebook\.com/.*/videos/(?:vb\.\d+\/)?(?<id>\d+)} =~ self or %r{^https?://www\.facebook\.com/video/embed\?video_id=(?<id>\d+)} =~ self
+    if %r{^https?://www\.facebook\.com/.*/videos/(?:vb\.\d+\/)?(?<id>\d+)} =~ self || %r{^https?://www\.facebook\.com/video/embed\?video_id=(?<id>\d+)} =~ self
       <<~EOF
         <iframe width="1280" height="720" src="https://www.facebook.com/video/embed?video_id=#{id}" frameborder="0" scrolling="no" allowfullscreen referrerpolicy="no-referrer"></iframe>
         <a href="https://www.facebook.com/video/embed?video_id=#{id}" rel="noreferrer">Open embed</a> | <a href="#{root_url}/facebook/download?url=#{id}">Download video</a> | <a href="#{root_url}/?download=#{CGI.escape("https://www.facebook.com/video/embed?video_id=#{id}")}">Download video with nice filename</a>
       EOF
-    elsif %r{^https?://(?:www\.|m\.)youtube\.com/(?:.*?[?&#](v=(?<id>[^&#]+)|list=(?<list>[^&#]+)|(?:t|time_continue)=(?<t>[^&#]+)))+} =~ self or %r{^https?://(?:youtu\.be|(?:www\.)?youtube\.com/embed)/(?<id>[^?&#]+)(?:.*?[?&#](list=(?<list>[^&#]+)|(?:t|time_continue)=(?<t>[^&#]+)))*} =~ self
+    elsif %r{^https?://(?:www\.|m\.)youtube\.com/(?:.*?[?&#](v=(?<id>[^&#]+)|list=(?<list>[^&#]+)|(?:t|time_continue)=(?<t>[^&#]+)))+} =~ self || %r{^https?://(?:youtu\.be|(?:www\.)?youtube\.com/embed)/(?<id>[^?&#]+)(?:.*?[?&#](list=(?<list>[^&#]+)|(?:t|time_continue)=(?<t>[^&#]+)))*} =~ self
       # https://www.youtube.com/watch?v=z5OGD5_9cA0&list=PL0QrZvg7QIgpoLdNFnEePRrU-YJfr9Be7&index=3&t=30s
       url = "https://www.youtube.com/embed/#{id}?rel=0"
       url += "&list=#{list}" if list

config/unicorn.rb

@@ -29,7 +29,7 @@
       next unless line =~ /^export /
       k, v = line.strip.sub(/^export /, "").split("=", 2)
       next if k == "PATH" # Don't update PATH
-      v = v[1..-2] if (v[0] == '"' and v[-1] == '"') or (v[0] == "'" and v[-1] == "'")
+      v = v[1..-2] if (v[0] == '"' && v[-1] == '"') || (v[0] == "'" && v[-1] == "'")
       if v == ""
         $stderr.puts "Unsetting ENV[#{k}]"
         ENV.delete k

lib/http.rb

@@ -4,11 +4,11 @@ class HTTP
   def self.get(url, options={headers: nil, query: nil})
     relative_url = (url[0] == "/")
 
-    if defined?(self::BASE_URL) and relative_url
+    if defined?(self::BASE_URL) && relative_url
       url = self::BASE_URL+url
     end
 
-    if defined?(self::PARAMS) and relative_url
+    if defined?(self::PARAMS) && relative_url
       if url["?"]
         url += "&"+self::PARAMS
       else
@@ -33,7 +33,7 @@ def self.get(url, options={headers: nil, query: nil})
     }
     Net::HTTP.start(uri.host, uri.port, opts) do |http|
       headers = {}
-      headers.merge!(self::HEADERS) if defined?(self::HEADERS) and relative_url
+      headers.merge!(self::HEADERS) if defined?(self::HEADERS) && relative_url
       headers.merge!(options[:headers]) if options[:headers]
       response = http.request_get(uri.request_uri, headers)
       return HTTPResponse.new(response, uri.to_s)

views/facebook_feed.erb

@@ -22,21 +22,21 @@
   end
 
   post["link"] = post["link"].resolve_url if post["link"]
-  post["link"] = "https://www.facebook.com/video/embed?video_id=#{object_id}" if @edge == "videos" or (post["type"] == "video" and post["link"].start_with?("https://www.facebook.com/"))
+  post["link"] = "https://www.facebook.com/video/embed?video_id=#{object_id}" if @edge == "videos" || (post["type"] == "video" && post["link"].start_with?("https://www.facebook.com/"))
   link = post["link"] || "https://www.facebook.com/#{post["id"]}"
 -%>
 
   <entry>
     <id>facebook:post:<%= id %><%= ":#{params[:cachebuster]}" if params[:cachebuster] %></id>
     <title><%=
-if (post["live_status"] and post["live_status"] != "VOD") or post["story"][" is live now"]
+if (post["live_status"] && post["live_status"] != "VOD") || post["story"][" is live now"]
   "[LIVE] "
 elsif post["length"]
   "[#{post["length"].round.to_duration}] "
 end
 %><%=
-if @type == "posts" or @type == "videos"
-  prefix = if post["live_status"] or post["story"][" live"]
+if @type == "posts" || @type == "videos"
+  prefix = if post["live_status"] || post["story"][" live"]
     "Live"
   elsif %w[link video photo event].include?(post["type"])
     "#{post["type"].camelize}"
@@ -55,9 +55,9 @@ elsif post["description"]
   post["description"].to_line.truncate(120).esc
 end
 
-if prefix and suffix
+if prefix && suffix
   "#{prefix}: #{suffix}"
-elsif suffix or prefix
+elsif suffix || prefix
   suffix || prefix
 else
   type.camelize
@@ -70,7 +70,7 @@ end
 <%= "<p><em>#{post["story"]}</em></p>".esc if post["story"] %>
 <%= post.slice("message", "description", "link").values.linkify_and_embed(request).to_paragraphs.esc %>
 <%=
-if type == "photo" and post["source"]
+if type == "photo" && post["source"]
   "<p><img src='#{post["source"]}' referrerpolicy='no-referrer'></p>".esc
 elsif type == "photo"
   <<~EOF.esc

views/index.erb

@@ -78,7 +78,7 @@
     </form>
 <% end %>
 
-<% if ENV["FACEBOOK_APP_ID"] and ENV["FACEBOOK_APP_SECRET"] %>
+<% if ENV["FACEBOOK_APP_ID"] && ENV["FACEBOOK_APP_SECRET"] %>
     <form class="input-group" method="get" action="facebook">
       <div class="input-group-addon"><label for="facebook_q">Facebook</label></div>
       <input class="form-control" type="search" name="q" id="facebook_q" placeholder="Enter a Facebook page name or its url." required>

views/instagram_feed.erb

@@ -8,7 +8,7 @@
   <link href="https://www.instagram.com/<%= @user %>" rel="alternate" />
   <updated><%= Time.at(@data["edge_owner_to_timeline_media"]["edges"][0]["node"]["taken_at_timestamp"]) if @data["edge_owner_to_timeline_media"]["edges"][0] %></updated>
 <%-
-if @data["is_private"] and @data["edge_owner_to_timeline_media"]["edges"].empty?
+if @data["is_private"] && @data["edge_owner_to_timeline_media"]["edges"].empty?
   reason = params[:sessionid] ? "The sessionid token is no longer valid." : "This user is private."
 -%>
 

views/twitter_feed.erb

@@ -23,7 +23,7 @@
     for entity in t["extended_entities"]["media"]
       next if !entity["video_info"]
       video = entity["video_info"]["variants"].sort do |a,b|
-        if a["content_type"].start_with?("video/") and b["content_type"].start_with?("video/")
+        if a["content_type"].start_with?("video/") && b["content_type"].start_with?("video/")
           b["bitrate"] - a["bitrate"]
         else
           b["content_type"].start_with?("video/") <=> a["content_type"].start_with?("video/")