Setting "verb" for postings from Diaspora, Feeds and Mails

diff --git a/include/diaspora.php b/include/diaspora.php
index 6df7f4baf82510f9ef636e2ece4ed0bc6c2e297a..72f91ee56e6d509ffaa9c243a4fdb92e80d71b10 100755 (executable)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -872,7 +872,8 @@ function diaspora_post($importer,$xml,$msg) {
        $datarray['uid'] = $importer['uid'];
        $datarray['contact-id'] = $contact['id'];
        $datarray['wall'] = 0;
-       $datarray['network']  = NETWORK_DIASPORA;
+       $datarray['network'] = NETWORK_DIASPORA;
+       $datarray['verb'] = ACTIVITY_POST;
        $datarray['guid'] = $guid;
        $datarray['uri'] = $datarray['parent-uri'] = $message_id;
        $datarray['changed'] = $datarray['created'] = $datarray['edited'] = datetime_convert('UTC','UTC',$created);
@@ -1346,6 +1347,7 @@ function diaspora_comment($importer,$xml,$msg) {
        $datarray['type'] = 'remote-comment';
        $datarray['wall'] = $parent_item['wall'];
        $datarray['network']  = NETWORK_DIASPORA;
+       $datarray['verb'] = ACTIVITY_POST;
        $datarray['gravity'] = GRAVITY_COMMENT;
        $datarray['guid'] = $guid;
        $datarray['uri'] = $message_id;

diff --git a/include/items.php b/include/items.php
index d71c0e2031a21270cd888e45ffb7b53e4812587a..8e99d82df1adc37908d8b73c9f5253094739aa12 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -678,6 +678,8 @@ function get_atom_elements($feed, $item, $contact = array()) {
        if($rawgeo)
                $res['coord'] = unxmlify($rawgeo[0]['data']);
 
+       if ($contact["network"] == NETWORK_FEED)
+               $res['verb'] = ACTIVITY_POST;
 
        $rawverb = $item->get_item_tags(NAMESPACE_ACTIVITY, 'verb');
 

diff --git a/include/onepoll.php b/include/onepoll.php
index 309764c74fb4ad281787a46b653d3d31710d2642..f5c253803b64257dde136ad9a49a57074befb160 100644 (file)
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -330,6 +330,7 @@ function onepoll_run(&$argv, &$argc){
                                                logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA);
 
                                                $datarray = array();
+                                               $datarray['verb'] = ACTIVITY_POST;
        //                                      $meta = email_msg_meta($mbox,$msg_uid);
        //                                      $headers = email_msg_headers($mbox,$msg_uid);