Merge pull request #5967 from annando/ap-nick

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index be3af101d9e18f66879c38883579ab1891724014..5d4a23caa7a28802a4c9f82210c07c5f640e9aa7 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -32,6 +32,7 @@ use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\Email;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Emailer;
+use Friendica\Util\Security;
 
 require_once 'include/enotify.php';
 require_once 'include/text.php';
@@ -39,11 +40,9 @@ require_once 'include/items.php';
 
 function item_post(App $a) {
        if (!local_user() && !remote_user()) {
-               return;
+               return 0;
        }
 
-       require_once 'include/security.php';
-
        $uid = local_user();
 
        if (!empty($_REQUEST['dropitems'])) {
@@ -152,17 +151,17 @@ function item_post(App $a) {
 
        // Check for multiple posts with the same message id (when the post was created via API)
        if (($message_id != '') && ($profile_uid != 0)) {
-               if (DBA::exists('item', ['uri' => $message_id, 'uid' => $profile_uid])) {
+               if (Item::exists(['uri' => $message_id, 'uid' => $profile_uid])) {
                        logger("Message with URI ".$message_id." already exists for user ".$profile_uid, LOGGER_DEBUG);
-                       return;
+                       return 0;
                }
        }
 
        // Allow commenting if it is an answer to a public post
-       $allow_comment = local_user() && ($profile_uid == 0) && $parent && in_array($parent_item['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
+       $allow_comment = local_user() && ($profile_uid == 0) && $parent && in_array($parent_item['network'], [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
 
        // Now check that valid personal details have been provided
-       if (!can_write_wall($profile_uid) && !$allow_comment) {
+       if (!Security::canWriteToUserWall($profile_uid) && !$allow_comment) {
                notice(L10n::t('Permission denied.') . EOL) ;
 
                if (!empty($_REQUEST['return'])) {
@@ -183,7 +182,7 @@ function item_post(App $a) {
        $user = DBA::selectFirst('user', [], ['uid' => $profile_uid]);
 
        if (!DBA::isResult($user) && !$parent) {
-               return;
+               return 0;
        }
 
        $categories = '';
@@ -240,7 +239,7 @@ function item_post(App $a) {
                $emailcc           =      notags(trim(defaults($_REQUEST, 'emailcc' , '')));
                $body              = escape_tags(trim(defaults($_REQUEST, 'body'    , '')));
                $network           =      notags(trim(defaults($_REQUEST, 'network' , Protocol::DFRN)));
-               $guid              =      System::createGUID(32);
+               $guid              =      System::createUUID();
 
                $postopts = defaults($_REQUEST, 'postopts', '');
 
@@ -343,20 +342,11 @@ function item_post(App $a) {
 
        $tags = get_tags($body);
 
-       // Add a tag if the parent contact is from OStatus (This will notify them during delivery)
-       if ($parent) {
-               if ($thr_parent_contact['network'] == Protocol::OSTATUS) {
-                       $contact = '@[url=' . $thr_parent_contact['url'] . ']' . $thr_parent_contact['nick'] . '[/url]';
-                       if (!stripos(implode($tags), '[url=' . $thr_parent_contact['url'] . ']')) {
-                               $tags[] = $contact;
-                       }
-               }
-
-               if ($parent_contact['network'] == Protocol::OSTATUS) {
-                       $contact = '@[url=' . $parent_contact['url'] . ']' . $parent_contact['nick'] . '[/url]';
-                       if (!stripos(implode($tags), '[url=' . $parent_contact['url'] . ']')) {
-                               $tags[] = $contact;
-                       }
+       // Add a tag if the parent contact is from ActivityPub or OStatus (This will notify them)
+       if ($parent && in_array($thr_parent_contact['network'], [Protocol::OSTATUS, Protocol::ACTIVITYPUB])) {
+               $contact = '@[url=' . $thr_parent_contact['url'] . ']' . $thr_parent_contact['nick'] . '[/url]';
+               if (!stripos(implode($tags), '[url=' . $thr_parent_contact['url'] . ']')) {
+                       $tags[] = $contact;
                }
        }
 
@@ -843,6 +833,10 @@ function item_post(App $a) {
 
        logger('post_complete');
 
+       if ($api_source) {
+               return $post_id;
+       }
+
        item_post_return(System::baseUrl(), $api_source, $return_path);
        // NOTREACHED
 }
@@ -876,18 +870,16 @@ function item_content(App $a)
                return;
        }
 
-       require_once 'include/security.php';
-
        $o = '';
 
        if (($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
-               if (is_ajax()) {
+               if ($a->isAjax()) {
                        $o = Item::deleteForUser(['id' => $a->argv[2]], local_user());
                } else {
                        $o = drop_item($a->argv[2]);
                }
 
-               if (is_ajax()) {
+               if ($a->isAjax()) {
                        // ajax return: [<item id>, 0 (no perm) | <owner id>]
                        echo json_encode([intval($a->argv[2]), intval($o)]);
                        killme();
@@ -1020,12 +1012,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
 
                        $profile = $contact["url"];
                        $alias   = $contact["alias"];
-                       $newname = $contact["nick"];
-
-                       if (($newname == "") || (($contact["network"] != Protocol::OSTATUS) && ($contact["network"] != Protocol::TWITTER)
-                               && ($contact["network"] != Protocol::STATUSNET))) {
-                               $newname = $contact["name"];
-                       }
+                       $newname = defaults($contact, "name", $contact["nick"]);
                }
 
                //if there is an url for this persons profile