]> git.mxchange.org Git - friendica.git/commitdiff
Merge pull request #2095 from rabuzarus/unread_forums
authorMichael Vogel <icarus@dabo.de>
Fri, 27 Nov 2015 15:28:21 +0000 (16:28 +0100)
committerMichael Vogel <icarus@dabo.de>
Fri, 27 Nov 2015 15:28:21 +0000 (16:28 +0100)
count unread forum items for forumlist widget (ping.php)

include/Scrape.php
include/api.php
include/delivery.php
include/items.php
include/notifier.php
include/ostatus.php
include/pubsubpublish.php
include/salmon.php
mod/dfrn_request.php
mod/ping.php

index ae9331ff7af8fc389ea67aa2e24837e84f8d2e58..4f9d675c1801309f5d11fee3a6bd2a79b28ea21e 100644 (file)
@@ -4,7 +4,7 @@ require_once('library/HTML5/Parser.php');
 require_once('include/crypto.php');
 
 if(! function_exists('scrape_dfrn')) {
-function scrape_dfrn($url) {
+function scrape_dfrn($url, $dont_probe = false) {
 
        $a = get_app();
 
@@ -17,6 +17,13 @@ function scrape_dfrn($url) {
        if(! $s)
                return $ret;
 
+       if (!$dont_probe) {
+               $probe = probe_url($url);
+
+               if (isset($probe["addr"]))
+                       $ret["addr"] = $probe["addr"];
+       }
+
        $headers = $a->get_curl_headers();
        logger('scrape_dfrn: headers=' . $headers, LOGGER_DEBUG);
 
@@ -524,7 +531,7 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
 
 
                if(strlen($dfrn)) {
-                       $ret = scrape_dfrn(($hcard) ? $hcard : $dfrn);
+                       $ret = scrape_dfrn(($hcard) ? $hcard : $dfrn, true);
                        if(is_array($ret) && x($ret,'dfrn-request')) {
                                $network = NETWORK_DFRN;
                                $request = $ret['dfrn-request'];
index 873006ac243709724e03b69d9de877898c0b320e..531b66814f16ba81d6a82e48539b84b146920b52 100644 (file)
                        'verified' => true,
                        'statusnet_blocking' => false,
                        'notifications' => false,
-                       'statusnet_profile_url' => $a->get_baseurl()."/contacts/".$uinfo[0]['cid'],
+                       //'statusnet_profile_url' => $a->get_baseurl()."/contacts/".$uinfo[0]['cid'],
+                       'statusnet_profile_url' => $uinfo[0]['url'],
                        'uid' => intval($uinfo[0]['uid']),
                        'cid' => intval($uinfo[0]['cid']),
                        'self' => $uinfo[0]['self'],
@@ -2849,15 +2850,29 @@ function api_share_as_retweet(&$item) {
 
 function api_get_nick($profile) {
 /* To-Do:
- - remove trailing jung from profile url
+ - remove trailing junk from profile url
  - pump.io check has to check the website
 */
 
        $nick = "";
 
-       $friendica = preg_replace("=https?://(.*)/profile/(.*)=ism", "$2", $profile);
-       if ($friendica != $profile)
-               $nick = $friendica;
+       $r = q("SELECT `nick` FROM `gcontact` WHERE `nurl` = '%s'",
+               dbesc(normalise_link($profile)));
+       if ($r)
+               $nick = $r[0]["nick"];
+
+       if (!$nick == "") {
+               $r = q("SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'",
+                       dbesc(normalise_link($profile)));
+               if ($r)
+                       $nick = $r[0]["nick"];
+       }
+
+       if (!$nick == "") {
+               $friendica = preg_replace("=https?://(.*)/profile/(.*)=ism", "$2", $profile);
+               if ($friendica != $profile)
+                       $nick = $friendica;
+       }
 
        if (!$nick == "") {
                $diaspora = preg_replace("=https?://(.*)/u/(.*)=ism", "$2", $profile);
index cdd59451f0f2b0065cdc76b324ba6521fa6edb56..dc02faaba8e03d1957797861a6cd4a0ee9defa59 100644 (file)
@@ -2,6 +2,7 @@
 require_once("boot.php");
 require_once('include/queue_fn.php');
 require_once('include/html2plain.php');
+require_once("include/ostatus.php");
 
 function delivery_run(&$argv, &$argc){
        global $a, $db;
@@ -391,7 +392,8 @@ function delivery_run(&$argv, &$argc){
                                                        continue;
 
                                                if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire))
-                                                       $slaps[] = atom_entry($item,'html',null,$owner,true);
+                                                       $slaps[] = ostatus_salmon($item,$owner);
+                                                       //$slaps[] = atom_entry($item,'html',null,$owner,true);
                                        }
 
                                        logger('notifier: slapdelivery: ' . $contact['name']);
index c4310c24e2233a3a83761ae38429d8d42483b1b0..53f4784c2d053fe06661a979d4ffdca507d71937 100644 (file)
@@ -4479,7 +4479,8 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
        //$o .= "\t".'<link rel="self" type="application/atom+xml" href="'.xmlify($a->get_baseurl().'/api/statuses/show/'.$item['id'].'.atom').'"/>'."\r\n";
        //$o .= "\t".'<link rel="edit" type="application/atom+xml" href="'.xmlify($a->get_baseurl().'/api/statuses/show/'.$item['id'].'.atom').'"/>'."\r\n";
 
-       $o .= item_get_attachment($item);
+       // Deactivated since it was meant only for OStatus
+       //$o .= item_get_attachment($item);
 
        $o .= item_getfeedattach($item);
 
index 9dac5f114b177d617956a9772d733194d13bd0f1..ec2b666bede9109304020a3bc3993c66abe7ea03 100644 (file)
@@ -4,6 +4,7 @@ require_once('include/queue_fn.php');
 require_once('include/html2plain.php');
 require_once("include/Scrape.php");
 require_once('include/diaspora.php');
+require_once("include/ostatus.php");
 
 /*
  * This file was at one time responsible for doing all deliveries, but this caused
@@ -529,7 +530,8 @@ function notifier_run(&$argv, &$argc){
                unset($photos);
        } else {
 
-               $slap = atom_entry($target_item,'html',null,$owner,false);
+               $slap = ostatus_salmon($target_item,$owner);
+               //$slap = atom_entry($target_item,'html',null,$owner,false);
 
                if($followup) {
                        foreach($items as $item) {  // there is only one item
@@ -569,7 +571,8 @@ function notifier_run(&$argv, &$argc){
                                        $atom .= atom_entry($item,'text',null,$owner,true);
 
                                if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire))
-                                       $slaps[] = atom_entry($item,'html',null,$owner,true);
+                                       $slaps[] = ostatus_salmon($item,$owner);
+                                       //$slaps[] = atom_entry($item,'html',null,$owner,true);
                        }
                }
        }
index 0dd462d3e16a4aa9c435dc331e6c7b99f5b3ae75..ce254ed61ad012328d362234882b6738c03c5cea 100644 (file)
@@ -14,6 +14,15 @@ define('OSTATUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
 define('OSTATUS_DEFAULT_POLL_TIMEFRAME', 1440); // given in minutes
 define('OSTATUS_DEFAULT_POLL_TIMEFRAME_MENTIONS', 14400); // given in minutes
 
+define("NS_ATOM", "http://www.w3.org/2005/Atom");
+define("NS_THR", "http://purl.org/syndication/thread/1.0");
+define("NS_GEORSS", "http://www.georss.org/georss");
+define("NS_ACTIVITY", "http://activitystrea.ms/spec/1.0/");
+define("NS_MEDIA", "http://purl.org/syndication/atommedia");
+define("NS_POCO", "http://portablecontacts.net/spec/1.0");
+define("NS_OSTATUS", "http://ostatus.org/schema/1.0");
+define("NS_STATUSNET", "http://status.net/schema/api/1/");
+
 function ostatus_check_follow_friends() {
        $r = q("SELECT `uid`,`v` FROM `pconfig` WHERE `cat`='system' AND `k`='ostatus_legacy_contact' AND `v` != ''");
 
@@ -137,9 +146,9 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact, $onlyfetch)
                        if ($value != "")
                                $contact["location"] = $value;
 
-                       q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s', `name-date` = '%s' WHERE `id` = %d",
+                       q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s', `name-date` = '%s' WHERE `id` = %d AND `network` = '%s'",
                                dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["about"]), dbesc($contact["location"]),
-                               dbesc(datetime_convert()), intval($contact["id"]));
+                               dbesc(datetime_convert()), intval($contact["id"]), dbesc(NETWORK_OSTATUS));
 
                        poco_check($contact["url"], $contact["name"], $contact["network"], $author["author-avatar"], $contact["about"], $contact["location"],
                                        "", "", "", datetime_convert(), 2, $contact["id"], $contact["uid"]);
@@ -152,9 +161,9 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact, $onlyfetch)
 
                        $photos = import_profile_photo($author["author-avatar"], $importer["uid"], $contact["id"]);
 
-                       q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' WHERE `id` = %d",
+                       q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' WHERE `id` = %d AND `network` = '%s'",
                                dbesc($photos[0]), dbesc($photos[1]), dbesc($photos[2]),
-                               dbesc(datetime_convert()), intval($contact["id"]));
+                               dbesc(datetime_convert()), intval($contact["id"]), dbesc(NETWORK_OSTATUS));
                }
        }
 
@@ -1067,4 +1076,382 @@ function ostatus_store_conversation($itemid, $conversation_url) {
                logger('Storing conversation url '.$conversation_url.' for id '.$itemid);
        }
 }
+
+function xml_add_element($doc, $parent, $element, $value = "", $attributes = array()) {
+       $element = $doc->createElement($element, xmlify($value));
+
+       foreach ($attributes AS $key => $value) {
+               $attribute = $doc->createAttribute($key);
+               $attribute->value = xmlify($value);
+               $element->appendChild($attribute);
+       }
+
+       $parent->appendChild($element);
+}
+
+function ostatus_add_header($doc, $owner) {
+       $a = get_app();
+
+       $r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`",
+               intval($owner["uid"]));
+       if (!$r)
+               return;
+
+       $profile = $r[0];
+
+       $root = $doc->createElementNS(NS_ATOM, 'feed');
+       $doc->appendChild($root);
+
+       $root->setAttribute("xmlns:thr", NS_THR);
+       $root->setAttribute("xmlns:georss", NS_GEORSS);
+       $root->setAttribute("xmlns:activity", NS_ACTIVITY);
+       $root->setAttribute("xmlns:media", NS_MEDIA);
+       $root->setAttribute("xmlns:poco", NS_POCO);
+       $root->setAttribute("xmlns:ostatus", NS_OSTATUS);
+       $root->setAttribute("xmlns:statusnet", NS_STATUSNET);
+
+       $attributes = array("uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION);
+       xml_add_element($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes);
+       xml_add_element($doc, $root, "id", $a->get_baseurl()."/profile/".$owner["nick"]);
+       xml_add_element($doc, $root, "title", sprintf("%s timeline", $profile["name"]));
+       xml_add_element($doc, $root, "subtitle", sprintf("Updates from %s on %s", $profile["name"], $a->config["sitename"]));
+       xml_add_element($doc, $root, "logo", $profile["photo"]);
+       xml_add_element($doc, $root, "updated", datetime_convert("UTC", "UTC", "now", ATOM_TIME));
+
+       $author = ostatus_add_author($doc, $owner, $profile);
+       $root->appendChild($author);
+
+       $attributes = array("href" => $owner["url"], "rel" => "alternate", "type" => "text/html");
+       xml_add_element($doc, $root, "link", "", $attributes);
+
+       // To-Do: We have to find out what this is
+       //$attributes = array("href" => $a->get_baseurl()."/sup",
+       //              "rel" => "http://api.friendfeed.com/2008/03#sup",
+       //              "type" => "application/json");
+       //xml_add_element($doc, $root, "link", "", $attributes);
+
+       ostatus_hublinks($doc, $root);
+
+       $attributes = array("href" => $a->get_baseurl()."/salmon/".$owner["nick"], "rel" => "salmon");
+       xml_add_element($doc, $root, "link", "", $attributes);
+
+       $attributes = array("href" => $a->get_baseurl()."/salmon/".$owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-replies");
+       xml_add_element($doc, $root, "link", "", $attributes);
+
+       $attributes = array("href" => $a->get_baseurl()."/salmon/".$owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-mention");
+       xml_add_element($doc, $root, "link", "", $attributes);
+
+       $attributes = array("href" => $a->get_baseurl()."/api/statuses/user_timeline/".$owner["nick"].".atom",
+                       "rel" => "self", "type" => "application/atom+xml");
+       xml_add_element($doc, $root, "link", "", $attributes);
+
+       return $root;
+}
+
+function ostatus_hublinks($doc, $root) {
+       $a = get_app();
+       $hub = get_config('system','huburl');
+
+       $hubxml = '';
+       if(strlen($hub)) {
+               $hubs = explode(',', $hub);
+               if(count($hubs)) {
+                       foreach($hubs as $h) {
+                               $h = trim($h);
+                               if(! strlen($h))
+                                       continue;
+                               if ($h === '[internal]')
+                                       $h = $a->get_baseurl() . '/pubsubhubbub';
+                               xml_add_element($doc, $root, "link", "", array("href" => $h, "rel" => "hub"));
+                       }
+               }
+       }
+}
+
+function ostatus_get_attachment($doc, $root, $item) {
+       $o = "";
+       $siteinfo = get_attached_data($item["body"]);
+
+       switch($siteinfo["type"]) {
+               case 'link':
+                       $attributes = array("rel" => "enclosure",
+                                       "href" => $siteinfo["url"],
+                                       "type" => "text/html; charset=UTF-8",
+                                       "length" => "",
+                                       "title" => $siteinfo["title"]);
+                       xml_add_element($doc, $root, "link", "", $attributes);
+                       break;
+               case 'photo':
+                       $imgdata = get_photo_info($siteinfo["image"]);
+                       $attributes = array("rel" => "enclosure",
+                                       "href" => $siteinfo["image"],
+                                       "type" => $imgdata["mime"],
+                                       "length" => intval($imgdata["size"]));
+                       xml_add_element($doc, $root, "link", "", $attributes);
+                       break;
+               case 'video':
+                       $attributes = array("rel" => "enclosure",
+                                       "href" => $siteinfo["url"],
+                                       "type" => "text/html; charset=UTF-8",
+                                       "length" => "",
+                                       "title" => $siteinfo["title"]);
+                       xml_add_element($doc, $root, "link", "", $attributes);
+                       break;
+               default:
+                       break;
+       }
+
+       $arr = explode('[/attach],',$item['attach']);
+       if(count($arr)) {
+               foreach($arr as $r) {
+                       $matches = false;
+                       $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches);
+                       if($cnt) {
+                               $attributes = array("rel" => "enclosure",
+                                               "href" => $matches[1],
+                                               "type" => $matches[3]);
+
+                               if(intval($matches[2]))
+                                       $attributes["length"] = intval($matches[2]);
+
+                               if(trim($matches[4]) != "")
+                                       $attributes["title"] = trim($matches[4]);
+
+                               xml_add_element($doc, $root, "link", "", $attributes);
+                       }
+               }
+       }
+}
+
+function ostatus_add_author($doc, $owner, $profile) {
+       $a = get_app();
+
+       $author = $doc->createElement("author");
+       xml_add_element($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON);
+       xml_add_element($doc, $author, "uri", $owner["url"]);
+       xml_add_element($doc, $author, "name", $owner["nick"]);
+
+       $attributes = array("rel" => "alternate", "type" => "text/html", "href" => $owner["url"]);
+       xml_add_element($doc, $author, "link", "", $attributes);
+
+       $attributes = array(
+                       "rel" => "avatar",
+                       "type" => "image/jpeg", // To-Do?
+                       "media:width" => 175,
+                       "media:height" => 175,
+                       "href" => $profile["photo"]);
+       xml_add_element($doc, $author, "link", "", $attributes);
+
+       $attributes = array(
+                       "rel" => "avatar",
+                       "type" => "image/jpeg", // To-Do?
+                       "media:width" => 80,
+                       "media:height" => 80,
+                       "href" => $profile["thumb"]);
+       xml_add_element($doc, $author, "link", "", $attributes);
+
+       xml_add_element($doc, $author, "poco:preferredUsername", $owner["nick"]);
+       xml_add_element($doc, $author, "poco:displayName", $profile["name"]);
+       xml_add_element($doc, $author, "poco:note", $profile["about"]);
+
+       if (trim($owner["location"]) != "") {
+               $element = $doc->createElement("poco:address");
+               xml_add_element($doc, $element, "poco:formatted", $owner["location"]);
+               $author->appendChild($element);
+       }
+
+       if (trim($profile["homepage"]) != "") {
+               $urls = $doc->createElement("poco:urls");
+               xml_add_element($doc, $urls, "poco:type", "homepage");
+               xml_add_element($doc, $urls, "poco:value", $profile["homepage"]);
+               xml_add_element($doc, $urls, "poco:primary", "true");
+               $author->appendChild($urls);
+       }
+
+       xml_add_element($doc, $author, "followers", "", array("url" => $a->get_baseurl()."/viewcontacts/".$owner["nick"]));
+       xml_add_element($doc, $author, "statusnet:profile_info", "", array("local_id" => $owner["uid"]));
+
+       return $author;
+}
+
+function ostatus_entry($doc, $item, $owner, $toplevel = false) {
+       $a = get_app();
+
+       if (!$toplevel) {
+               $entry = $doc->createElement("entry");
+               $title = sprintf("New note by %s", $owner["nick"]);
+       } else {
+               $entry = $doc->createElementNS(NS_ATOM, "entry");
+
+               $entry->setAttribute("xmlns:thr", NS_THR);
+               $entry->setAttribute("xmlns:georss", NS_GEORSS);
+               $entry->setAttribute("xmlns:activity", NS_ACTIVITY);
+               $entry->setAttribute("xmlns:media", NS_MEDIA);
+               $entry->setAttribute("xmlns:poco", NS_POCO);
+               $entry->setAttribute("xmlns:ostatus", NS_OSTATUS);
+               $entry->setAttribute("xmlns:statusnet", NS_STATUSNET);
+
+               $r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`",
+                       intval($owner["uid"]));
+               if (!$r)
+                       return;
+
+               $profile = $r[0];
+
+               $author = ostatus_add_author($doc, $owner, $profile);
+               $entry->appendChild($author);
+
+               $title = sprintf("New comment by %s", $owner["nick"]);
+       }
+
+       // To use the object-type "bookmark" we have to implement these elements:
+       //
+       // <activity:object-type>http://activitystrea.ms/schema/1.0/bookmark</activity:object-type>
+       // <title>Historic Rocket Landing</title>
+       // <summary>Nur ein Testbeitrag.</summary>
+       // <link rel="related" href="https://www.youtube.com/watch?v=9pillaOxGCo"/>
+       // <link rel="preview" href="https://pirati.cc/file/thumb-4526-450x338-b48c8055f0c2fed0c3f67adc234c4b99484a90c42ed3cac73dc1081a4d0a7bc1.jpg.jpg" media:width="450" media:height="338"/>
+       //
+       // But: it seems as if it doesn't federate well between the GS servers
+       // So we just set it to "note" to be sure that it reaches their target systems
+
+       xml_add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE);
+       xml_add_element($doc, $entry, "id", $item["uri"]);
+       xml_add_element($doc, $entry, "title", $title);
+
+       if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid'])
+               $body = fix_private_photos($item['body'],$owner['uid'],$item, 0);
+       else
+               $body = $item['body'];
+
+       if ($item['title'] != "")
+               $body = "[b]".$item['title']."[/b]\n\n".$body;
+
+       $body = bbcode($body, false, false, 7);
+
+       xml_add_element($doc, $entry, "content", $body, array("type" => "html"));
+
+       xml_add_element($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html",
+                                                       "href" => $a->get_baseurl()."/display/".$item["guid"]));
+
+       xml_add_element($doc, $entry, "status_net", "", array("notice_id" => $item["id"]));
+       xml_add_element($doc, $entry, "activity:verb", construct_verb($item));
+       xml_add_element($doc, $entry, "published", datetime_convert("UTC","UTC",$item["created"]."+00:00",ATOM_TIME));
+       xml_add_element($doc, $entry, "updated", datetime_convert("UTC","UTC",$item["edited"]."+00:00",ATOM_TIME));
+
+       if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
+               $parent = q("SELECT `guid` FROM `item` WHERE `id` = %d", intval($item["parent"]));
+               $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
+
+               $attributes = array(
+                               "ref" => $parent_item,
+                               "type" => "text/html",
+                               "href" => $a->get_baseurl()."/display/".$parent[0]["guid"]);
+               xml_add_element($doc, $entry, "thr:in-reply-to", "", $attributes);
+
+               $attributes = array(
+                               "rel" => "related",
+                               "href" => $a->get_baseurl()."/display/".$parent[0]["guid"]);
+               xml_add_element($doc, $entry, "link", "", $attributes);
+        }
+
+       xml_add_element($doc, $entry, "link", "", array("rel" => "ostatus:conversation",
+                                                       "href" => $a->get_baseurl()."/display/".$owner["nick"]."/".$item["parent"]));
+       xml_add_element($doc, $entry, "ostatus:conversation", $a->get_baseurl()."/display/".$owner["nick"]."/".$item["parent"]);
+
+       $tags = item_getfeedtags($item);
+
+       if(count($tags))
+               foreach($tags as $t)
+                       if ($t[0] == "@")
+                               xml_add_element($doc, $entry, "link", "", array("rel" => "mentioned",
+                                                                               "ostatus:object-type" => ACTIVITY_OBJ_PERSON,
+                                                                               "href" => $t[1]));
+
+       if (!$item["private"])
+               xml_add_element($doc, $entry, "link", "", array("rel" => "mentioned",
+                                                               "ostatus:object-type" => "http://activitystrea.ms/schema/1.0/collection",
+                                                               "href" => "http://activityschema.org/collection/public"));
+
+       if(count($tags))
+               foreach($tags as $t)
+                       if ($t[0] != "@")
+                               xml_add_element($doc, $entry, "category", "", array("term" => $t[2]));
+
+       ostatus_get_attachment($doc, $entry, $item);
+
+       // To-Do:
+       // The API call has yet to be implemented
+       //$attributes = array("href" => $a->get_baseurl()."/api/statuses/show/".$item["id"].".atom",
+       //              "rel" => "self", "type" => "application/atom+xml");
+       //xml_add_element($doc, $entry, "link", "", $attributes);
+
+       //$attributes = array("href" => $a->get_baseurl()."/api/statuses/show/".$item["id"].".atom",
+       //              "rel" => "edit", "type" => "application/atom+xml");
+       //xml_add_element($doc, $entry, "link", "", $attributes);
+
+       $app = $item["app"];
+       if ($app == "")
+               $app = "web";
+
+       xml_add_element($doc, $entry, "statusnet:notice_info", "", array("local_id" => $item["id"], "source" => $app));
+
+       return $entry;
+}
+
+function ostatus_feed(&$a, $owner_nick, $last_update) {
+
+       $r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`
+                       FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
+                       WHERE `contact`.`self` AND `user`.`nickname` = '%s' LIMIT 1",
+                       dbesc($owner_nick));
+       if (!$r)
+               return;
+
+       $owner = $r[0];
+
+       if(!strlen($last_update))
+               $last_update = 'now -30 days';
+
+       $check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
+
+       $items = q("SELECT STRAIGHT_JOIN `item`.*, `item`.`id` AS `item_id` FROM `item`
+                       INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`
+                       LEFT JOIN `item` AS `thritem` ON `thritem`.`uri`=`item`.`thr-parent` AND `thritem`.`uid`=`item`.`uid`
+                       WHERE `item`.`uid` = %d AND `item`.`received` > '%s' AND NOT `item`.`private` AND NOT `item`.`deleted`
+                               AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
+                               AND ((`item`.`wall` AND (`item`.`parent` = `item`.`id`))
+                                       OR (`item`.`network` = '%s' AND ((`thread`.`network`='%s') OR (`thritem`.`network` = '%s'))) AND `thread`.`mention`)
+                               AND (`item`.`owner-link` IN ('%s', '%s'))
+                       ORDER BY `item`.`received` DESC
+                       LIMIT 0, 300",
+                       intval($owner["uid"]), dbesc($check_date),
+                       dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS),
+                       dbesc($owner["nurl"]), dbesc(str_replace("http://", "https://", $owner["nurl"]))
+               );
+
+       $doc = new DOMDocument('1.0', 'utf-8');
+       $doc->formatOutput = true;
+
+       $root = ostatus_add_header($doc, $owner);
+
+       foreach ($items AS $item) {
+               $entry = ostatus_entry($doc, $item, $owner);
+               $root->appendChild($entry);
+       }
+
+       return($doc->saveXML());
+}
+
+function ostatus_salmon($item,$owner) {
+
+       $doc = new DOMDocument('1.0', 'utf-8');
+       $doc->formatOutput = true;
+
+       $entry = ostatus_entry($doc, $item, $owner, true);
+
+       $doc->appendChild($entry);
+
+       return($doc->saveXML());
+}
 ?>
index bc81fd78680c16cf0b429abeb557aa6b59727c87..d27beea3d5ea7683a771afd319b54fac3abd571a 100644 (file)
@@ -1,5 +1,6 @@
 <?php
 require_once("boot.php");
+require_once("include/ostatus.php");
 
 function handle_pubsubhubbub() {
        global $a, $db;
@@ -12,17 +13,17 @@ function handle_pubsubhubbub() {
        $r = q("SELECT * FROM `push_subscriber` WHERE `push` > 0");
 
        foreach($r as $rr) {
-               $params = get_feed_for($a, '', $rr['nickname'], $rr['last_update'], 0, true);
+               //$params = get_feed_for($a, '', $rr['nickname'], $rr['last_update'], 0, true);
+               $params = ostatus_feed($a, $rr['nickname'], $rr['last_update']);
                $hmac_sig = hash_hmac("sha1", $params, $rr['secret']);
 
                $headers = array("Content-type: application/atom+xml",
-                                               sprintf("Link: <%s>;rel=hub," .
-                                                               "<%s>;rel=self",
-                                                               $a->get_baseurl() . '/pubsubhubbub',
-                                                               $rr['topic']),
-                                               "X-Hub-Signature: sha1=" . $hmac_sig);
+                               sprintf("Link: <%s>;rel=hub,<%s>;rel=self",
+                                       $a->get_baseurl().'/pubsubhubbub',
+                                       $rr['topic']),
+                               "X-Hub-Signature: sha1=".$hmac_sig);
 
-               logger('POST '. print_r($headers, true)."\n".$params, LOGGER_DEBUG);
+               logger('POST '.print_r($headers, true)."\n".$params, LOGGER_DEBUG);
 
                post_url($rr['callback_url'], $params, $headers);
                $ret = $a->get_curl_code();
index 7574374907eabf3f4cca2789b5be712dfebadee5..a254fe7e97086953d4a8b1c607ad0e1feefd6b39 100644 (file)
@@ -66,8 +66,6 @@ function get_salmon_key($uri,$keyhash) {
 
 function slapper($owner,$url,$slap) {
 
-       logger('slapper called for '.$url.'. Data: ' . $slap);
-
        // does contact have a salmon endpoint?
 
        if(! strlen($url))
@@ -97,6 +95,8 @@ EOT;
 
        $slap = str_replace('<entry>',$namespaces,$slap);
 
+       logger('slapper called for '.$url.'. Data: ' . $slap);
+
        // create a magic envelope
 
        $data      = base64url_encode($slap);
index 7e5b67b7c2b1ff2024c7a5ceb0cd760097bd25ce..b0ad2d4a0f741190c5af8cced8d05651f3bc4d4c 100644 (file)
@@ -136,7 +136,7 @@ function dfrn_request_post(&$a) {
 
                                        $dfrn_request = $parms['dfrn-request'];
 
-                    /********* Escape the entire array ********/
+                                       /********* Escape the entire array ********/
 
                                        dbesc_array($parms);
 
@@ -146,13 +146,14 @@ function dfrn_request_post(&$a) {
                                         * Create a contact record on our site for the other person
                                         */
 
-                                       $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `name`, `nick`, `photo`, `site-pubkey`,
+                                       $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `addr`, `name`, `nick`, `photo`, `site-pubkey`,
                                                `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`)
-                                               VALUES ( %d, '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
+                                               VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
                                                intval(local_user()),
                                                datetime_convert(),
                                                dbesc($dfrn_url),
                                                dbesc(normalise_link($dfrn_url)),
+                                               $parms['addr'],
                                                $parms['fn'],
                                                $parms['nick'],
                                                $parms['photo'],
@@ -539,13 +540,14 @@ function dfrn_request_post(&$a) {
 
 
                                dbesc_array($parms);
-                               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`,`name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
+                               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
                                        `request`, `confirm`, `notify`, `poll`, `poco`, `network` )
-                                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
+                                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
                                        intval($uid),
                                        dbesc(datetime_convert()),
                                        $parms['url'],
                                        dbesc(normalise_link($parms['url'])),
+                                       $parms['addr'],
                                        $parms['fn'],
                                        $parms['nick'],
                                        $parms['issued-id'],
index 9075bd28a708421bb27356bf987b5a2012596ba4..967555881c0c1f5f535163fb1657b8ea9349a642 100644 (file)
@@ -43,8 +43,9 @@ function ping_init(&$a) {
                                FROM `item` INNER JOIN `item` as `pitem` ON  `pitem`.`id`=`item`.`parent`
                                WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
                                 `item`.`deleted` = 0 AND `item`.`uid` = %d AND `pitem`.`parent` != 0
+                               AND `item`.`contact-id` != %d
                                ORDER BY `item`.`created` DESC",
-                       intval(local_user())
+                       intval(local_user()), intval(local_user())
                );
 
                if(count($r)) {