AP Improvements for forums

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index 08a565e069a6001fce6df5b5d75f3fee1b27ef1f..3474bea90c88a0ab51d7999f638743b4426b89cb 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -30,6 +30,7 @@
 
 use Friendica\App;
 use Friendica\Content\Item as ItemHelper;
+use Friendica\Content\PageInfo;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
@@ -57,8 +58,6 @@ use Friendica\Util\Security;
 use Friendica\Util\Strings;
 use Friendica\Worker\Delivery;
 
-require_once __DIR__ . '/../include/items.php';
-
 function item_post(App $a) {
        if (!Session::isAuthenticated()) {
                throw new HTTPException\ForbiddenException();
@@ -137,6 +136,16 @@ function item_post(App $a) {
                        throw new HTTPException\NotFoundException(DI::l10n()->t('Unable to locate original post.'));
                }
 
+               // When commenting on a public post then store the post for the current user
+               // This enables interaction like starring and saving into folders
+               if ($toplevel_item['uid'] == 0) {
+                       $stored = Item::storeForUserByUriId($toplevel_item['uri-id'], local_user());
+                       Logger::info('Public item stored for user', ['uri-id' => $toplevel_item['uri-id'], 'uid' => $uid, 'stored' => $stored]);
+                       if ($stored) {
+                               $toplevel_item = Item::selectFirst([], ['id' => $stored]);
+                       }
+               }
+
                $toplevel_item_id = $toplevel_item['id'];
                $parent_user = $toplevel_item['uid'];
 
@@ -233,7 +242,7 @@ function item_post(App $a) {
                        ];
                }
 
-               $att_bbcode = add_page_info_data($attachment);
+               $att_bbcode = "\n" . PageInfo::getFooterFromData($attachment);
                $body .= $att_bbcode;
        }
 
@@ -324,7 +333,7 @@ function item_post(App $a) {
                                System::jsonExit(['preview' => '']);
                        }
 
-                       info(DI::l10n()->t('Empty post discarded.'));
+                       notice(DI::l10n()->t('Empty post discarded.'));
                        if ($return_path) {
                                DI::baseUrl()->redirect($return_path);
                        }
@@ -367,9 +376,9 @@ function item_post(App $a) {
 
        // get contact info for owner
        if ($profile_uid == local_user() || $allow_comment) {
-               $contact_record = $author;
+               $contact_record = $author ?: [];
        } else {
-               $contact_record = DBA::selectFirst('contact', [], ['uid' => $profile_uid, 'self' => true]);
+               $contact_record = DBA::selectFirst('contact', [], ['uid' => $profile_uid, 'self' => true]) ?: [];
        }
 
        // Look for any tags and linkify them
@@ -564,9 +573,9 @@ function item_post(App $a) {
        $datarray['gravity']       = $gravity;
        $datarray['network']       = $network;
        $datarray['contact-id']    = $contact_id;
-       $datarray['owner-name']    = $contact_record['name'];
-       $datarray['owner-link']    = $contact_record['url'];
-       $datarray['owner-avatar']  = $contact_record['thumb'];
+       $datarray['owner-name']    = $contact_record['name'] ?? '';
+       $datarray['owner-link']    = $contact_record['url'] ?? '';
+       $datarray['owner-avatar']  = $contact_record['thumb'] ?? '';
        $datarray['owner-id']      = Contact::getIdForURL($datarray['owner-link']);
        $datarray['author-name']   = $author['name'];
        $datarray['author-link']   = $author['url'];
@@ -694,7 +703,6 @@ function item_post(App $a) {
                // update filetags in pconfig
                FileTag::updatePconfig($uid, $categories_old, $categories_new, 'category');
 
-               info(DI::l10n()->t('Post updated.'));
                if ($return_path) {
                        DI::baseUrl()->redirect($return_path);
                }
@@ -716,7 +724,7 @@ function item_post(App $a) {
        $post_id = Item::insert($datarray);
 
        if (!$post_id) {
-               info(DI::l10n()->t('Item wasn\'t stored.'));
+               notice(DI::l10n()->t('Item wasn\'t stored.'));
                if ($return_path) {
                        DI::baseUrl()->redirect($return_path);
                }
@@ -817,7 +825,6 @@ function item_post(App $a) {
                return $post_id;
        }
 
-       info(DI::l10n()->t('Post published.'));
        item_post_return(DI::baseUrl(), $api_source, $return_path);
        // NOTREACHED
 }
@@ -881,7 +888,7 @@ function drop_item(int $id, string $return = '')
        $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $id]);
 
        if (!DBA::isResult($item)) {
-               notice(DI::l10n()->t('Item not found.') . EOL);
+               notice(DI::l10n()->t('Item not found.'));
                DI::baseUrl()->redirect('network');
        }