...
|
...
|
@@ -28,7 +28,7 @@ class WsRosterController < WebsocketRails::BaseController
|
28
|
28
|
|
29
|
29
|
clients.each do |credentials|
|
30
|
30
|
begin
|
31
|
|
- client = Signin.try_login(credentials["jid"], credentials["pass"])
|
|
31
|
+ client = Signin.try_login(credentials['jid'], credentials['pass'])
|
32
|
32
|
connection_store[:clients] << client
|
33
|
33
|
rescue Signin::LoginError
|
34
|
34
|
send_message 'app.client.cannot_connect', true
|
...
|
...
|
@@ -150,12 +150,12 @@ class WsRosterController < WebsocketRails::BaseController
|
150
|
150
|
vcard = Jabber::Vcard::Helper.get(me, contact_jid)
|
151
|
151
|
|
152
|
152
|
{ name: pull_name_from_vcard(vcard) || contact_jid,
|
153
|
|
- avatar: vcard["PHOTO/TYPE"] && ('data:' + vcard["PHOTO/TYPE"] + ';base64,' + vcard["PHOTO/BINVAL"]) || ''
|
|
153
|
+ avatar: vcard['PHOTO/TYPE'] && ('data:' + vcard['PHOTO/TYPE'] + ';base64,' + vcard['PHOTO/BINVAL']) || ''
|
154
|
154
|
}
|
155
|
155
|
end
|
156
|
156
|
|
157
|
157
|
def pull_name_from_vcard(vcard)
|
158
|
|
- vcard && (vcard["FN"] || vcard["NICKNAME"])
|
|
158
|
+ vcard && (vcard['FN'] || vcard['NICKNAME'])
|
159
|
159
|
end
|
160
|
160
|
|
161
|
161
|
def uniform_presence(xmpp_presence)
|