start fixing mod_display message-id

This commit is contained in:
Mike Macgirvin 2022-07-20 01:30:58 -07:00
parent a5547a44b5
commit 1d2fa92bf3
3 changed files with 8 additions and 8 deletions

View file

@ -58,7 +58,7 @@ class Display extends Controller
if ($_REQUEST['mid']) { if ($_REQUEST['mid']) {
$item_hash = $_REQUEST['mid']; $item_hash = $_REQUEST['mid'];
} }
logger('item_hash: ' . $item_hash);
if (!$item_hash) { if (!$item_hash) {
App::$error = 404; App::$error = 404;
notice(t('Item not found.') . EOL); notice(t('Item not found.') . EOL);

View file

@ -1668,7 +1668,7 @@ class Item extends Controller
'from_xchan' => $datarray['author_xchan'], 'from_xchan' => $datarray['author_xchan'],
'to_xchan' => $datarray['owner_xchan'], 'to_xchan' => $datarray['owner_xchan'],
'item' => $datarray, 'item' => $datarray,
'link' => z_root() . '/display/' . gen_link_id($datarray['mid']), 'link' => z_root() . '/display/?mid=' . $datarray['mid'],
'verb' => ACTIVITY_POST, 'verb' => ACTIVITY_POST,
'otype' => 'item', 'otype' => 'item',
'parent' => $parent, 'parent' => $parent,
@ -1684,7 +1684,7 @@ class Item extends Controller
'from_xchan' => $datarray['author_xchan'], 'from_xchan' => $datarray['author_xchan'],
'to_xchan' => $datarray['owner_xchan'], 'to_xchan' => $datarray['owner_xchan'],
'item' => $datarray, 'item' => $datarray,
'link' => z_root() . '/display/' . gen_link_id($datarray['mid']), 'link' => z_root() . '/display/?mid=' . $datarray['mid'],
'verb' => ACTIVITY_POST, 'verb' => ACTIVITY_POST,
'otype' => 'item' 'otype' => 'item'
)); ));
@ -1739,7 +1739,7 @@ class Item extends Controller
} }
$datarray['id'] = $post_id; $datarray['id'] = $post_id;
$datarray['llink'] = z_root() . '/display/' . gen_link_id($datarray['mid']); $datarray['llink'] = z_root() . '/display/?mid=' . $datarray['mid'];
Hook::call('post_local_end', $datarray); Hook::call('post_local_end', $datarray);

View file

@ -1689,11 +1689,11 @@ function item_store($arr, $allow_exec = false, $deliver = true, $linkid = true)
if($d2 > $d1) if($d2 > $d1)
$arr['item_delayed'] = 1; $arr['item_delayed'] = 1;
$arr['llink'] = z_root() . '/display/' . gen_link_id($arr['mid']); $arr['llink'] = z_root() . '/display/?mid=' . $arr['mid'];
if(! $arr['plink']) if (! $arr['plink']) {
$arr['plink'] = $arr['llink']; $arr['plink'] = $arr['llink'];
}
if($arr['parent_mid'] === $arr['mid']) { if($arr['parent_mid'] === $arr['mid']) {
$parent_id = 0; $parent_id = 0;
$parent_deleted = 0; $parent_deleted = 0;
@ -2456,7 +2456,7 @@ function send_status_notifications($post_id,$item) {
if($unfollowed) if($unfollowed)
return; return;
$link = z_root() . '/display/' . gen_link_id($item['mid']); $link = z_root() . '/display/?mid=' . $item['mid'];
$y = q("select id from notify where link = '%s' and uid = %d limit 1", $y = q("select id from notify where link = '%s' and uid = %d limit 1",
dbesc($link), dbesc($link),