ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use https url for twitter avatars refs #5194 

Change-Id: Ia2efe31cc31500f6796c2bb61c1b19d900881c0d
Reviewed-on: https://gerrit.instructure.com/6018
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
This commit is contained in:
Cody Cutrer 2011-10-06 16:02:51 -06:00
parent 5dbb29e559
commit bcab31afaa
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/profile_controller.rb
View File

@ -137,7 +137,7 @@ class ProfileController < ApplicationController
data = JSON.parse(Net::HTTP.get(url)) rescue nil
if data
@pics << {
:url => data['profile_image_url'],
:url => data['profile_image_url_https'],
:type => 'twitter',
:alt => 'twitter pic'
}

4
app/models/user.rb
View File

@ -920,7 +920,7 @@ class User < ActiveRecord::Base
url = URI.parse("http://twitter.com/users/show.json?user_id=#{twitter.service_user_id}")
data = JSON.parse(Net::HTTP.get(url)) rescue nil
if data
self.avatar_image_url = data['profile_image_url'] || self.avatar_image_url
self.avatar_image_url = data['profile_image_url_https'] || self.avatar_image_url
self.avatar_image_updated_at = Time.now
end
end
@ -958,7 +958,7 @@ class User < ActiveRecord::Base
data = JSON.parse(Net::HTTP.get(url)) rescue nil
if data
self.avatar_image_source = 'twitter'
self.avatar_image_url = data['profile_image_url'] || self.avatar_image_url
self.avatar_image_url = data['profile_image_url_https'] || self.avatar_image_url
self.avatar_image_updated_at = Time.now
self.avatar_state = 'submitted'
end