Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-23 21:10:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improved message handling / new activity relay handling

Browse source
This commit is contained in:
Michael 2022-07-27 17:39:00 +00:00
parent 7834359957
commit 86105635ca
26 changed files with 280 additions and 428 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Module/Admin/Item/Source.php
View file

@ -35,7 +35,6 @@ class Source extends BaseAdmin
$guid = basename($_REQUEST['guid'] ?? $this->parameters['guid'] ?? '');
$source = '';
$item_uri = '';
$item_id = '';
$terms = [];
@ -43,11 +42,8 @@ class Source extends BaseAdmin
$item = Model\Post::selectFirst(['id', 'uri-id', 'guid', 'uri'], ['guid' => $guid]);
if ($item) {
$conversation = Model\Conversation::getByItemUri($item['uri']);
$item_id = $item['id'];
$item_uri = $item['uri'];
$source = $conversation['source'];
$terms = Model\Tag::getByURIId($item['uri-id'], [Model\Tag::HASHTAG, Model\Tag::MENTION, Model\Tag::IMPLICIT_MENTION]);
}
}
@ -56,7 +52,6 @@ class Source extends BaseAdmin
$o = Renderer::replaceMacros($tpl, [
'$title' => DI::l10n()->t('Item Source'),
'$guid' => ['guid', DI::l10n()->t('Item Guid'), $guid, ''],
'$source' => $source,
'$item_uri' => $item_uri,
'$item_id' => $item_id,
'$terms' => $terms,
@ -70,7 +65,6 @@ class Source extends BaseAdmin
'$urllbl' => DI::l10n()->t('URL'),
'$mentionlbl' => DI::l10n()->t('Mention'),
'$implicitlbl' => DI::l10n()->t('Implicit Mention'),
'$sourcelbl' => DI::l10n()->t('Source'),
]);
return $o;

2
src/Module/DFRN/Notify.php
View file

@ -59,7 +59,7 @@ class Notify extends BaseModule
}
}
private static function dispatchPublic(array $postdata)
private static function dispatchPublic(string $postdata)
{
$msg = Diaspora::decodeRaw($postdata, '', true);
if (!is_array($msg)) {