diff --git a/app/models/user.rb b/app/models/user.rb index 9bdf1b5aa..a9cdf0cd8 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -56,11 +56,11 @@ class User < Person end def receive_friend_request(friend_request) + GPGME.import(friend_request.exported_key) if Request.where(:callback_url => friend_request.callback_url).first friend_request.activate_friend friend_request.destroy else - GPGME.import(friend_request.exported_key) friend_request.person.save friend_request.save end