From 33fc7240e6988cd89c83d7d8558a35d0631e06cd Mon Sep 17 00:00:00 2001 From: Steffen K9 Date: Sat, 23 May 2020 16:30:55 +0200 Subject: [PATCH 1/2] Issue 8680: Fix slim application error This should fix https://github.com/friendica/friendica/issues/8680 --- advancedcontentfilter/advancedcontentfilter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php index 62b18d15..866b0b11 100644 --- a/advancedcontentfilter/advancedcontentfilter.php +++ b/advancedcontentfilter/advancedcontentfilter.php @@ -417,7 +417,7 @@ function advancedcontentfilter_get_variables_guid(ServerRequestInterface $reques throw new HTTPException\NotFoundException(DI::l10n()->t('Unknown post with guid: %s', $args['guid'])); } - $tags = Tag::populateTagsFromItem($item); + $tags = Tag::populateFromItem($item); $item['tags'] = $tags['tags']; $item['hashtags'] = $tags['hashtags']; -- 2.49.1 From 351ff48ef8603748a1276ae52eba58be22ded0fd Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 23 May 2020 17:51:41 +0000 Subject: [PATCH 2/2] Twitter: set the baseurl and the gsid --- twitter/twitter.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/twitter/twitter.php b/twitter/twitter.php index a52ce8e9..7500b90a 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -79,6 +79,7 @@ use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Conversation; use Friendica\Model\Group; +use Friendica\Model\GServer; use Friendica\Model\Item; use Friendica\Model\ItemContent; use Friendica\Model\ItemURI; @@ -1069,13 +1070,15 @@ function twitter_fetch_contact($uid, $data, $create_user) } $avatar = twitter_fix_avatar($data->profile_image_url_https); - $url = "https://twitter.com/" . $data->screen_name; + $baseurl = "https://twitter.com"; + $url = $baseurl . "/" . $data->screen_name; $addr = $data->screen_name . "@twitter.com"; $fields = ['url' => $url, 'network' => Protocol::TWITTER, 'alias' => 'twitter::' . $data->id_str, + 'baseurl' => $baseurl, 'gsid' => GServer::getID($baseurl), 'name' => $data->name, 'nick' => $data->screen_name, 'addr' => $addr, - 'location' => $data->location, 'about' => $data->description]; + 'location' => $data->location, 'about' => $data->description]; // Update the public contact $pcontact = DBA::selectFirst('contact', ['id'], ['uid' => 0, 'alias' => "twitter::" . $data->id_str]); -- 2.49.1