Skip to content

Commit f1899d0

Browse files
jcbrandjcbrand
committed
Looser coupling with converse-vcard
To make it easier to remove it without breaking stuff.
1 parent 36761f2 commit f1899d0

File tree

7 files changed

+181
-81
lines changed

7 files changed

+181
-81
lines changed

‎dist/converse.js

Lines changed: 70 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -48641,19 +48641,24 @@ const AvatarMixin = {
4864148641
return;
4864248642
}
4864348643

48644-
const image_type = this.model.vcard.get('image_type'),
48645-
image = this.model.vcard.get('image');
48646-
canvas_el.outerHTML = templates_avatar_svg__WEBPACK_IMPORTED_MODULE_4___default()({
48644+
const data = {
4864748645
'classes': canvas_el.getAttribute('class'),
4864848646
'width': canvas_el.width,
48649-
'height': canvas_el.height,
48650-
'image': "data:" + image_type + ";base64," + image
48651-
});
48647+
'height': canvas_el.height
48648+
};
48649+
48650+
if (this.model.vcard) {
48651+
const image_type = this.model.vcard.get('image_type'),
48652+
image = this.model.vcard.get('image');
48653+
data['image'] = "data:" + image_type + ";base64," + image;
48654+
}
48655+
48656+
canvas_el.outerHTML = templates_avatar_svg__WEBPACK_IMPORTED_MODULE_4___default()(data);
4865248657
}
4865348658

4865448659
};
4865548660
_converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins.add('converse-chatboxviews', {
48656-
dependencies: ["converse-chatboxes"],
48661+
dependencies: ["converse-chatboxes", "converse-vcard"],
4865748662
overrides: {
4865848663
// Overrides mentioned here will be picked up by converse.js's
4865948664
// plugin architecture they will replace existing methods on the
@@ -61849,6 +61854,11 @@ _converse_core__WEBPACK_IMPORTED_MODULE_2__["default"].plugins.add('converse-cha
6184961854
},
6185061855

6185161856
setVCard() {
61857+
if (!_converse.vcards) {
61858+
// VCards aren't supported
61859+
return;
61860+
}
61861+
6185261862
if (this.get('type') === 'error') {
6185361863
return;
6185461864
} else if (this.get('type') === 'groupchat') {
@@ -61870,12 +61880,12 @@ _converse_core__WEBPACK_IMPORTED_MODULE_2__["default"].plugins.add('converse-cha
6187061880
getDisplayName() {
6187161881
if (this.get('type') === 'groupchat') {
6187261882
return this.get('nick');
61883+
} else if (this.contact) {
61884+
return this.contact.getDisplayName();
61885+
} else if (this.vcard) {
61886+
return this.vcard.getDisplayName();
6187361887
} else {
61874-
if (this.contact) {
61875-
return this.contact.getDisplayName();
61876-
}
61877-
61878-
return this.vcard.get('nickname') || this.vcard.get('fullname') || this.get('from');
61888+
return this.get('from');
6187961889
}
6188061890
},
6188161891

@@ -62015,22 +62025,25 @@ _converse_core__WEBPACK_IMPORTED_MODULE_2__["default"].plugins.add('converse-cha
6201562025
// This happens when the controlbox is in browser storage,
6201662026
// but we're in embedded mode.
6201762027
return;
62018-
}
62019-
62020-
this.vcard = _converse.vcards.findWhere({
62021-
'jid': jid
62022-
}) || _converse.vcards.create({
62023-
'jid': jid
62024-
}); // XXX: this creates a dependency on converse-roster, which we
62028+
} // XXX: this creates a dependency on converse-roster, which we
6202562029
// probably shouldn't have here, so we should probably move
6202662030
// ChatBox out of converse-chatboxes
6202762031

62032+
6202862033
this.presence = _converse.presences.findWhere({
6202962034
'jid': jid
6203062035
}) || _converse.presences.create({
6203162036
'jid': jid
6203262037
});
6203362038

62039+
if (_converse.vcards) {
62040+
this.vcard = _converse.vcards.findWhere({
62041+
'jid': jid
62042+
}) || _converse.vcards.create({
62043+
'jid': jid
62044+
});
62045+
}
62046+
6203462047
if (this.get('type') === _converse.PRIVATE_CHAT_TYPE) {
6203562048
this.setRosterContact(jid);
6203662049
}
@@ -62070,9 +62083,11 @@ _converse_core__WEBPACK_IMPORTED_MODULE_2__["default"].plugins.add('converse-cha
6207062083
getDisplayName() {
6207162084
if (this.contact) {
6207262085
return this.contact.getDisplayName();
62086+
} else if (this.vcard) {
62087+
return this.vcard.getDisplayName();
62088+
} else {
62089+
return this.get('jid');
6207362090
}
62074-
62075-
return this.vcard.get('nickname') || this.vcard.get('fullname') || this.get('jid');
6207662091
},
6207762092

6207862093
getUpdatedMessageAttributes(message, stanza) {
@@ -64254,16 +64269,6 @@ _converse.initialize = async function (settings, callback) {
6425464269
},
6425564270

6425664271
initialize() {
64257-
this.vcard = _converse.vcards.findWhere({
64258-
'jid': this.get('jid')
64259-
});
64260-
64261-
if (_lodash_noconflict__WEBPACK_IMPORTED_MODULE_4___default.a.isNil(this.vcard)) {
64262-
this.vcard = _converse.vcards.create({
64263-
'jid': this.get('jid')
64264-
});
64265-
}
64266-
6426764272
this.on('change:status', item => {
6426864273
const status = this.get('status');
6426964274
this.sendPresence(status);
@@ -68820,6 +68825,11 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins
6882068825
},
6882168826

6882268827
setVCard() {
68828+
if (!_converse.vcards) {
68829+
// VCards aren't supported
68830+
return;
68831+
}
68832+
6882368833
const jid = this.get('jid');
6882468834
this.vcard = _converse.vcards.findWhere({
6882568835
'jid': jid
@@ -68873,11 +68883,21 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins
6887368883
},
6887468884

6887568885
getDisplayName() {
68876-
return this.get('nickname') || this.vcard.get('nickname') || this.vcard.get('fullname') || this.get('jid');
68886+
if (this.get('nickname')) {
68887+
return this.get('nickname');
68888+
} else if (this.vcard) {
68889+
return this.vcard.getDisplayName();
68890+
} else {
68891+
return this.get('jid');
68892+
}
6887768893
},
6887868894

6887968895
getFullname() {
68880-
return this.vcard.get('fullname');
68896+
if (this.vcard) {
68897+
return this.vcard.get('fullname');
68898+
} else {
68899+
return this.get('jid');
68900+
}
6888168901
},
6888268902

6888368903
/**
@@ -69828,6 +69848,10 @@ _converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins.add('converse-vca
6982869848
} else {
6982969849
return Backbone.Model.prototype.set.apply(this, arguments);
6983069850
}
69851+
},
69852+
69853+
getDisplayName() {
69854+
return this.get('nickname') || this.get('fullname') || this.get('jid');
6983169855
}
6983269856

6983369857
});
@@ -69925,6 +69949,18 @@ _converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins.add('converse-vca
6992569949

6992669950
_converse.api.listen.on('sessionInitialized', _converse.initVCardCollection);
6992769951

69952+
_converse.api.listen.on('statusInitialized', () => {
69953+
const vcards = _converse.vcards;
69954+
69955+
const jid = _converse.xmppstatus.get('jid');
69956+
69957+
_converse.xmppstatus.vcard = vcards.findWhere({
69958+
'jid': jid
69959+
}) || vcards.create({
69960+
'jid': jid
69961+
});
69962+
});
69963+
6992869964
_converse.api.listen.on('addClientFeatures', () => {
6992969965
_converse.api.disco.own.features.add(Strophe.NS.VCARD);
6993069966
});
@@ -94517,7 +94553,7 @@ __p += '\n </span>\n ';
9451794553
__p += '<div class="chat-msg__body">';
9451894554
} ;
9451994555
__p += '\n ';
94520-
if (o.received) { ;
94556+
if (o.received && !o.is_me_message) { ;
9452194557
__p += ' <span class="fa fa-check chat-msg__receipt"></span> ';
9452294558
} ;
9452394559
__p += '\n ';

‎src/converse-chatboxviews.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,24 @@ const AvatarMixin = {
2323
if (_.isNull(canvas_el)) {
2424
return;
2525
}
26-
const image_type = this.model.vcard.get('image_type'),
27-
image = this.model.vcard.get('image');
28-
29-
canvas_el.outerHTML = tpl_avatar({
26+
const data = {
3027
'classes': canvas_el.getAttribute('class'),
3128
'width': canvas_el.width,
3229
'height': canvas_el.height,
33-
'image': "data:" + image_type + ";base64," + image,
34-
});
30+
}
31+
if (this.model.vcard) {
32+
const image_type = this.model.vcard.get('image_type'),
33+
image = this.model.vcard.get('image');
34+
data['image'] = "data:" + image_type + ";base64," + image;
35+
}
36+
canvas_el.outerHTML = tpl_avatar(data);
3537
},
3638
};
3739

3840

3941
converse.plugins.add('converse-chatboxviews', {
4042

41-
dependencies: ["converse-chatboxes"],
43+
dependencies: ["converse-chatboxes", "converse-vcard"],
4244

4345
overrides: {
4446
// Overrides mentioned here will be picked up by converse.js's

‎src/headless/converse-chatboxes.js

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ converse.plugins.add('converse-chatboxes', {
118118
},
119119

120120
setVCard () {
121+
if (!_converse.vcards) {
122+
// VCards aren't supported
123+
return;
124+
}
121125
if (this.get('type') === 'error') {
122126
return;
123127
} else if (this.get('type') === 'groupchat') {
@@ -135,11 +139,12 @@ converse.plugins.add('converse-chatboxes', {
135139
getDisplayName () {
136140
if (this.get('type') === 'groupchat') {
137141
return this.get('nick');
142+
} else if (this.contact) {
143+
return this.contact.getDisplayName();
144+
} else if (this.vcard) {
145+
return this.vcard.getDisplayName();
138146
} else {
139-
if (this.contact) {
140-
return this.contact.getDisplayName();
141-
}
142-
return this.vcard.get('nickname') || this.vcard.get('fullname') || this.get('from');
147+
return this.get('from');
143148
}
144149
},
145150

@@ -271,12 +276,15 @@ converse.plugins.add('converse-chatboxes', {
271276
// but we're in embedded mode.
272277
return;
273278
}
274-
275-
this.vcard = _converse.vcards.findWhere({'jid': jid}) || _converse.vcards.create({'jid': jid});
276279
// XXX: this creates a dependency on converse-roster, which we
277280
// probably shouldn't have here, so we should probably move
278281
// ChatBox out of converse-chatboxes
279282
this.presence = _converse.presences.findWhere({'jid': jid}) || _converse.presences.create({'jid': jid});
283+
284+
if (_converse.vcards) {
285+
this.vcard = _converse.vcards.findWhere({'jid': jid}) || _converse.vcards.create({'jid': jid});
286+
}
287+
280288
if (this.get('type') === _converse.PRIVATE_CHAT_TYPE) {
281289
this.setRosterContact(jid);
282290
}
@@ -317,8 +325,11 @@ converse.plugins.add('converse-chatboxes', {
317325
getDisplayName () {
318326
if (this.contact) {
319327
return this.contact.getDisplayName();
328+
} else if (this.vcard) {
329+
return this.vcard.getDisplayName();
330+
} else {
331+
return this.get('jid');
320332
}
321-
return this.vcard.get('nickname') || this.vcard.get('fullname') || this.get('jid');
322333
},
323334

324335
getUpdatedMessageAttributes (message, stanza) {

‎src/headless/converse-core.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,11 +1059,6 @@ _converse.initialize = async function (settings, callback) {
10591059
},
10601060

10611061
initialize () {
1062-
this.vcard = _converse.vcards.findWhere({'jid': this.get('jid')});
1063-
if (_.isNil(this.vcard)) {
1064-
this.vcard = _converse.vcards.create({'jid': this.get('jid')});
1065-
}
1066-
10671062
this.on('change:status', (item) => {
10681063
const status = this.get('status');
10691064
this.sendPresence(status);

‎src/headless/converse-roster.js

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,10 @@ converse.plugins.add('converse-roster', {
211211
},
212212

213213
setVCard () {
214+
if (!_converse.vcards) {
215+
// VCards aren't supported
216+
return;
217+
}
214218
const jid = this.get('jid');
215219
this.vcard = _converse.vcards.findWhere({'jid': jid}) || _converse.vcards.create({'jid': jid});
216220
},
@@ -258,11 +262,21 @@ converse.plugins.add('converse-roster', {
258262
},
259263

260264
getDisplayName () {
261-
return this.get('nickname') || this.vcard.get('nickname') || this.vcard.get('fullname') || this.get('jid');
265+
if (this.get('nickname')) {
266+
return this.get('nickname');
267+
} else if (this.vcard) {
268+
return this.vcard.getDisplayName();
269+
} else {
270+
return this.get('jid');
271+
}
262272
},
263273

264274
getFullname () {
265-
return this.vcard.get('fullname');
275+
if (this.vcard) {
276+
return this.vcard.get('fullname');
277+
} else {
278+
return this.get('jid');
279+
}
266280
},
267281

268282
/**

‎src/headless/converse-vcard.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ converse.plugins.add('converse-vcard', {
4343
} else {
4444
return Backbone.Model.prototype.set.apply(this, arguments);
4545
}
46+
},
47+
48+
getDisplayName () {
49+
return this.get('nickname') || this.get('fullname') || this.get('jid');
4650
}
4751
});
4852

@@ -124,6 +128,13 @@ converse.plugins.add('converse-vcard', {
124128
_converse.api.listen.on('sessionInitialized', _converse.initVCardCollection);
125129

126130

131+
_converse.api.listen.on('statusInitialized', () => {
132+
const vcards = _converse.vcards;
133+
const jid = _converse.xmppstatus.get('jid');
134+
_converse.xmppstatus.vcard = vcards.findWhere({'jid': jid}) || vcards.create({'jid': jid});
135+
});
136+
137+
127138
_converse.api.listen.on('addClientFeatures', () => {
128139
_converse.api.disco.own.features.add(Strophe.NS.VCARD);
129140
});

0 commit comments

Comments
 (0)