mirror of
https://github.com/Growstuff/growstuff.git
synced 2026-10-31 11:21:06 -04:00
google-labs-jules[bot]andCloCkWeRX
3c70ba12ca
- Update MemberFlickr concern to support tag-based search using flickr.photos.search - Update PhotosController to handle the 'tag' parameter - Add tag search input field to the 'New Photo' view - Add test case to verify tag filtering in PhotosController spec Co-authored-by: CloCkWeRX <365751+CloCkWeRX@users.noreply.github.com>
79 lines
2.2 KiB
Ruby
79 lines
2.2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module MemberFlickr
|
|
extend ActiveSupport::Concern
|
|
|
|
included do
|
|
# Authenticates against Flickr and returns an object we can use for subsequent api calls
|
|
def flickr
|
|
if @flickr.nil?
|
|
flickr_auth = auth('flickr')
|
|
if flickr_auth
|
|
FlickRaw.api_key = ENV.fetch('GROWSTUFF_FLICKR_KEY', nil)
|
|
FlickRaw.shared_secret = ENV.fetch('GROWSTUFF_FLICKR_SECRET', nil)
|
|
@flickr = FlickRaw::Flickr.new
|
|
@flickr.access_token = flickr_auth.token
|
|
@flickr.access_secret = flickr_auth.secret
|
|
end
|
|
end
|
|
@flickr
|
|
end
|
|
|
|
def flickr_auth_valid?
|
|
# no flickr token saved for this member
|
|
return false if flickr.nil?
|
|
|
|
# test the token/secret we have
|
|
flickr.test.login # This throws exception if fails
|
|
|
|
# success!
|
|
true
|
|
rescue FlickRaw::FailedResponse, FlickRaw::OAuthClient::FailedResponse
|
|
# token for this user doesn't work
|
|
false
|
|
end
|
|
|
|
def remove_stale_flickr_auth
|
|
authentications.find_by(provider: "flickr")&.delete
|
|
end
|
|
|
|
# Fetches a collection of photos from Flickr
|
|
# Returns a [[page of photos], total] pair.
|
|
# Total is needed for pagination.
|
|
def flickr_photos(page_num = 1, set = nil, tags = nil)
|
|
result = if tags.present?
|
|
flickr.photos.search(
|
|
user_id: 'me',
|
|
tags: tags,
|
|
page: page_num,
|
|
per_page: 30
|
|
)
|
|
elsif set.present?
|
|
flickr.photosets.getPhotos(
|
|
photoset_id: set,
|
|
page: page_num,
|
|
per_page: 30
|
|
)
|
|
else
|
|
flickr.people.getPhotos(
|
|
user_id: 'me',
|
|
page: page_num,
|
|
per_page: 30
|
|
)
|
|
end
|
|
return [result.photo, result.total] if result
|
|
|
|
[[], 0]
|
|
end
|
|
|
|
# Returns a hash of Flickr photosets' ids and titles
|
|
def flickr_sets
|
|
sets = {}
|
|
flickr.photosets.getList.each do |p|
|
|
sets[p.title] = p.id
|
|
end
|
|
sets
|
|
end
|
|
end
|
|
end
|