moparisthebest/kaiwa
1
0
Fork 0
mirror of https://github.com/moparisthebest/kaiwa synced 2025-01-11 05:38:01 -05:00
Code Issues Releases Wiki Activity

Streamline resource specific properties

Browse Source
This commit is contained in:
Lance Stout 2013-09-13 00:08:48 -07:00
parent 1a95d60a3b
commit 2f544b82b3
2 changed files with 75 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
clientapp/helpers/xmppEventHandlers.js
View File

@ -227,22 +227,7 @@ module.exports = function (client, app) {
});
}
if (!contact.activeContact && msg.from.bare === contact.jid) {
contact.unreadCount++;
app.notifier.show({
title: contact.displayName,
description: msg.body,
icon: contact.avatar,
onclick: _.bind(app.navigate, app, '/chat/' + contact.jid)
});
}
contact.messages.add(message);
var newInteraction = new Date(message.created);
if (!contact.lastInteraction || contact.lastInteraction < newInteraction) {
contact.lastInteraction = newInteraction;
}
contact.addMessage(message, true);
if (!contact.lockedResource) {
contact.lockedResource = msg.from.full;

106
clientapp/models/contact.js
View File

@ -35,25 +35,70 @@ module.exports = HumanModel.define({
groups: ['array', true, []],
avatarID: ['string', true, '']
},
session: {
topResource: 'string',
lockedResource: 'string',
offlineStatus: ['string', true, ''],
avatar: 'string',
chatState: ['string', true, 'gone'],
lastSentMessage: 'object',
activeContact: ['bool', true, false],
unreadCount: ['number', true, 0],
lastInteraction: 'date'
},
derived: {
displayName: {
deps: ['name', 'jid'],
fn: function () {
if (this.name) {
return this.name;
}
return this.jid;
return this.name || this.jid;
}
},
status: {
deps: ['topResourceStatus', 'offlineStatus'],
deps: ['topResource', 'lockedResource', 'offlineStatus'],
fn: function () {
if (this.topResourceStatus) {
return this.topResourceStatus;
if (this.lockedResource) {
return this.resources.get(this.lockedResource).status;
}
if (this.topResource) {
return this.resources.get(this.topResource).status;
}
return this.offlineStatus;
}
},
show: {
deps: ['topResource', 'lockedResource'],
fn: function () {
if (this.lockedResource) {
return this.resources.get(this.lockedResource).show || 'online';
}
if (this.topResource) {
return this.resources.get(this.topResource).show || 'online';
}
return 'offline';
}
},
idleSince: {
deps: ['topResource', 'lockedResource'],
fn: function () {
if (this.lockedResource) {
return this.resources.get(this.lockedResource).idleSince;
}
if (this.topResource) {
return this.resources.get(this.topResource).idleSince;
}
}
},
timezoneOffset: {
deps: ['topResource', 'lockedResource'],
fn: function () {
if (this.lockedResource) {
return this.resources.get(this.lockedResource).timezoneOffset;
}
if (this.topResource) {
return this.resources.get(this.topResource).timezoneOffset;
}
}
},
formattedTZO: {
deps: ['timezoneOffset', 'displayName'],
fn: function () {
@ -77,20 +122,6 @@ module.exports = HumanModel.define({
}
}
},
session: {
topResourceStatus: ['string', true, ''],
offlineStatus: ['string', true, ''],
idleSince: 'date',
avatar: 'string',
show: ['string', true, 'offline'],
chatState: ['string', true, 'gone'],
lockedResource: 'string',
lastSentMessage: 'object',
timezoneOffset: ['number', false, 0],
activeContact: ['bool', true, false],
unreadCount: ['number', true, 0],
lastInteraction: 'date'
},
collections: {
resources: Resources,
messages: Messages
@ -143,14 +174,30 @@ module.exports = HumanModel.define({
var res = this.resources.first();
if (res) {
this.offlineStatus = '';
this.topResourceStatus = res.status;
this.show = res.show || 'online';
this.lockedResource = undefined;
this.topResource = res.id;
} else {
this.topResourceStatus = '';
this.show = 'offline';
this.chatState = 'gone';
}
this.lockedResource = undefined;
},
addMessage: function (message, notify) {
if (notify && !this.activeContact && message.from.bare === this.jid) {
this.unreadCount++;
app.notifier.show({
title: this.displayName,
description: message.body,
icon: this.avatar,
onclick: _.bind(app.navigate, app, '/chat/' + this.jid)
});
}
this.messages.add(message);
var newInteraction = new Date(message.created);
if (!this.lastInteraction || this.lastInteraction < newInteraction) {
this.lastInteraction = newInteraction;
}
},
fetchHistory: function () {
var self = this;
@ -198,12 +245,7 @@ module.exports = HumanModel.define({
var message = new Message(msg);
message.archivedId = result.mam.id;
var newInteraction = new Date(message.created);
if (!self.lastInteraction || newInteraction > self.lastInteraction) {
self.lastInteraction = newInteraction;
}
self.messages.add(message);
self.addMessage(message, false);
});
});
});