friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

mostly cosmetic changes to make DB tables accurately reflect the conversation members

This commit is contained in:
Friendika 2011-10-05 19:16:05 -07:00
parent 7df6cb850e
commit 7d6a67f903
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/conversation.php
View File

@ -540,7 +540,7 @@ function conversation(&$a, $items, $mode, $update) {
'$osparkle' => $osparkle, '$osparkle' => $osparkle,
'$sparkle' => $sparkle, '$sparkle' => $sparkle,
'$title' => template_escape($item['title']), '$title' => template_escape($item['title']),
'$ago' => ((($item['app']) && ($item['id'] == $item['parent'])) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])), '$ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
'$lock' => $lock, '$lock' => $lock,
'$location' => template_escape($location), '$location' => template_escape($location),
'$indent' => $indent, '$indent' => $indent,

7
include/diaspora.php
View File

@ -613,7 +613,6 @@ function diaspora_comment($importer,$xml,$msg) {
return; return;
} }
if($parent_author_signature) { if($parent_author_signature) {
$owner_signed_data = $guid . ';' . $parent_guid . ';' . $text . ';' . $diaspora_handle; $owner_signed_data = $guid . ';' . $parent_guid . ';' . $text . ';' . $diaspora_handle;
@ -646,9 +645,9 @@ function diaspora_comment($importer,$xml,$msg) {
$datarray['created'] = $datarray['edited'] = datetime_convert(); $datarray['created'] = $datarray['edited'] = datetime_convert();
$datarray['private'] = $parent_item['private']; $datarray['private'] = $parent_item['private'];
$datarray['owner-name'] = $contact['name']; $datarray['owner-name'] = $parent_item['owner-name'];
$datarray['owner-link'] = $contact['url']; $datarray['owner-link'] = $parent_item['owner-link'];
$datarray['owner-avatar'] = $contact['thumb']; $datarray['owner-avatar'] = $parent_item['owner-avatar'];
$datarray['author-name'] = $person['name']; $datarray['author-name'] = $person['name'];
$datarray['author-link'] = $person['url']; $datarray['author-link'] = $person['url'];

2
include/notifier.php
View File

@ -183,6 +183,7 @@ function notifier_run($argv, $argc){
// We will only send a "notify owner to relay" or followup message if the referenced post // We will only send a "notify owner to relay" or followup message if the referenced post
// originated on our system by virtue of having our hostname somewhere // originated on our system by virtue of having our hostname somewhere
// in the URI, AND it was a comment (not top_level) AND the parent originated elsewhere. // in the URI, AND it was a comment (not top_level) AND the parent originated elsewhere.
// if $parent['wall'] == 1 we will already have the parent message in our array // if $parent['wall'] == 1 we will already have the parent message in our array
// and we will relay the whole lot. // and we will relay the whole lot.
@ -357,6 +358,7 @@ function notifier_run($argv, $argc){
continue; continue;
$contact = get_item_contact($item,$contacts); $contact = get_item_contact($item,$contacts);
if(! $contact) if(! $contact)
continue; continue;

7
mod/dfrn_notify.php
View File

@ -454,9 +454,9 @@ function dfrn_notify_post(&$a) {
// was the top-level post for this reply written by somebody on this site? // was the top-level post for this reply written by somebody on this site?
// Specifically, the recipient? // Specifically, the recipient?
$r = q("select `item`.`id` from `item` $r = q("select `item`.`id`, `contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item`
LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `contact`.`self` = 1 AND `item`.`uri` = '%s' AND `item`.`uid` = %d LIMIT 1", WHERE `contact`.`self` = 1 AND `item`.`wall` = 1 AND `item`.`uri` = '%s' AND `item`.`uid` = %d LIMIT 1",
dbesc($parent_uri), dbesc($parent_uri),
intval($importer['importer_uid']) intval($importer['importer_uid'])
); );
@ -470,6 +470,9 @@ function dfrn_notify_post(&$a) {
$datarray['wall'] = 1; $datarray['wall'] = 1;
$datarray['parent-uri'] = $parent_uri; $datarray['parent-uri'] = $parent_uri;
$datarray['uid'] = $importer['importer_uid']; $datarray['uid'] = $importer['importer_uid'];
$datarray['owner-name'] = $r[0]['name'];
$datarray['owner-link'] = $r[0]['url'];
$datarray['owner-avatar'] = $r[0]['thumb'];
$datarray['contact-id'] = $importer['id']; $datarray['contact-id'] = $importer['id'];
if(($datarray['verb'] == ACTIVITY_LIKE) || ($datarray['verb'] == ACTIVITY_DISLIKE)) { if(($datarray['verb'] == ACTIVITY_LIKE) || ($datarray['verb'] == ACTIVITY_DISLIKE)) {
$is_like = true; $is_like = true;