From 5114e018d0a519576d011a21a09707d8de796627 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Tue, 15 Jul 2014 08:50:49 +0200
Subject: [PATCH] Setting "verb" for postings from Diaspora, Feeds and Mails
---
include/diaspora.php | 4 +++-
include/items.php | 2 ++
include/onepoll.php | 1 +
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/include/diaspora.php b/include/diaspora.php
index 6df7f4baf8..72f91ee56e 100755
--- 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 d71c0e2031..8e99d82df1 100644
--- 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 309764c74f..f5c253803b 100644
--- 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);