@@ -10,6 +10,7 @@ gem 'xmpp4r', '~> 0.5'

 gem 'thin', '~> 1.5.0'

 gem 'websocket-rails', '~> 0.4.3'

 gem 'bcrypt-ruby'

+gem 'rmagick', '~> 2.13.2'

 # Gems used only for assets and not required

 # in production environments by default.

@@ -200,6 +200,7 @@ GEM

     rdoc (3.12.2)

       json (~> 1.4)

     redis (3.0.3)

+    rmagick (2.13.2)

     rspec-core (2.13.1)

     rspec-expectations (2.13.0)

       diff-lcs (>= 1.1.3, < 2.0)

@@ -287,6 +288,7 @@ DEPENDENCIES

   phantomjs-binaries

   rails (~> 3.2.11)

   rails-backbone

+  rmagick (~> 2.13.2)

   rspec-rails

   sass-rails (~> 3.2.3)

   spork

@@ -107,9 +107,12 @@ this.App =

     updateMyStatus: (message, state)->

       App.Com.trigger(event: 'app.roster.updateMyStatus', data: {message: message, state: state})

-    updateMyVcard: (name, avatar) ->

+    updateMyVcardName: (name) ->

       App.Com.trigger(event: 'app.roster.updateMyVcard', data: {name: name})

+    updateMyVcardAvatar: (imageBase64) ->

+      App.Com.trigger(event: 'app.roster.updateMyVcard', data: {avatar: imageBase64})

+

     removeContactRemote: (contact, client) ->

       App.Com.trigger(event: 'app.roster.removeContact', data: {jid: contact, client: client})

@@ -1,6 +1,7 @@

 .user

   .avatar.bigger{ title: "#{@jid}" }

     %img{ src: "#{@avatar || 'assets/avatar.png'}", alt: I18n.t('chat.roster.avatar_alt') }

+    %input.hidden{ type: 'file', name: 'avatar', accept: 'image/png,image/jpeg,image/pjpeg,image/gif,image/webp'}

     .change-avatar.hidden

       .background

       %p change

@@ -14,8 +14,11 @@ class Xmpp.Views.Contacts.MeView extends Backbone.View

     'click .js-change-state': (e) -> @openChangeState(e)

     'click .js-state-clickable': (e) -> @confirmChangeState(e)

+    #avatar change events:

     'mouseover .avatar': -> $('.change-avatar').show()

     'mouseout .avatar': -> $('.change-avatar').hide()

+    'click .change-avatar': -> $('input[name=avatar]').click()

+    'change input[name=avatar]': 'uploadAvatar'

   initialize: () ->

     _.bindAll(this)

@@ -70,7 +73,7 @@ class Xmpp.Views.Contacts.MeView extends Backbone.View

       $this.removeClass('editing')

     $this.blur()

-    App.Com.updateMyVcard(@_getName())

+    App.Com.updateMyVcardName(@_getName())

     @model.set('name', @_getName())

   openChangeState: (e) ->

@@ -95,6 +98,14 @@ class Xmpp.Views.Contacts.MeView extends Backbone.View

     App.Com.updateMyStatus(@_getStatusMessage(), @_getState())

+  uploadAvatar: (e) ->

+    fr = new FileReader;

+    fr.onloadend = ->

+      App.Models.me.set(avatar: fr.result)

+      App.Com.updateMyVcardAvatar(fr.result)

+

+    fr.readAsDataURL(e.target.files[0]);

+

   _getStatusMessage: ->

     if $('.js-edit-status').hasClass('empty')

       return ''

@@ -149,6 +149,7 @@

       img {

         height: 46px;

+        max-width: 46px;

       }

       .change-avatar {

@@ -1,6 +1,7 @@

 class WsRosterController < WsController

     require 'xmpp4r/roster'

     require 'xmpp4r/vcard'

+    require 'RMagick'

     def initialize

         super

@@ -170,9 +171,33 @@ class WsRosterController < WsController

     def me_update_vcard

         connection_store[:clients].each do |client|

-            my_vcard = Jabber::Vcard::Helper.get(client)

-            my_vcard['FN'] = my_vcard['NICKNAME'] = message[:name]

-            Jabber::Vcard::Helper.set(client, my_vcard)

+            Thread.new do

+                my_vcard = Jabber::Vcard::Helper.get(client)

+

+                if message[:name]

+                    my_vcard['FN'] = my_vcard['NICKNAME'] = message[:name]

+                end

+

+                if message[:avatar]

+                    begin

+                        im = Magick::Image::read_inline(message[:avatar]).first

+

+                        type = im.format.downcase

+                        allowed_types = %w(png jpeg pjpeg gif webp)

+                        return unless allowed_types.include? type

+

+                        im.resize_to_fit! 128,128

+                        base64 = Base64.encode64(im.to_blob)

+

+                        my_vcard['PHOTO/TYPE'] = 'image/' + type

+                        my_vcard['PHOTO/BINVAL'] = base64

+                    rescue

+                        # ignored

+                    end

+                end

+

+                Jabber::Vcard::Helper.set(client, my_vcard)

+            end

         end

     end