diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 58358015b..d178d5606 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -16,7 +16,7 @@ Example: "firstname":"Marti", "lastname":"Ede", "email":"m@edenhofer.de", - "image":"http://www.gravatar.com/avatar/1c38b099f2344976005de69965733465?s=48", + "image_source":"http://www.gravatar.com/avatar/1c38b099f2344976005de69965733465?s=48", "web":"http://127.0.0.1", "password":"123", "phone":"112", diff --git a/app/models/channel/twitter2.rb b/app/models/channel/twitter2.rb index 364478b08..2efc53cc5 100644 --- a/app/models/channel/twitter2.rb +++ b/app/models/channel/twitter2.rb @@ -151,7 +151,7 @@ class Channel::Twitter2 :lastname => '', :email => '', :password => '', - :image => sender.profile_image_url, + :image_source => sender.profile_image_url.request_uri, :note => sender.description, :active => true, :roles => roles, diff --git a/test/unit/twitter_test.rb b/test/unit/twitter_test.rb index 0925fa0c2..286a6b469 100644 --- a/test/unit/twitter_test.rb +++ b/test/unit/twitter_test.rb @@ -126,7 +126,7 @@ class TwitterTest < ActiveSupport::TestCase end dms = client.direct_messages( :count => 200 ) dms.each {|dm| - client.direct_message_destroy(dm.id) + client.destroy_direct_message(dm.id) } # direct message to @armin_theo @@ -144,7 +144,7 @@ class TwitterTest < ActiveSupport::TestCase hash = '#citheo44' + rand(9999).to_s text = 'How about the details? ' + hash - dm = client.direct_message_create( + dm = client.create_direct_message( 'armin_theo', text, )