google_photos_onebox.rb in onebox-2.2.15

- old
+ new

@@ -9,13 +9,13 @@
       matches_regexp(/^https?:\/\/(photos)\.(app\.goo\.gl|google\.com)/)
       always_https
 
       def to_html
         og = get_opengraph
-        return video_html(og) if !og.video_secure_url.nil?
-        return album_html(og) if !og.type.nil? && og.type == "google_photos:photo_album"
-        return image_html(og) if !og.image.nil?
+        return video_html(og) if og.video_secure_url
+        return album_html(og) if og.type == "google_photos:photo_album"
+        return image_html(og) if og.image
         nil
       end
 
       private
 
@@ -30,11 +30,11 @@
             </header>
             <article class="onebox-body">
               <h3><a href="#{escaped_url}" target="_blank" rel="nofollow ugc noopener">#{og.title}</a></h3>
               <div class="aspect-image-full-size">
                 <a href="#{escaped_url}" target="_blank" rel="nofollow ugc noopener">
-                  <img src="#{og.get_secure_image}" class="scale-image"/>
+                  <img src="#{og.secure_image_url}" class="scale-image"/>
                   <span class="instagram-video-icon"></span>
                 </a>
               </div>
             </article>
           </aside>
@@ -51,21 +51,21 @@
               <span class='outer-box' style='width:#{og.image_width}px'>
                 <span class='inner-box'>
                   <span class='album-title'>#{Onebox::Helpers.truncate(album_title, 80)}</span>
                 </span>
               </span>
-              <img src='#{og.get_secure_image}' #{og.title_attr} height='#{og.image_height}' width='#{og.image_width}'>
+              <img src='#{og.secure_image_url}' #{og.title_attr} height='#{og.image_height}' width='#{og.image_width}'>
             </a>
           </div>
         HTML
       end
 
       def image_html(og)
         escaped_url = ::Onebox::Helpers.normalize_url_for_output(url)
 
         <<-HTML
           <a href='#{escaped_url}' target='_blank' rel='noopener' class="onebox">
-            <img src='#{og.get_secure_image}' #{og.title_attr} alt='Google Photos' height='#{og.image_height}' width='#{og.image_width}'>
+            <img src='#{og.secure_image_url}' #{og.title_attr} alt='Google Photos' height='#{og.image_height}' width='#{og.image_width}'>
           </a>
         HTML
       end
     end
   end