yet more diaspora images to scale

[friendica.git] / include / items.php

diff --git a/include/items.php b/include/items.php
index 82d351b28d2e902003252e619d0d9ab0d907c0e7..1b4b52491106e934f018b6657b23753ac0ce17e3 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -1263,7 +1263,8 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                                        $when = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
                        }
                        if($deleted && is_array($contact)) {
-                               $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `contact-id` = %d LIMIT 1",
+                               $r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join `contact` on `item`.`contact-id` = `contact`.id` 
+                                       WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d LIMIT 1",
                                        dbesc($uri),
                                        intval($importer['uid']),
                                        intval($contact['id'])
@@ -1274,6 +1275,41 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                                        if(! $item['deleted'])
                                                logger('consume_feed: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG);
 
+                                       if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTVITY_OBJ_TAGTERM)) {
+                                               $xo = parse_xml_string($item['object'],false);
+                                               $xt = parse_xml_string($item['target'],false);
+                                               if($xt->type === ACTIVITY_OBJ_NOTE) {
+                                                       $i = q("select * from `item` where uri = '%s' and uid = %d limit 1",
+                                                               dbesc($xt->id),
+                                                               intval($importer['importer_uid'])
+                                                       );
+                                                       if(count($i)) {
+
+                                                               // For tags, the owner cannot remove the tag on the author's copy of the post.
+
+                                                               $owner_remove = (($item['contact-id'] == $i[0]['contact-id']) ? true: false);
+                                                               $author_remove = (($item['origin'] && $item['self']) ? true : false);
+                                                               $author_copy = (($item['origin']) ? true : false);
+
+                                                               if($owner_remove && $author_copy)
+                                                                       continue;
+                                                               if($author_remove || $owner_remove) {
+                                                                       $tags = explode(',',$i[0]['tag']);
+                                                                       $newtags = array();
+                                                                       if(count($tags)) {
+                                                                               foreach($tags as $tag)
+                                                                                       if(trim($tag) !== trim($xo->body))
+                                                                                               $newtags[] = trim($tag);
+                                                                       }
+                                                                       q("update item set tag = '%s' where id = %d limit 1",
+                                                                               dbesc(implode(',',$newtags)),
+                                                                               intval($i[0]['id'])
+                                                                       );
+                                                               }
+                                                       }
+                                               }
+                                       }
+
                                        if($item['uri'] == $item['parent-uri']) {
                                                $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
                                                        `body` = '', `title` = ''
@@ -1420,6 +1456,30 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                                        $datarray['gravity'] = GRAVITY_LIKE;
                                }
 
+                               if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
+                                       $xo = parse_xml_string($datarray['object'],false);
+                                       $xt = parse_xml_string($datarray['target'],false);
+
+                                       if($xt->type == ACTIVITY_OBJ_NOTE) {
+                                               $r = q("select * from item where `uri` = '%s' AND `uid` = %d limit 1",
+                                                       dbesc($xt->id),
+                                                       intval($importer['importer_uid'])
+                                               );
+                                               if(! count($r))
+                                                       continue;
+
+                                               // extract tag, if not duplicate, add to parent item
+                                               if($xo->content) {
+                                                       if(! (stristr($r[0]['tag'],trim($xo->content)))) {
+                                                               q("UPDATE item SET tag = '%s' WHERE id = %d LIMIT 1",
+                                                                       dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
+                                                                       intval($r[0]['id'])
+                                                               );
+                                                       }
+                                               }
+                                       }
+                               }
+
                                $r = item_store($datarray,$force_parent);
                                continue;
                        }
@@ -1797,7 +1857,8 @@ function local_delivery($importer,$data) {
                        }
                        if($deleted) {
 
-                               $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `contact-id` = %d LIMIT 1",
+                               $r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join contact on `item`.`contact-id` = `contact`.`id`
+                                       WHERE `uri` = '%s' AND `uid` = %d AND `contact-id` = %d LIMIT 1",
                                        dbesc($uri),
                                        intval($importer['importer_uid']),
                                        intval($importer['id'])
@@ -1815,22 +1876,33 @@ function local_delivery($importer,$data) {
                                                $xo = parse_xml_string($item['object'],false);
                                                $xt = parse_xml_string($item['target'],false);
                                                if($xt->type === ACTIVITY_OBJ_NOTE) {
-                                                       $i = q("select * from item where uri = '%s' and uid = %d limit 1",
+                                                       $i = q("select * from `item` where uri = '%s' and uid = %d limit 1",
                                                                dbesc($xt->id),
                                                                intval($importer['importer_uid'])
                                                        );
                                                        if(count($i)) {
-                                                               $tags = explode(',',$i['tag']);
-                                                               $newtags = array();
-                                                               if(count($tags)) {
-                                                                       foreach($tags as $tag)
-                                                                               if(trim($tag) !== trim($xo->body))
-                                                                                       $newtags[] = trim($tag);
+
+                                                               // For tags, the owner cannot remove the tag on the author's copy of the post.
+                                                               
+                                                               $owner_remove = (($item['contact-id'] == $i[0]['contact-id']) ? true: false);
+                                                               $author_remove = (($item['origin'] && $item['self']) ? true : false);
+                                                               $author_copy = (($item['origin']) ? true : false); 
+
+                                                               if($owner_remove && $author_copy)
+                                                                       continue;
+                                                               if($author_remove || $owner_remove) {                                                           
+                                                                       $tags = explode(',',$i[0]['tag']);
+                                                                       $newtags = array();
+                                                                       if(count($tags)) {
+                                                                               foreach($tags as $tag)
+                                                                                       if(trim($tag) !== trim($xo->body))
+                                                                                               $newtags[] = trim($tag);
+                                                                       }
+                                                                       q("update item set tag = '%s' where id = %d limit 1",
+                                                                               dbesc(implode(',',$newtags)),
+                                                                               intval($i[0]['id'])
+                                                                       );
                                                                }
-                                                               q("update item set tag = '%s' where id = %d limit 1",
-                                                                       dbesc(implode(',',$newtags)),
-                                                                       intval($i[0]['id'])
-                                                               );
                                                        }
                                                }
                                        }
@@ -1893,7 +1965,8 @@ function local_delivery($importer,$data) {
                        // was the top-level post for this reply written by somebody on this site? 
                        // Specifically, the recipient? 
 
-                       $r = q("select `item`.`id`, `contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item` 
+                       $r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, 
+                               `contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item` 
                                LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` 
                                WHERE `contact`.`self` = 1 AND `item`.`wall` = 1 AND `item`.`uri` = '%s' AND `item`.`parent-uri` = '%s'
                                AND `item`.`uid` = %d LIMIT 1",
@@ -2602,7 +2675,7 @@ function item_getfeedtags($item) {
        if($cnt) {
                for($x = 0; $x < count($matches); $x ++) {
                        if($matches[1][$x])
-                               $ret[] = array('#',$matches[1][$x], $matches[2][$x]);
+                               $ret[] = array('@',$matches[1][$x], $matches[2][$x]);
                }
        } 
        return $ret;