Merge pull request #8077 from annando/notifications

[friendica.git] / src / Model / Item.php

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 3f3de8f8f1f405e11a497508c3da3b3232dd567e..0fc1280c2b7f4577cb771b62e5f219fda2457bf2 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -656,7 +656,7 @@ class Item
                        'iaid' => 'internal-iaid'];
 
                if ($usermode) {
-                       $fields['user-item'] = ['pinned', 'ignored' => 'internal-user-ignored'];
+                       $fields['user-item'] = ['pinned', 'notification-type', 'ignored' => 'internal-user-ignored'];
                }
 
                $fields['item-activity'] = ['activity', 'activity' => 'internal-activity'];
@@ -1279,7 +1279,7 @@ class Item
                if ($notify) {
                        // We have to avoid duplicates. So we create the GUID in form of a hash of the plink or uri.
                        // We add the hash of our own host because our host is the original creator of the post.
-                       $prefix_host = \get_app()->getHostName();
+                       $prefix_host = DI::baseUrl()->getHostname();
                } else {
                        $prefix_host = '';
 
@@ -1564,7 +1564,7 @@ class Item
                        $item['edited'] = DateTimeFormat::utcNow();
                }
 
-               $item['plink'] = ($item['plink'] ?? '') ?: System::baseUrl() . '/display/' . urlencode($item['guid']);
+               $item['plink'] = ($item['plink'] ?? '') ?: DI::baseUrl() . '/display/' . urlencode($item['guid']);
 
                $default = ['url' => $item['author-link'], 'name' => $item['author-name'],
                        'photo' => $item['author-avatar'], 'network' => $item['network']];
@@ -2026,6 +2026,8 @@ class Item
 
                self::updateContact($item);
 
+               UserItem::setNotification($current_post);
+
                check_user_notification($current_post);
 
                if ($notify || ($item['visible'] && ((!empty($parent) && $parent['origin']) || $item['origin']))) {
@@ -2058,7 +2060,7 @@ class Item
                }
 
                // To avoid timing problems, we are using locks.
-               $locked = Lock::acquire('item_insert_activity');
+               $locked = DI::lock()->acquire('item_insert_activity');
                if (!$locked) {
                        Logger::log("Couldn't acquire lock for URI " . $item['uri'] . " - proceeding anyway.");
                }
@@ -2074,11 +2076,11 @@ class Item
                } else {
                        // This shouldn't happen.
                        Logger::log('Could not insert activity for URI ' . $item['uri'] . ' - should not happen');
-                       Lock::release('item_insert_activity');
+                       DI::lock()->release('item_insert_activity');
                        return false;
                }
                if ($locked) {
-                       Lock::release('item_insert_activity');
+                       DI::lock()->release('item_insert_activity');
                }
                return true;
        }
@@ -2101,7 +2103,7 @@ class Item
                }
 
                // To avoid timing problems, we are using locks.
-               $locked = Lock::acquire('item_insert_content');
+               $locked = DI::lock()->acquire('item_insert_content');
                if (!$locked) {
                        Logger::log("Couldn't acquire lock for URI " . $item['uri'] . " - proceeding anyway.");
                }
@@ -2119,7 +2121,7 @@ class Item
                        Logger::log('Could not insert content for URI ' . $item['uri'] . ' - should not happen');
                }
                if ($locked) {
-                       Lock::release('item_insert_content');
+                       DI::lock()->release('item_insert_content');
                }
        }
 
@@ -2511,7 +2513,7 @@ class Item
                        $guid = System::createUUID();
                }
 
-               return DI::app()->getBaseURL() . '/objects/' . $guid;
+               return DI::baseUrl()->get() . '/objects/' . $guid;
        }
 
        /**
@@ -2592,10 +2594,10 @@ class Item
                // All hashtags should point to the home server if "local_tags" is activated
                if (Config::get('system', 'local_tags')) {
                        $item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
-                                       "#[url=".System::baseUrl()."/search?tag=$2]$2[/url]", $item["body"]);
+                                       "#[url=".DI::baseUrl()."/search?tag=$2]$2[/url]", $item["body"]);
 
                        $item["tag"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
-                                       "#[url=".System::baseUrl()."/search?tag=$2]$2[/url]", $item["tag"]);
+                                       "#[url=".DI::baseUrl()."/search?tag=$2]$2[/url]", $item["tag"]);
                }
 
                // mask hashtags inside of url, bookmarks and attachments to avoid urls in urls
@@ -2624,7 +2626,7 @@ class Item
                        }
 
                        $basetag = str_replace('_',' ',substr($tag,1));
-                       $newtag = '#[url=' . System::baseUrl() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]';
+                       $newtag = '#[url=' . DI::baseUrl() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]';
 
                        $item["body"] = str_replace($tag, $newtag, $item["body"]);
 
@@ -2676,13 +2678,13 @@ class Item
                        return false;
                }
 
-               $link = Strings::normaliseLink(System::baseUrl() . '/profile/' . $user['nickname']);
+               $link = Strings::normaliseLink(DI::baseUrl() . '/profile/' . $user['nickname']);
 
                /*
                 * Diaspora uses their own hardwired link URL in @-tags
                 * instead of the one we supply with webfinger
                 */
-               $dlink = Strings::normaliseLink(System::baseUrl() . '/u/' . $user['nickname']);
+               $dlink = Strings::normaliseLink(DI::baseUrl() . '/u/' . $user['nickname']);
 
                $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER);
                if ($cnt) {
@@ -2752,8 +2754,6 @@ class Item
 
        public static function isRemoteSelf($contact, &$datarray)
        {
-               $a = \get_app();
-
                if (!$contact['remote_self']) {
                        return false;
                }
@@ -2765,7 +2765,7 @@ class Item
                }
 
                // Prevent to forward already forwarded posts
-               if ($datarray["app"] == $a->getHostName()) {
+               if ($datarray["app"] == DI::baseUrl()->getHostname()) {
                        Logger::log('Already forwarded (second test)', Logger::DEBUG);
                        return false;
                }
@@ -2854,7 +2854,7 @@ class Item
                }
 
                Logger::log('check for photos', Logger::DEBUG);
-               $site = substr(System::baseUrl(), strpos(System::baseUrl(), '://'));
+               $site = substr(DI::baseUrl(), strpos(DI::baseUrl(), '://'));
 
                $orig_body = $s;
                $new_body = '';
@@ -3578,7 +3578,7 @@ class Item
                        if (strpos($mime, 'video') !== false) {
                                if (!$vhead) {
                                        $vhead = true;
-                                       $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('videos_head.tpl'));
+                                       DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('videos_head.tpl'));
                                }
 
                                $url_parts = explode('/', $the_url);