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

Fix #1262 Remove the quote-using-thread feature as we rely on the proper XEP now 

Update the dependencies
pull/1265/head
Timothée Jaussoin 3 years ago
parent
adffb76cb1
commit
fbb0827434
3 changed files with 33 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      app/Message.php
  2. 3
      app/widgets/Chat/Chat.php
  3. 64
      composer.lock

13
app/Message.php
View File

@ -434,19 +434,6 @@ class Message extends Model
(int)$stanza->fallback->body->attributes()->end
);
}
} else if ($this->thread) {
$parent = $this->user->messages()
->jid($this->jidfrom)
->where('thread', $this->thread)
->orderBy('published', 'asc')
->first();
if (
$parent && $parent->mid != $this->mid
&& $parent->originid != $this->originid
) {
$this->parentmid = $parent->mid;
}
}
if ($this->isMuc()) {

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

@ -860,8 +860,7 @@ class Chat extends \Movim\Widget\Base
if (
$message->isClassic()
&& (($message->isMuc() && $message->stanzaid)
|| (!$message->isMuc() && $message->messageid)
|| isset($message->thread))
|| (!$message->isMuc() && $message->messageid))
) {
$view = $this->tpl();
$view->assign('message', $message);

64
composer.lock
View File

@ -1125,16 +1125,16 @@
},
{
"name": "doctrine/inflector",
"version": "2.0.8",
"version": "2.0.9",
"source": {
"type": "git",
"url": "https://github.com/doctrine/inflector.git",
"reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff"
"reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/f9301a5b2fb1216b2b08f02ba04dc45423db6bff",
"reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/2930cd5ef353871c821d5c43ed030d39ac8cfe65",
"reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65",
"shasum": ""
},
"require": {
@ -1196,7 +1196,7 @@
],
"support": {
"issues": "https://github.com/doctrine/inflector/issues",
"source": "https://github.com/doctrine/inflector/tree/2.0.8"
"source": "https://github.com/doctrine/inflector/tree/2.0.9"
},
"funding": [
{
@ -1212,7 +1212,7 @@
"type": "tidelift"
}
],
"time": "2023-06-16T13:40:37+00:00"
"time": "2024-01-15T18:05:13+00:00"
},
{
"name": "embed/embed",
@ -1988,16 +1988,16 @@
},
{
"name": "illuminate/bus",
"version": "v10.40.0",
"version": "v10.41.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/bus.git",
"reference": "8db4b00a3f6071075e9f08094c6c7b059f8deddf"
"reference": "a183e52039cc4f54d712ea8639d99544fcd0d593"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/bus/zipball/8db4b00a3f6071075e9f08094c6c7b059f8deddf",
"reference": "8db4b00a3f6071075e9f08094c6c7b059f8deddf",
"url": "https://api.github.com/repos/illuminate/bus/zipball/a183e52039cc4f54d712ea8639d99544fcd0d593",
"reference": "a183e52039cc4f54d712ea8639d99544fcd0d593",
"shasum": ""
},
"require": {
@ -2037,11 +2037,11 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2023-12-15T14:09:57+00:00"
"time": "2024-01-11T20:33:23+00:00"
},
{
"name": "illuminate/collections",
"version": "v10.40.0",
"version": "v10.41.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/collections.git",
@ -2096,7 +2096,7 @@
},
{
"name": "illuminate/conditionable",
"version": "v10.40.0",
"version": "v10.41.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/conditionable.git",
@ -2142,7 +2142,7 @@
},
{
"name": "illuminate/container",
"version": "v10.40.0",
"version": "v10.41.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/container.git",
@ -2193,16 +2193,16 @@
},
{
"name": "illuminate/contracts",
"version": "v10.40.0",
"version": "v10.41.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/contracts.git",
"reference": "0b26d49d4bb0986da1ca30bcc701d5c22722576b"
"reference": "8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/contracts/zipball/0b26d49d4bb0986da1ca30bcc701d5c22722576b",
"reference": "0b26d49d4bb0986da1ca30bcc701d5c22722576b",
"url": "https://api.github.com/repos/illuminate/contracts/zipball/8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac",
"reference": "8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac",
"shasum": ""
},
"require": {
@ -2237,20 +2237,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2023-12-28T16:46:25+00:00"
"time": "2024-01-15T18:52:32+00:00"
},
{
"name": "illuminate/database",
"version": "v10.40.0",
"version": "v10.41.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/database.git",
"reference": "d41a5b7b1dc67bf640f16bf50c376b29ba575da5"
"reference": "f7a7d35dec5e7c6c4711cde31119f67d06846459"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/database/zipball/d41a5b7b1dc67bf640f16bf50c376b29ba575da5",
"reference": "d41a5b7b1dc67bf640f16bf50c376b29ba575da5",
"url": "https://api.github.com/repos/illuminate/database/zipball/f7a7d35dec5e7c6c4711cde31119f67d06846459",
"reference": "f7a7d35dec5e7c6c4711cde31119f67d06846459",
"shasum": ""
},
"require": {
@ -2310,11 +2310,11 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2024-01-07T15:44:56+00:00"
"time": "2024-01-16T14:41:20+00:00"
},
{
"name": "illuminate/events",
"version": "v10.40.0",
"version": "v10.41.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/events.git",
@ -2369,7 +2369,7 @@
},
{
"name": "illuminate/macroable",
"version": "v10.40.0",
"version": "v10.41.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/macroable.git",
@ -2415,7 +2415,7 @@
},
{
"name": "illuminate/pipeline",
"version": "v10.40.0",
"version": "v10.41.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/pipeline.git",
@ -2463,16 +2463,16 @@
},
{
"name": "illuminate/support",
"version": "v10.40.0",
"version": "v10.41.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/support.git",
"reference": "76a79337200b06b4b2a7fe93902aa770d6dcec03"
"reference": "1355b7d28ebb802e95bffcb27417862961382c52"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/support/zipball/76a79337200b06b4b2a7fe93902aa770d6dcec03",
"reference": "76a79337200b06b4b2a7fe93902aa770d6dcec03",
"url": "https://api.github.com/repos/illuminate/support/zipball/1355b7d28ebb802e95bffcb27417862961382c52",
"reference": "1355b7d28ebb802e95bffcb27417862961382c52",
"shasum": ""
},
"require": {
@ -2530,7 +2530,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2024-01-07T16:54:08+00:00"
"time": "2024-01-15T18:53:10+00:00"
},
{
"name": "league/commonmark",

Write Preview
Loading…
Cancel
Save