Mirrors
/
movim
mirror of https://github.com/movim/movim
3
0
Fork 0
Code Releases Activity
Browse Source

Fix #264

pull/277/head
Timothée Jaussoin 9 years ago
parent
2f35a2c831
commit
bfeaf4b36a
5 changed files with 64 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      app/models/message/Message.php
  2. 29
      app/models/message/MessageDAO.php
  3. 49
      app/widgets/Chat/Chat.php
  4. 7
      app/widgets/Chat/chat.css
  5. 4
      app/widgets/Chat/chat.js

16
app/models/message/Message.php
View File

@ -30,6 +30,7 @@ class Message extends Model {
public $picture; // A valid (small) picture URL public $picture; // A valid (small) picture URL
public $sticker; // The sticker code public $sticker; // The sticker code
public $quoted; // If the user was quoted in the message
public function __construct() public function __construct()
{ {
@ -64,7 +65,9 @@ class Message extends Model {
"picture" : "picture" :
{"type":"text" }, {"type":"text" },
"sticker" : "sticker" :
{"type":"string", "size":128 }
{"type":"string", "size":128 },
"quoted" :
{"type":"int", "size":1}
}'; }';
parent::__construct(); parent::__construct();
@ -92,7 +95,7 @@ class Message extends Model {
$this->type = 'chat'; $this->type = 'chat';
if($stanza->attributes()->type) { if($stanza->attributes()->type) {
$this->type = (string)$stanza->attributes()->type;
$this->type = (string)$stanza->attributes()->type;
} }
if($stanza->body) if($stanza->body)
@ -101,6 +104,15 @@ class Message extends Model {
if($stanza->subject) if($stanza->subject)
$this->__set('subject', (string)$stanza->subject); $this->__set('subject', (string)$stanza->subject);
if($this->type == 'groupchat') {
$pd = new \Modl\PresenceDAO;
$p = $pd->getMyPresenceRoom($this->jidfrom);
if(strpos($this->body, $p->resource) !== false) {
$this->quoted = true;
}
}
if($stanza->html) { if($stanza->html) {
$xml = \simplexml_load_string((string)$stanza->html->body); $xml = \simplexml_load_string((string)$stanza->html->body);
if($xml) { if($xml) {

29
app/models/message/MessageDAO.php
View File

@ -12,7 +12,8 @@ class MessageDAO extends SQL {
published = :published, published = :published,
delivered = :delivered, delivered = :delivered,
edited = :edited, edited = :edited,
picture = :picture
picture = :picture,
quoted = :quoted
where session = :session where session = :session
and id = :id and id = :id
@ -21,19 +22,20 @@ class MessageDAO extends SQL {
$this->prepare( $this->prepare(
'Message', 'Message',
array(
[
'thread' => $message->newid, // FIXME 'thread' => $message->newid, // FIXME
'id' => $message->id, 'id' => $message->id,
'session' => $message->session, 'session' => $message->session,
'jidto' => $message->jidto, 'jidto' => $message->jidto,
'edited' => $message->edited, 'edited' => $message->edited,
'picture' => $message->picture, 'picture' => $message->picture,
'quoted' => $message->quoted,
'jidfrom' => $message->jidfrom, 'jidfrom' => $message->jidfrom,
'body' => $message->body, 'body' => $message->body,
'html' => $message->html, 'html' => $message->html,
'published' => $message->published, 'published' => $message->published,
'delivered' => $message->delivered 'delivered' => $message->delivered
)
]
); );
$this->run('Message'); $this->run('Message');
@ -55,7 +57,8 @@ class MessageDAO extends SQL {
published, published,
delivered, delivered,
sticker, sticker,
picture)
picture,
quoted)
values( values(
:id, :id,
:session, :session,
@ -70,12 +73,13 @@ class MessageDAO extends SQL {
:published, :published,
:delivered, :delivered,
:sticker, :sticker,
:picture
:picture,
:quoted
)'; )';
$this->prepare( $this->prepare(
'Message', 'Message',
array(
[
'id' => $message->id, 'id' => $message->id,
'session' => $message->session, 'session' => $message->session,
'jidto' => $message->jidto, 'jidto' => $message->jidto,
@ -89,8 +93,9 @@ class MessageDAO extends SQL {
'published' => $message->published, 'published' => $message->published,
'delivered' => $message->delivered, 'delivered' => $message->delivered,
'sticker' => $message->sticker, 'sticker' => $message->sticker,
'picture' => $message->picture
)
'picture' => $message->picture,
'quoted' => $message->quoted
]
); );
} }
@ -107,10 +112,10 @@ class MessageDAO extends SQL {
$this->prepare( $this->prepare(
'Message', 'Message',
array(
[
'session' => $this->_user, 'session' => $this->_user,
'id' => $id 'id' => $id
)
]
); );
return $this->run('Message', 'item'); return $this->run('Message', 'item');
@ -128,11 +133,11 @@ class MessageDAO extends SQL {
$this->prepare( $this->prepare(
'Message', 'Message',
array(
[
'session' => $this->_user, 'session' => $this->_user,
'jidto' => $to, 'jidto' => $to,
'jidfrom' => $this->_user 'jidfrom' => $this->_user
)
]
); );
return $this->run('Message', 'item'); return $this->run('Message', 'item');

49
app/widgets/Chat/Chat.php
View File

@ -91,22 +91,17 @@ class Chat extends \Movim\Widget\Base
4, 4,
$this->route('chat', $contact->jid) $this->route('chat', $contact->jid)
); );
} elseif($message->type == 'groupchat') {
$pd = new \Modl\PresenceDAO;
$p = $pd->getMyPresenceRoom($from);
// If we are quoted in a chatroom
if(strpos($message->body, $p->resource) !== false) {
$cd = new \Modl\ConferenceDAO;
$c = $cd->get($from);
Notification::append(
'chat|'.$from,
($c != null && $c->name) ? $c->name : $from,
$message->body,
false,
4);
}
} elseif ($message->type == 'groupchat'
&& $message->quoted) {
$cd = new \Modl\ConferenceDAO;
$c = $cd->get($from);
Notification::append(
'chat|'.$from,
($c != null && $c->name) ? $c->name : $from,
$message->resource.': '.$message->body,
false,
4);
} }
RPC::call('MovimTpl.fill', '#' . cleanupId($from.'_state'), $contact->jid); RPC::call('MovimTpl.fill', '#' . cleanupId($from.'_state'), $contact->jid);
@ -539,11 +534,6 @@ class Chat extends \Movim\Widget\Base
if(is_array($messages)) { if(is_array($messages)) {
$messages = array_reverse($messages); $messages = array_reverse($messages);
/*foreach($messages as $message) {
$this->_msgMap[$message->published.$message->jid] = $message;
}
foreach($this->_msgMap as $message) {*/
foreach($messages as $message) { foreach($messages as $message) {
$this->prepareMessage($message); $this->prepareMessage($message);
} }
@ -576,7 +566,7 @@ class Chat extends \Movim\Widget\Base
RPC::call('Chat.clearReplace'); RPC::call('Chat.clearReplace');
} }
function prepareMessage(&$message, $jid=null)
function prepareMessage(&$message, $jid = null)
{ {
if($jid != $message->jidto && $jid != $message->jidfrom && $jid != null) if($jid != $message->jidto && $jid != $message->jidfrom && $jid != null)
return $this->_wrapper; return $this->_wrapper;
@ -587,10 +577,8 @@ class Chat extends \Movim\Widget\Base
if (isset($message->html)) { if (isset($message->html)) {
$message->body = $message->html; $message->body = $message->html;
} else { } else {
// We add some smileys...
$message->convertEmojis(); $message->convertEmojis();
$message->addUrls(); $message->addUrls();
// $message->body = prepareString(htmlentities($message->body , ENT_COMPAT,'UTF-8'));
} }
if (isset($message->sticker)) { if (isset($message->sticker)) {
@ -620,7 +608,6 @@ class Chat extends \Movim\Widget\Base
]; ];
} }
$message->publishedPrepared = prepareDate(strtotime($message->published), true); $message->publishedPrepared = prepareDate(strtotime($message->published), true);
if ($message->delivered) { if ($message->delivered) {
@ -639,29 +626,37 @@ class Chat extends \Movim\Widget\Base
else else
array_push($this->_wrapper[$date], $message); array_push($this->_wrapper[$date], $message);
} }
$pd = new \Modl\PresenceDAO;
$p = $pd->getMyPresenceRoom($message->from);
} else { } else {
$msgkey = $message->jidfrom . '>' . substr($message->published, 11, 5); $msgkey = $message->jidfrom . '>' . substr($message->published, 11, 5);
//fillup $wrapper //fillup $wrapper
if (!array_key_exists($date, $this->_wrapper)) { if (!array_key_exists($date, $this->_wrapper)) {
$sticker = ""; $sticker = "";
if (isset($message->sticker)) { if (isset($message->sticker)) {
$sticker = "sticker"; $sticker = "sticker";
} }
$this->_wrapper[$date] = ['0' . $sticker . '<' . $msgkey => [$message]]; $this->_wrapper[$date] = ['0' . $sticker . '<' . $msgkey => [$message]];
} else { //date contains at least one speaker@time=>msg already } else { //date contains at least one speaker@time=>msg already
end($this->_wrapper[$date]); end($this->_wrapper[$date]);
$lastkey = key($this->_wrapper[$date]); $lastkey = key($this->_wrapper[$date]);
if (substr($lastkey, strpos($lastkey, '<') + 1) == $msgkey // same jidfrom, same min if (substr($lastkey, strpos($lastkey, '<') + 1) == $msgkey // same jidfrom, same min
&& !isset($message->sticker) // this msg is not a sticker && !isset($message->sticker) // this msg is not a sticker
&& strpos($lastkey, "sticker<") === false && strpos($lastkey, "sticker<") === false
) { // the previous msg was not a sticker ) { // the previous msg was not a sticker
array_push($this->_wrapper[$date][$lastkey], $message); array_push($this->_wrapper[$date][$lastkey], $message);
}
else {
} else {
$sticker = ""; $sticker = "";
if (isset($message->sticker)) { if (isset($message->sticker)) {
$sticker = "sticker"; $sticker = "sticker";
} }
$this->_wrapper[$date][count($this->_wrapper[$date]) . $sticker . '<' . $msgkey] = [$message]; $this->_wrapper[$date][count($this->_wrapper[$date]) . $sticker . '<' . $msgkey] = [$message];
} }
} }

7
app/widgets/Chat/chat.css
View File

@ -119,6 +119,13 @@
cursor: pointer; cursor: pointer;
} }
#chat_widget li.room p.quoted {
background-color: rgba(255, 255, 51, 0.3);
padding: 0 0.5rem;
margin: 0 1rem;
border-radius: 0.5rem;
}
#chat_widget ul:after { #chat_widget ul:after {
content: " "; content: " ";
display: block; display: block;

4
app/widgets/Chat/chat.js
View File

@ -102,6 +102,10 @@ var Chat = {
bubble.querySelector('p.message').innerHTML = messages[i].body.replace(/\r\n?|\n/g, '<br />'); bubble.querySelector('p.message').innerHTML = messages[i].body.replace(/\r\n?|\n/g, '<br />');
} }
if (messages[i].quoted) {
bubble.querySelector('p.message').classList.add('quoted');
}
bubble.querySelector('span.info').innerHTML = messages[i].publishedPrepared; bubble.querySelector('span.info').innerHTML = messages[i].publishedPrepared;
bubble.querySelector('p.user').className = 'user ' + messages[i].color; bubble.querySelector('p.user').className = 'user ' + messages[i].color;

Write Preview
Loading…
Cancel
Save