Browse Source

- Comment the logs in the linker

- Catch and display the "gone" event in the chat
- Show when the message has been published (and not delivered)
pull/16/head
Jaussoin Timothée 11 years ago
parent
commit
5132a0c41a
  1. 6
      app/widgets/Chat/Chat.php
  2. 2
      app/widgets/Chat/_chat_message.tpl
  3. 1
      app/widgets/Chat/locales.ini
  4. 6
      linker.php

6
app/widgets/Chat/Chat.php

@ -14,6 +14,7 @@ class Chat extends WidgetCommon
$this->registerEvent('message', 'onMessage');
$this->registerEvent('composing', 'onComposing');
$this->registerEvent('paused', 'onPaused');
$this->registerEvent('gone', 'onGone');
}
function onMessage($packet)
@ -62,6 +63,11 @@ class Chat extends WidgetCommon
$this->setState($array, $this->__('message.paused'));
}
function onGone($array)
{
$this->setState($array, $this->__('message.gone'));
}
private function setState($array, $message)
{
list($from, $to) = $array;

2
app/widgets/Chat/_chat_message.tpl

@ -34,7 +34,7 @@
{else}
<div>{if="isset($message->html)"}{$message->html|prepareString}{else}{$message->body|htmlentities:ENT_COMPAT,'UTF-8'|prepareString}{/if}</div>
{/if}
<span class="info">{$message->delivered|strtotime|prepareDate}</span>
<span class="info">{$message->published|strtotime|prepareDate}</span>
{if="$message->type == 'groupchat'"}
<span class="info">{$message->resource} - </span>
{/if}

1
app/widgets/Chat/locales.ini

@ -3,6 +3,7 @@ message.published = 'Message Published'
message.encrypted = 'Encrypted message'
message.composing = 'Composing...'
message.paused = 'Paused...'
message.gone = 'Contact gone'
[chat]
chat.attention = '%s needs your attention'

6
linker.php

@ -45,7 +45,7 @@ $connector($config->websocketurl, array('xmpp'))->then(function($conn) use (&$st
$conn->on('message', function($message) use ($conn, $loop) {
if($message != '') {
fwrite(STDERR, colorize($message, 'yellow')." : ".colorize('received', 'green')."\n");
#fwrite(STDERR, colorize($message, 'yellow')." : ".colorize('received', 'green')."\n");
if($message == '</stream:stream>') {
$conn->close();
@ -76,7 +76,7 @@ $connector($config->websocketurl, array('xmpp'))->then(function($conn) use (&$st
}
if(!empty($xml)) {
fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
#fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
$conn->send(trim($xml));
}
}
@ -118,7 +118,7 @@ $connector($config->websocketurl, array('xmpp'))->then(function($conn) use (&$st
\Moxl\API::clear();
if(!empty($xml)) {
fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
#fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
$conn->send(trim($xml));
}

Loading…
Cancel
Save