harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

send "hidden" edit activities to networks which don't support edits themselves

Browse Source
This commit is contained in:
zotlabs 2016-10-25 20:43:24 -07:00
parent 88a68b941f
commit bd83936e5d
5 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Zotlabs/Daemon/Notifier.php
View File

@ -4,6 +4,7 @@ namespace Zotlabs\Daemon;
require_once('include/queue_fn.php'); require_once('include/queue_fn.php');
require_once('include/html2plain.php'); require_once('include/html2plain.php');
require_once('include/conversation.php');
/* /*
* This file was at one time responsible for doing all deliveries, but this caused * This file was at one time responsible for doing all deliveries, but this caused

1
Zotlabs/Module/Editpost.php
View File

@ -85,6 +85,7 @@ class Editpost extends \Zotlabs\Web\Controller {
'hide_voting' => true, 'hide_voting' => true,
'hide_future' => true, 'hide_future' => true,
'hide_location' => true, 'hide_location' => true,
'parent' => (($itm[0]['mid'] === $itm[0]['parent_mid']) ? 0 : $itm[0]['parent']),
'mimetype' => $itm[0]['mimetype'], 'mimetype' => $itm[0]['mimetype'],
'ptyp' => $itm[0]['obj_type'], 'ptyp' => $itm[0]['obj_type'],
'body' => htmlspecialchars_decode(undo_post_tagging($itm[0]['body']),ENT_COMPAT), 'body' => htmlspecialchars_decode(undo_post_tagging($itm[0]['body']),ENT_COMPAT),

2
Zotlabs/Module/Item.php
View File

@ -901,7 +901,7 @@ class Item extends \Zotlabs\Web\Controller {
$x = item_store_update($datarray,$execflag); $x = item_store_update($datarray,$execflag);
// item_create_edit_activity($x); item_create_edit_activity($x);
if(! $parent) { if(! $parent) {
$r = q("select * from item where id = %d", $r = q("select * from item where id = %d",

7
include/conversation.php
View File

@ -414,8 +414,8 @@ function visible_activity($item) {
} }
} }
// if(is_edit_activity($item)) if(is_edit_activity($item))
// return false; return false;
return true; return true;
} }
@ -1312,7 +1312,8 @@ function status_editor($a, $x, $popup = false) {
'$expiryModalOK' => t('OK'), '$expiryModalOK' => t('OK'),
'$expiryModalCANCEL' => t('Cancel'), '$expiryModalCANCEL' => t('Cancel'),
'$expanded' => ((x($x, 'expanded')) ? $x['expanded'] : false), '$expanded' => ((x($x, 'expanded')) ? $x['expanded'] : false),
'$bbcode' => ((x($x, 'bbcode')) ? $x['bbcode'] : false) '$bbcode' => ((x($x, 'bbcode')) ? $x['bbcode'] : false),
'$parent' => ((array_key_exists('parent',$x) && $x['parent']) ? $x['parent'] : 0)
)); ));
if ($popup === true) { if ($popup === true) {

32
include/items.php
View File

@ -4506,6 +4506,7 @@ function fix_attached_file_permissions($channel,$observer_hash,$body,
function item_create_edit_activity($post) { function item_create_edit_activity($post) {
if((! $post) || (! $post['item'])) if((! $post) || (! $post['item']))
return; return;
@ -4513,6 +4514,13 @@ function item_create_edit_activity($post) {
$new_item = $update_item; $new_item = $update_item;
$author = q("select * from xchan where xchan_hash = '%s' limit 1",
dbesc($new_item['author_xchan'])
);
if($author)
$item_author = $author[0];
$new_item['id'] = 0; $new_item['id'] = 0;
$new_item['parent'] = 0; $new_item['parent'] = 0;
$new_item['mid'] = item_message_id(); $new_item['mid'] = item_message_id();
@ -4521,11 +4529,35 @@ function item_create_edit_activity($post) {
$new_item['body'] .= "\n\n"; $new_item['body'] .= "\n\n";
$new_item['body'] .= $update_item['body']; $new_item['body'] .= $update_item['body'];
$new_item['sig'] = '';
$new_item['verb'] = ACTIVITY_UPDATE; $new_item['verb'] = ACTIVITY_UPDATE;
$new_item['item_thread_top'] = 0; $new_item['item_thread_top'] = 0;
$new_item['created'] = $new_item['edited'] = datetime_convert(); $new_item['created'] = $new_item['edited'] = datetime_convert();
$new_item['obj'] = json_encode(array(
'type' => (($update_item['item_thread_top']) ? ACTIVITY_OBJ_NOTE : ACTIVITY_OBJ_COMMENT),
'id' => $update_item['mid'],
'parent' => $update_item['parent_mid'],
'link' => array(array('rel' => 'alternate','type' => 'text/html', 'href' => $update_item['plink'])),
'title' => $update_item['title'],
'content' => $update_item['body'],
'created' => $update_item['created'],
'edited' => $update_item['edited'],
'author' => array(
'name' => $item_author['xchan_name'],
'address' => $item_author['xchan_addr'],
'guid' => $item_author['xchan_guid'],
'guid_sig' => $item_author['xchan_guid_sig'],
'link' => array(
array('rel' => 'alternate', 'type' => 'text/html', 'href' => $item_author['xchan_url']),
array('rel' => 'photo', 'type' => $item_author['xchan_photo_mimetype'], 'href' => $item_author['xchan_photo_m'])),
),
));
$x = post_activity_item($new_item); $x = post_activity_item($new_item);
$post_id = $x['id']; $post_id = $x['id'];