aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Prezkuta <fermion@gmx.com>2012-06-03 14:32:17 -0600
committerZach Prezkuta <fermion@gmx.com>2012-06-03 14:53:30 -0600
commit9920fb39e566a10c44aa7ead9603ff3d1893a01a (patch)
tree0f1296c8335197a344e78f69357a1338e1b3ec79
parent06263f72a8d37688f305b563543bca86d939653e (diff)
downloadvolse-hubzilla-9920fb39e566a10c44aa7ead9603ff3d1893a01a.tar.gz
volse-hubzilla-9920fb39e566a10c44aa7ead9603ff3d1893a01a.tar.bz2
volse-hubzilla-9920fb39e566a10c44aa7ead9603ff3d1893a01a.zip
Debugged implementation of Diaspora relayable_retractions
Diaspora "relayable_retraction" is now supported by Friendica. The following should now work: Friendica top-level post: Diaspora comment deleted, disappears in Friendica Friendica comment deleted, disappears in Diaspora Diaspora like retracted, disappears in Friendica Friendica like retracted, disappears in Diaspora Diaspora top-level post: Same There are still exceptions, however. First, Friendica and Diaspora seem to frequently reject comments with an "invalid signature" error. This can probably be fixed. Also, some comments/likes/retractions seem to just disappear on the Diaspora side. In the Diaspora log these seem to be accompanied by a "not a valid object" error, often preceeded by a "received a comment but no corresponding post" error. These seem to be purely internal, since sometimes it works for some Diaspora contacts but not others.
-rwxr-xr-x[-rw-r--r--]include/diaspora.php0
-rwxr-xr-x[-rw-r--r--]include/items.php4
-rwxr-xr-x[-rw-r--r--]mod/like.php62
3 files changed, 38 insertions, 28 deletions
diff --git a/include/diaspora.php b/include/diaspora.php
index 1e6662f04..1e6662f04 100644..100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
diff --git a/include/items.php b/include/items.php
index 6b16810b2..4513db1db 100644..100755
--- a/include/items.php
+++ b/include/items.php
@@ -3300,7 +3300,9 @@ function drop_item($id,$interactive = true) {
if(count($r)) {
// The below handle only works for NETWORK_DFRN. I think that's ok, because this function
// only handles DFRN deletes
- $handle = $r['nick'] . '@' . substr($r['url'], strpos($r['url'],'://') + 3, strpos($r['url'],'/profile') - 1);
+ $handle_baseurl_start = strpos($r['url'],'://') + 3;
+ $handle_baseurl_length = strpos($r['url'],'/profile') - $handle_baseurl_start;
+ $handle = $r['nick'] . '@' . substr($r['url'], $handle_baseurl_start, $handle_baseurl_length);
$authorsig = '';
}
}
diff --git a/mod/like.php b/mod/like.php
index 06d27659b..942a04fe7 100644..100755
--- a/mod/like.php
+++ b/mod/like.php
@@ -105,7 +105,7 @@ function like_content(&$a) {
}
- $r = q("SELECT `id` FROM `item` WHERE `verb` = '%s' AND `deleted` = 0
+ $r = q("SELECT * FROM `item` WHERE `verb` = '%s' AND `deleted` = 0
AND `contact-id` = %d AND ( `parent` = '%s' OR `parent-uri` = '%s') LIMIT 1",
dbesc($activity),
intval($contact['id']),
@@ -113,15 +113,17 @@ function like_content(&$a) {
dbesc($item_id)
);
if(count($r)) {
+ $like_item = $r[0];
+
// Already voted, undo it
$r = q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1",
dbesc(datetime_convert()),
- intval($r[0]['id'])
+ intval($like_item['id'])
);
// Clean up the `sign` table
- $r2 = q("DELETE FROM `sign` WHERE `iid` = %d",
- intval($r[0]['id'])
+ $r = q("DELETE FROM `sign` WHERE `iid` = %d",
+ intval($like_item['id'])
);
// Save the author information for the unlike in case we need to relay to Diaspora
@@ -134,27 +136,29 @@ function like_content(&$a) {
// likes on photos, so don't bother.
if(($activity === ACTIVITY_LIKE) && (! $item['resource-id'])) {
- $signed_text = $r[0]['guid'] . ';' . 'Like';
+ $signed_text = $like_item['guid'] . ';' . 'Like';
- if( contact['network'] === NETWORK_DIASPORA)
+ if( $contact['network'] === NETWORK_DIASPORA)
$diaspora_handle = $contact['addr'];
else { // Only works for NETWORK_DFRN
- $contact_baseurl = substr($contact['url'], strpos($contact['url'],'://') + 3, strpos($contact['url'],'/profile') - 1);
+ $contact_baseurl_start = strpos($contact['url'],'://') + 3;
+ $contact_baseurl_length = strpos($contact['url'],'/profile') - $contact_baseurl_start;
+ $contact_baseurl = substr($contact['url'], $contact_baseurl_start, $contact_baseurl_length);
$diaspora_handle = $contact['nick'] . '@' . $contact_baseurl;
// Get contact's private key if he's a user of the local Friendica server
- $r2 = q("SELECT `contact`.`uid` FROM `contact` WHERE `url` = '%s' AND `self` = 1 LIMIT 1",
- dbesc(contact['url'])
+ $r = q("SELECT `contact`.`uid` FROM `contact` WHERE `url` = '%s' AND `self` = 1 LIMIT 1",
+ dbesc($contact['url'])
);
- if( $r2) {
- $contact_uid = $r2['uid'];
- $r2 = q("SELECT prvkey FROM user WHERE id = %d LIMIT 1",
+ if( $r) {
+ $contact_uid = $r['uid'];
+ $r = q("SELECT prvkey FROM user WHERE uid = %d LIMIT 1",
intval($contact_uid)
);
- if( $r2)
- $authorsig = base64_encode(rsa_sign($signed_text,$r2['prvkey'],'sha256'));
+ if( $r)
+ $authorsig = base64_encode(rsa_sign($signed_text,$r['prvkey'],'sha256'));
}
}
@@ -162,15 +166,17 @@ function like_content(&$a) {
$authorsig = '';
q("insert into sign (`retract_iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
- intval($r[0]['id']),
+ intval($like_item['id']),
dbesc($signed_text),
dbesc($authorsig),
dbesc($diaspora_handle)
);
}
+
// proc_run('php',"include/notifier.php","like","$post_id"); // $post_id isn't defined here!
- proc_run('php',"include/notifier.php","like","$r[0]['id']");
+ $like_item_id = $like_item['id'];
+ proc_run('php',"include/notifier.php","like","$like_item_id");
return;
}
@@ -251,25 +257,27 @@ EOT;
// only checks the parent_author_signature if it doesn't have to relay further
if(($activity === ACTIVITY_LIKE) && ($post_type === t('status'))) {
- if( contact['network'] === NETWORK_DIASPORA)
+ if( $contact['network'] === NETWORK_DIASPORA)
$diaspora_handle = $contact['addr'];
else { // Only works for NETWORK_DFRN
- $contact_baseurl = substr($contact['url'], strpos($contact['url'],'://') + 3, strpos($contact['url'],'/profile') - 1);
+ $contact_baseurl_start = strpos($contact['url'],'://') + 3;
+ $contact_baseurl_length = strpos($contact['url'],'/profile') - $contact_baseurl_start;
+ $contact_baseurl = substr($contact['url'], $contact_baseurl_start, $contact_baseurl_length);
$diaspora_handle = $contact['nick'] . '@' . $contact_baseurl;
// Get contact's private key if he's a user of the local Friendica server
- $r2 = q("SELECT `contact`.`uid` FROM `contact` WHERE `url` = '%s' AND `self` = 1 LIMIT 1",
- dbesc(contact['url'])
+ $r = q("SELECT `contact`.`uid` FROM `contact` WHERE `url` = '%s' AND `self` = 1 LIMIT 1",
+ dbesc($contact['url'])
);
- if( $r2) {
- $contact_uid = $r2['uid'];
- $r2 = q("SELECT prvkey FROM user WHERE id = %d LIMIT 1",
+ if( $r) {
+ $contact_uid = $r['uid'];
+ $r = q("SELECT prvkey FROM user WHERE uid = %d LIMIT 1",
intval($contact_uid)
);
- if( $r2)
- $contact_uprvkey = $r2['prvkey'];
+ if( $r)
+ $contact_uprvkey = $r['prvkey'];
}
}
@@ -278,8 +286,8 @@ EOT;
);
if( $r) {
$p = q("SELECT guid FROM `item` WHERE id = %d AND parent = %d LIMIT 1",
- intval($r[0]['parent'),
- intval($r[0]['parent')
+ intval($r[0]['parent']),
+ intval($r[0]['parent'])
);
if( $p) {
$signed_text = $r[0]['guid'] . ';Post;' . $p[0]['guid'] . ';true;' . $diaspora_handle;