Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-07 15:04:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Changes:

Browse source 
- unified class import, we had these both:

````
use Friendica\Model\Item as ModelItem;
use Friendica\Object\Post as PostObject;
````

In first version the namespace was prefixing class name, in second suffixing it.
This commit is contained in:
Roland Häder 2022-09-12 23:27:54 +02:00
parent da66730e4f
commit 8f92d1cc8e
No known key found for this signature in database
GPG key ID: C82EDE5DDFA0BA77
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/Content/Conversation.php
View file

@ -36,7 +36,7 @@ use Friendica\Core\Session;
use Friendica\Core\Theme;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\Item;
use Friendica\Model\Item as ItemModel;
use Friendica\Model\Post;
use Friendica\Model\Tag;
use Friendica\Model\User;
@ -135,7 +135,7 @@ class Conversation
return;
}
if (!empty($activity['verb']) && $this->activity->match($activity['verb'], $verb) && ($activity['gravity'] != Item::GRAVITY_PARENT)) {
if (!empty($activity['verb']) && $this->activity->match($activity['verb'], $verb) && ($activity['gravity'] != ItemModel::GRAVITY_PARENT)) {
$author = [
'uid' => 0,
'id' => $activity['author-id'],
@ -755,7 +755,7 @@ class Conversation
$item['pagedrop'] = $page_dropping;
if ($item['gravity'] == Item::GRAVITY_PARENT) {
if ($item['gravity'] == ItemModel::GRAVITY_PARENT) {
$item_object = new PostObject($item);
$conv->addParent($item_object);
}
@ -825,7 +825,7 @@ class Conversation
}
if (!empty($activity)) {
if (($row['gravity'] == Item::GRAVITY_PARENT)) {
if (($row['gravity'] == ItemModel::GRAVITY_PARENT)) {
$row['post-reason'] = Item::PR_ANNOUNCEMENT;
$row = array_merge($row, $activity);
@ -834,7 +834,7 @@ class Conversation
$row['causer-link'] = $contact['url'];
$row['causer-avatar'] = $contact['thumb'];
$row['causer-name'] = $contact['name'];
} elseif (($row['gravity'] == Item::GRAVITY_ACTIVITY) && ($row['verb'] == Activity::ANNOUNCE) &&
} elseif (($row['gravity'] == ItemModel::GRAVITY_ACTIVITY) && ($row['verb'] == Activity::ANNOUNCE) &&
($row['author-id'] == $activity['causer-id'])) {
return $row;
}
@ -867,7 +867,7 @@ class Conversation
$row['owner-name'] = $row['causer-name'];
}
if (in_array($row['gravity'], [Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT]) && !empty($row['causer-id'])) {
if (in_array($row['gravity'], [ItemModel::GRAVITY_PARENT, ItemModel::GRAVITY_COMMENT]) && !empty($row['causer-id'])) {
$causer = ['uid' => 0, 'id' => $row['causer-id'], 'network' => $row['causer-network'], 'url' => $row['causer-link']];
$row['reshared'] = $this->l10n->t('%s reshared this.', '<a href="'. htmlentities(Contact::magicLinkByContact($causer)) .'">' . htmlentities($row['causer-name']) . '</a>');
@ -941,7 +941,7 @@ class Conversation
$activitycounter = [];
foreach ($parents as $parent) {
if (!empty($parent['thr-parent-id']) && !empty($parent['gravity']) && ($parent['gravity'] == Item::GRAVITY_ACTIVITY)) {
if (!empty($parent['thr-parent-id']) && !empty($parent['gravity']) && ($parent['gravity'] == ItemModel::GRAVITY_ACTIVITY)) {
$uriid = $parent['thr-parent-id'];
if (!empty($parent['author-id'])) {
$activities[$uriid] = ['causer-id' => $parent['author-id']];
@ -993,10 +993,10 @@ class Conversation
}
if ($max_comments > 0) {
if (($row['gravity'] == Item::GRAVITY_COMMENT) && (++$commentcounter[$row['parent-uri-id']] > $max_comments)) {
if (($row['gravity'] == ItemModel::GRAVITY_COMMENT) && (++$commentcounter[$row['parent-uri-id']] > $max_comments)) {
continue;
}
if (($row['gravity'] == Item::GRAVITY_ACTIVITY) && (++$activitycounter[$row['parent-uri-id']] > $max_comments)) {
if (($row['gravity'] == ItemModel::GRAVITY_ACTIVITY) && (++$activitycounter[$row['parent-uri-id']] > $max_comments)) {
continue;
}
}
@ -1025,7 +1025,7 @@ class Conversation
$this->profiler->startRecording('rendering');
$children = [];
foreach ($item_list as $i => $item) {
if ($item['gravity'] != Item::GRAVITY_PARENT) {
if ($item['gravity'] != ItemModel::GRAVITY_PARENT) {
if ($recursive) {
// Fallback to parent-uri if thr-parent is not set
$thr_parent = $item['thr-parent-id'];
@ -1182,7 +1182,7 @@ class Conversation
// Extract the top level items
foreach ($item_array as $item) {
if ($item['gravity'] == Item::GRAVITY_PARENT) {
if ($item['gravity'] == ItemModel::GRAVITY_PARENT) {
$parents[] = $item;
}
}