moparisthebest/kaiwa
1
0
Fork 0
mirror of https://github.com/moparisthebest/kaiwa synced 2024-11-04 16:45:08 -05:00
Code Issues Releases Wiki Activity

Attempt at resolving hanging chat states

Browse Source
This commit is contained in:
Lance Stout 2013-09-19 09:27:52 -07:00
parent 3a288423bc
commit c667d79cb9
3 changed files with 72 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
clientapp/helpers/xmppEventHandlers.js
View File

@ -175,12 +175,16 @@ module.exports = function (client, app) {
if (contact) {
var resource = contact.resources.get(pres.from.full);
if (resource) {
if (resource.id === contact.lockedResource) {
contact.lockedResource = '';
}
if (contact.resources.length === 1) {
contact.offlineStatus = pres.status;
}
contact.resources.remove(resource);
}
if (contact.resources.length === 0) {
contact.offlineStatus = pres.status;
}
}
});
@ -206,9 +210,13 @@ module.exports = function (client, app) {
client.on('chatState', function (info) {
var contact = me.getContact(info.from);
if (contact) {
contact.chatState = info.chatState;
if (info.chatState === 'gone') {
contact.lockedResource = undefined;
var resource = contact.resources.get(info.from.full);
if (resource) {
resource.chatState = info.chatState;
console.log(info.chatState);
if (info.chatState === 'gone') {
contact.lockedResource = undefined;
}
}
} else if (me.isMe(info.from)) {
if (info.chatState === 'active' || info.chatState === 'composing') {

85
clientapp/models/contact.js
View File

@ -18,7 +18,10 @@ module.exports = HumanModel.define({
}
this.setAvatar(attrs.avatarID);
this.resources.bind('add remove reset change', this.onResourceChange, this);
this.resources.bind('add remove reset', this.onResourceListChange, this);
this.resources.bind('change', this.onResourceChange, this);
this.bind('change:topResource change:lockedResource change:_forceUpdate', this.summarizeResources, this);
},
type: 'contact',
props: {
@ -35,17 +38,13 @@ module.exports = HumanModel.define({
session: {
activeContact: ['bool', true, false],
avatar: 'string',
chatState: ['string', true, 'gone'],
idleSince: 'string',
lastInteraction: 'date',
lastSentMessage: 'object',
lockedResource: 'string',
offlineStatus: ['string', true, ''],
show: ['string', true, 'offline'],
status: ['string', true, ''],
timezoneOffset: 'number',
topResource: 'string',
unreadCount: ['number', true, 0]
unreadCount: ['number', true, 0],
_forceUpdate: ['number', true, 0]
},
derived: {
displayName: {
@ -70,6 +69,52 @@ module.exports = HumanModel.define({
}
}
},
status: {
deps: ['topResource', 'lockedResource', '_forceUpdate'],
fn: function () {
var resource = this.resources.get(this.lockedResource) || this.resources.get(this.topResource) || {};
return resource.status || '';
}
},
show: {
deps: ['topResource', 'lockedResource', '_forceUpdate'],
fn: function () {
if (this.resources.length === 0) {
return 'offline';
}
var resource = this.resources.get(this.lockedResource) || this.resources.get(this.topResource) || {};
return resource.show || 'online';
}
},
timezoneOffset: {
deps: ['topResource', 'lockedResource', '_forceUpdate'],
fn: function () {
var resource = this.resources.get(this.lockedResource) || this.resources.get(this.topResource) || {};
return resource.timezoneOffset || undefined;
}
},
idleSince: {
deps: ['topResource', 'lockedResource', '_forceUpdate'],
fn: function () {
var resource = this.resources.get(this.lockedResource) || this.resources.get(this.topResource) || {};
return resource.idleSince || undefined;
}
},
chatState: {
deps: ['topResource', 'lockedResource', '_forceUpdate'],
fn: function () {
var states = {};
this.resources.models.forEach(function (resource) {
states[resource.chatState] = true;
});
if (states.composing) return 'composing';
if (states.paused) return 'paused';
if (states.active) return 'active';
if (states.inactive) return 'inactive';
return 'gone';
}
},
hasUnread: {
deps: ['unreadCount'],
fn: function () {
@ -121,16 +166,12 @@ module.exports = HumanModel.define({
}
});
},
onLockedResourceChange: function () {
var res = this.resources.get(this.lockedResource);
if (res) {
this.status = res.status;
this.show = res.show || 'online';
this.timezoneOffset = res.timezoneOffset;
this.idleSince = res.idleSince;
}
},
onResourceChange: function () {
this.resources.sort();
this.topResource = (this.resources.first() || {}).id;
this._forceUpdate++;
},
onResourceListChange: function () {
// Manually propagate change events for properties that
// depend on the resources collection.
this.resources.sort();
@ -139,20 +180,8 @@ module.exports = HumanModel.define({
if (res) {
this.offlineStatus = '';
this.topResource = res.id;
if (!this.lockedResource) {
this.status = res.status;
this.show = res.show || 'online';
this.timezoneOffset = res.timezoneOffset;
this.idleSince = res.idleSince;
}
this.chatState = 'active';
} else {
this.topResource = undefined;
this.chatState = 'gone';
this.status = this.offlineStatus;
this.show = 'offline';
this.timezoneOffset = undefined;
this.idleSince = undefined;
}
this.lockedResource = undefined;

1
clientapp/models/resource.js
View File

@ -12,6 +12,7 @@ module.exports = HumanModel.define({
status: ['string', true, ''],
show: ['string', true, ''],
priority: ['number', true, 0],
chatState: ['string', true, 'gone'],
idleSince: 'date',
discoInfo: 'object',
timezoneOffset: 'number'