aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/ping.php2
-rw-r--r--mod/sharedwithme.php11
2 files changed, 8 insertions, 5 deletions
diff --git a/mod/ping.php b/mod/ping.php
index 593ae21f8..1cebd152d 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -229,7 +229,7 @@ function ping_init(&$a) {
foreach($z as $zz) {
$notifs[] = array(
'notify_link' => $a->get_baseurl() . '/notify/view/' . $zz['id'],
- 'name' => '', // not required here because the name is in the message
+ 'name' => $zz['name'],
'url' => $zz['url'],
'photo' => $zz['photo'],
'when' => relative_date($zz['date']),
diff --git a/mod/sharedwithme.php b/mod/sharedwithme.php
index ff93051da..baaf41f61 100644
--- a/mod/sharedwithme.php
+++ b/mod/sharedwithme.php
@@ -12,7 +12,7 @@ function sharedwithme_content(&$a) {
$is_owner = (local_user() && (local_user() == $channel['channel_id']));
- //maintenance - see if a file got dropped and remove it systemwide
+ //maintenance - see if a file got dropped and remove it systemwide - this should possibly go to include/poller
$x = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d",
dbesc(ACTIVITY_UPDATE),
dbesc(ACTIVITY_OBJ_FILE),
@@ -26,18 +26,21 @@ function sharedwithme_content(&$a) {
$object = json_decode($xx['object'],true);
$hash = $object['hash'];
- //If object has a mid it's an update - the inlcuded mid is the latest and should not be removed
+ //If object has a mid it's an update activity - the inlcuded mid is the latest and should not be removed
$update = (($object['mid']) ? true : false);
if($update) {
$mid = $object['mid'];
- $y = q("DELETE FROM item WHERE (mid != '%s' AND obj_type = '%s' AND object LIKE '%s') AND (verb = '%s' OR verb = '%s')",
+ unset($object['mid']); //remove mid from object to match the post activity object
+
+ $y = q("DELETE FROM item WHERE (mid != '%s' AND obj_type = '%s') AND (object = '%s' AND verb = '%s') OR (object = '%s' AND verb = '%s')",
dbesc($mid),
dbesc(ACTIVITY_OBJ_FILE),
- dbesc('%"hash":"' . $hash . '"%'),
+ dbesc(json_encode($object)),
dbesc(ACTIVITY_POST),
+ dbesc($xx['object']),
dbesc(ACTIVITY_UPDATE)
);