[list=A]
diff --git a/doc/themes.md b/doc/themes.md
index 8d85dce2a9..5804868836 100644
--- a/doc/themes.md
+++ b/doc/themes.md
@@ -2,153 +2,10 @@
* [Home](help)
-To change the look of friendica you have to touch the themes.
-The current default theme is [Vier](https://github.com/friendica/friendica/tree/stable/view/theme/vier) but there are numerous others.
-Have a look at [github.com/bkil/friendica-themes](https://github.com/bkil/friendica-themes) for an overview of the existing themes.
-In case none of them suits your needs, there are several ways to change a theme.
+The default Theme in Friendica is called [frio](https://github.com/friendica/friendica/tree/stable/view/theme/frio).
-So, how to work on the UI of friendica.
+Open `Settings > Display > Custom Theme Settings` adjust the Theme to your liking. Select your preferred Appearance - light, dark or black - and your favorite Accent color. Click `Submit` to save your changes.
-You can either directly edit an existing theme.
-But you might loose your changes when the theme is updated by the friendica team.
+The `Custom` Appearance allows to tweak the themes CSS and set colors for UI elements. So called `schemestrings` can be shared between users.
-If you are almost happy with an existing theme, the easiest way to cover your needs is to create a new theme, inheriting most of the properties of the parent theme and change just minor stuff.
-The below for a more detailed description of theme heritage.
-
-Some themes also allow users to select *variants* of the theme.
-Those theme variants most often contain an additional [CSS](https://en.wikipedia.org/wiki/CSS) file to override some styling of the default theme values.
-From the themes in the main repository *vier* and *vier* are using this methods for variations.
-Quattro is using a slightly different approach.
-
-Third you can start your theme from scratch.
-Which is the most complex way to change friendicas look.
-But it leaves you the most freedom.
-So below for a *detailed* description and the meaning of some special files.
-
-### Styling
-
-If you want to change the styling of a theme, have a look at the themes CSS file.
-In most cases, you can found these in
-
- /view/theme/**your-theme-name**/style.css
-
-sometimes, there is also a file called style.php in the theme directory.
-This is only needed if the theme allows the user to change certain things of the theme dynamically.
-Say the font size or set a background image.
-
-### Templates
-
-If you want to change the structure of the theme, you need to change the templates used by the theme.
-Friendica themes are using [SMARTY3](http://www.smarty.net/) for templating.
-The default template can be found in
-
- /view/templates
-
-if you want to override any template within your theme create your version of the template in
-
- /view/theme/**your-theme-name**/templates
-
-any template that exists there will be used instead of the default one.
-
-### JavaScript
-
-The same rule applies to the JavaScript files found in
-
- /js
-
-they will be overwritten by files in
-
- /view/theme/**your-theme-name**/js.
-
-## Creating a Theme from Scratch
-
-Keep patient.
-Basically what you have to do is identify which template you have to change so it looks more like what you want.
-Adopt the CSS of the theme accordingly.
-And iterate the process until you have the theme the way you want it.
-
-*Use the source Luke.* and don't hesitate to ask in @[developers](https://forum.friendi.ca/profile/developers) or @[helpers](https://forum.friendi.ca/profile/helpers).
-
-## Special Files
-
-### unsupported
-
-If a file with this name (which might be empty) exists in the theme directory, the theme is marked as *unsupported*.
-An unsupported theme may not be selected by a user in the settings.
-Users who are already using it wont notice anything.
-
-### README(.md)
-
-The contents of this file, with or without the .md which indicates [Markdown](https://daringfireball.net/projects/markdown/) syntax, will be displayed at most repository hosting services and in the theme page within the admin panel of friendica.
-
-This file should contain information you want to let others know about your theme.
-
-### screenshot.[png|jpg]
-
-If you want to have a preview image of your theme displayed in the settings you should take a screenshot and save it with this name.
-Supported formats are PNG and JPEG.
-
-### theme.php
-
-This is the main definition file of the theme.
-In the header of that file, some meta information is stored.
-For example, have a look at the theme.php of the *vier* theme:
-
-
- * Author: Ike
- * Author: Beanow
- * Maintainer: Ike
- * Description: "Vier" is a very compact and modern theme. It uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/
- */
-
-You see the definition of the theme's name, it's version and the initial author of the theme.
-These three pieces of information should be listed.
-If the original author is no longer working on the theme, but a maintainer has taken over, the maintainer should be listed as well.
-The information from the theme header will be displayed in the admin panel.
-
-The first thing in file is to import the `App` class from `\Friendica\` namespace.
-
- use Friendica\App;
-
-This will make our job a little easier, as we don't have to specify the full name every time we need to use the `App` class.
-
-The next crucial part of the theme.php file is a definition of an init function.
-The name of the function is _init.
-So in the case of vier it is
-
- function vier_init(App $a) {
- $a->theme_info = array();
- $a->set_template_engine('smarty3');
- }
-
-Here we have set the basic theme information, in this case they are empty.
-But the array needs to be set.
-And we have set the template engine that should be used by friendica for this theme.
-At the moment you should use the *smarty3* engine.
-There once was a friendica specific templating engine as well but that is not used anymore.
-If you like to use another templating engine, please implement it.
-
-If you want to add something to the HTML header of the theme, one way to do so is by adding it to the theme.php file.
-To do so, add something alike
-
- DI::page()['htmlhead'] .= <<< EOT
- /* stuff you want to add to the header */
- EOT;
-
-So you can access the properties of this friendica session from the theme.php file as well.
-
-### default.php
-
-This file covers the structure of the underlying HTML layout.
-The default file is in
-
- /view/default.php
-
-if you want to change it, say adding a 4th column for banners of your favourite FLOSS projects, place a new default.php file in your theme directory.
-As with the theme.php file, you can use the properties of the $a variable with holds the friendica application to decide what content is displayed.
+In the `General Theme Settings` you can also find the [vier](https://github.com/friendica/friendica/tree/stable/view/theme/vier) Theme, which precedes frio and is no longer officially maintained.
diff --git a/images/bluesky.jpg b/images/bluesky.jpg
index 35020ac770..4f551764c4 100644
Binary files a/images/bluesky.jpg and b/images/bluesky.jpg differ
diff --git a/images/screenshots/friendica-2023-10-frio-desktop.png b/images/screenshots/friendica-2023-10-frio-desktop.png
deleted file mode 100644
index e06f971365..0000000000
Binary files a/images/screenshots/friendica-2023-10-frio-desktop.png and /dev/null differ
diff --git a/images/screenshots/friendica-2023-12-frio-desktop.png b/images/screenshots/friendica-2023-12-frio-desktop.png
new file mode 100644
index 0000000000..1a926ffb65
Binary files /dev/null and b/images/screenshots/friendica-2023-12-frio-desktop.png differ
diff --git a/index.php b/index.php
index 87778308a5..1b62b71c1c 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
render([$post], Conversation::MODE_SEARCH, false, true);
diff --git a/mod/lostpass.php b/mod/lostpass.php
index 5eb53ae2f3..51e0ba8db6 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -1,6 +1,6 @@
t('User not found.'));
}
- $phototypes = Images::supportedTypes();
-
$can_post = false;
$visitor = 0;
@@ -215,14 +213,14 @@ function photos_post(App $a)
// get the list of photos we are about to delete
if ($visitor) {
$r = DBA::toArray(DBA::p(
- "SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `contact-id` = ? AND `uid` = ? AND `album` = ?",
+ "SELECT distinct(`resource-id`) AS `rid` FROM `photo` WHERE `contact-id` = ? AND `uid` = ? AND `album` = ?",
$visitor,
$page_owner_uid,
$album
));
} else {
$r = DBA::toArray(DBA::p(
- "SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `uid` = ? AND `album` = ?",
+ "SELECT distinct(`resource-id`) AS `rid` FROM `photo` WHERE `uid` = ? AND `album` = ?",
DI::userSession()->getLocalUserId(),
$album
));
@@ -337,7 +335,7 @@ function photos_post(App $a)
if (DBA::isResult($photos)) {
$photo = $photos[0];
- $ext = $phototypes[$photo['type']];
+ $ext = Images::getExtensionByMimeType($photo['type']);
Photo::update(
['desc' => $desc, 'album' => $albname, 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_circle_allow, 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_circle_deny],
['resource-id' => $resource_id, 'uid' => $page_owner_uid]
@@ -590,8 +588,6 @@ function photos_content(App $a)
$profile = Profile::getByUID($user['uid']);
- $phototypes = Images::supportedTypes();
-
$_SESSION['photo_return'] = DI::args()->getCommand();
// Parse arguments
@@ -762,7 +758,7 @@ function photos_content(App $a)
$total = 0;
$r = DBA::toArray(DBA::p(
- "SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = ? AND `album` = ?
+ "SELECT `resource-id`, MAX(`scale`) AS `scale` FROM `photo` WHERE `uid` = ? AND `album` = ?
AND `scale` <= 4 $sql_extra GROUP BY `resource-id`",
$owner_uid,
$album
@@ -782,9 +778,9 @@ function photos_content(App $a)
}
$r = DBA::toArray(DBA::p(
- "SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`,
- ANY_VALUE(`type`) AS `type`, max(`scale`) AS `scale`, ANY_VALUE(`desc`) as `desc`,
- ANY_VALUE(`created`) as `created`
+ "SELECT `resource-id`, MIN(`id`) AS `id`, MIN(`filename`) AS `filename`,
+ MIN(`type`) AS `type`, MAX(`scale`) AS `scale`, MIN(`desc`) AS `desc`,
+ MIN(`created`) AS `created`
FROM `photo` WHERE `uid` = ? AND `album` = ?
AND `scale` <= 4 $sql_extra GROUP BY `resource-id` ORDER BY `created` $order LIMIT ? , ?",
intval($owner_uid),
@@ -844,7 +840,7 @@ function photos_content(App $a)
foreach ($r as $rr) {
$twist = !$twist;
- $ext = $phototypes[$rr['type']];
+ $ext = Images::getExtensionByMimeType($rr['type']);
$imgalt_e = $rr['filename'];
$desc_e = $rr['desc'];
@@ -855,7 +851,7 @@ function photos_content(App $a)
'link' => 'photos/' . $user['nickname'] . '/image/' . $rr['resource-id']
. ($order_field === 'created' ? '?order=created' : ''),
'title' => DI::l10n()->t('View Photo'),
- 'src' => 'photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.' . $ext,
+ 'src' => 'photo/' . $rr['resource-id'] . '-' . $rr['scale'] . $ext,
'alt' => $imgalt_e,
'desc' => $desc_e,
'ext' => $ext,
@@ -1013,9 +1009,9 @@ function photos_content(App $a)
}
$photo = [
- 'href' => 'photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.' . $phototypes[$hires['type']],
+ 'href' => 'photo/' . $hires['resource-id'] . '-' . $hires['scale'] . Images::getExtensionByMimeType($hires['type']),
'title' => DI::l10n()->t('View Full Size'),
- 'src' => 'photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.' . $phototypes[$lores['type']] . '?_u=' . DateTimeFormat::utcNow('ymdhis'),
+ 'src' => 'photo/' . $lores['resource-id'] . '-' . $lores['scale'] . Images::getExtensionByMimeType($lores['type']) . '?_u=' . DateTimeFormat::utcNow('ymdhis'),
'height' => $hires['height'],
'width' => $hires['width'],
'album' => $hires['album'],
@@ -1043,7 +1039,7 @@ function photos_content(App $a)
$pager = new Pager(DI::l10n(), DI::args()->getQueryString());
$params = ['order' => ['id'], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
- $items = Post::toArray(Post::selectForUser($link_item['uid'], Item::ITEM_FIELDLIST, $condition, $params));
+ $items = Post::toArray(Post::selectForUser($link_item['uid'], array_merge(Item::ITEM_FIELDLIST, ['author-alias']), $condition, $params));
if (DI::userSession()->getLocalUserId() == $link_item['uid']) {
Item::update(['unseen' => false], ['parent' => $link_item['parent']]);
@@ -1167,11 +1163,11 @@ function photos_content(App $a)
}
if (!empty($conv_responses['like'][$link_item['uri']])) {
- $like = DI::conversation()->formatActivity($conv_responses['like'][$link_item['uri']]['links'], 'like', $link_item['id']);
+ $like = DI::conversation()->formatActivity($conv_responses['like'][$link_item['uri']]['links'], 'like', $link_item['id'], '', []);
}
if (!empty($conv_responses['dislike'][$link_item['uri']])) {
- $dislike = DI::conversation()->formatActivity($conv_responses['dislike'][$link_item['uri']]['links'], 'dislike', $link_item['id']);
+ $dislike = DI::conversation()->formatActivity($conv_responses['dislike'][$link_item['uri']]['links'], 'dislike', $link_item['id'], '', []);
}
if (($can_post || Security::canWriteToUserWall($owner_uid))) {
diff --git a/mod/update_contact.php b/mod/update_contact.php
index b97e9ec7be..474b545040 100644
--- a/mod/update_contact.php
+++ b/mod/update_contact.php
@@ -1,6 +1,6 @@
.
- *
- */
-
-if (($_POST["friendica_acct_name"] != '') && ($_POST["friendica_password"] != '')) {
- setcookie("username", $_POST["friendica_acct_name"], time()+60*60*24*300);
- setcookie("password", $_POST["friendica_password"], time()+60*60*24*300);
-}
-
-?>
-
-
-
-
-
-
- $content];
-
- // echo "posting to: $url
- ] [-h|--help|-?] [-v]
- bin/console user add [ [ [ []]]] [-h|--help|-?] [-v]
+ bin/console user add [ [ [ [ []]]]] [-h|--help|-?] [-v]
bin/console user delete [] [-y] [-h|--help|-?] [-v]
bin/console user allow [] [-h|--help|-?] [-v]
bin/console user deny [] [-h|--help|-?] [-v]
@@ -228,10 +228,11 @@ HELP;
*/
private function addUser()
{
- $name = $this->getArgument(1);
- $nick = $this->getArgument(2);
- $email = $this->getArgument(3);
- $lang = $this->getArgument(4);
+ $name = $this->getArgument(1);
+ $nick = $this->getArgument(2);
+ $email = $this->getArgument(3);
+ $lang = $this->getArgument(4);
+ $avatar = $this->getArgument(5);
if (empty($name)) {
$this->out($this->l10n->t('Enter user name: '));
@@ -262,10 +263,15 @@ HELP;
$lang = CliPrompt::prompt();
}
+ if (empty($avatar)) {
+ $this->out($this->l10n->t('Enter URL of an image to use as avatar (optional): '));
+ $avatar = CliPrompt::prompt();
+ }
+
if (empty($lang)) {
return UserModel::createMinimal($name, $email, $nick);
} else {
- return UserModel::createMinimal($name, $email, $nick, $lang);
+ return UserModel::createMinimal($name, $email, $nick, $lang, $avatar);
}
}
diff --git a/src/Contact/Avatar.php b/src/Contact/Avatar.php
index fc4b7e38cb..f165e1d3a1 100644
--- a/src/Contact/Avatar.php
+++ b/src/Contact/Avatar.php
@@ -1,6 +1,6 @@
getBody();
+ if (!$fetchResult->isSuccess()) {
+ Logger::debug('Fetching was unsuccessful', ['avatar' => $avatar]);
+ return $fields;
+ }
+
+ $img_str = $fetchResult->getBodyString();
if (empty($img_str)) {
Logger::debug('Avatar is invalid', ['avatar' => $avatar]);
return $fields;
}
- $image = new Image($img_str, Images::getMimeTypeByData($img_str));
+ $image = new Image($img_str, $fetchResult->getContentType(), $avatar);
if (!$image->isValid()) {
Logger::debug('Avatar picture is invalid', ['avatar' => $avatar]);
return $fields;
@@ -145,7 +150,7 @@ class Avatar
return '';
}
- $path = $filename . $size . '.' . $image->getExt();
+ $path = $filename . $size . $image->getExt();
$basepath = self::basePath();
if (empty($basepath)) {
diff --git a/src/Contact/FriendSuggest/Collection/FriendSuggests.php b/src/Contact/FriendSuggest/Collection/FriendSuggests.php
index 8777087bc9..a59a8f1e26 100644
--- a/src/Contact/FriendSuggest/Collection/FriendSuggests.php
+++ b/src/Contact/FriendSuggest/Collection/FriendSuggests.php
@@ -1,6 +1,6 @@
getBlocklist())) {
- continue;
- }
-
// Can we put this after the visibility check?
$this->builtinActivityPuller($item, $conv_responses);
@@ -694,29 +690,6 @@ class Conversation
return $threads;
}
- private function getBlocklist(): array
- {
- if (!$this->session->getLocalUserId()) {
- return [];
- }
-
- $str_blocked = str_replace(["\n", "\r"], ",", $this->pConfig->get($this->session->getLocalUserId(), 'system', 'blocked') ?? '');
- if (empty($str_blocked)) {
- return [];
- }
-
- $blocklist = [];
-
- foreach (explode(',', $str_blocked) as $entry) {
- $cid = Contact::getIdForURL(trim($entry), 0, false);
- if (!empty($cid)) {
- $blocklist[] = $cid;
- }
- }
-
- return $blocklist;
- }
-
/**
* Adds some information (Causer, post reason, direction) to the fetched post row.
*
@@ -893,6 +866,7 @@ class Conversation
$emojis = $this->getEmojis($uriids);
$quoteshares = $this->getQuoteShares($uriids);
+ $counts = $this->getCounts($uriids);
if (!$this->config->get('system', 'legacy_activities')) {
$condition = DBA::mergeConditions($condition, ["(`gravity` != ? OR `origin`)", ItemModel::GRAVITY_ACTIVITY]);
@@ -900,7 +874,7 @@ class Conversation
$condition = DBA::mergeConditions(
$condition,
- ["`uid` IN (0, ?) AND (NOT `vid` IN (?, ?, ?) OR `vid` IS NULL)", $uid, Verb::getID(Activity::FOLLOW), Verb::getID(Activity::VIEW), Verb::getID(Activity::READ)]
+ ["`uid` IN (0, ?) AND (NOT `verb` IN (?, ?, ?) OR `verb` IS NULL)", $uid, Activity::FOLLOW, Activity::VIEW, Activity::READ]
);
$condition = DBA::mergeConditions($condition, ["(`uid` != ? OR `private` != ?)", 0, ItemModel::PRIVATE]);
@@ -1017,6 +991,7 @@ class Conversation
foreach ($items as $key => $row) {
$items[$key]['emojis'] = $emojis[$key] ?? [];
+ $items[$key]['counts'] = $counts[$key] ?? 0;
$items[$key]['quoteshares'] = $quoteshares[$key] ?? [];
$always_display = in_array($mode, [self::MODE_CONTACTS, self::MODE_CONTACT_POSTS]);
@@ -1050,6 +1025,16 @@ class Conversation
*/
private function getEmojis(array $uriids): array
{
+ $emojis = [];
+
+ foreach (Post\Counts::get(['parent-uri-id' => $uriids]) as $count) {
+ $emojis[$count['uri-id']][$count['reaction']]['emoji'] = $count['reaction'];
+ $emojis[$count['uri-id']][$count['reaction']]['verb'] = Verb::getByID($count['vid']);
+ $emojis[$count['uri-id']][$count['reaction']]['total'] = $count['count'];
+ $emojis[$count['uri-id']][$count['reaction']]['title'] = [];
+ }
+
+ // @todo The following code should be removed, once that we display activity authors on demand
$activity_emoji = [
Activity::LIKE => '👍',
Activity::DISLIKE => '👎',
@@ -1058,42 +1043,49 @@ class Conversation
Activity::ATTENDNO => '❌',
Activity::ANNOUNCE => '♻',
Activity::VIEW => '📺',
+ Activity::READ => '📖',
];
- $index_list = array_values($activity_emoji);
- $verbs = array_merge(array_keys($activity_emoji), [Activity::EMOJIREACT, Activity::POST]);
-
+ $verbs = array_merge(array_keys($activity_emoji), [Activity::EMOJIREACT, Activity::POST]);
$condition = DBA::mergeConditions(['parent-uri-id' => $uriids, 'gravity' => [ItemModel::GRAVITY_ACTIVITY, ItemModel::GRAVITY_COMMENT], 'verb' => $verbs], ["NOT `deleted`"]);
$separator = chr(255) . chr(255) . chr(255);
- $sql = "SELECT `thr-parent-id`, `body`, `verb`, `gravity`, COUNT(*) AS `total`, GROUP_CONCAT(REPLACE(`author-name`, '" . $separator . "', ' ') SEPARATOR '" . $separator . "' LIMIT 50) AS `title` FROM `post-view` WHERE " . array_shift($condition) . " GROUP BY `thr-parent-id`, `verb`, `body`, `gravity`";
-
- $emojis = [];
+ $sql = "SELECT `parent-uri-id`, `thr-parent-id`, `body`, `verb`, `gravity`, GROUP_CONCAT(REPLACE(`author-name`, '" . $separator . "', ' ') SEPARATOR '" . $separator . "' LIMIT 50) AS `title` FROM `post-view` WHERE " . array_shift($condition) . " GROUP BY `parent-uri-id`, `thr-parent-id`, `verb`, `body`, `gravity`";
$rows = DBA::p($sql, $condition);
while ($row = DBA::fetch($rows)) {
if ($row['gravity'] == ItemModel::GRAVITY_ACTIVITY) {
- $row['verb'] = $row['body'] ? Activity::EMOJIREACT : $row['verb'];
- $emoji = $row['body'] ?: $activity_emoji[$row['verb']];
+ $emoji = $row['body'] ?: $activity_emoji[$row['verb']];
} else {
$emoji = '';
}
- if (!isset($index_list[$emoji])) {
- $index_list[] = $emoji;
+ if (isset($emojis[$row['thr-parent-id']][$emoji]['title'])) {
+ $emojis[$row['thr-parent-id']][$emoji]['title'] = array_unique(array_merge($emojis[$row['thr-parent-id']][$emoji]['title'] ?? [], explode($separator, $row['title'])));
}
- $index = array_search($emoji, $index_list);
-
- $emojis[$row['thr-parent-id']][$index]['emoji'] = $emoji;
- $emojis[$row['thr-parent-id']][$index]['verb'] = $row['verb'];
- $emojis[$row['thr-parent-id']][$index]['total'] = ($emojis[$row['thr-parent-id']][$index]['total'] ?? 0) + $row['total'];
- $emojis[$row['thr-parent-id']][$index]['title'] = array_unique(array_merge($emojis[$row['thr-parent-id']][$index]['title'] ?? [], explode($separator, $row['title'])));
}
DBA::close($rows);
return $emojis;
}
+ /**
+ * Fetch comment counts from the conversation
+ *
+ * @param array $uriids
+ * @return array
+ */
+ private function getCounts(array $uriids): array
+ {
+ $counts = [];
+
+ foreach (Post\Counts::get(['parent-uri-id' => $uriids, 'verb' => Activity::POST]) as $count) {
+ $counts[$count['parent-uri-id']] = ($counts[$count['parent-uri-id']] ?? 0) + $count['count'];
+ }
+
+ return $counts;
+ }
+
/**
* Fetch quote shares from the conversation
*
@@ -1274,16 +1266,10 @@ class Conversation
return $parents;
}
- $blocklist = $this->getBlocklist();
-
$item_array = [];
// Dedupes the item list on the uri to prevent infinite loops
foreach ($item_list as $item) {
- if (in_array($item['author-id'], $blocklist)) {
- continue;
- }
-
$item_array[$item['uri-id']] = $item;
}
@@ -1472,10 +1458,6 @@ class Conversation
continue;
}
- if (in_array($item['author-id'], $this->getBlocklist())) {
- continue;
- }
-
// prevent private email from leaking.
if ($item['network'] === Protocol::MAIL && $this->session->getLocalUserId() != $item['uid']) {
continue;
diff --git a/src/Content/Conversation/Collection/Timelines.php b/src/Content/Conversation/Collection/Timelines.php
index da9c7c9e61..41607ee01e 100644
--- a/src/Content/Conversation/Collection/Timelines.php
+++ b/src/Content/Conversation/Collection/Timelines.php
@@ -1,6 +1,6 @@
code = $code;
$this->label = $label;
@@ -69,8 +84,13 @@ class Timeline extends \Friendica\BaseEntity
$this->uid = $uid;
$this->includeTags = $includeTags;
$this->excludeTags = $excludeTags;
+ $this->minSize = $minSize;
+ $this->maxSize = $maxSize;
$this->fullTextSearch = $fullTextSearch;
$this->mediaType = $mediaType;
$this->circle = $circle;
+ $this->languages = $languages;
+ $this->publish = $publish;
+ $this->valid = $valid;
}
}
diff --git a/src/Content/Conversation/Entity/UserDefinedChannel.php b/src/Content/Conversation/Entity/UserDefinedChannel.php
index 3d88c6666b..574d677e08 100644
--- a/src/Content/Conversation/Entity/UserDefinedChannel.php
+++ b/src/Content/Conversation/Entity/UserDefinedChannel.php
@@ -1,6 +1,6 @@
l10n->t('For you'), $this->l10n->t('Posts from contacts you interact with and who interact with you'), 'y'),
+ new ChannelEntity(ChannelEntity::DISCOVER, $this->l10n->t('Discover'), $this->l10n->t('Posts from accounts that you don\'t follow, but that you might like.'), 'o'),
new ChannelEntity(ChannelEntity::WHATSHOT, $this->l10n->t('What\'s Hot'), $this->l10n->t('Posts with a lot of interactions'), 'h'),
new ChannelEntity(ChannelEntity::LANGUAGE, $native, $this->l10n->t('Posts in %s', $native), 'g'),
new ChannelEntity(ChannelEntity::FOLLOWERS, $this->l10n->t('Followers'), $this->l10n->t('Posts from your followers that you don\'t follow'), 'f'),
new ChannelEntity(ChannelEntity::SHARERSOFSHARERS, $this->l10n->t('Sharers of sharers'), $this->l10n->t('Posts from accounts that are followed by accounts that you follow'), 'r'),
+ new ChannelEntity(ChannelEntity::QUIETSHARERS, $this->l10n->t('Quiet sharers'), $this->l10n->t('Posts from accounts that you follow but who don\'t post very often'), 'q'),
new ChannelEntity(ChannelEntity::IMAGE, $this->l10n->t('Images'), $this->l10n->t('Posts with images'), 'i'),
new ChannelEntity(ChannelEntity::AUDIO, $this->l10n->t('Audio'), $this->l10n->t('Posts with audio'), 'd'),
new ChannelEntity(ChannelEntity::VIDEO, $this->l10n->t('Videos'), $this->l10n->t('Posts with videos'), 'v'),
@@ -54,6 +56,6 @@ final class Channel extends Timeline
public function isTimeline(string $selectedTab): bool
{
- return in_array($selectedTab, [ChannelEntity::WHATSHOT, ChannelEntity::FORYOU, ChannelEntity::FOLLOWERS, ChannelEntity::SHARERSOFSHARERS, ChannelEntity::IMAGE, ChannelEntity::VIDEO, ChannelEntity::AUDIO, ChannelEntity::LANGUAGE]);
+ return in_array($selectedTab, [ChannelEntity::WHATSHOT, ChannelEntity::FORYOU, ChannelEntity::DISCOVER, ChannelEntity::FOLLOWERS, ChannelEntity::SHARERSOFSHARERS, ChannelEntity::QUIETSHARERS, ChannelEntity::IMAGE, ChannelEntity::VIDEO, ChannelEntity::AUDIO, ChannelEntity::LANGUAGE]);
}
}
diff --git a/src/Content/Conversation/Factory/Community.php b/src/Content/Conversation/Factory/Community.php
index bd86ce3a9f..5472bd2739 100644
--- a/src/Content/Conversation/Factory/Community.php
+++ b/src/Content/Conversation/Factory/Community.php
@@ -1,6 +1,6 @@
pConfig = $pConfig;
+ $this->config = $config;
}
/**
@@ -63,6 +66,11 @@ class UserDefinedChannel extends \Friendica\BaseRepository
return $Entities;
}
+ public function select(array $condition, array $params = []): UserDefinedChannels
+ {
+ return $this->_select($condition, $params);
+ }
+
/**
* Fetch a single user channel
*
@@ -122,8 +130,13 @@ class UserDefinedChannel extends \Friendica\BaseRepository
'circle' => $Channel->circle,
'include-tags' => $Channel->includeTags,
'exclude-tags' => $Channel->excludeTags,
+ 'min-size' => $Channel->minSize,
+ 'max-size' => $Channel->maxSize,
'full-text-search' => $Channel->fullTextSearch,
'media-type' => $Channel->mediaType,
+ 'languages' => !empty($Channel->languages) ? serialize($Channel->languages) : null,
+ 'publish' => $Channel->publish,
+ 'valid' => $this->isValid($Channel->fullTextSearch),
];
if ($Channel->code) {
@@ -139,40 +152,161 @@ class UserDefinedChannel extends \Friendica\BaseRepository
return $Channel;
}
+ private function isValid(string $searchtext): bool
+ {
+ if ($searchtext == '') {
+ return true;
+ }
+
+ return $this->db->select('check-full-text-search', [], ["`pid` = ? AND MATCH (`searchtext`) AGAINST (? IN BOOLEAN MODE)", getmypid(), Engagement::escapeKeywords($searchtext)]) !== false;
+ }
+
/**
- * Checks, if one of the user defined channels matches with the given search text
- * @todo To increase the performance, this functionality should be replaced with a single SQL call.
+ * Checks if one of the user-defined channels matches the given language or item text via full-text search
*
- * @param string $searchtext
+ * @param string $haystack
* @param string $language
* @return boolean
+ * @throws \Exception
*/
- public function match(string $searchtext, string $language): bool
+ public function match(string $haystack, string $language): bool
{
- if (!in_array($language, User::getLanguages())) {
- $this->logger->debug('Unwanted language found. No matched channel found.', ['language' => $language, 'searchtext' => $searchtext]);
+ $users = $this->db->selectToArray('user', ['uid'], $this->getUserCondition());
+ if (empty($users)) {
return false;
}
- $store = false;
- $this->db->insert('check-full-text-search', ['pid' => getmypid(), 'searchtext' => $searchtext], Database::INSERT_UPDATE);
- $channels = $this->db->select(self::$table_name, ['full-text-search', 'uid', 'label'], ["`full-text-search` != ? AND `circle` = ?", '', 0]);
- while ($channel = $this->db->fetch($channels)) {
- $channelsearchtext = $channel['full-text-search'];
- foreach (Engagement::KEYWORDS as $keyword) {
- $channelsearchtext = preg_replace('~(' . $keyword . ':.[\w@\.-]+)~', '"$1"', $channelsearchtext);
- }
- if ($this->db->exists('check-full-text-search', ["`pid` = ? AND MATCH (`searchtext`) AGAINST (? IN BOOLEAN MODE)", getmypid(), $channelsearchtext])) {
- if (in_array($language, $this->pConfig->get($channel['uid'], 'channel', 'languages', [User::getLanguageCode($channel['uid'])]))) {
- $store = true;
- $this->logger->debug('Matching channel found.', ['uid' => $channel['uid'], 'label' => $channel['label'], 'language' => $language, 'channelsearchtext' => $channelsearchtext, 'searchtext' => $searchtext]);
- break;
- }
+ $uids = array_column($users, 'uid');
+
+ $usercondition = ['uid' => $uids];
+ $condition = DBA::mergeConditions($usercondition, ["`languages` != ? AND `include-tags` = ? AND `full-text-search` = ? AND `circle` = ?", '', '', '', 0]);
+ foreach ($this->select($condition) as $channel) {
+ if (!empty($channel->languages) && in_array($language, $channel->languages)) {
+ return true;
}
}
- $this->db->close($channels);
- $this->db->delete('check-full-text-search', ['pid' => getmypid()]);
- return $store;
+ $search = '';
+ $condition = DBA::mergeConditions($usercondition, ["`full-text-search` != ? AND `circle` = ? AND `valid`", '', 0]);
+ foreach ($this->select($condition) as $channel) {
+ $search .= '(' . $channel->fullTextSearch . ') ';
+ }
+
+ return (new DisposableFullTextSearch($this->db, $haystack))->match(Engagement::escapeKeywords($search));
+ }
+
+ /**
+ * List the IDs of the relay/group users that have matching user-defined channels based on an item details
+ *
+ * @param string $searchtext
+ * @param string $language
+ * @param array $tags
+ * @param int $media_type
+ * @param int $owner_id
+ * @param int $reshare_id
+ * @return array
+ * @throws \Exception
+ */
+ public function getMatchingChannelUsers(string $searchtext, string $language, array $tags, int $media_type, int $owner_id, int $reshare_id): array
+ {
+ $condition = $this->getUserCondition();
+ $condition = DBA::mergeConditions($condition, ["`account-type` IN (?, ?) AND `uid` != ?", User::ACCOUNT_TYPE_RELAY, User::ACCOUNT_TYPE_COMMUNITY, 0]);
+ $users = $this->db->selectToArray('user', ['uid'], $condition);
+ if (empty($users)) {
+ return [];
+ }
+
+ if (!in_array($language, User::getLanguages())) {
+ $this->logger->debug('Unwanted language found. No matched channel found.', ['language' => $language, 'searchtext' => $searchtext]);
+ return [];
+ }
+
+ $disposableFullTextSearch = new DisposableFullTextSearch($this->db, $searchtext);
+
+ $filteredChannels = $this->select(['uid' => array_column($users, 'uid'), 'publish' => true, 'valid' => true])->filter(
+ function (Entity\UserDefinedChannel $channel) use ($owner_id, $reshare_id, $language, $tags, $media_type, $disposableFullTextSearch, $searchtext) {
+ static $uids = [];
+
+ // Filter out channels from already picked users
+ if (in_array($channel->uid, $uids)) {
+ return false;
+ }
+
+ if (
+ ($channel->circle ?? 0)
+ && !$this->inCircle($channel->circle, $channel->uid, $owner_id)
+ && !$this->inCircle($channel->circle, $channel->uid, $reshare_id)
+ ) {
+ return false;
+ }
+
+ if (!in_array($language, $channel->languages ?: User::getWantedLanguages($channel->uid))) {
+ return false;
+ }
+
+ if ($channel->includeTags && !$this->inTaglist($channel->includeTags, $tags)) {
+ return false;
+ }
+
+ if ($channel->excludeTags && $this->inTaglist($channel->excludeTags, $tags)) {
+ return false;
+ }
+
+ if ($channel->mediaType && !($channel->mediaType & $media_type)) {
+ return false;
+ }
+
+ if ($channel->fullTextSearch && !$disposableFullTextSearch->match(Engagement::escapeKeywords($channel->fullTextSearch))) {
+ return false;
+ }
+
+ $uids[] = $channel->uid;
+ $this->logger->debug('Matching channel found.', ['uid' => $channel->uid, 'label' => $channel->label, 'language' => $language, 'tags' => $tags, 'media_type' => $media_type, 'searchtext' => $searchtext]);
+
+ return true;
+ }
+ );
+
+ return $filteredChannels->column('uid');
+ }
+
+ private function inCircle(int $circleId, int $uid, int $cid): bool
+ {
+ if ($cid == 0) {
+ return false;
+ }
+
+ $account = Contact::selectFirstAccountUser(['id'], ['pid' => $cid, 'uid' => $uid]);
+ if (empty($account['id'])) {
+ return false;
+ }
+ return $this->db->exists('group_member', ['gid' => $circleId, 'contact-id' => $account['id']]);
+ }
+
+ private function inTaglist(string $tagList, array $tags): bool
+ {
+ if (empty($tags)) {
+ return false;
+ }
+ array_walk($tags, function (&$value) {
+ $value = mb_strtolower($value);
+ });
+ foreach (explode(',', $tagList) as $tag) {
+ if (in_array($tag, $tags)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private function getUserCondition(): array
+ {
+ $condition = ["`verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired` AND `user`.`uid` > ?", 0];
+
+ $abandon_days = intval($this->config->get('system', 'account_abandon_days'));
+ if (!empty($abandon_days)) {
+ $condition = DBA::mergeConditions($condition, ["`last-activity` > ?", DateTimeFormat::utc('now - ' . $abandon_days . ' days')]);
+ }
+ return $condition;
}
}
diff --git a/src/Content/Feature.php b/src/Content/Feature.php
index b9b9d2e0e6..a95d3779d3 100644
--- a/src/Content/Feature.php
+++ b/src/Content/Feature.php
@@ -1,6 +1,6 @@
$baseurl . '/' . $contact['id'],
+ 'url' => 'contact/' . $contact['id'] . '/conversations',
'external_url' => Contact::magicLinkByContact($contact),
'name' => $contact['name'],
'cid' => $contact['id'],
- 'selected' => $selected,
'micro' => DI::baseUrl()->remove(Contact::getMicro($contact)),
'id' => ++$id,
];
diff --git a/src/Content/Image.php b/src/Content/Image.php
index cc2fd5122c..a3a2e1abcc 100644
--- a/src/Content/Image.php
+++ b/src/Content/Image.php
@@ -1,6 +1,6 @@
$item['author-link'],
'alias' => $item['author-alias'],
];
- $profile_link = Contact::magicLinkByContact($author, $item['author-link']);
+ $profile_link = Contact::magicLinkByContact($author, Contact::getProfileLink($author));
if (strpos($profile_link, 'contact/redir/') === 0) {
$status_link = $profile_link . '?' . http_build_query(['url' => $item['author-link'] . '/status']);
$photos_link = $profile_link . '?' . http_build_query(['url' => $item['author-link'] . '/photos']);
@@ -695,7 +695,7 @@ class Item
$item['body'] = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
}
- $shared_content = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['plink'], $item['created'], $item['guid'], $item['uri']);
+ $shared_content = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['plink'] ?? $item['uri'], $item['created'], $item['guid'], $item['uri']);
if (!empty($item['title'])) {
$shared_content .= '[h3]' . $item['title'] . "[/h3]\n";
@@ -1105,4 +1105,35 @@ class Item
Tag::store($toUriId, $receiver['type'], $receiver['name'], $receiver['url']);
}
}
+
+ /**
+ * Check if the item is too old
+ *
+ * @param string $created
+ * @param integer $uid
+ * @return boolean item is too old
+ */
+ public function isTooOld(string $created, int $uid = 0): bool
+ {
+ // check for create date and expire time
+ $expire_interval = DI::config()->get('system', 'dbclean-expire-days', 0);
+
+ if ($uid) {
+ $user = DBA::selectFirst('user', ['expire'], ['uid' => $uid]);
+ if (DBA::isResult($user) && ($user['expire'] > 0) && (($user['expire'] < $expire_interval) || ($expire_interval == 0))) {
+ $expire_interval = $user['expire'];
+ }
+ }
+
+ if (($expire_interval > 0) && !empty($created)) {
+ $expire_date = time() - ($expire_interval * 86400);
+ $created_date = strtotime($created);
+ if ($created_date < $expire_date) {
+ Logger::notice('Item created before expiration interval.', ['created' => date('c', $created_date), 'expired' => date('c', $expire_date)]);
+ return true;
+ }
+ }
+
+ return false;
+ }
}
diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index cab5f7a425..a8f568630f 100644
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -1,6 +1,6 @@
fetchFull($href . '&maxwidth=' . $a->getThemeInfoValue('videowidth'));
- if ($result->getReturnCode() === 200) {
- $json_string = $result->getBody();
+ if ($result->isSuccess()) {
+ $json_string = $result->getBodyString();
break;
}
}
@@ -157,57 +139,55 @@ class OEmbed
}
// Improve the OEmbed data with data from OpenGraph, Twitter cards and other sources
- if ($use_parseurl) {
- $data = ParseUrl::getSiteinfoCached($embedurl, false);
+ $data = ParseUrl::getSiteinfoCached($embedurl);
- if (($oembed->type == 'error') && empty($data['title']) && empty($data['text'])) {
- return $oembed;
- }
+ if (($oembed->type == 'error') && empty($data['title']) && empty($data['text'])) {
+ return $oembed;
+ }
- if ($no_rich_type || ($oembed->type == 'error')) {
- $oembed->html = '';
- $oembed->type = $data['type'];
+ if (!self::isAllowedURL($embedurl) || ($oembed->type == 'error')) {
+ $oembed->html = '';
+ $oembed->type = $data['type'];
- if ($oembed->type == 'photo') {
- if (!empty($data['images'])) {
- $oembed->url = $data['images'][0]['src'];
- $oembed->width = $data['images'][0]['width'];
- $oembed->height = $data['images'][0]['height'];
- } else {
- $oembed->type = 'link';
- }
+ if ($oembed->type == 'photo') {
+ if (!empty($data['images'])) {
+ $oembed->url = $data['images'][0]['src'];
+ $oembed->width = $data['images'][0]['width'];
+ $oembed->height = $data['images'][0]['height'];
+ } else {
+ $oembed->type = 'link';
}
}
+ }
- if (!empty($data['title'])) {
- $oembed->title = $data['title'];
- }
+ if (!empty($data['title'])) {
+ $oembed->title = $data['title'];
+ }
- if (!empty($data['text'])) {
- $oembed->description = $data['text'];
- }
+ if (!empty($data['text'])) {
+ $oembed->description = $data['text'];
+ }
- if (!empty($data['publisher_name'])) {
- $oembed->provider_name = $data['publisher_name'];
- }
+ if (!empty($data['publisher_name'])) {
+ $oembed->provider_name = $data['publisher_name'];
+ }
- if (!empty($data['publisher_url'])) {
- $oembed->provider_url = $data['publisher_url'];
- }
+ if (!empty($data['publisher_url'])) {
+ $oembed->provider_url = $data['publisher_url'];
+ }
- if (!empty($data['author_name'])) {
- $oembed->author_name = $data['author_name'];
- }
+ if (!empty($data['author_name'])) {
+ $oembed->author_name = $data['author_name'];
+ }
- if (!empty($data['author_url'])) {
- $oembed->author_url = $data['author_url'];
- }
+ if (!empty($data['author_url'])) {
+ $oembed->author_url = $data['author_url'];
+ }
- if (!empty($data['images']) && ($oembed->type != 'photo')) {
- $oembed->thumbnail_url = $data['images'][0]['src'];
- $oembed->thumbnail_width = $data['images'][0]['width'];
- $oembed->thumbnail_height = $data['images'][0]['height'];
- }
+ if (!empty($data['images']) && ($oembed->type != 'photo')) {
+ $oembed->thumbnail_url = $data['images'][0]['src'];
+ $oembed->thumbnail_width = $data['images'][0]['width'];
+ $oembed->thumbnail_height = $data['images'][0]['height'];
}
Hook::callAll('oembed_fetch_url', $embedurl, $oembed);
@@ -219,9 +199,10 @@ class OEmbed
* Returns a formatted string from OEmbed object
*
* @param \Friendica\Object\OEmbed $oembed
+ * @param int $uriid
* @return string
*/
- private static function formatObject(\Friendica\Object\OEmbed $oembed): string
+ private static function formatObject(\Friendica\Object\OEmbed $oembed, int $uriid): string
{
$ret = '';
@@ -241,22 +222,22 @@ class OEmbed
'$escapedhtml' => base64_encode($oembed->html),
'$tw' => $tw,
'$th' => $th,
- '$turl' => $oembed->thumbnail_url,
+ '$turl' => BBCode::proxyUrl($oembed->thumbnail_url, BBCode::INTERNAL, $uriid, Proxy::SIZE_SMALL),
]);
} else {
- $ret = $oembed->html;
+ $ret .= Proxy::proxifyHtml($oembed->html, $uriid);
}
break;
case 'photo':
- $ret .= '
';
+ $ret .= '
';
break;
case 'link':
break;
case 'rich':
- $ret .= Proxy::proxifyHtml($oembed->html);
+ $ret .= Proxy::proxifyHtml($oembed->html, $uriid);
break;
}
@@ -294,12 +275,21 @@ class OEmbed
$ret .= '
' . $oembed->embed_url . ' ';
}
$ret .= "";
+ if ($oembed->type == 'link') {
+ if (!empty($oembed->thumbnail_url)) {
+ $ret .= '
';
+ }
+ if (!empty($oembed->description)) {
+ $ret .= '
' . $oembed->description . '
';
+ }
+ }
} elseif (!strpos($oembed->html, $oembed->embed_url)) {
// add
for html2bbcode conversion
$ret .= ' ' . $oembed->title . ' ';
}
$ret .= '
" . DI::l10n()->t('Embedding disabled') . " : $1 ", $text);
- }
- return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", [self::class, 'replaceCallback'], $text);
- }
-
- /**
- * Find ....
- * and replace it with [embed]url[/embed]
- *
- * @param string $text
- * @return string
- */
- public static function HTML2BBCode(string $text): string
- {
- // start parser only if 'oembed' is in text
- if (strpos($text, 'oembed')) {
- // convert non ascii chars to html entities
- $html_text = mb_convert_encoding($text, 'HTML-ENTITIES', mb_detect_encoding($text));
-
- // If it doesn't parse at all, just return the text.
- $dom = new DOMDocument();
- if (!@$dom->loadHTML($html_text)) {
- return $text;
- }
- $xpath = new DOMXPath($dom);
-
- $xattr = self::buildXPath('class', 'oembed');
- $entries = $xpath->query("//div[$xattr]");
-
- $xattr = "@rel='oembed'"; //oe_build_xpath("rel","oembed");
- foreach ($entries as $e) {
- $href = $xpath->evaluate("a[$xattr]/@href", $e)->item(0)->nodeValue;
- if (!is_null($href)) {
- $e->parentNode->replaceChild(new DOMText('[embed]' . $href . '[/embed]'), $e);
- }
- }
- return self::getInnerHTML($dom->getElementsByTagName('body')->item(0));
- } else {
+ if (!preg_match_all("/\[embed\](.+?)\[\/embed\]/is", $text, $matches, PREG_SET_ORDER)) {
return $text;
}
+ foreach ($matches as $match) {
+ $data = self::fetchURL($match[1]);
+ $text = str_replace($match[0], self::formatObject($data, $uriid), $text);
+ }
+ return $text;
}
/**
@@ -373,26 +331,25 @@ class OEmbed
return false;
}
- $str_allowed = DI::config()->get('system', 'allowed_oembed', '');
- if (empty($str_allowed)) {
+ $allowed = DI::config()->get('system', 'allowed_oembed', '');
+ if (empty($allowed)) {
return false;
}
- $allowed = explode(',', $str_allowed);
-
- return Network::isDomainAllowed($domain, $allowed);
+ return Network::isDomainMatch($domain, explode(',', $allowed));
}
/**
* Returns a formatted HTML code from given URL and sets optional title
*
* @param string $url URL to fetch
- * @param string $title Optional title (default: what comes from OEmbed object)
+ * @param string $title title (default: what comes from OEmbed object)
+ * @param int $uriid
* @return string Formatted HTML
*/
- public static function getHTML(string $url, string $title = ''): string
+ public static function getHTML(string $url, string $title, int $uriid): string
{
- $o = self::fetchURL($url, !self::isAllowedURL($url));
+ $o = self::fetchURL($url);
if (!is_object($o) || property_exists($o, 'type') && $o->type == 'error') {
throw new Exception('OEmbed failed for URL: ' . $url);
@@ -402,74 +359,8 @@ class OEmbed
$o->title = $title;
}
- $html = self::formatObject($o);
+ $html = self::formatObject($o, $uriid);
return $html;
}
-
- /**
- * Generates the iframe HTML for an oembed attachment.
- *
- * Width and height are given by the remote, and are regularly too small for
- * the generated iframe.
- *
- * The width is entirely discarded for the actual width of the post, while fixed
- * height is used as a starting point before the inevitable resizing.
- *
- * Since the iframe is automatically resized on load, there are no need for ugly
- * and impractical scrollbars.
- *
- * @todo This function is currently unused until someone™ adds support for a separate OEmbed domain
- *
- * @param string $src Original remote URL to embed
- * @param string $width
- * @param string $height
- * @return string Formatted HTML
- *
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
- * @see oembed_format_object()
- */
- private static function iframe(string $src, string $width, string $height): string
- {
- if (!$height || strstr($height, '%')) {
- $height = '200';
- }
- $width = '100%';
-
- $src = DI::baseUrl() . '/oembed/' . Strings::base64UrlEncode($src);
- return '';
- }
-
- /**
- * Generates attribute search XPath string
- *
- * Generates an XPath query to select elements whose provided attribute contains
- * the provided value in a space-separated list.
- *
- * @param string $attr Name of the attribute to search
- * @param string $value Value to search in a space-separated list
- * @return string
- */
- private static function buildXPath(string $attr, $value): string
- {
- // https://www.westhoffswelt.de/blog/2009/6/9/select-html-elements-with-more-than-one-css-class-using-xpath
- return "contains(normalize-space(@$attr), ' $value ') or substring(normalize-space(@$attr), 1, string-length('$value') + 1) = '$value ' or substring(normalize-space(@$attr), string-length(@$attr) - string-length('$value')) = ' $value' or @$attr = '$value'";
- }
-
- /**
- * Returns the inner XML string of a provided DOMNode
- *
- * @param DOMNode $node
- * @return string
- */
- private static function getInnerHTML(DOMNode $node): string
- {
- $innerHTML = '';
- $children = $node->childNodes;
- foreach ($children as $child) {
- $innerHTML .= $child->ownerDocument->saveXML($child);
- }
- return $innerHTML;
- }
-
}
diff --git a/src/Content/PageInfo.php b/src/Content/PageInfo.php
index be8d055c96..d59cf5f320 100644
--- a/src/Content/PageInfo.php
+++ b/src/Content/PageInfo.php
@@ -1,6 +1,6 @@
id;
+ if ($blurred) {
+ $path .= '?' . http_build_query(['blur' => true]);
+ }
+ return $path;
}
/**
diff --git a/src/Content/Post/Factory/PostMedia.php b/src/Content/Post/Factory/PostMedia.php
index dfebfd4874..9f6bae4070 100644
--- a/src/Content/Post/Factory/PostMedia.php
+++ b/src/Content/Post/Factory/PostMedia.php
@@ -1,6 +1,6 @@
_select(['uri-id' => $uriId]);
+ return $this->_select(["`uri-id` = ? AND `type` != ?", $uriId, Post\Media::UNKNOWN]);
}
public function save(Entity\PostMedia $PostMedia): Entity\PostMedia
diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index 29752701f0..c0fc195f98 100644
--- a/src/Content/Smilies.php
+++ b/src/Content/Smilies.php
@@ -1,6 +1,6 @@
%s (%s) ', $data['provider_url'], $data['author_name'], $data['provider_name']);
} else {
@@ -1012,12 +1028,12 @@ class BBCode
if (is_null($text)) {
$curlResult = DI::httpClient()->head($match[1], [HttpClientOptions::TIMEOUT => DI::config()->get('system', 'xrd_timeout')]);
if ($curlResult->isSuccess()) {
- $mimetype = $curlResult->getHeader('Content-Type')[0] ?? '';
+ $mimetype = $curlResult->getContentType() ?? '';
} else {
$mimetype = '';
}
- if (substr($mimetype, 0, 6) == 'image/') {
+ if (Images::isSupportedMimeType($mimetype)) {
$text = '[url=' . $match[1] . ']' . $match[1] . '[/url]';
} else {
$text = '[url=' . $match[2] . ']' . $match[2] . '[/url]';
@@ -1053,6 +1069,21 @@ class BBCode
return $text;
}
+ /**
+ * Callback: Sanitize links from given $match array
+ *
+ * @param array $match Array with link match
+ * @return string BBCode
+ */
+ private static function sanitizeLinksCallback(array $match): string
+ {
+ if (count($match) == 3) {
+ return '[' . $match[1] . ']' . Network::sanitizeUrl($match[2]) . '[/' . $match[1] . ']';
+ } else {
+ return '[' . $match[1] . '=' . Network::sanitizeUrl($match[2]) . ']' . $match[3] . '[/' . $match[1] . ']';
+ }
+ }
+
/**
* Callback: Expands links from given $match array
*
@@ -1095,13 +1126,13 @@ class BBCode
$curlResult = DI::httpClient()->head($match[1], [HttpClientOptions::TIMEOUT => DI::config()->get('system', 'xrd_timeout')]);
if ($curlResult->isSuccess()) {
- $mimetype = $curlResult->getHeader('Content-Type')[0] ?? '';
+ $mimetype = $curlResult->getContentType() ?? '';
} else {
$mimetype = '';
}
// if its a link to a picture then embed this picture
- if (substr($mimetype, 0, 6) == 'image/') {
+ if (Images::isSupportedMimeType($mimetype)) {
$text = '[img]' . $match[1] . '[/img]';
} else {
if (!empty($match[3])) {
@@ -1214,6 +1245,42 @@ class BBCode
return $match[1] . '[url=' . $data['url'] . ']' . $data['nick'] . '[/url]';
}
+ /**
+ * Replace mention links
+ *
+ * @param string $body HTML/BBCode
+ * @return string Body with replaced mentions
+ */
+ public static function setMentionsToAddr(string $body): string
+ {
+ DI::profiler()->startRecording('rendering');
+ $regexp = "/([@!])\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
+ $body = preg_replace_callback($regexp, [self::class, 'mentionToAddrCallback'], $body);
+ DI::profiler()->stopRecording();
+ return $body;
+ }
+
+ /**
+ * Callback function to replace a Friendica style mention in a mention with the addr
+ *
+ * @param array $match Matching values for the callback
+ * @return string Replaced mention or empty string
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ */
+ private static function mentionToAddrCallback(array $match): string
+ {
+ if (empty($match[2])) {
+ return '';
+ }
+
+ $data = Contact::getByURL($match[2], false, ['url', 'nick', 'addr']);
+ if (empty($data['nick'])) {
+ return $match[0];
+ }
+
+ return $match[1] . ($data['addr'] ?: $data['nick']);
+ }
+
/**
* Normalize links to Youtube and Vimeo to a unified format.
*
@@ -1327,12 +1394,12 @@ class BBCode
* $match[1] = $url
* $match[2] = $title or absent
*/
- $try_oembed_callback = function (array $match) {
+ $try_oembed_callback = function (array $match) use ($uriid) {
$url = $match[1];
$title = $match[2] ?? '';
try {
- $return = OEmbed::getHTML($url, $title);
+ $return = OEmbed::getHTML($url, $title, $uriid);
} catch (Exception $ex) {
$return = $match[0];
}
@@ -1444,7 +1511,7 @@ class BBCode
// Replace non graphical smilies for external posts
if (!$nosmile) {
- $text = self::performWithEscapedTags($text, ['img'], function ($text) use ($simple_html, $for_plaintext) {
+ $text = self::performWithEscapedTags($text, ['url', 'img', 'audio', 'video', 'youtube', 'vimeo', 'share', 'attachment', 'iframe', 'bookmark'], function ($text) use ($simple_html, $for_plaintext) {
return Smilies::replace($text, ($simple_html != self::INTERNAL) || $for_plaintext);
});
}
@@ -1538,9 +1605,6 @@ class BBCode
// Check for centered text
$text = preg_replace("(\[center\](.*?)\[\/center\])ism", '$1
', $text);
- // Check for list text
- $text = str_replace("[*]", "", $text);
-
// Check for block-level custom CSS
$text = preg_replace('#(?<=^|\n)\[style=(.*?)](.*?)\[/style](?:\n|$)#ism', '$2
', $text);
@@ -1580,6 +1644,10 @@ class BBCode
$text = preg_replace("/\[li\](.*?)\[\/li\]/ism", ' $1 ', $text);
}
+ // Check for list text
+ $text = str_replace("[*]", "", $text);
+ $text = str_replace("[li]", " ", $text);
+
$text = preg_replace("/\[th\](.*?)\[\/th\]/sm", '$1 ', $text);
$text = preg_replace("/\[td\](.*?)\[\/td\]/sm", '$1 ', $text);
$text = preg_replace("/\[tr\](.*?)\[\/tr\]/sm", '$1 ', $text);
@@ -1705,6 +1773,9 @@ class BBCode
// Simplify "video" element
$text = preg_replace('(\[video[^\]]*?\ssrc\s?=\s?([^\s\]]+)[^\]]*?\].*?\[/video\])ism', '[video]$1[/video]', $text);
+ $text = preg_replace_callback("/\[(video)\](.*?)\[\/video\]/ism", [self::class, 'sanitizeLinksCallback'], $text);
+ $text = preg_replace_callback("/\[(audio)\](.*?)\[\/audio\]/ism", [self::class, 'sanitizeLinksCallback'], $text);
+
if ($simple_html == self::NPF) {
$text = preg_replace(
"/\[video\](.*?)\[\/video\]/ism",
@@ -1747,12 +1818,13 @@ class BBCode
}
// Backward compatibility, [iframe] support has been removed in version 2020.12
+ $text = preg_replace_callback("/\[(iframe)\](.*?)\[\/iframe\]/ism", [self::class, 'sanitizeLinksCallback'], $text);
$text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '$1 ', $text);
$text = self::normalizeVideoLinks($text);
// Youtube extensions
- if ($try_oembed) {
+ if ($try_oembed && OEmbed::isAllowedURL('https://www.youtube.com/embed/')) {
$text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", 'VIDEO ', $text);
} else {
$text = preg_replace(
@@ -1763,7 +1835,7 @@ class BBCode
}
// Vimeo extensions
- if ($try_oembed) {
+ if ($try_oembed && OEmbed::isAllowedURL('https://player.vimeo.com/video')) {
$text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '', $text);
} else {
$text = preg_replace(
@@ -1774,7 +1846,7 @@ class BBCode
}
// oembed tag
- $text = OEmbed::BBCode2HTML($text);
+ $text = OEmbed::BBCode2HTML($text, $uriid);
// Avoid triple linefeeds through oembed
$text = str_replace("' . $text . ' ';
}
+ $text = preg_replace_callback("/\[(url)\](.*?)\[\/url\]/ism", [self::class, 'sanitizeLinksCallback'], $text);
+ $text = preg_replace_callback("/\[(url)\=(.*?)\](.*?)\[\/url\]/ism", [self::class, 'sanitizeLinksCallback'], $text);
+
// Handle mentions and hashtag links
if ($simple_html == self::DIASPORA) {
// The ! is converted to @ since Diaspora only understands the @
@@ -1901,11 +1976,11 @@ class BBCode
self::performWithEscapedTags($text, ['url', 'share'], function ($text) use ($simple_html) {
$text = preg_replace_callback("/(?:#\[url\=[^\[\]]*\]|\[url\=[^\[\]]*\]#)(.*?)\[\/url\]/ism", function ($matches) use ($simple_html) {
if ($simple_html == self::ACTIVITYPUB) {
- return '#'
. XML::escape($matches[1]) . ' ';
} else {
- return '#'
. XML::escape($matches[1]) . ' ';
}
@@ -1932,6 +2007,7 @@ class BBCode
$text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', 'acct:$1@$2 ', $text);
// Perform MAIL Search
+ $text = preg_replace_callback("/\[(mail)\](.*?)\[\/mail\]/ism", [self::class, 'sanitizeLinksCallback'], $text);
$text = preg_replace("/\[mail\](.*?)\[\/mail\]/", '$1 ', $text);
$text = preg_replace("/\[mail\=(.*?)\](.*?)\[\/mail\]/", '$2 ', $text);
@@ -2017,13 +2093,7 @@ class BBCode
);
// Default iframe allowed domains/path
- $allowedIframeDomains = [
- DI::baseUrl()->getHost()
- . (DI::baseUrl()->getPath() ? '/' . DI::baseUrl()->getPath() : '')
- . '/oembed/', # The path part has to change with the source in Content\Oembed::iframe
- 'www.youtube.com/embed/',
- 'player.vimeo.com/video/',
- ];
+ $allowedIframeDomains = DI::config()->get('system', 'no_oembed_rich_content') ? [] : ['www.youtube.com/embed/', 'player.vimeo.com/video/'];
$allowedIframeDomains = array_merge(
$allowedIframeDomains,
@@ -2292,7 +2362,7 @@ class BBCode
case '#':
default:
- return $match[1] . '[url=' . DI::baseUrl() . '/search?tag=' . $match[2] . ']' . $match[2] . '[/url]';
+ return $match[1] . '[url=' . DI::baseUrl() . '/search?tag=' . urlencode($match[2]) . ']' . $match[2] . '[/url]';
}
},
$body
diff --git a/src/Content/Text/BBCode/Video.php b/src/Content/Text/BBCode/Video.php
index 728c6092bd..d01fe433c4 100644
--- a/src/Content/Text/BBCode/Video.php
+++ b/src/Content/Text/BBCode/Video.php
@@ -1,6 +1,6 @@
'/(.+)/'], '[url=$1]', '[/url]');
self::tagToBBCode($doc, 'img', ['src' => '/(.+)/', 'alt' => '/(.+)/'], '[img=$1]$2', '[/img]', true);
+ self::tagToBBCode($doc, 'img', ['src' => '/(.+)/', 'title' => '/(.+)/'], '[img=$1]$2', '[/img]', true);
self::tagToBBCode($doc, 'img', ['src' => '/(.+)/', 'width' => '/(\d+)/', 'height' => '/(\d+)/'], '[img=$2x$3]$1', '[/img]', true);
self::tagToBBCode($doc, 'img', ['src' => '/(.+)/'], '[img]$1', '[/img]', true);
diff --git a/src/Content/Text/HTMLPurifier_URIScheme_cid.php b/src/Content/Text/HTMLPurifier_URIScheme_cid.php
index ba89615f9c..96f2a24a0f 100644
--- a/src/Content/Text/HTMLPurifier_URIScheme_cid.php
+++ b/src/Content/Text/HTMLPurifier_URIScheme_cid.php
@@ -1,6 +1,6 @@
'organisation', 'name' => DI::l10n()->t('Organisations')],
['ref' => 'news', 'name' => DI::l10n()->t('News')],
['ref' => 'community', 'name' => DI::l10n()->t('Groups')],
+ ['ref' => 'relay', 'name' => DI::l10n()->t('Relays')],
];
return self::filter(
diff --git a/src/Content/Widget/CalendarExport.php b/src/Content/Widget/CalendarExport.php
index 520c32063e..4059146010 100644
--- a/src/Content/Widget/CalendarExport.php
+++ b/src/Content/Widget/CalendarExport.php
@@ -1,6 +1,6 @@
[
'name' => $contact['name'],
'nick' => $contact['nick'],
- 'addr' => $contact['addr'] ?: $contact['url'],
+ 'addr' => $contact['addr'] ?: $contact_url,
'thumb' => Contact::getThumb($contact),
'url' => Contact::magicLinkByContact($contact),
'nurl' => $contact['nurl'],
'location' => $contact['location'],
'about' => $contact['about'],
- 'network_link' => Strings::formatNetworkName($contact['network'], $contact['url']),
+ 'network_link' => Strings::formatNetworkName($contact['network'], $contact_url),
'tags' => $contact['keywords'],
'bd' => $contact['bd'] <= DBA::NULL_DATE ? '' : $contact['bd'],
'account_type' => Contact::getAccountType($contact['contact-type']),
diff --git a/src/Content/Widget/SavedSearches.php b/src/Content/Widget/SavedSearches.php
index 79d66936d0..d0917e7cb6 100644
--- a/src/Content/Widget/SavedSearches.php
+++ b/src/Content/Widget/SavedSearches.php
@@ -1,6 +1,6 @@
$contact ?? []]);
}
- if (!Network::isValidHttpUrl($contact['url']) && Network::isValidHttpUrl($contact['alias'])) {
- $contact_url = $contact['alias'];
- } else {
- $contact_url = $contact['url'];
- }
+ $contact_url = Contact::getProfileLink($contact);
if ($contact['network'] != '') {
$network_link = Strings::formatNetworkName($contact['network'], $contact_url);
@@ -103,10 +100,12 @@ class VCard
}
if ($contact['contact-type'] == Contact::TYPE_COMMUNITY) {
- $mention_label = DI::l10n()->t('Post to group');
- $mention_link = 'compose/0?body=!' . $contact['addr'];
- $showgroup_link = 'network/group/' . $id;
- } else {
+ if (!$hide_mention) {
+ $mention_label = DI::l10n()->t('Post to group');
+ $mention_link = 'compose/0?body=!' . $contact['addr'];
+ }
+ $showgroup_link = 'contact/' . $id . '/conversations';
+ } elseif (!$hide_mention) {
$mention_label = DI::l10n()->t('Mention');
$mention_link = 'compose/0?body=@' . $contact['addr'];
}
diff --git a/src/Core/ACL.php b/src/Core/ACL.php
index 1bf8ef03ee..73ae53fea9 100644
--- a/src/Core/ACL.php
+++ b/src/Core/ACL.php
@@ -1,6 +1,6 @@
addCheck(DI::l10n()->t('ImageMagick PHP extension is not installed'), $imagick, false, "");
+ if (!class_exists('Imagick')) {
+ $this->addCheck(DI::l10n()->t('ImageMagick PHP extension is not installed'), false, false, "");
} else {
- $this->addCheck(DI::l10n()->t('ImageMagick PHP extension is installed'), $imagick, false, "");
- if ($imagick) {
- $this->addCheck(DI::l10n()->t('ImageMagick supports GIF'), $gif, false, "");
- }
+ $this->addCheck(DI::l10n()->t('ImageMagick PHP extension is installed'), true, false, "");
}
// Imagick is not required
diff --git a/src/Core/KeyValueStorage/Capability/IManageKeyValuePairs.php b/src/Core/KeyValueStorage/Capability/IManageKeyValuePairs.php
index 5d9c8455ee..778dcba8ae 100644
--- a/src/Core/KeyValueStorage/Capability/IManageKeyValuePairs.php
+++ b/src/Core/KeyValueStorage/Capability/IManageKeyValuePairs.php
@@ -1,6 +1,6 @@
'简体中文',
];
+ /** @var string Undetermined language */
+ const UNDETERMINED_LANGUAGE = 'un';
+
/**
* A string indicating the current language used for translation:
* - Two-letter ISO 639-1 code.
@@ -436,7 +439,9 @@ class L10n
{
$iso639 = new \Matriphe\ISO639\ISO639;
- $languages = [];
+ // In ISO 639-2 undetermined languages have got the code "und".
+ // There is no official code for ISO 639-1, but "un" is not assigned to any language.
+ $languages = [self::UNDETERMINED_LANGUAGE => $this->t('Undetermined')];
foreach ($this->getDetectableLanguages() as $code) {
$code = $this->toISO6391($code);
diff --git a/src/Core/Lock/Capability/ICanLock.php b/src/Core/Lock/Capability/ICanLock.php
index 7671de82cd..21c1db2247 100644
--- a/src/Core/Lock/Capability/ICanLock.php
+++ b/src/Core/Lock/Capability/ICanLock.php
@@ -1,6 +1,6 @@
handleOnlyReportedErrors && !(error_reporting() & $code)) {
- return false;
+ return true;
}
// fatal error codes are ignored if a fatal error handler is present as well to avoid duplicate log entries
diff --git a/src/Core/Logger/Type/AbstractLogger.php b/src/Core/Logger/Type/AbstractLogger.php
index 7de0e41605..5e0c6cbc9d 100644
--- a/src/Core/Logger/Type/AbstractLogger.php
+++ b/src/Core/Logger/Type/AbstractLogger.php
@@ -1,6 +1,6 @@
1 ? 'p=' . $page : '';
$curlResult = DI::httpClient()->get(self::getGlobalDirectory() . '/search/people?' . $p . '&q=' . urlencode($search), HttpClientAccept::JSON);
if ($curlResult->isSuccess()) {
- $searchResult = json_decode($curlResult->getBody(), true);
+ $searchResult = json_decode($curlResult->getBodyString(), true);
if (!empty($searchResult['profiles'])) {
// Converting Directory Search results into contact-looking records
$return = array_map(function ($result) {
@@ -245,6 +245,7 @@ class Search
'Group' => Contact::TYPE_COMMUNITY,
'Organization' => Contact::TYPE_ORGANISATION,
'News' => Contact::TYPE_NEWS,
+ 'Relay' => Contact::TYPE_RELAY,
];
return [
diff --git a/src/Core/Session/Capability/IHandleSessions.php b/src/Core/Session/Capability/IHandleSessions.php
index 86f57d5b57..43ac6d7cba 100644
--- a/src/Core/Session/Capability/IHandleSessions.php
+++ b/src/Core/Session/Capability/IHandleSessions.php
@@ -1,6 +1,6 @@
isSuccess()) {
$this->logger->debug('Got picture', ['Content-Type' => $fetchResult->getHeader('Content-Type'), 'uid' => $data->uid, 'url' => $data->url]);
- return $fetchResult->getBody();
+ return $fetchResult->getBodyString();
} else {
if (empty($fetchResult)) {
throw new ReferenceStorageException(sprintf('External resource failed to get %s', $reference));
} else {
- throw new ReferenceStorageException(sprintf('External resource failed to get %s', $reference), $fetchResult->getReturnCode(), new Exception($fetchResult->getBody()));
+ throw new ReferenceStorageException(sprintf('External resource failed to get %s', $reference), $fetchResult->getReturnCode(), new Exception($fetchResult->getBodyString()));
}
}
}
diff --git a/src/Core/Storage/Type/Filesystem.php b/src/Core/Storage/Type/Filesystem.php
index 7c5f05db7f..790242dd7b 100644
--- a/src/Core/Storage/Type/Filesystem.php
+++ b/src/Core/Storage/Type/Filesystem.php
@@ -1,6 +1,6 @@
connected();
}
- /**
- * Replaces ANY_VALUE() function by MIN() function,
- * if the database server does not support ANY_VALUE().
- *
- * Considerations for Standard SQL, or MySQL with ONLY_FULL_GROUP_BY (default since 5.7.5).
- * ANY_VALUE() is available from MySQL 5.7.5 https://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html
- * A standard fall-back is to use MIN().
- *
- * @param string $sql An SQL string without the values
- * @return string The input SQL string modified if necessary.
- */
- public static function anyValueFallback(string $sql): string
- {
- return DI::dba()->anyValueFallback($sql);
- }
-
/**
* beautifies the query - useful for "SHOW PROCESSLIST"
*
diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 6291d0ffc4..eafe421c82 100644
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -1,6 +1,6 @@
serverInfo();
- if (version_compare($server_info, '5.7.5', '<') ||
- (stripos($server_info, 'MariaDB') !== false)) {
- $sql = str_ireplace('ANY_VALUE(', 'MIN(', $sql);
- }
- return $sql;
- }
-
/**
* Replaces the ? placeholders with the parameters in the $args array
*
@@ -532,7 +510,6 @@ class Database
}
$sql = DBA::cleanQuery($sql);
- $sql = $this->anyValueFallback($sql);
$orig_sql = $sql;
@@ -1440,7 +1417,7 @@ class Database
private function escapeFields(array $fields, array $options): array
{
// In the case of a "GROUP BY" we have to add all the ORDER fields to the fieldlist.
- // This needs to done to apply the "ANY_VALUE(...)" treatment from below to them.
+ // This needs to done to apply the "MIN(...)" treatment from below to them.
// Otherwise MySQL would report errors.
if (!empty($options['group_by']) && !empty($options['order'])) {
foreach ($options['order'] as $key => $field) {
@@ -1461,7 +1438,7 @@ class Database
$value = DBA::quoteIdentifier($field);
if (!empty($options['group_by']) && !in_array($field, $options['group_by'])) {
- $value = 'ANY_VALUE(' . $value . ') AS ' . $value;
+ $value = 'MIN(' . $value . ') AS ' . $value;
}
});
diff --git a/src/Database/DatabaseException.php b/src/Database/DatabaseException.php
index 8c99b9a7ef..70db777388 100644
--- a/src/Database/DatabaseException.php
+++ b/src/Database/DatabaseException.php
@@ -1,6 +1,6 @@
.
+ *
+ */
+
+namespace Friendica\Database;
+
+/**
+ * Full-text search on a haystack string that isn't present in the database.
+ * The haystack is inserted in a temporary table with a FULLTEXT index, then any number of
+ * matches can be performed on it before the row is deleted when the class instance is destroyed,
+ * either manually or at the end of the script at the latest.
+ */
+class DisposableFullTextSearch
+{
+ private Database $db;
+ /** @var int Unique identifier of the haystack in the database. */
+ private int $identifier;
+
+ public function __construct(Database $database, string $haystack)
+ {
+ $this->db = $database;
+
+ // Unique identifier generation. Two DisposableFullTextSearch object should never have the same as the first object destruction
+ // would delete both check-full-text-search rows before the second object destruction is called, leading to unexpected behavior.
+ do {
+ // Maximum value is indicated by the INT UNSIGNED type of the check-full-text-search.pid field
+ $this->identifier = random_int(0, pow(2, 32) - 1);
+ } while ($this->db->exists('check-full-text-search', ['pid' => $this->identifier]));
+
+ // If the `exists()` call fails and return false because the database is unavailable, the `insert()` call will likely fail as well, which means
+ // all subsequent calls to `match()` will return false because the haystack won't have been inserted.
+ // However, at this point there may be bigger problems to worry about.
+ $this->db->insert('check-full-text-search', ['pid' => $this->identifier, 'searchtext' => $haystack]);
+ }
+
+ public function __destruct()
+ {
+ $this->db->delete('check-full-text-search', ['pid' => $this->identifier]);
+ }
+
+ /**
+ * @param string $needle Boolean mode search string
+ * @return bool
+ * @throws \Exception
+ */
+ public function match(string $needle): bool
+ {
+ return $this->db->exists('check-full-text-search', ["`pid` = ? AND MATCH (`searchtext`) AGAINST (? IN BOOLEAN MODE)", $this->identifier, $needle]);
+ }
+}
diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index acc98c882c..c82fd090c8 100644
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -1,6 +1,6 @@
get('post_update_version') >= 1544) {
+ return true;
+ }
+
+ $id = (int)(DI::keyValue()->get('post_update_version_1544_id') ?? 0);
+ if ($id == 0) {
+ $post = Post::selectFirstPost(['uri-id'], [], ['order' => ['uri-id' => true]]);
+ $id = (int)($post['uri-id'] ?? 0);
+ }
+
+ Logger::info('Start', ['uri-id' => $id]);
+
+ $rows = 0;
+
+ $posts = Post::selectPosts(['uri-id', 'parent-uri-id'], ["`uri-id` < ? AND `gravity` IN (?, ?)", $id, Item::GRAVITY_COMMENT, Item::GRAVITY_PARENT], ['order' => ['uri-id' => true], 'limit' => 1000]);
+
+ if (DBA::errorNo() != 0) {
+ Logger::error('Database error', ['no' => DBA::errorNo(), 'message' => DBA::errorMessage()]);
+ return false;
+ }
+
+ while ($post = Post::fetch($posts)) {
+ $id = $post['uri-id'];
+ Counts::updateForPost($post['uri-id'], $post['parent-uri-id']);
+ ++$rows;
+ }
+ DBA::close($posts);
+
+ DI::keyValue()->set('post_update_version_1544_id', $id);
+
+ Logger::info('Processed', ['rows' => $rows, 'last' => $id]);
+
+ if ($rows <= 100) {
+ DI::keyValue()->set('post_update_version', 1544);
+ Logger::info('Done');
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Create "post-searchindex" entries for old entries.
+ *
+ * @return bool "true" when the job is done
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
+ */
+ private static function update1550()
+ {
+ // Was the script completed?
+ if (DI::keyValue()->get('post_update_version') >= 1550) {
+ return true;
+ }
+
+ $engagements = DBA::select('post-engagement', ['uri-id'], ["`language` IS NULL"], ['order' => ['uri-id' => true], 'limit' => 1000]);
+ while ($engagement = DBA::fetch($engagements)) {
+ $item = Post::selectFirst([], ['uri-id' => $engagement['uri-id']]);
+ if (empty($item)) {
+ continue;
+ }
+ Post\Engagement::storeFromItem($item);
+ }
+ DBA::close($engagements);
+
+ $id = (int)(DI::keyValue()->get('post_update_version_1550_id') ?? 0);
+ if ($id == 0) {
+ $post = Post::selectFirstPost(['uri-id'], [], ['order' => ['uri-id' => true]]);
+ $id = (int)($post['uri-id'] ?? 0);
+ }
+
+ Logger::info('Start', ['uri-id' => $id]);
+
+ $rows = 0;
+
+ $condition = ["`uri-id` < ? AND `gravity` IN (?, ?)", $id, Item::GRAVITY_COMMENT, Item::GRAVITY_PARENT];
+
+ $limit = Post\SearchIndex::searchAgeDateLimit();
+ if (!empty($limit)) {
+ DBA::mergeConditions($condition, ["`created` > ?", $limit]);
+ }
+
+ $posts = Post::selectPosts(['uri-id', 'created'], $condition, ['order' => ['uri-id' => true], 'limit' => 1000]);
+
+ if (DBA::errorNo() != 0) {
+ Logger::error('Database error', ['no' => DBA::errorNo(), 'message' => DBA::errorMessage()]);
+ return false;
+ }
+
+ while ($post = Post::fetch($posts)) {
+ $id = $post['uri-id'];
+ Post\SearchIndex::insert($post['uri-id'], $post['created'], true);
+ ++$rows;
+ }
+ DBA::close($posts);
+
+ DI::keyValue()->set('post_update_version_1550_id', $id);
+
+ Logger::info('Processed', ['rows' => $rows, 'last' => $id]);
+
+ if ($rows <= 100) {
+ DI::keyValue()->set('post_update_version', 1550);
+ Logger::info('Done');
+ return true;
+ }
+
+ return false;
+ }
}
diff --git a/src/Database/View.php b/src/Database/View.php
index 9fe44bd759..738c57b889 100644
--- a/src/Database/View.php
+++ b/src/Database/View.php
@@ -1,6 +1,6 @@
$photo['blurhash'],
];
- $photoTypes = Images::supportedTypes();
- $ext = $photoTypes[$photo['type']];
+ $ext = Images::getExtensionByMimeType($photo['type']);
- $url = $this->baseUrl . '/photo/' . $photo['resource-id'] . '-0.' . $ext;
+ $url = $this->baseUrl . '/photo/' . $photo['resource-id'] . '-0' . $ext;
$preview = Photo::selectFirst(['scale'], ["`resource-id` = ? AND `uid` = ? AND `scale` > ?", $photo['resource-id'], $photo['uid'], 0], ['order' => ['scale']]);
if (!empty($preview)) {
- $preview_url = $this->baseUrl . '/photo/' . $photo['resource-id'] . '-' . $preview['scale'] . '.' . $ext;
+ $preview_url = $this->baseUrl . '/photo/' . $photo['resource-id'] . '-' . $preview['scale'] . $ext;
} else {
$preview_url = '';
}
diff --git a/src/Factory/Api/Mastodon/Card.php b/src/Factory/Api/Mastodon/Card.php
index c0bad9beb6..d2972adfc8 100644
--- a/src/Factory/Api/Mastodon/Card.php
+++ b/src/Factory/Api/Mastodon/Card.php
@@ -1,6 +1,6 @@
mstdnCardFactory = $mstdnCardFactory;
$this->mstdnAttachmentFactory = $mstdnAttachmentFactory;
$this->mstdnEmojiFactory = $mstdnEmojiFactory;
- $this->mstdnErrorFactory = $mstdnErrorFactory;
$this->mstdnPollFactory = $mstdnPollFactory;
$this->contentItem = $contentItem;
$this->aclFormatter = $aclFormatter;
@@ -112,7 +107,7 @@ class Status extends BaseFactory
{
$fields = ['uri-id', 'uid', 'author-id', 'causer-id', 'author-uri-id', 'author-link', 'causer-uri-id', 'post-reason', 'starred', 'app', 'title', 'body', 'raw-body', 'content-warning', 'question-id',
'created', 'edited', 'commented', 'received', 'changed', 'network', 'thr-parent-id', 'parent-author-id', 'language', 'uri', 'plink', 'private', 'vid', 'gravity', 'featured', 'has-media', 'quote-uri-id',
- 'delivery_queue_count', 'delivery_queue_done','delivery_queue_failed', 'allow_cid', 'deny_cid', 'allow_gid', 'deny_gid'];
+ 'delivery_queue_count', 'delivery_queue_done','delivery_queue_failed', 'allow_cid', 'deny_cid', 'allow_gid', 'deny_gid', 'sensitive'];
$item = Post::selectFirst($fields, ['uri-id' => $uriId, 'uid' => [0, $uid]], ['order' => ['uid' => true]]);
if (!$item) {
$mail = DBA::selectFirst('mail', ['id'], ['uri-id' => $uriId, 'uid' => $uid]);
@@ -217,7 +212,7 @@ class Status extends BaseFactory
$item['featured']
);
- $sensitive = $this->dba->exists('tag-view', ['uri-id' => $uriId, 'name' => 'nsfw', 'type' => TagModel::HASHTAG]);
+ $sensitive = (bool)$item['sensitive'];
$application = new \Friendica\Object\Api\Mastodon\Application($item['app'] ?: ContactSelector::networkToName($item['network'], $item['author-link']));
$mentions = $this->mstdnMentionFactory->createFromUriId($uriId)->getArrayCopy();
diff --git a/src/Factory/Api/Mastodon/StatusSource.php b/src/Factory/Api/Mastodon/StatusSource.php
index 170b66e1b0..7e2a18e292 100644
--- a/src/Factory/Api/Mastodon/StatusSource.php
+++ b/src/Factory/Api/Mastodon/StatusSource.php
@@ -1,6 +1,6 @@
$uriId, 'uid' => [0, $uid]]);
+ $post = Post::selectOriginal(['uri-id', 'raw-body', 'body', 'title', 'content-warning'], ['uri-id' => $uriId, 'uid' => [0, $uid]]);
- $spoiler_text = $post['title'] ?: BBCode::toPlaintext(BBCode::getAbstract($post['body'], Protocol::ACTIVITYPUB));
- $body = BBCode::toMarkdown(Post\Media::removeFromEndOfBody($post['body']));
+ $spoiler_text = $post['title'] ?: $post['content-warning'] ?: BBCode::toPlaintext(BBCode::getAbstract($post['body'], Protocol::ACTIVITYPUB));
+
+ $body = Post\Media::removeFromEndOfBody($post['body']);
+ $body = Post\Media::addHTMLLinkToBody($uriId, $body);
+ $body = BBCode::setMentionsToAddr($body);
+ $body = BBCode::toPlaintext($body);
return new \Friendica\Object\Api\Mastodon\StatusSource($post['uri-id'], $body, $spoiler_text);
}
diff --git a/src/Factory/Api/Mastodon/Subscription.php b/src/Factory/Api/Mastodon/Subscription.php
index 0219361480..25a6cbe424 100644
--- a/src/Factory/Api/Mastodon/Subscription.php
+++ b/src/Factory/Api/Mastodon/Subscription.php
@@ -1,6 +1,6 @@
createFromContactId(Contact::getPublicIdByUserId($uid), $uid, $skip_status, $include_user_entities);
+ $cid = Contact::getPublicIdByUserId($uid);
+ if (!$cid) {
+ throw new HTTPException\NotFoundException();
+ }
+
+ return $this->createFromContactId($cid, $uid, $skip_status, $include_user_entities);
}
}
diff --git a/src/Federation/Collection/DeliveryQueueAggregates.php b/src/Federation/Collection/DeliveryQueueAggregates.php
index 60f07675af..c141ce8426 100644
--- a/src/Federation/Collection/DeliveryQueueAggregates.php
+++ b/src/Federation/Collection/DeliveryQueueAggregates.php
@@ -1,6 +1,6 @@
getBody()) ||
+ $failed = empty($curlResult) || empty($curlResult->getBodyString()) ||
(!$curlResult->isSuccess() && ($curlResult->getReturnCode() != 410));
if (!$failed) {
- $data = json_decode($curlResult->getBody(), true);
+ $data = json_decode($curlResult->getBodyString(), true);
$failed = empty($data) || !is_array($data);
}
if (!$failed && ($curlResult->getReturnCode() == 410)) {
$data = ['@context' => ActivityPub::CONTEXT, 'id' => $url, 'type' => 'Tombstone'];
+ } elseif (!$failed && !HTTPSignature::isValidContentType($curlResult->getContentType(), $url)) {
+ $failed = true;
}
} catch (\Exception $exception) {
Logger::notice('Error fetching url', ['url' => $url, 'exception' => $exception]);
@@ -374,6 +376,9 @@ class APContact
}
$apcontact['discoverable'] = JsonLD::fetchElement($compacted, 'toot:discoverable', '@value');
+ if (is_null($apcontact['discoverable']) && ($apcontact['type'] == 'Application')) {
+ $apcontact['discoverable'] = false;
+ }
if (!empty($apcontact['photo'])) {
$apcontact['photo'] = Network::addBasePath($apcontact['photo'], $apcontact['url']);
diff --git a/src/Model/APContact/Endpoint.php b/src/Model/APContact/Endpoint.php
index ea20c9e0f9..7133a8e7d5 100644
--- a/src/Model/APContact/Endpoint.php
+++ b/src/Model/APContact/Endpoint.php
@@ -1,6 +1,6 @@
$uid, 'verified' => true, 'blocked' => false, 'account_removed' => false, 'account_expired' => false]
+ ['uid' => $uid, 'account_removed' => false, 'account_expired' => false]
);
if (!DBA::isResult($user)) {
return false;
@@ -779,6 +784,7 @@ class Contact
'name-date' => DateTimeFormat::utcNow(),
'uri-date' => DateTimeFormat::utcNow(),
'avatar-date' => DateTimeFormat::utcNow(),
+ 'baseurl' => DI::baseUrl(),
'closeness' => 0
];
@@ -814,7 +820,7 @@ class Contact
$fields = [
'id', 'uri-id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', 'prvkey', 'pubkey', 'manually-approve',
'xmpp', 'matrix', 'contact-type', 'forum', 'prv', 'avatar-date', 'url', 'nurl', 'unsearchable',
- 'photo', 'thumb', 'micro', 'header', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco', 'network'
+ 'photo', 'thumb', 'micro', 'header', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco', 'network', 'baseurl', 'gsid'
];
$self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
if (!DBA::isResult($self)) {
@@ -836,7 +842,6 @@ class Contact
return false;
}
- $file_suffix = 'jpg';
$url = DI::baseUrl() . '/profile/' . $user['nickname'];
$fields = [
@@ -869,17 +874,11 @@ class Contact
$fields['avatar-date'] = DateTimeFormat::utcNow();
}
- // Creating the path to the avatar, beginning with the file suffix
- $types = Images::supportedTypes();
- if (isset($types[$avatar['type']])) {
- $file_suffix = $types[$avatar['type']];
- }
-
// We are adding a timestamp value so that other systems won't use cached content
$timestamp = strtotime($fields['avatar-date']);
$prefix = DI::baseUrl() . '/photo/' . $avatar['resource-id'] . '-';
- $suffix = '.' . $file_suffix . '?ts=' . $timestamp;
+ $suffix = Images::getExtensionByMimeType($avatar['type']) . '?ts=' . $timestamp;
$fields['photo'] = $prefix . '4' . $suffix;
$fields['thumb'] = $prefix . '5' . $suffix;
@@ -897,6 +896,8 @@ class Contact
$fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP;
$fields['unsearchable'] = !$profile['net-publish'];
$fields['manually-approve'] = in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP]);
+ $fields['baseurl'] = DI::baseUrl();
+ $fields['gsid'] = GServer::getID($fields['baseurl'], true);
$update = false;
@@ -1129,7 +1130,7 @@ class Contact
{
// Always unarchive the relay contact entry
if (!empty($contact['batch']) && !empty($contact['term-date']) && ($contact['term-date'] > DBA::NULL_DATETIME)) {
- $fields = ['failed' => false, 'term-date' => DBA::NULL_DATETIME, 'archive' => false];
+ $fields = ['failed' => false, 'term-date' => DBA::NULL_DATETIME, 'archive' => false, 'unsearchable' => true];
$condition = ['uid' => 0, 'network' => Protocol::FEDERATED, 'batch' => $contact['batch'], 'contact-type' => self::TYPE_RELAY];
if (!DBA::exists('contact', array_merge($condition, $fields))) {
self::update($fields, $condition);
@@ -1204,13 +1205,12 @@ class Contact
$mention_label = DI::l10n()->t('Post to group');
$mention_url = 'compose/0?body=!' . $contact['addr'];
$network_label = DI::l10n()->t('View group');
- $network_url = 'network/group/' . $contact['id'];
} else {
$mention_label = DI::l10n()->t('Mention');
$mention_url = 'compose/0?body=@' . $contact['addr'];
$network_label = DI::l10n()->t('Network Posts');
- $network_url = 'contact/' . $contact['id'] . '/conversations';
}
+ $network_url = 'contact/' . $contact['id'] . '/conversations';
$follow_link = '';
$unfollow_link = '';
@@ -1742,6 +1742,10 @@ class Contact
$account_type = DI::l10n()->t("Group");
break;
+ case self::TYPE_RELAY:
+ $account_type = DI::l10n()->t("Relay");
+ break;
+
default:
$account_type = "";
break;
@@ -2300,9 +2304,9 @@ class Contact
try {
$fetchResult = HTTPSignature::fetchRaw($avatar, 0, [HttpClientOptions::ACCEPT_CONTENT => [HttpClientAccept::IMAGE]]);
- $img_str = $fetchResult->getBody();
- if (!empty($img_str)) {
- $image = new Image($img_str, Images::getMimeTypeByData($img_str));
+ $img_str = $fetchResult->getBodyString();
+ if ($fetchResult->isSuccess() && !empty($img_str)) {
+ $image = new Image($img_str, $fetchResult->getContentType(), $avatar);
if ($image->isValid()) {
$update_fields['blurhash'] = $image->getBlurHash();
} else {
@@ -2815,13 +2819,19 @@ class Contact
}
// We must not try to update relay contacts via probe. They are no real contacts.
+ // See Relay::updateContact() for more details.
// We check after the probing to be able to correct falsely detected contact types.
- if (($contact['contact-type'] == self::TYPE_RELAY) &&
+ if (($contact['contact-type'] == self::TYPE_RELAY) && Strings::compareLink($contact['url'], $contact['baseurl']) &&
(!Strings::compareLink($ret['url'], $contact['url']) || in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]))
) {
- self::updateContact($id, $uid, $uriid, $contact['url'], ['failed' => false, 'local-data' => $has_local_data, 'last-update' => $updated, 'next-update' => $success_next_update, 'success_update' => $updated]);
- Logger::info('Not updating relais', ['id' => $id, 'url' => $contact['url']]);
- return true;
+ if (GServer::reachable($contact)) {
+ self::updateContact($id, $uid, $uriid, $contact['url'], ['failed' => false, 'local-data' => $has_local_data, 'last-update' => $updated, 'next-update' => $success_next_update, 'success_update' => $updated, 'unsearchable' => true]);
+ Logger::info('Not updating relay', ['id' => $id, 'url' => $contact['url']]);
+ return true;
+ }
+ Logger::info('Relay server is not reachable', ['id' => $id, 'url' => $contact['url']]);
+ self::updateContact($id, $uid, $uriid, $contact['url'], ['failed' => true, 'local-data' => $has_local_data, 'last-update' => $updated, 'next-update' => $failed_next_update, 'failure_update' => $updated, 'unsearchable' => true]);
+ return false;
}
// If Probe::uri fails the network code will be different ("feed" or "unkn")
@@ -3094,6 +3104,13 @@ class Contact
$ret['url'] = str_replace('?absolute=true', '', $ret['url']);
}
+ if (($protocol == Protocol::ACTIVITYPUB) && ($uid != 0)) {
+ if (APContact::isRelay(APContact::getByURL($ret['url']))) {
+ $result['message'] = DI::l10n()->t('This seems to be a relay account. They can\'t be followed by users.');
+ return $result;
+ }
+ }
+
// do we have enough information?
if (empty($protocol) || ($protocol == Protocol::PHANTOM) || (empty($ret['url']) && empty($ret['addr']))) {
$result['message'] .= DI::l10n()->t('The profile address specified does not provide adequate information.') . '(.*?)"> #';
- $s = preg_replace_callback($pattern, function () use ($PostMedia) {
+ $s = preg_replace_callback($pattern, function () use ($PostMedia, $sensitive) {
return Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image/single_with_height_allocation.tpl'), [
'$image' => $PostMedia,
+ '$sensitive' => $sensitive,
'$allocated_height' => $PostMedia->getAllocatedHeight(),
'$allocated_max_width' => ($PostMedia->previewWidth ?? $PostMedia->width) . 'px',
]);
@@ -3508,9 +3576,10 @@ class Item
*
* @param PostMedias $PostMedias
* @param string $body
+ * @param bool $sensitive
* @return string modified body
*/
- private static function replaceVisualAttachments(PostMedias $PostMedias, string $body): string
+ private static function replaceVisualAttachments(PostMedias $PostMedias, string $body, bool $sensitive): string
{
DI::profiler()->startRecording('rendering');
@@ -3519,7 +3588,7 @@ class Item
if (DI::baseUrl()->isLocalUri($PostMedia->preview)) {
continue;
}
- $proxy = DI::baseUrl() . $PostMedia->getPreviewPath(Proxy::SIZE_LARGE);
+ $proxy = DI::baseUrl() . $PostMedia->getPreviewPath(Proxy::SIZE_LARGE, $sensitive);
$search = ['[img=' . $PostMedia->preview . ']', ']' . $PostMedia->preview . '[/img]'];
$replace = ['[img=' . $proxy . ']', ']' . $proxy . '[/img]'];
@@ -3528,7 +3597,7 @@ class Item
if (DI::baseUrl()->isLocalUri($PostMedia->url)) {
continue;
}
- $proxy = DI::baseUrl() . $PostMedia->getPreviewPath(Proxy::SIZE_LARGE);
+ $proxy = DI::baseUrl() . $PostMedia->getPreviewPath(Proxy::SIZE_LARGE, $sensitive);
$search = ['[img=' . $PostMedia->url . ']', ']' . $PostMedia->url . '[/img]'];
$replace = ['[img=' . $proxy . ']', ']' . $proxy . '[/img]'];
@@ -3546,10 +3615,11 @@ class Item
* @param array $item
* @param string $content
* @param bool $shared
+ * @param bool $sensitive
* @return string modified content
* @throws ServiceUnavailableException
*/
- private static function addVisualAttachments(PostMedias $PostMedias, array $item, string $content, bool $shared): string
+ private static function addVisualAttachments(PostMedias $PostMedias, array $item, string $content, bool $shared, bool $sensitive): string
{
DI::profiler()->startRecording('rendering');
$leading = '';
@@ -3564,7 +3634,7 @@ class Item
if ($PostMedia->mimetype->type == 'image' || $PostMedia->preview) {
$preview_size = Proxy::SIZE_MEDIUM;
- $preview_url = DI::baseUrl() . $PostMedia->getPreviewPath($preview_size);
+ $preview_url = DI::baseUrl() . $PostMedia->getPreviewPath($preview_size, $sensitive);
} else {
$preview_size = 0;
$preview_url = '';
@@ -3575,6 +3645,13 @@ class Item
}
if ($PostMedia->mimetype->type == 'video') {
+ if (($PostMedia->height ?? 0) > ($PostMedia->width ?? 0)) {
+ $height = min(DI::config()->get('system', 'max_video_height') ?: '100%', $PostMedia->height);
+ $width = 'auto';
+ } else {
+ $height = 'auto';
+ $width = '100%';
+ }
/// @todo Move the template to /content as well
$media = Renderer::replaceMacros(Renderer::getMarkupTemplate('video_top.tpl'), [
'$video' => [
@@ -3583,6 +3660,8 @@ class Item
'name' => $PostMedia->name ?: $PostMedia->url,
'preview' => $preview_url,
'mime' => (string)$PostMedia->mimetype,
+ 'height' => $height,
+ 'width' => $width,
],
]);
if (($item['post-type'] ?? null) == Item::PT_VIDEO) {
@@ -3649,11 +3728,12 @@ class Item
* @param string $content
* @param bool $shared
* @param array $ignore_links A list of URLs to ignore
+ * @param bool $sensitive
* @return string modified content
* @throws InternalServerErrorException
* @throws ServiceUnavailableException
*/
- private static function addLinkAttachment(int $uriid, array $attachments, string $body, string $content, bool $shared, array $ignore_links): string
+ private static function addLinkAttachment(int $uriid, array $attachments, string $body, string $content, bool $shared, array $ignore_links, bool $sensitive): string
{
DI::profiler()->startRecording('rendering');
// Don't show a preview when there is a visual attachment (audio or video)
@@ -3696,9 +3776,9 @@ class Item
if ($preview && $attachment->preview) {
if ($attachment->previewWidth >= 500) {
- $data['image'] = DI::baseUrl() . $attachment->getPreviewPath(Proxy::SIZE_MEDIUM);
+ $data['image'] = DI::baseUrl() . $attachment->getPreviewPath(Proxy::SIZE_MEDIUM, $sensitive);
} else {
- $data['preview'] = DI::baseUrl() . $attachment->getPreviewPath(Proxy::SIZE_MEDIUM);
+ $data['preview'] = DI::baseUrl() . $attachment->getPreviewPath(Proxy::SIZE_MEDIUM, $sensitive);
}
}
@@ -3722,6 +3802,12 @@ class Item
} elseif (preg_match("/.*(\[attachment.*?\].*?\[\/attachment\]).*/ism", $body, $match)) {
$data = BBCode::getAttachmentData($match[1]);
}
+
+ if ($sensitive) {
+ $data['image'] = '';
+ $data['preview'] = '';
+ }
+
DI::profiler()->stopRecording();
if (isset($data['url']) && !in_array(strtolower($data['url']), $ignore_links)) {
@@ -4010,9 +4096,12 @@ class Item
return is_numeric($hookData['item_id']) ? $hookData['item_id'] : 0;
}
- $fetched_uri = ActivityPub\Processor::fetchMissingActivity($uri, [], '', $completion, $uid);
+ $curlResult = DI::httpClient()->head($uri, [HttpClientOptions::ACCEPT_CONTENT => HttpClientAccept::JSON_AS]);
+ if (HTTPSignature::isValidContentType($curlResult->getContentType(), $uri)) {
+ $fetched_uri = ActivityPub\Processor::fetchMissingActivity($uri, [], '', $completion, $uid);
+ }
- if ($fetched_uri) {
+ if (!empty($fetched_uri)) {
$item_id = self::searchByLink($fetched_uri, $uid);
} else {
$item_id = Diaspora::fetchByURL($uri);
diff --git a/src/Model/ItemURI.php b/src/Model/ItemURI.php
index 1755552299..bca5a2862e 100644
--- a/src/Model/ItemURI.php
+++ b/src/Model/ItemURI.php
@@ -1,6 +1,6 @@
t('[no subject]');
- }
-
- $guid = System::createUUID();
- $uri = Item::newURI($guid);
-
- $me = Contact::getByURL($replyto);
- if (!$me['name']) {
- return -2;
- }
-
- $conv_guid = System::createUUID();
-
- $recip_handle = $recipient['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
-
- $sender_handle = $me['addr'];
-
- $handles = $recip_handle . ';' . $sender_handle;
-
- $convid = null;
- $fields = ['uid' => $recipient['uid'], 'guid' => $conv_guid, 'creator' => $sender_handle,
- 'created' => DateTimeFormat::utcNow(), 'updated' => DateTimeFormat::utcNow(),
- 'subject' => $subject, 'recips' => $handles];
- if (DBA::insert('conv', $fields)) {
- $convid = DBA::lastInsertId();
- }
-
- if (!$convid) {
- Logger::warning('conversation not found.');
- return -4;
- }
-
- self::insert(
- [
- 'uid' => $recipient['uid'],
- 'guid' => $guid,
- 'convid' => $convid,
- 'from-name' => $me['name'],
- 'from-photo' => $me['photo'],
- 'from-url' => $me['url'],
- 'contact-id' => 0,
- 'title' => $subject,
- 'body' => $body,
- 'seen' => 0,
- 'reply' => 0,
- 'replied' => 0,
- 'uri' => $uri,
- 'parent-uri' => $me['url'],
- 'created' => DateTimeFormat::utcNow(),
- 'unknown' => 1
- ],
- false
- );
-
- return 0;
- }
}
diff --git a/src/Model/Nodeinfo.php b/src/Model/Nodeinfo.php
index 825afb4a9a..f705e0be14 100644
--- a/src/Model/Nodeinfo.php
+++ b/src/Model/Nodeinfo.php
@@ -1,6 +1,6 @@
$url, 'uid' => $uid]);
$photo['type'] = $mimetype;
+ $photo['filename'] = basename(parse_url($url, PHP_URL_PATH));
$photo['cacheable'] = true;
$photo['blurhash'] = $blurhash;
$photo['width'] = $width;
@@ -597,7 +599,7 @@ class Photo
if (!empty($image_url)) {
$ret = DI::httpClient()->get($image_url, HttpClientAccept::IMAGE);
Logger::debug('Got picture', ['Content-Type' => $ret->getHeader('Content-Type'), 'url' => $image_url]);
- $img_str = $ret->getBody();
+ $img_str = $ret->getBodyString();
$type = $ret->getContentType();
} else {
$img_str = '';
@@ -608,9 +610,7 @@ class Photo
return false;
}
- $type = Images::getMimeTypeByData($img_str, $image_url, $type);
-
- $image = new Image($img_str, $type);
+ $image = new Image($img_str, $type, $image_url);
if ($image->isValid()) {
$image->scaleToSquare(300);
@@ -619,9 +619,9 @@ class Photo
if ($maximagesize && ($filesize > $maximagesize)) {
Logger::info('Avatar exceeds image limit', ['uid' => $uid, 'cid' => $cid, 'maximagesize' => $maximagesize, 'size' => $filesize, 'type' => $image->getType()]);
- if ($image->getType() == 'image/gif') {
+ if ($image->getImageType() == IMAGETYPE_GIF) {
$image->toStatic();
- $image = new Image($image->asString(), 'image/png');
+ $image = new Image($image->asString(), image_type_to_mime_type(IMAGETYPE_PNG));
$filesize = strlen($image->asString());
Logger::info('Converted gif to a static png', ['uid' => $uid, 'cid' => $cid, 'size' => $filesize, 'type' => $image->getType()]);
@@ -662,9 +662,9 @@ class Photo
$suffix = '?ts=' . time();
- $image_url = DI::baseUrl() . '/photo/' . $resource_id . '-4.' . $image->getExt() . $suffix;
- $thumb = DI::baseUrl() . '/photo/' . $resource_id . '-5.' . $image->getExt() . $suffix;
- $micro = DI::baseUrl() . '/photo/' . $resource_id . '-6.' . $image->getExt() . $suffix;
+ $image_url = DI::baseUrl() . '/photo/' . $resource_id . '-4' . $image->getExt() . $suffix;
+ $thumb = DI::baseUrl() . '/photo/' . $resource_id . '-5' . $image->getExt() . $suffix;
+ $micro = DI::baseUrl() . '/photo/' . $resource_id . '-6' . $image->getExt() . $suffix;
} else {
$photo_failure = true;
}
@@ -751,7 +751,7 @@ class Photo
if (!DI::config()->get('system', 'no_count', false)) {
/// @todo This query needs to be renewed. It is really slow
// At this time we just store the data in the cache
- $albums = DBA::toArray(DBA::p("SELECT COUNT(DISTINCT `resource-id`) AS `total`, `album`, ANY_VALUE(`created`) AS `created`
+ $albums = DBA::toArray(DBA::p("SELECT COUNT(DISTINCT `resource-id`) AS `total`, `album`, MIN(`created`) AS `created`
FROM `photo`
WHERE `uid` = ? AND `photo-type` IN (?, ?, ?) $sql_extra
GROUP BY `album` ORDER BY `created` DESC",
@@ -762,9 +762,10 @@ class Photo
));
} else {
// This query doesn't do the count and is much faster
- $albums = DBA::toArray(DBA::p("SELECT DISTINCT(`album`), '' AS `total`
+ $albums = DBA::toArray(DBA::p("SELECT '' AS `total`, `album`, MIN(`created`) AS `created`
FROM `photo` USE INDEX (`uid_album_scale_created`)
- WHERE `uid` = ? AND `photo-type` IN (?, ?, ?) $sql_extra",
+ WHERE `uid` = ? AND `photo-type` IN (?, ?, ?) $sql_extra
+ GROUP BY `album` ORDER BY `created` DESC",
$uid,
self::DEFAULT,
$banner_type,
@@ -1047,7 +1048,7 @@ class Photo
if (!empty($image_url)) {
$ret = DI::httpClient()->get($image_url, HttpClientAccept::IMAGE);
Logger::debug('Got picture', ['Content-Type' => $ret->getHeader('Content-Type'), 'url' => $image_url]);
- $img_str = $ret->getBody();
+ $img_str = $ret->getBodyString();
$type = $ret->getContentType();
} else {
$img_str = '';
@@ -1059,9 +1060,7 @@ class Photo
return [];
}
- $type = Images::getMimeTypeByData($img_str, $image_url, $type);
-
- $image = new Image($img_str, $type);
+ $image = new Image($img_str, $type, $image_url);
$image = self::fitImageSize($image);
if (empty($image)) {
@@ -1131,12 +1130,10 @@ class Photo
return [];
}
- $filetype = Images::getMimeTypeBySource($src, $filename, $filetype);
-
Logger::info('File upload', ['src' => $src, 'filename' => $filename, 'size' => $filesize, 'type' => $filetype]);
$imagedata = @file_get_contents($src);
- $image = new Image($imagedata, $filetype);
+ $image = new Image($imagedata, $filetype, $filename);
if (!$image->isValid()) {
Logger::notice('Image is unvalid', ['files' => $files]);
return [];
diff --git a/src/Model/Post.php b/src/Model/Post.php
index 2e8bbe22e3..6118dede91 100644
--- a/src/Model/Post.php
+++ b/src/Model/Post.php
@@ -1,6 +1,6 @@
[$start, $limit]
];
- $tags = Post::select(['uri-id'], $condition, $params);
+ $tags = DBA::select('post-searchindex', ['uri-id'], $condition, $params);
$uriids = [];
while ($tag = DBA::fetch($tags)) {
@@ -135,9 +137,12 @@ class Content
public static function countBySearch(string $search, int $uid = 0)
{
- $condition = ["`uri-id` IN (SELECT `uri-id` FROM `post-content` WHERE MATCH (`title`, `content-warning`, `body`) AGAINST (? IN BOOLEAN MODE))
- AND (`uid` = ? OR (`uid` = ? AND NOT `global`)) AND (`network` IN (?, ?, ?, ?) OR (`uid` = ? AND `uid` != ?))",
- str_replace('@', ' ', $search), 0, $uid, Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, $uid, 0];
- return Post::count($condition);
+ $search = Post\Engagement::escapeKeywords($search);
+ if ($uid != 0) {
+ $condition = ["MATCH (`searchtext`) AGAINST (? IN BOOLEAN MODE) AND (NOT `restricted` OR `uri-id` IN (SELECT `uri-id` FROM `post-user` WHERE `uid` = ?))", $search, $uid];
+ } else {
+ $condition = ["MATCH (`searchtext`) AGAINST (? IN BOOLEAN MODE) AND NOT `restricted", $search];
+ }
+ return DBA::count('post-searchindex', $condition);
}
}
diff --git a/src/Model/Post/Counts.php b/src/Model/Post/Counts.php
new file mode 100644
index 0000000000..66d6bddad3
--- /dev/null
+++ b/src/Model/Post/Counts.php
@@ -0,0 +1,126 @@
+.
+ *
+ */
+
+namespace Friendica\Model\Post;
+
+use Friendica\Content\Smilies;
+use Friendica\Database\Database;
+use Friendica\Database\DBA;
+use Friendica\Model\Item;
+use Friendica\Model\Post;
+use Friendica\Model\Verb;
+use Friendica\Protocol\Activity;
+
+class Counts
+{
+ /**
+ * Insert or update a post-counts entry
+ *
+ * @param int $uri_id
+ */
+ public static function update(int $uri_id, int $parent_uri_id, int $vid, string $verb, string $body = null)
+ {
+ if (!in_array($verb, [Activity::POST, Activity::LIKE, Activity::DISLIKE,
+ Activity::ATTEND, Activity::ATTENDMAYBE, Activity::ATTENDNO,
+ Activity::EMOJIREACT, Activity::ANNOUNCE, Activity::VIEW, Activity::READ])) {
+ return true;
+ }
+
+ $condition = ['thr-parent-id' => $uri_id, 'vid' => $vid, 'deleted' => false];
+
+ if ($body == $verb) {
+ $condition['body'] = null;
+ $body = '';
+ } elseif ($verb == Activity::POST) {
+ $condition['gravity'] = Item::GRAVITY_COMMENT;
+ $body = '';
+ } elseif ($body && mb_strlen($body) == 1 && Smilies::isEmojiPost($body)) {
+ $condition['body'] = $body;
+ } else {
+ $body = '';
+ }
+
+ $fields = [
+ 'uri-id' => $uri_id,
+ 'vid' => $vid,
+ 'reaction' => $body,
+ 'parent-uri-id' => $parent_uri_id,
+ 'count' => Post::countPosts($condition),
+ ];
+
+ if ($fields['count'] == 0) {
+ DBA::delete('post-counts', ['uri-id' => $uri_id, 'vid' => $vid, 'reaction' => $body]);
+ return true;
+ }
+
+ return DBA::insert('post-counts', $fields, Database::INSERT_UPDATE);
+ }
+
+ public static function updateForPost(int $uri_id, int $parent_uri_id)
+ {
+ self::update($uri_id, $parent_uri_id, Verb::getID(Activity::POST), Activity::POST);
+
+ $activities = DBA::p("SELECT `parent-uri-id`, `vid`, `verb`, `body` FROM `post-view` WHERE `thr-parent-id` = ? AND `gravity` = ? AND `vid` IS NOT NULL GROUP BY `parent-uri-id`, `vid`, `verb`, `body`", $uri_id, Item::GRAVITY_ACTIVITY);
+ while ($activity = DBA::fetch($activities)) {
+ self::update($uri_id, $activity['parent-uri-id'], $activity['vid'], $activity['verb'], $activity['body']);
+ }
+ DBA::close($activities);
+ }
+
+ /**
+ * Retrieves counts of the given condition
+ *
+ * @param array $condition
+ *
+ * @return array
+ */
+ public static function get(array $condition): array
+ {
+ $counts = [];
+
+ $activity_emoji = [
+ Activity::LIKE => '👍',
+ Activity::DISLIKE => '👎',
+ Activity::ATTEND => '✔️',
+ Activity::ATTENDMAYBE => '❓',
+ Activity::ATTENDNO => '❌',
+ Activity::ANNOUNCE => '♻',
+ Activity::VIEW => '📺',
+ Activity::READ => '📖',
+ ];
+
+ $verbs = array_merge(array_keys($activity_emoji), [Activity::EMOJIREACT, Activity::POST]);
+
+ $condition = DBA::mergeConditions($condition, ['verb' => $verbs]);
+ $countquery = DBA::select('post-counts-view', [], $condition);
+ while ($count = DBA::fetch($countquery)) {
+ if (!empty($count['reaction'])) {
+ $count['verb'] = Activity::EMOJIREACT;
+ $count['vid'] = Verb::getID($count['verb']);
+ } elseif (!empty($activity_emoji[$count['verb']])) {
+ $count['reaction'] = $activity_emoji[$count['verb']];
+ }
+ $counts[] = $count;
+ }
+ DBA::close($counts);
+ return $counts;
+ }
+}
diff --git a/src/Model/Post/Delayed.php b/src/Model/Post/Delayed.php
index e840a02384..c18d771ccc 100644
--- a/src/Model/Post/Delayed.php
+++ b/src/Model/Post/Delayed.php
@@ -1,6 +1,6 @@
'language', 'net' => 'network', 'relay' => 'application'];
+ const ALTERNATIVES = ['source:news' => 'source:service', 'source:relay' => 'source:application',
+ 'media:picture' => 'media:image', 'media:photo' => 'media:image',
+ 'network:activitypub' => 'network:apub', 'network:friendica' => 'network:dfrn',
+ 'network:diaspora' => 'network:dspr', 'network:ostatus' => 'network:stat',
+ 'network:discourse' => 'network:dscs', 'network:tumblr' => 'network:tmbl', 'network:bluesky' => 'network:bsky'];
+ const MEDIA_NONE = 0;
+ const MEDIA_IMAGE = 1;
+ const MEDIA_VIDEO = 2;
+ const MEDIA_AUDIO = 4;
+ const MEDIA_CARD = 8;
+ const MEDIA_POST = 16;
/**
* Store engagement data from an item array
*
* @param array $item
- * @return void
+ * @return int uri-id of the engagement post if newly inserted, 0 on update
*/
- public static function storeFromItem(array $item)
+ public static function storeFromItem(array $item): int
{
if (in_array($item['verb'], [Activity::FOLLOW, Activity::VIEW, Activity::READ])) {
Logger::debug('Technical activities are not stored', ['uri-id' => $item['uri-id'], 'parent-uri-id' => $item['parent-uri-id'], 'verb' => $item['verb']]);
- return;
+ return 0;
}
- $parent = Post::selectFirst(['uri-id', 'created', 'author-id', 'owner-id', 'uid', 'private', 'contact-contact-type', 'language', 'network',
- 'title', 'content-warning', 'body', 'author-contact-type', 'author-nick', 'author-addr', 'author-gsid', 'owner-contact-type', 'owner-nick', 'owner-addr', 'owner-gsid'],
+ $parent = Post::selectFirst(['uri-id', 'created', 'uid', 'private', 'quote-uri-id',
+ 'contact-contact-type', 'network', 'title', 'content-warning', 'body', 'language',
+ 'author-id', 'author-contact-type', 'author-nick', 'author-addr', 'author-gsid',
+ 'owner-id', 'owner-contact-type', 'owner-nick', 'owner-addr', 'owner-gsid'],
['uri-id' => $item['parent-uri-id']]);
if ($parent['created'] < self::getCreationDateLimit(false)) {
Logger::debug('Post is too old', ['uri-id' => $item['uri-id'], 'parent-uri-id' => $item['parent-uri-id'], 'created' => $parent['created']]);
- return;
+ return 0;
}
$store = ($item['gravity'] != Item::GRAVITY_PARENT);
@@ -69,28 +83,30 @@ class Engagement
$store = Contact::hasFollowers($parent['owner-id']);
}
+ if (!$store && ($parent['owner-id'] != $parent['author-id'])) {
+ $store = Contact::hasFollowers($parent['author-id']);
+ }
+
if (!$store) {
$tagList = Relay::getSubscribedTags();
foreach (array_column(Tag::getByURIId($item['parent-uri-id'], [Tag::HASHTAG]), 'name') as $tag) {
- if (in_array($tag, $tagList)) {
+ if (in_array(mb_strtolower($tag), $tagList)) {
$store = true;
break;
}
}
}
- $mediatype = self::getMediaType($item['parent-uri-id']);
+ $mediatype = self::getMediaType($item['parent-uri-id'], $parent['quote-uri-id']);
if (!$store) {
$store = !empty($mediatype);
}
- $searchtext = self::getSearchTextForItem($parent);
+ $searchtext = self::getSearchTextForItem($parent, $mediatype);
+ $language = !empty($parent['language']) ? (array_key_first(json_decode($parent['language'], true)) ?? L10n::UNDETERMINED_LANGUAGE) : L10n::UNDETERMINED_LANGUAGE;
if (!$store) {
- $content = trim(($parent['title'] ?? '') . ' ' . ($parent['content-warning'] ?? '') . ' ' . ($parent['body'] ?? ''));
- $languages = Item::getLanguageArray($content, 1, 0, $parent['author-id']);
- $language = !empty($languages) ? array_key_first($languages) : '';
- $store = DI::userDefinedChannel()->match($searchtext, $language);
+ $store = DI::userDefinedChannel()->match($searchtext, $language);
}
$engagement = [
@@ -98,9 +114,11 @@ class Engagement
'owner-id' => $parent['owner-id'],
'contact-type' => $parent['contact-contact-type'],
'media-type' => $mediatype,
- 'language' => $parent['language'],
+ 'language' => $language,
'searchtext' => $searchtext,
+ 'size' => self::getContentSize($parent),
'created' => $parent['created'],
+ 'network' => $parent['network'],
'restricted' => !in_array($item['network'], Protocol::FEDERATED) || ($parent['private'] != Item::PUBLIC),
'comments' => DBA::count('post', ['parent-uri-id' => $item['parent-uri-id'], 'gravity' => Item::GRAVITY_COMMENT]),
'activities' => DBA::count('post', [
@@ -111,10 +129,29 @@ class Engagement
];
if (!$store && ($engagement['comments'] == 0) && ($engagement['activities'] == 0)) {
Logger::debug('No media, follower, subscribed tags, comments or activities. Engagement not stored', ['fields' => $engagement]);
- return;
+ return 0;
}
- $ret = DBA::insert('post-engagement', $engagement, Database::INSERT_UPDATE);
- Logger::debug('Engagement stored', ['fields' => $engagement, 'ret' => $ret]);
+ $exists = DBA::exists('post-engagement', ['uri-id' => $engagement['uri-id']]);
+ if ($exists) {
+ $ret = DBA::update('post-engagement', $engagement, ['uri-id' => $engagement['uri-id']]);
+ Logger::debug('Engagement updated', ['uri-id' => $engagement['uri-id'], 'ret' => $ret]);
+ } else {
+ $ret = DBA::insert('post-engagement', $engagement);
+ Logger::debug('Engagement inserted', ['uri-id' => $engagement['uri-id'], 'ret' => $ret]);
+ }
+ return ($ret && !$exists) ? $engagement['uri-id'] : 0;
+ }
+
+ public static function getContentSize(array $item): int
+ {
+ $body = ' ' . $item['title'] . ' ' . $item['content-warning'] . ' ' . $item['body'];
+ $body = BBCode::removeAttachment($body);
+ $body = BBCode::removeSharedData($body);
+ $body = preg_replace('/[^@!#]\[url\=.*?\].*?\[\/url\]/ism', '', $body);
+ $body = BBCode::removeLinks($body);
+ $msg = BBCode::toPlaintext($body, false);
+
+ return mb_strlen($msg);
}
public static function getSearchTextForActivity(string $content, int $author_id, array $tags, array $receivers): string
@@ -137,7 +174,8 @@ class Engagement
'owner-contact-type' => $author['contact-type'],
'owner-nick' => $author['nick'],
'owner-addr' => $author['addr'],
- 'author-gsid' => $author['gsid'],
+ 'owner-gsid' => $author['gsid'],
+ 'quote-uri-id' => 0,
];
foreach ($receivers as $receiver) {
@@ -146,91 +184,142 @@ class Engagement
}
}
- return self::getSearchText($item, $receivers, $tags);
+ return self::getSearchText($item, $receivers, $tags, 0);
}
- private static function getSearchTextForItem(array $item): string
+ public static function getSearchTextForUriId(int $uri_id, bool $refresh = false): string
+ {
+ if (!$refresh) {
+ $engagement = DBA::selectFirst('post-engagement', ['searchtext'], ['uri-id' => $uri_id]);
+ if (!empty($engagement['searchtext'])) {
+ return $engagement['searchtext'];
+ }
+ }
+
+ $post = Post::selectFirstPost(['uri-id', 'network', 'title', 'content-warning', 'body', 'private',
+ 'author-id', 'author-contact-type', 'author-nick', 'author-addr', 'author-gsid', 'quote-uri-id',
+ 'owner-id', 'owner-contact-type', 'owner-nick', 'owner-addr', 'owner-gsid'], ['uri-id' => $uri_id]);
+ if (empty($post['uri-id'])) {
+ return '';
+ }
+ $mediatype = self::getMediaType($uri_id, $post['quote-uri-id']);
+ return self::getSearchTextForItem($post, $mediatype);
+ }
+
+ private static function getSearchTextForItem(array $item, int $mediatype): string
{
$receivers = array_column(Tag::getByURIId($item['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION, Tag::AUDIENCE]), 'url');
$tags = array_column(Tag::getByURIId($item['uri-id'], [Tag::HASHTAG]), 'name');
- return self::getSearchText($item, $receivers, $tags);
+ return self::getSearchText($item, $receivers, $tags, $mediatype);
}
- private static function getSearchText(array $item, array $receivers, array $tags): string
+ private static function getSearchText(array $item, array $receivers, array $tags, int $mediatype): string
{
- $body = '[nosmile]network:' . $item['network'];
+ $body = '[nosmile]network_' . $item['network'];
if (!empty($item['author-gsid'])) {
$gserver = DBA::selectFirst('gserver', ['platform', 'nurl'], ['id' => $item['author-gsid']]);
- $platform = preg_replace( '/[\W]/', '', $gserver['platform'] ?? '');
+ $platform = preg_replace('/[\W]/', '', $gserver['platform'] ?? '');
if (!empty($platform)) {
- $body .= ' platform:' . $platform;
+ $body .= ' platform_' . $platform;
}
- $body .= ' server:' . parse_url($gserver['nurl'], PHP_URL_HOST);
+ $body .= ' server_' . parse_url($gserver['nurl'], PHP_URL_HOST);
}
if (($item['owner-contact-type'] == Contact::TYPE_COMMUNITY) && !empty($item['owner-gsid']) && ($item['owner-gsid'] != ($item['author-gsid'] ?? 0))) {
$gserver = DBA::selectFirst('gserver', ['platform', 'nurl'], ['id' => $item['owner-gsid']]);
- $platform = preg_replace( '/[\W]/', '', $gserver['platform'] ?? '');
- if (!empty($platform) && !strpos($body, 'platform:' . $platform)) {
- $body .= ' platform:' . $platform;
+ $platform = preg_replace('/[\W]/', '', $gserver['platform'] ?? '');
+ if (!empty($platform) && !strpos($body, 'platform_' . $platform)) {
+ $body .= ' platform_' . $platform;
}
- $body .= ' server:' . parse_url($gserver['nurl'], PHP_URL_HOST);
+ $body .= ' server_' . parse_url($gserver['nurl'], PHP_URL_HOST);
}
switch ($item['private']) {
case Item::PUBLIC:
- $body .= ' visibility:public';
+ $body .= ' visibility_public';
break;
case Item::UNLISTED:
- $body .= ' visibility:unlisted';
+ $body .= ' visibility_unlisted';
break;
case Item::PRIVATE:
- $body .= ' visibility:private';
+ $body .= ' visibility_private';
break;
}
if (in_array(Contact::TYPE_COMMUNITY, [$item['author-contact-type'], $item['owner-contact-type']])) {
- $body .= ' source:group';
+ $body .= ' source_group';
} elseif ($item['author-contact-type'] == Contact::TYPE_PERSON) {
- $body .= ' source:person';
+ $body .= ' source_person';
} elseif ($item['author-contact-type'] == Contact::TYPE_NEWS) {
- $body .= ' source:service';
+ $body .= ' source_service';
} elseif ($item['author-contact-type'] == Contact::TYPE_ORGANISATION) {
- $body .= ' source:organization';
+ $body .= ' source_organization';
} elseif ($item['author-contact-type'] == Contact::TYPE_RELAY) {
- $body .= ' source:application';
+ $body .= ' source_application';
}
if ($item['author-contact-type'] == Contact::TYPE_COMMUNITY) {
- $body .= ' group:' . $item['author-nick'] . ' group:' . $item['author-addr'];
+ $body .= ' group_' . $item['author-nick'] . ' group_' . $item['author-addr'];
+ } elseif ($item['author-contact-type'] == Contact::TYPE_RELAY) {
+ $body .= ' application_' . $item['author-nick'] . ' application_' . $item['author-addr'];
} elseif (in_array($item['author-contact-type'], [Contact::TYPE_PERSON, Contact::TYPE_NEWS, Contact::TYPE_ORGANISATION])) {
- $body .= ' from:' . $item['author-nick'] . ' from:' . $item['author-addr'];
+ $body .= ' from_' . $item['author-nick'] . ' from_' . $item['author-addr'];
}
if ($item['author-id'] != $item['owner-id']) {
if ($item['owner-contact-type'] == Contact::TYPE_COMMUNITY) {
- $body .= ' group:' . $item['owner-nick'] . ' group:' . $item['owner-addr'];
+ $body .= ' group_' . $item['owner-nick'] . ' group_' . $item['owner-addr'];
} elseif (in_array($item['owner-contact-type'], [Contact::TYPE_PERSON, Contact::TYPE_NEWS, Contact::TYPE_ORGANISATION])) {
- $body .= ' from:' . $item['owner-nick'] . ' from:' . $item['owner-addr'];
+ $body .= ' from_' . $item['owner-nick'] . ' from_' . $item['owner-addr'];
}
}
+ $body = self::addResharers($body, $item['uri-id']);
+
foreach ($receivers as $receiver) {
+ if (empty($receiver)) {
+ continue;
+ }
$contact = Contact::getByURL($receiver, false, ['nick', 'addr', 'contact-type']);
if (empty($contact)) {
continue;
}
- if (($contact['contact-type'] == Contact::TYPE_COMMUNITY) && !strpos($body, 'group:' . $contact['addr'])) {
- $body .= ' group:' . $contact['nick'] . ' group:' . $contact['addr'];
+ if (($contact['contact-type'] == Contact::TYPE_COMMUNITY) && !strpos($body, 'group_' . $contact['addr'])) {
+ $body .= ' group_' . $contact['nick'] . ' group_' . $contact['addr'];
} elseif (in_array($contact['contact-type'], [Contact::TYPE_PERSON, Contact::TYPE_NEWS, Contact::TYPE_ORGANISATION])) {
- $body .= ' to:' . $contact['nick'] . ' to:' . $contact['addr'];
+ $body .= ' to_' . $contact['nick'] . ' to_' . $contact['addr'];
}
}
foreach ($tags as $tag) {
- $body .= ' tag:' . $tag;
+ $body .= ' tag_' . $tag;
+ }
+
+ if (!empty($item['language'])) {
+ $languages = json_decode($item['language'], true);
+ $body .= ' language_' . array_key_first($languages);
+ }
+
+ if ($mediatype & self::MEDIA_IMAGE) {
+ $body .= ' media_image';
+ }
+
+ if ($mediatype & self::MEDIA_VIDEO) {
+ $body .= ' media_video';
+ }
+
+ if ($mediatype & self::MEDIA_AUDIO) {
+ $body .= ' media_audio';
+ }
+
+ if ($mediatype & self::MEDIA_CARD) {
+ $body .= ' media_card';
+ }
+
+ if ($mediatype & self::MEDIA_POST) {
+ $body .= ' media_post';
}
$body .= ' ' . $item['title'] . ' ' . $item['content-warning'] . ' ' . $item['body'];
@@ -238,17 +327,46 @@ class Engagement
return BBCode::toSearchText($body, $item['uri-id']);
}
- private static function getMediaType(int $uri_id): int
+ private static function addResharers(string $text, int $uri_id): string
+ {
+ $result = Post::selectPosts(['author-addr', 'author-nick', 'author-contact-type'],
+ ['thr-parent-id' => $uri_id, 'gravity' => Item::GRAVITY_ACTIVITY, 'verb' => Activity::ANNOUNCE, 'author-contact-type' => [Contact::TYPE_RELAY, Contact::TYPE_COMMUNITY]]);
+ while ($reshare = Post::fetch($result)) {
+ switch ($reshare['author-contact-type']) {
+ case Contact::TYPE_RELAY:
+ $prefix = ' application_';
+ break;
+ case Contact::TYPE_COMMUNITY:
+ $prefix = ' group_';
+ break;
+ }
+ $nick = $prefix . $reshare['author-nick'];
+ $addr = $prefix . $reshare['author-addr'];
+
+ if (stripos($text, $addr) === false) {
+ $text .= $nick . $addr;
+ }
+ }
+ DBA::close($result);
+
+ return $text;
+ }
+
+ public static function getMediaType(int $uri_id, int $quote_uri_id = null): int
{
$media = Post\Media::getByURIId($uri_id);
- $type = 0;
+ $type = !empty($quote_uri_id) ? self::MEDIA_POST : self::MEDIA_NONE;
foreach ($media as $entry) {
if ($entry['type'] == Post\Media::IMAGE) {
- $type = $type | 1;
+ $type = $type | self::MEDIA_IMAGE;
} elseif ($entry['type'] == Post\Media::VIDEO) {
- $type = $type | 2;
+ $type = $type | self::MEDIA_VIDEO;
} elseif ($entry['type'] == Post\Media::AUDIO) {
- $type = $type | 4;
+ $type = $type | self::MEDIA_AUDIO;
+ } elseif ($entry['type'] == Post\Media::HTML) {
+ $type = $type | self::MEDIA_CARD;
+ } elseif ($entry['type'] == Post\Media::ACTIVITY) {
+ $type = $type | self::MEDIA_POST;
}
}
return $type;
@@ -284,4 +402,20 @@ class Engagement
return DateTimeFormat::utc('now - ' . DI::config()->get('channel', 'engagement_hours') . ' hour');
}
+
+ public static function escapeKeywords(string $fullTextSearch): string
+ {
+ foreach (SELF::SHORTCUTS as $search => $replace) {
+ $fullTextSearch = preg_replace('~' . $search . ':(.[\w\*@\.-]+)~', $replace . ':$1', $fullTextSearch);
+ }
+
+ foreach (SELF::ALTERNATIVES as $search => $replace) {
+ $fullTextSearch = str_replace($search, $replace, $fullTextSearch);
+ }
+
+ foreach (self::KEYWORDS as $keyword) {
+ $fullTextSearch = preg_replace('~(' . $keyword . '):(.[\w\*@\.-]+)~', '"$1_$2"', $fullTextSearch);
+ }
+ return $fullTextSearch;
+ }
}
diff --git a/src/Model/Post/History.php b/src/Model/Post/History.php
index 8a373b3cd3..996993ad46 100644
--- a/src/Model/Post/History.php
+++ b/src/Model/Post/History.php
@@ -1,6 +1,6 @@
$url, 'exception' => $exception]);
return [];
}
- $fields = ['mimetype' => $curlResult->getHeader('Content-Type')[0]];
- $img_str = $curlResult->getBody();
- $image = new Image($img_str, Images::getMimeTypeByData($img_str));
- if ($image->isValid()) {
- $fields['mimetype'] = $image->getType();
- $fields['width'] = $image->getWidth();
- $fields['height'] = $image->getHeight();
- $fields['blurhash'] = $image->getBlurHash();
+ if (!$curlResult->isSuccess()) {
+ Logger::notice('Fetching unsuccessful', ['url' => $url]);
+ return [];
+ }
+
+ $fields = ['mimetype' => $curlResult->getContentType()];
+
+ if (Images::isSupportedMimeType($fields['mimetype'])) {
+ $img_str = $curlResult->getBodyString();
+ $image = new Image($img_str, $fields['mimetype'], $url);
+ if ($image->isValid()) {
+ $fields['mimetype'] = $image->getType();
+ $fields['width'] = $image->getWidth();
+ $fields['height'] = $image->getHeight();
+ $fields['blurhash'] = $image->getBlurHash();
+ }
}
return $fields;
diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php
index 671c19f454..0b8a971803 100644
--- a/src/Model/Post/Media.php
+++ b/src/Model/Post/Media.php
@@ -1,6 +1,6 @@
truncateFieldsForTable('post-media', $media);
@@ -195,7 +196,7 @@ class Media
if ($curlResult->isSuccess()) {
if (empty($media['mimetype'])) {
- $media['mimetype'] = $curlResult->getHeader('Content-Type')[0] ?? '';
+ $media['mimetype'] = $curlResult->getContentType() ?? '';
}
if (empty($media['size'])) {
$media['size'] = (int)($curlResult->getHeader('Content-Length')[0] ?? 0);
@@ -208,13 +209,17 @@ class Media
$filetype = !empty($media['mimetype']) ? strtolower(current(explode('/', $media['mimetype']))) : '';
if (($media['type'] == self::IMAGE) || ($filetype == 'image')) {
- $imagedata = Images::getInfoFromURLCached($media['url']);
+ $imagedata = Images::getInfoFromURLCached($media['url'], empty($media['description']));
if ($imagedata) {
$media['mimetype'] = $imagedata['mime'];
$media['size'] = $imagedata['size'];
$media['width'] = $imagedata[0];
$media['height'] = $imagedata[1];
$media['blurhash'] = $imagedata['blurhash'] ?? null;
+ if (!empty($imagedata['description']) && empty($media['description'])) {
+ $media['description'] = $imagedata['description'];
+ Logger::debug('Detected text for image', $media);
+ }
} else {
Logger::notice('No image data', ['media' => $media]);
}
@@ -360,7 +365,7 @@ class Media
*/
private static function addPage(array $media): array
{
- $data = ParseUrl::getSiteinfoCached($media['url'], false);
+ $data = ParseUrl::getSiteinfoCached($media['url']);
$media['preview'] = $data['images'][0]['src'] ?? null;
$media['preview-height'] = $data['images'][0]['height'] ?? null;
$media['preview-width'] = $data['images'][0]['width'] ?? null;
@@ -907,6 +912,8 @@ class Media
$body .= "\n[audio]" . $media['url'] . "[/audio]\n";
} elseif ($media['type'] == self::VIDEO) {
$body .= "\n[video]" . $media['url'] . "[/video]\n";
+ } else {
+ $body .= "\n[url]" . $media['url'] . "[/url]\n";
}
}
diff --git a/src/Model/Post/Question.php b/src/Model/Post/Question.php
index 6c58562978..4c20959d1a 100644
--- a/src/Model/Post/Question.php
+++ b/src/Model/Post/Question.php
@@ -1,6 +1,6 @@
.
+ *
+ */
+
+namespace Friendica\Model\Post;
+
+use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
+use Friendica\Database\Database;
+use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Model\Item;
+use Friendica\Model\Post;
+use Friendica\Util\DateTimeFormat;
+
+class SearchIndex
+{
+ /**
+ * Insert a post-searchindex entry
+ *
+ * @param int $uri_id
+ * @param string $created
+ * @param bool $refresh
+ */
+ public static function insert(int $uri_id, string $created, bool $refresh = false)
+ {
+ $limit = self::searchAgeDateLimit();
+ if (!empty($limit) && (strtotime($created) < strtotime($limit))) {
+ return;
+ }
+
+ $item = Post::selectFirstPost(['created', 'owner-id', 'private', 'language', 'network', 'title', 'content-warning', 'body', 'quote-uri-id'], ['uri-id' => $uri_id]);
+ if (empty($item)) {
+ return;
+ }
+
+ $search = [
+ 'uri-id' => $uri_id,
+ 'owner-id' => $item['owner-id'],
+ 'media-type' => Engagement::getMediaType($uri_id, $item['quote-uri-id']),
+ 'language' => substr(!empty($item['language']) ? (array_key_first(json_decode($item['language'], true)) ?? L10n::UNDETERMINED_LANGUAGE) : L10n::UNDETERMINED_LANGUAGE, 0, 2),
+ 'searchtext' => Post\Engagement::getSearchTextForUriId($uri_id, $refresh),
+ 'size' => Engagement::getContentSize($item),
+ 'created' => $item['created'],
+ 'restricted' => !in_array($item['network'], Protocol::FEDERATED) || ($item['private'] != Item::PUBLIC),
+ ];
+ return DBA::insert('post-searchindex', $search, Database::INSERT_UPDATE);
+ }
+
+ /**
+ * update a post-searchindex entry
+ *
+ * @param int $uri_id
+ */
+ public static function update(int $uri_id)
+ {
+ $searchtext = Post\Engagement::getSearchTextForUriId($uri_id);
+ return DBA::update('post-searchindex', ['searchtext' => $searchtext], ['uri-id' => $uri_id]);
+ }
+
+ /**
+ * Expire old searchindex entries
+ *
+ * @return void
+ */
+ public static function expire()
+ {
+ $limit = self::searchAgeDateLimit();
+ if (empty($limit)) {
+ return;
+ }
+ DBA::delete('post-searchindex', ["`created` < ?", $limit]);
+ Logger::notice('Cleared expired searchindex entries', ['limit' => $limit, 'rows' => DBA::affectedRows()]);
+ }
+
+ public static function searchAgeDateLimit(): string
+ {
+ $days = DI::config()->get('system', 'search_age_days');
+ if (empty($days)) {
+ return '';
+ }
+ return DateTimeFormat::utc('now - ' . $days . ' day');
+ }
+}
diff --git a/src/Model/Post/Thread.php b/src/Model/Post/Thread.php
index 4d9290bf7e..ae4db93e66 100644
--- a/src/Model/Post/Thread.php
+++ b/src/Model/Post/Thread.php
@@ -1,6 +1,6 @@
t('Post to group');
$mention_url = 'compose/0?body=!' . $profile['addr'];
$network_label = DI::l10n()->t('View group');
- $network_url = 'network/group/' . $cid;
} else {
$mention_label = DI::l10n()->t('Mention');
$mention_url = 'compose/0?body=@' . $profile['addr'];
$network_label = DI::l10n()->t('Network Posts');
- $network_url = 'contact/' . $cid . '/conversations';
}
+ $network_url = 'contact/' . $cid . '/conversations';
$tpl = Renderer::getMarkupTemplate('profile/vcard.tpl');
$o .= Renderer::replaceMacros($tpl, [
diff --git a/src/Model/PushSubscriber.php b/src/Model/PushSubscriber.php
index 2a2ce57ef3..e910f2f1e1 100644
--- a/src/Model/PushSubscriber.php
+++ b/src/Model/PushSubscriber.php
@@ -1,6 +1,6 @@
$uriId, 'type' => [self::HASHTAG, self::MENTION, self::EXCLUSIVE_MENTION, self::IMPLICIT_MENTION]]);
}
+ /**
+ * Check for a given hashtag on a given post
+ *
+ * @param integer $uriId
+ * @param string $tag
+ * @return boolean
+ */
+ public static function existsTagForPost(int $uriId, string $tag): bool
+ {
+ return DBA::exists('tag-view', ['uri-id' => $uriId, 'type' => self::HASHTAG, 'name' => $tag]);
+ }
+
/**
* Remove tag/mention
*
@@ -546,7 +558,7 @@ class Tag
);
while ($tag = DBA::fetch($taglist)) {
if ($tag['url'] == '') {
- $tag['url'] = $searchpath . rawurlencode($tag['name']);
+ $tag['url'] = $searchpath . urlencode($tag['name']);
}
$orig_tag = $tag['url'];
@@ -667,12 +679,11 @@ class Tag
*/
private static function getBlockedSQL(): string
{
- $blocked_txt = DI::config()->get('system', 'blocked_tags');
- if (empty($blocked_txt)) {
+ $blocked = Strings::getTagArrayByString(DI::config()->get('system', 'blocked_tags'));
+ if (empty($blocked)) {
return '';
}
- $blocked = explode(',', $blocked_txt);
array_walk($blocked, function (&$value) {
$value = "'" . DBA::escape(trim($value)) . "'";
});
diff --git a/src/Model/User.php b/src/Model/User.php
index 28742e6395..5b06f5e77a 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -1,6 +1,6 @@
$system['sprvkey'],
'guid' => System::createUUID(),
'verified' => true,
- 'page-flags' => User::PAGE_FLAGS_SOAPBOX,
- 'account-type' => User::ACCOUNT_TYPE_RELAY,
+ 'page-flags' => self::PAGE_FLAGS_SOAPBOX,
+ 'account-type' => self::ACCOUNT_TYPE_RELAY,
];
DBA::update('user', $fields, ['uid' => 0]);
@@ -351,7 +354,7 @@ class User
public static function setCommunityUserSettings(int $uid)
{
$user = self::getById($uid, ['account-type', 'page-flags']);
- if ($user['account-type'] != User::ACCOUNT_TYPE_COMMUNITY) {
+ if ($user['account-type'] != self::ACCOUNT_TYPE_COMMUNITY) {
return;
}
@@ -359,14 +362,14 @@ class User
$fields = [
'allow_cid' => '',
- 'allow_gid' => $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP ? '<' . Circle::FOLLOWERS . '>' : '',
+ 'allow_gid' => $user['page-flags'] == self::PAGE_FLAGS_PRVGROUP ? '<' . Circle::FOLLOWERS . '>' : '',
'deny_cid' => '',
'deny_gid' => '',
'blockwall' => true,
'blocktags' => true,
];
- User::update($fields, $uid);
+ self::update($fields, $uid);
Profile::update(['hide-friends' => true], $uid);
}
@@ -477,7 +480,7 @@ class User
// Check for correct url and normalised nurl
$url = DI::baseUrl() . '/profile/' . $owner['nickname'];
- $repair = empty($owner['network']) || ($owner['url'] != $url) || ($owner['nurl'] != Strings::normaliseLink($owner['url']));
+ $repair = empty($owner['baseurl']) || empty($owner['network']) || ($owner['url'] != $url) || ($owner['nurl'] != Strings::normaliseLink($owner['url']));
if (!$repair) {
// Check if "addr" is present and correct
@@ -585,7 +588,7 @@ class User
*/
public static function getWantedLanguages(int $uid): array
{
- return DI::pConfig()->get($uid, 'channel', 'languages', [User::getLanguageCode($uid)]) ?? [];
+ return DI::pConfig()->get($uid, 'channel', 'languages', [self::getLanguageCode($uid)]) ?? [];
}
/**
@@ -638,6 +641,16 @@ class User
}
DBA::close($channels);
+ foreach (DI::userDefinedChannel()->select(["NOT `languages` IS NULL"]) as $channel) {
+ foreach ($channel->languages ?? [] as $language) {
+ $languages[$language] = $language;
+ }
+ }
+
+ if (!DI::config()->get('system', 'relay_deny_undetected_language')) {
+ $languages[L10n::UNDETERMINED_LANGUAGE] = L10n::UNDETERMINED_LANGUAGE;
+ }
+
ksort($languages);
$languages = array_keys($languages);
DI::cache()->set($cachekey, $languages);
@@ -813,26 +826,30 @@ class User
/**
* Update the day of the last activity of the given user
*
- * @param integer $uid
+ * @param array $user
+ * @param bool $refresh_login
* @return void
*/
- public static function updateLastActivity(int $uid)
+ public static function updateLastActivity(array $user, bool $refresh_login)
{
- if (!$uid) {
- return;
- }
-
- $user = User::getById($uid, ['last-activity']);
- if (empty($user)) {
- return;
- }
-
$current_day = DateTimeFormat::utcNow('Y-m-d');
+ if (($user['last-activity'] == $current_day) && (!$refresh_login || DateTimeFormat::utc($user['login_date'], 'z-H') == DateTimeFormat::utcNow('z-H'))) {
+ return;
+ }
- if ($user['last-activity'] != $current_day) {
- User::update(['last-activity' => $current_day], $uid);
- // Set the last activity for all identities of the user
- DBA::update('user', ['last-activity' => $current_day], ['parent-uid' => $uid, 'verified' => true, 'blocked' => false, 'account_removed' => false, 'account_expired' => false]);
+ $fields = ['last-activity' => $current_day];
+ if ($refresh_login) {
+ $fields['login_date'] = DateTimeFormat::utcNow();
+ }
+
+ Logger::debug('Set last activity for user', ['uid' => $user['uid'], 'fields' => $fields]);
+ self::update($fields, $user['uid']);
+ // Set the last activity for all identities of the user
+ DBA::update('user', $fields, ['parent-uid' => $user['uid'], 'verified' => true, 'blocked' => false, 'account_removed' => false, 'account_expired' => false]);
+
+ if (!empty($user['parent-uid'])) {
+ self::update($fields, $user['parent-uid']);
+ DBA::update('user', $fields, ['parent-uid' => $user['parent-uid'], 'verified' => true, 'blocked' => false, 'account_removed' => false, 'account_expired' => false]);
}
}
@@ -864,7 +881,7 @@ class User
try {
$passwordExposedChecker = new PasswordExposed\PasswordExposedChecker(null, $cache);
- return $passwordExposedChecker->passwordExposed($password) === PasswordExposed\PasswordStatus::EXPOSED;
+ return $passwordExposedChecker->passwordExposed($password) === PasswordExposed\Enums\PasswordStatus::EXPOSED;
} catch (Exception $e) {
Logger::error('Password Exposed Exception: ' . $e->getMessage(), [
'code' => $e->getCode(),
@@ -1271,7 +1288,7 @@ class User
throw new Exception(DI::l10n()->t('Nickname is already registered. Please choose another.'));
}
- $new_password = strlen($password) ? $password : User::generateNewPassword();
+ $new_password = strlen($password) ? $password : self::generateNewPassword();
$new_password_encoded = self::hashPassword($new_password);
$return['password'] = $new_password;
@@ -1383,16 +1400,14 @@ class User
$curlResult = DI::httpClient()->get($photo, HttpClientAccept::IMAGE);
if ($curlResult->isSuccess()) {
Logger::debug('Got picture', ['Content-Type' => $curlResult->getHeader('Content-Type'), 'url' => $photo]);
- $img_str = $curlResult->getBody();
+ $img_str = $curlResult->getBodyString();
$type = $curlResult->getContentType();
} else {
$img_str = '';
$type = '';
}
- $type = Images::getMimeTypeByData($img_str, $photo, $type);
-
- $image = new Image($img_str, $type);
+ $image = new Image($img_str, $type, $photo);
if ($image->isValid()) {
$image->scaleToSquare(300);
@@ -1492,7 +1507,7 @@ class User
return false;
}
- $user = User::getById($register['uid']);
+ $user = self::getById($register['uid']);
if (!DBA::isResult($user)) {
return false;
}
@@ -1510,7 +1525,7 @@ class User
$l10n = DI::l10n()->withLang($register['language']);
- return User::sendRegisterOpenEmail(
+ return self::sendRegisterOpenEmail(
$l10n,
$user,
DI::config()->get('config', 'sitename'),
@@ -1538,7 +1553,7 @@ class User
return false;
}
- $user = User::getById($register['uid']);
+ $user = self::getById($register['uid']);
if (!DBA::isResult($user)) {
return false;
}
@@ -1553,16 +1568,17 @@ class User
/**
* Creates a new user based on a minimal set and sends an email to this user
*
- * @param string $name The user's name
- * @param string $email The user's email address
- * @param string $nick The user's nick name
- * @param string $lang The user's language (default is english)
+ * @param string $name The user's name
+ * @param string $email The user's email address
+ * @param string $nick The user's nick name
+ * @param string $lang The user's language (default is english)
+ * @param string $avatar URL to an image to use as avatar (default is to prompt user at first login)
* @return bool True, if the user was created successfully
* @throws HTTPException\InternalServerErrorException
* @throws ErrorException
* @throws ImagickException
*/
- public static function createMinimal(string $name, string $email, string $nick, string $lang = L10n::DEFAULT): bool
+ public static function createMinimal(string $name, string $email, string $nick, string $lang = L10n::DEFAULT, string $avatar = ''): bool
{
if (empty($name) ||
empty($email) ||
@@ -1575,7 +1591,8 @@ class User
'email' => $email,
'nickname' => $nick,
'verified' => 1,
- 'language' => $lang
+ 'language' => $lang,
+ 'photo' => $avatar
]);
$user = $result['user'];
@@ -1597,8 +1614,8 @@ class User
You may also wish to add some basic information to your default profile
(on the "Profiles" page) so that other people can easily find you.
- We recommend adding a profile photo, adding some profile "keywords"
- (very useful in making new friends) - and perhaps what country you live in;
+ We recommend adding a profile photo, adding some profile "keywords"
+ (very useful in making new friends) - and perhaps what country you live in;
if you do not wish to be more specific than that.
We fully respect your right to privacy, and none of these items are necessary.
diff --git a/src/Model/User/Cookie.php b/src/Model/User/Cookie.php
index aa89ae2275..c14600b441 100644
--- a/src/Model/User/Cookie.php
+++ b/src/Model/User/Cookie.php
@@ -1,6 +1,6 @@
$verb]);
if (DBA::isResult($verb_record)) {
+ self::$verbs[$verb_record['id']] = $verb;
return $verb_record['id'];
}
DBA::insert('verb', ['name' => $verb], Database::INSERT_IGNORE);
- return DBA::lastInsertId();
+ $id = DBA::lastInsertId();
+ self::$verbs[$id] = $verb;
+ return $id;
+
}
/**
@@ -62,11 +73,17 @@ class Verb
return '';
}
+ if (!empty(self::$verbs[$id])) {
+ return self::$verbs[$id];
+ }
+
$verb_record = DBA::selectFirst('verb', ['name'], ['id' => $id]);
if (!DBA::isResult($verb_record)) {
return '';
}
+ self::$verbs[$id] = $verb_record['name'];
+
return $verb_record['name'];
}
}
diff --git a/src/Moderation/Collection/Report/Posts.php b/src/Moderation/Collection/Report/Posts.php
index 374654dc37..48475bd97a 100644
--- a/src/Moderation/Collection/Report/Posts.php
+++ b/src/Moderation/Collection/Report/Posts.php
@@ -1,6 +1,6 @@
['name' => 'BirdsiteLIVE', 'color' => '#1b6ec2'], // Color from the page
'bookwyrm' => ['name' => 'BookWyrm', 'color' => '#00d1b2'], // Color from the page
'castopod' => ['name' => 'Castopod', 'color' => '#00564a'], // Background color from the page
+ 'cherrypick' => ['name' => 'Cherrypick', 'color' => 'pink'], // Color from one of the instabces
'diaspora' => ['name' => 'Diaspora', 'color' => '#a1a1a1'], // logo is black and white, makes a gray
'calckey' => ['name' => 'firefish (Calckey)', 'color' => '#1c4a5c'], // Color from the page
+ 'sharkey' => ['name' => 'Sharkey', 'color' => 'lightpink'], // Font color from the homepage
'foundkey' => ['name' => 'Foundkey', 'color' => '#609926'], // Some random color from the repository
'funkwhale' => ['name' => 'Funkwhale', 'color' => '#4082B4'], // From the homepage
'gancio' => ['name' => 'Gancio', 'color' => '#7253ed'], // Fontcolor from the page
'gnusocial' => ['name' => 'GNU Social/Statusnet', 'color' => '#a22430'], // dark red from the logo
'gotosocial' => ['name' => 'GoToSocial', 'color' => '#df8958'], // Some color from their mascot
'hometown' => ['name' => 'Hometown', 'color' => '#1f70c1'], // Color from the Patreon page
- 'honk' => ['name' => 'Honk', 'color' => '##0d0d0d'], // Background color from the page
+ 'honk' => ['name' => 'Honk', 'color' => '#0d0d0d'], // Background color from the page
'hubzilla' => ['name' => 'Hubzilla/Red Matrix', 'color' => '#43488a'], // blue from the logo
+ 'iceshrimp' => ['name' => 'iceshrimp', 'color' => 'mediumslateblue'], // Color that is used in their software
'kbin' => ['name' => 'kbin', 'color' => '#61366b'], // Color from their main instance
'lemmy' => ['name' => 'Lemmy', 'color' => '#00c853'], // Green from the page
'mastodon' => ['name' => 'Mastodon', 'color' => '#1a9df9'], // blue from the Mastodon logo
+ 'mbin' => ['name' => 'mbin', 'color' => '#3c3c3c'], // Color from one of their instances
'microblog' => ['name' => 'Microblog', 'color' => '#fdb52b'], // Color from the page
'misskey' => ['name' => 'Misskey', 'color' => '#ccfefd'], // Font color of the homepage
'mobilizon' => ['name' => 'Mobilizon', 'color' => '#ffd599'], // Background color of parts of the homepage
@@ -66,8 +70,10 @@ class Federation extends BaseAdmin
'pixelfed' => ['name' => 'Pixelfed', 'color' => '#11da47'], // One of the logo colors
'pleroma' => ['name' => 'Pleroma', 'color' => '#E46F0F'], // Orange from the text that is used on Pleroma instances
'plume' => ['name' => 'Plume', 'color' => '#7765e3'], // From the homepage
+ 'postmarks' => ['name' => 'Postmarks', 'color' => 'darkblue'], // Header color from the homepage
'relay' => ['name' => 'ActivityPub Relay', 'color' => '#888888'], // Grey like the second color of the ActivityPub logo
'socialhome' => ['name' => 'SocialHome', 'color' => '#52056b'], // lilac from the Django Image used at the Socialhome homepage
+ 'snac' => ['name' => 'Snac', 'color' => '#2966a8'], // Color from one of their themes
'takahe' => ['name' => 'Takahē', 'color' => '#26323c'], // Background color of the homepage
'wildebeest' => ['name' => 'Wildebeest', 'color' => '#0055dc'], // Color of the mascot
'wordpress' => ['name' => 'WordPress', 'color' => '#016087'], // Background color of the homepage
@@ -93,7 +99,7 @@ class Federation extends BaseAdmin
SUM(IFNULL(`local-posts`, 0) + IFNULL(`local-comments`, 0)) AS `posts`,
SUM(IFNULL(`active-month-users`, `active-week-users`)) AS `month`,
SUM(IFNULL(`active-halfyear-users`, `active-week-users`)) AS `halfyear`, `platform`,
- ANY_VALUE(`network`) AS `network`, MAX(`version`) AS `version`
+ MIN(`network`) AS `network`, MAX(`version`) AS `version`
FROM `gserver` WHERE NOT `failed` AND `platform` != ? AND `detection-method` != ? AND NOT `network` IN (?, ?) GROUP BY `platform`",
'', GServer::DETECT_MANUAL, Protocol::PHANTOM, Protocol::FEED);
while ($gserver = DBA::fetch($gservers)) {
diff --git a/src/Module/Admin/Logs/Settings.php b/src/Module/Admin/Logs/Settings.php
index 54f929f090..1839986c55 100644
--- a/src/Module/Admin/Logs/Settings.php
+++ b/src/Module/Admin/Logs/Settings.php
@@ -1,6 +1,6 @@
set('config', 'register_text' , $register_text);
$transactionConfig->set('system', 'allowed_sites' , $allowed_sites);
$transactionConfig->set('system', 'allowed_email' , $allowed_email);
+ $transactionConfig->set('system', 'disallowed_email' , $disallowed_email);
$transactionConfig->set('system', 'forbidden_nicknames' , $forbidden_nicknames);
$transactionConfig->set('system', 'system_actor_name' , $system_actor_name);
$transactionConfig->set('system', 'no_oembed_rich_content' , $no_oembed_rich_content);
@@ -261,12 +267,13 @@ class Site extends BaseAdmin
$transactionConfig->set('system', 'enotify_no_content' , $enotify_no_content);
$transactionConfig->set('system', 'disable_embedded' , $disable_embedded);
$transactionConfig->set('system', 'allow_users_remote_self', $allow_users_remote_self);
+ $transactionConfig->set('system', 'allow_relay_channels' , $allow_relay_channels);
$transactionConfig->set('system', 'adjust_poll_frequency' , $adjust_poll_frequency);
$transactionConfig->set('system', 'min_poll_interval' , $min_poll_interval);
$transactionConfig->set('system', 'explicit_content' , $explicit_content);
$transactionConfig->set('system', 'proxify_content' , $proxify_content);
$transactionConfig->set('system', 'local_search' , $local_search);
- $transactionConfig->set('system', 'blocked_tags' , $blocked_tags);
+ $transactionConfig->set('system', 'blocked_tags' , Strings::cleanTags($blocked_tags));
$transactionConfig->set('system', 'cache_contact_avatar' , $cache_contact_avatar);
$transactionConfig->set('system', 'check_new_version_url' , $check_new_version_url);
@@ -276,6 +283,7 @@ class Site extends BaseAdmin
$transactionConfig->set('system', 'register_notification' , $register_notification);
$transactionConfig->set('system', 'community_page_style' , $community_page_style);
$transactionConfig->set('system', 'max_author_posts_community_page', $max_author_posts_community_page);
+ $transactionConfig->set('system', 'max_server_posts_community_page', $max_server_posts_community_page);
$transactionConfig->set('system', 'verifyssl' , $verifyssl);
$transactionConfig->set('system', 'proxyuser' , $proxyuser);
$transactionConfig->set('system', 'proxy' , $proxy);
@@ -310,7 +318,8 @@ class Site extends BaseAdmin
$transactionConfig->set('system', 'temppath', $temppath);
- $transactionConfig->set('system', 'only_tag_search' , $only_tag_search);
+ $transactionConfig->set('system', 'only_tag_search', $only_tag_search);
+ $transactionConfig->set('system', 'search_age_days', $search_age_days);
$transactionConfig->set('system', 'compute_circle_counts', $compute_circle_counts);
$transactionConfig->set('system', 'process_view', $process_view);
$transactionConfig->set('system', 'archival_days', $archival_days);
@@ -325,8 +334,9 @@ class Site extends BaseAdmin
$transactionConfig->set('system', 'relay_directly' , $relay_directly);
$transactionConfig->set('system', 'relay_scope' , $relay_scope);
- $transactionConfig->set('system', 'relay_server_tags' , $relay_server_tags);
- $transactionConfig->set('system', 'relay_deny_tags' , $relay_deny_tags);
+ $transactionConfig->set('system', 'relay_server_tags' , Strings::cleanTags($relay_server_tags));
+ $transactionConfig->set('system', 'relay_deny_tags' , Strings::cleanTags($relay_deny_tags));
+ $transactionConfig->set('system', 'relay_max_tags' , $relay_max_tags);
$transactionConfig->set('system', 'relay_user_tags' , $relay_user_tags);
$transactionConfig->set('system', 'relay_deny_undetected_language', $relay_deny_undetected_language);
$transactionConfig->set('system', 'relay_language_quality' , $relay_language_quality);
@@ -497,6 +507,7 @@ class Site extends BaseAdmin
'$abandon_days' => ['abandon_days', DI::l10n()->t('Accounts abandoned after x days'), DI::config()->get('system', 'account_abandon_days'), DI::l10n()->t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')],
'$allowed_sites' => ['allowed_sites', DI::l10n()->t('Allowed friend domains'), DI::config()->get('system', 'allowed_sites'), DI::l10n()->t('Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains')],
'$allowed_email' => ['allowed_email', DI::l10n()->t('Allowed email domains'), DI::config()->get('system', 'allowed_email'), DI::l10n()->t('Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains')],
+ '$disallowed_email' => ['disallowed_email', DI::l10n()->t('Disallowed email domains'), DI::config()->get('system', 'disallowed_email'), DI::l10n()->t('Comma separated list of domains which are rejected as email addresses for registrations to this site. Wildcards are accepted.')],
'$no_oembed_rich_content' => ['no_oembed_rich_content', DI::l10n()->t('No OEmbed rich content'), DI::config()->get('system', 'no_oembed_rich_content'), DI::l10n()->t('Don\'t show the rich content (e.g. embedded PDF), except from the domains listed below.')],
'$allowed_oembed' => ['allowed_oembed', DI::l10n()->t('Trusted third-party domains'), DI::config()->get('system', 'allowed_oembed'), DI::l10n()->t('Comma separated list of domains from which content is allowed to be embedded in posts like with OEmbed. All sub-domains of the listed domains are allowed as well.')],
'$block_public' => ['block_public', DI::l10n()->t('Block public'), DI::config()->get('system', 'block_public'), DI::l10n()->t('Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.')],
@@ -512,6 +523,7 @@ class Site extends BaseAdmin
'$blocked_tags' => ['blocked_tags', DI::l10n()->t('Blocked tags for trending tags'), DI::config()->get('system', 'blocked_tags'), DI::l10n()->t("Comma separated list of hashtags that shouldn't be displayed in the trending tags.")],
'$cache_contact_avatar' => ['cache_contact_avatar', DI::l10n()->t('Cache contact avatars'), DI::config()->get('system', 'cache_contact_avatar'), DI::l10n()->t('Locally store the avatar pictures of the contacts. This uses a lot of storage space but it increases the performance.')],
'$allow_users_remote_self'=> ['allow_users_remote_self', DI::l10n()->t('Allow Users to set remote_self'), DI::config()->get('system', 'allow_users_remote_self'), DI::l10n()->t('With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream.')],
+ '$allow_relay_channels' => ['allow_relay_channels', DI::l10n()->t('Allow Users to set up relay channels'), DI::config()->get('system', 'allow_relay_channels'), DI::l10n()->t('If enabled, it is possible to create relay users that are used to reshare content based on user defined channels.')],
'$adjust_poll_frequency' => ['adjust_poll_frequency', DI::l10n()->t('Adjust the feed poll frequency'), DI::config()->get('system', 'adjust_poll_frequency'), DI::l10n()->t('Automatically detect and set the best feed poll frequency.')],
'$min_poll_interval' => ['min_poll_interval', DI::l10n()->t('Minimum poll interval'), DI::config()->get('system', 'min_poll_interval'), DI::l10n()->t('Minimal distance in minutes between two polls for mail and feed contacts. Reasonable values are between 1 and 59.')],
'$enable_multi_reg' => ['enable_multi_reg', DI::l10n()->t('Enable multiple registrations'), !DI::config()->get('system', 'block_extended_register'), DI::l10n()->t('Enable users to register additional accounts for use as pages.')],
@@ -519,7 +531,8 @@ class Site extends BaseAdmin
'$enable_regfullname' => ['enable_regfullname', DI::l10n()->t('Enable full name check'), !DI::config()->get('system', 'no_regfullname'), DI::l10n()->t('Prevents users from registering with a display name with fewer than two parts separated by spaces.')],
'$register_notification' => ['register_notification', DI::l10n()->t('Email administrators on new registration'), DI::config()->get('system', 'register_notification'), DI::l10n()->t('If enabled and the system is set to an open registration, an email for each new registration is sent to the administrators.')],
'$community_page_style' => ['community_page_style', DI::l10n()->t('Community pages for visitors'), DI::config()->get('system', 'community_page_style'), DI::l10n()->t('Which community pages should be available for visitors. Local users always see both pages.'), $community_page_style_choices],
- '$max_author_posts_community_page' => ['max_author_posts_community_page', DI::l10n()->t('Posts per user on community page'), DI::config()->get('system', 'max_author_posts_community_page'), DI::l10n()->t('The maximum number of posts per user on the community page. (Not valid for "Global Community")')],
+ '$max_author_posts_community_page' => ['max_author_posts_community_page', DI::l10n()->t('Posts per user on community page'), DI::config()->get('system', 'max_author_posts_community_page'), DI::l10n()->t('The maximum number of posts per user on the local community page. This is useful, when a single user floods the local community page.')],
+ '$max_server_posts_community_page' => ['max_server_posts_community_page', DI::l10n()->t('Posts per server on community page'), DI::config()->get('system', 'max_server_posts_community_page'), DI::l10n()->t('The maximum number of posts per server on the global community page. This is useful, when posts from a single server flood the global community page.')],
'$mail_able' => function_exists('imap_open'),
'$mail_enabled' => ['mail_enabled', DI::l10n()->t('Enable Mail support'), !DI::config()->get('system', 'imap_disabled', !function_exists('imap_open')), DI::l10n()->t('Enable built-in mail support to poll IMAP folders and to reply via mail.')],
'$mail_not_able' => DI::l10n()->t('Mail support can\'t be enabled because the PHP IMAP module is not installed.'),
@@ -561,6 +574,7 @@ class Site extends BaseAdmin
'$itemspage_network_mobile' => ['itemspage_network_mobile', DI::l10n()->t('Items per page for mobile devices'), DI::config()->get('system', 'itemspage_network_mobile'), DI::l10n()->t('Number of items per page in stream pages (network, community, profile/contact statuses, search) for mobile devices.')],
'$temppath' => ['temppath', DI::l10n()->t('Temp path'), DI::config()->get('system', 'temppath'), DI::l10n()->t('If you have a restricted system where the webserver can\'t access the system temp path, enter another path here.')],
'$only_tag_search' => ['only_tag_search', DI::l10n()->t('Only search in tags'), DI::config()->get('system', 'only_tag_search'), DI::l10n()->t('On large systems the text search can slow down the system extremely.')],
+ '$search_age_days' => ['search_age_days', DI::l10n()->t('Maximum age of items in the search table'), DI::config()->get('system', 'search_age_days'), DI::l10n()->t('Maximum age of items in the search table in days. Lower values will increase the performance and reduce disk usage. 0 means no age restriction.')],
'$compute_circle_counts' => ['compute_circle_counts', DI::l10n()->t('Generate counts per contact circle when calculating network count'), DI::config()->get('system', 'compute_circle_counts'), DI::l10n()->t('On systems with users that heavily use contact circles the query can be very expensive.')],
'$process_view' => ['process_view', DI::l10n()->t('Process "view" activities'), DI::config()->get('system', 'process_view'), DI::l10n()->t('"view" activities are mostly geberated by Peertube systems. Per default they are not processed for performance reasons. Only activate this option on performant system.')],
'$archival_days' => ['archival_days', DI::l10n()->t('Days, after which a contact is archived'), DI::config()->get('system', 'archival_days'), DI::l10n()->t('Number of days that we try to deliver content or to update the contact data before we archive a contact.')],
@@ -577,6 +591,7 @@ class Site extends BaseAdmin
'$relay_scope' => ['relay_scope', DI::l10n()->t('Relay scope'), DI::config()->get('system', 'relay_scope'), DI::l10n()->t('Can be "all" or "tags". "all" means that every public post should be received. "tags" means that only posts with selected tags should be received.'), [Relay::SCOPE_NONE => DI::l10n()->t('Disabled'), Relay::SCOPE_ALL => DI::l10n()->t('all'), Relay::SCOPE_TAGS => DI::l10n()->t('tags')]],
'$relay_server_tags' => ['relay_server_tags', DI::l10n()->t('Server tags'), DI::config()->get('system', 'relay_server_tags'), DI::l10n()->t('Comma separated list of tags for the "tags" subscription.')],
'$relay_deny_tags' => ['relay_deny_tags', DI::l10n()->t('Deny Server tags'), DI::config()->get('system', 'relay_deny_tags'), DI::l10n()->t('Comma separated list of tags that are rejected.')],
+ '$relay_max_tags' => ['relay_max_tags', DI::l10n()->t('Maximum amount of tags'), DI::config()->get('system', 'relay_max_tags'), DI::l10n()->t('Maximum amount of tags in a post before it is rejected as spam. The post has to contain at least one link. Posts from subscribed accounts will not be rejected.')],
'$relay_user_tags' => ['relay_user_tags', DI::l10n()->t('Allow user tags'), DI::config()->get('system', 'relay_user_tags'), DI::l10n()->t('If enabled, the tags from the saved searches will used for the "tags" subscription in addition to the "relay_server_tags".')],
'$relay_deny_undetected_language' => ['relay_deny_undetected_language', DI::l10n()->t('Deny undetected languages'), DI::config()->get('system', 'relay_deny_undetected_language'), DI::l10n()->t('If enabled, posts with undetected languages will be rejected.')],
'$relay_language_quality' => ['relay_language_quality', DI::l10n()->t('Language Quality'), DI::config()->get('system', 'relay_language_quality'), DI::l10n()->t('The minimum language quality that is required to accept the post.')],
diff --git a/src/Module/Admin/Storage.php b/src/Module/Admin/Storage.php
index 434b43b32e..877d20721d 100644
--- a/src/Module/Admin/Storage.php
+++ b/src/Module/Admin/Storage.php
@@ -1,6 +1,6 @@
.
+ *
+ */
+
+namespace Friendica\Module\Api\Mastodon\Accounts;
+
+use Friendica\Core\Protocol;
+use Friendica\DI;
+use Friendica\Model\Contact;
+use Friendica\Module\BaseApi;
+
+/**
+ * @see https://docs.joinmastodon.org/methods/accounts/#lookup
+ */
+class Lookup extends BaseApi
+{
+ /**
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ */
+ protected function rawContent(array $request = [])
+ {
+ $this->checkAllowedScope(self::SCOPE_READ);
+ $uid = self::getCurrentUserID();
+
+ $request = $this->getRequest([
+ 'acct' => '', // The username or Webfinger address to lookup.
+ ], $request);
+
+ if (empty($request['acct'])) {
+ $this->logAndJsonError(404, $this->errorFactory->RecordNotFound());
+ }
+ $contact = Contact::getByURL($request['acct'], null, ['id', 'network', 'failed', 'blocked']);
+ if (empty($contact) || ($contact['network'] == Protocol::PHANTOM) || $contact['failed'] || $contact['blocked']) {
+ $this->logAndJsonError(404, $this->errorFactory->RecordNotFound());
+ }
+
+ $this->jsonExit(DI::mstdnAccount()->createFromContactId($contact['id'], $uid));
+ }
+}
diff --git a/src/Module/Api/Mastodon/Accounts/Mute.php b/src/Module/Api/Mastodon/Accounts/Mute.php
index 4602b18caa..147a62b25a 100644
--- a/src/Module/Api/Mastodon/Accounts/Mute.php
+++ b/src/Module/Api/Mastodon/Accounts/Mute.php
@@ -1,6 +1,6 @@
.
+ *
+ */
+
+namespace Friendica\Module\Api\Mastodon\Instance;
+
+use DateTime;
+use Friendica\App;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\L10n;
+use Friendica\Model\User;
+use Friendica\Module\Api\ApiResponse;
+use Friendica\Module\BaseApi;
+use Friendica\Network\HTTPException;
+use Friendica\Object\Api\Mastodon;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
+
+/**
+ * @see https://docs.joinmastodon.org/methods/instance/#extended_description
+ */
+class ExtendedDescription extends BaseApi
+{
+ private IManageConfigValues $config;
+
+ public function __construct(\Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, IManageConfigValues $config, array $server, array $parameters = [])
+ {
+ parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+ $this->config = $config;
+ }
+
+ /**
+ * @throws HTTPException\InternalServerErrorException
+ */
+ protected function rawContent(array $request = [])
+ {
+ $account = User::getSystemAccount();
+
+ $this->jsonExit(new Mastodon\ExtendedDescription(new DateTime($account['updated']), $this->config->get('config', 'info')));
+ }
+}
diff --git a/src/Module/Api/Mastodon/Instance/Peers.php b/src/Module/Api/Mastodon/Instance/Peers.php
index fba59e0095..4bfde07c2d 100644
--- a/src/Module/Api/Mastodon/Instance/Peers.php
+++ b/src/Module/Api/Mastodon/Instance/Peers.php
@@ -1,6 +1,6 @@
{$marker['timeline']} = [
'last_read_id' => $marker['last_read_id'],
'version' => $marker['version'],
- 'updated_at' => $marker['updated_at']
+ 'updated_at' => DateTimeFormat::utc($marker['updated_at'], DateTimeFormat::JSON)
];
}
return $values;
diff --git a/src/Module/Api/Mastodon/Media.php b/src/Module/Api/Mastodon/Media.php
index 1da6b3006b..529b5c83fb 100644
--- a/src/Module/Api/Mastodon/Media.php
+++ b/src/Module/Api/Mastodon/Media.php
@@ -1,6 +1,6 @@
checkAllowedScope(self::SCOPE_READ);
$uid = self::getCurrentUserID();
- if (empty($this->parameters['id'])) {
- $this->logAndJsonError(422, $this->errorFactory->UnprocessableEntity());
- }
-
- $id = $this->parameters['id'];
- if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
- $this->logAndJsonError(404, $this->errorFactory->RecordNotFound());
- }
-
$request = $this->getRequest([
'max_id' => 0, // Return results older than this id
'since_id' => 0, // Return results newer than this id
@@ -57,7 +47,7 @@ class Mutes extends BaseApi
$params = ['order' => ['cid' => true], 'limit' => $request['limit']];
- $condition = ['cid' => $id, 'ignored' => true, 'uid' => $uid];
+ $condition = ['ignored' => true, 'uid' => $uid];
if (!empty($request['max_id'])) {
$condition = DBA::mergeConditions($condition, ["`cid` < ?", $request['max_id']]);
@@ -74,6 +64,7 @@ class Mutes extends BaseApi
}
$followers = DBA::select('user-contact', ['cid'], $condition, $params);
+ $accounts = [];
while ($follower = DBA::fetch($followers)) {
self::setBoundaries($follower['cid']);
$accounts[] = DI::mstdnAccount()->createFromContactId($follower['cid'], $uid);
diff --git a/src/Module/Api/Mastodon/Notifications.php b/src/Module/Api/Mastodon/Notifications.php
index b359113dc4..dd8de17ab5 100644
--- a/src/Module/Api/Mastodon/Notifications.php
+++ b/src/Module/Api/Mastodon/Notifications.php
@@ -1,6 +1,6 @@
0) {
+ return [];
+ }
$q = Network::convertToIdn($q);
// If the user-specific search failed, we search and probe a public post
$item_id = Item::fetchByLink($q, $uid) ?: Item::fetchByLink($q);
@@ -154,10 +157,13 @@ class Search extends BaseApi
substr($q, 1), 0, $uid, Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, $uid, 0];
$table = 'tag-search-view';
} else {
- $condition = ["`uri-id` IN (SELECT `uri-id` FROM `post-content` WHERE MATCH (`title`, `content-warning`, `body`) AGAINST (? IN BOOLEAN MODE))
- AND (`uid` = ? OR (`uid` = ? AND NOT `global`)) AND (`network` IN (?, ?, ?, ?) OR (`uid` = ? AND `uid` != ?))",
- str_replace('@', ' ', $q), 0, $uid, Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, $uid, 0];
- $table = 'post-user-view';
+ $q = Post\Engagement::escapeKeywords($q);
+ $condition = ["MATCH (`searchtext`) AGAINST (? IN BOOLEAN MODE) AND (NOT `restricted` OR `uri-id` IN (SELECT `uri-id` FROM `post-user` WHERE `uid` = ?))", $q, $uid];
+ $table = 'post-searchindex';
+ }
+
+ if (!empty($account_id)) {
+ $condition = DBA::mergeConditions($condition, ["`author-id` = ?", $account_id]);
}
if (!empty($max_id)) {
diff --git a/src/Module/Api/Mastodon/Statuses.php b/src/Module/Api/Mastodon/Statuses.php
index 0ebd616089..9add05376c 100644
--- a/src/Module/Api/Mastodon/Statuses.php
+++ b/src/Module/Api/Mastodon/Statuses.php
@@ -1,6 +1,6 @@
'', // Text content of the status. If media_ids is provided, this becomes optional. Attaching a poll is optional while status is provided.
'media_ids' => [], // Array of Attachment ids to be attached as media. If provided, status becomes optional, and poll cannot be used.
'in_reply_to_id' => 0, // ID of the status being replied to, if status is a reply
+ 'sensitive' => false, // Mark status and attached media as sensitive? Defaults to false.
'spoiler_text' => '', // Text to be shown as a warning or subject before the actual content. Statuses are generally collapsed behind this field.
'language' => '', // ISO 639 language code for this status.
'media_attributes' => [],
@@ -83,6 +84,7 @@ class Statuses extends BaseApi
$item['gravity'] = $post['gravity'];
$item['verb'] = $post['verb'];
$item['app'] = $this->getApp();
+ $item['sensitive'] = $request['sensitive'];
if (!empty($request['language'])) {
$item['language'] = json_encode([$request['language'] => 1]);
@@ -179,7 +181,7 @@ class Statuses extends BaseApi
'poll' => [], // Poll data. If provided, media_ids cannot be used, and poll[expires_in] must be provided.
'in_reply_to_id' => 0, // ID of the status being replied to, if status is a reply
'quote_id' => 0, // ID of the message to quote
- 'sensitive' => false, // Mark status and attached media as sensitive?
+ 'sensitive' => false, // Mark status and attached media as sensitive? Defaults to false.
'spoiler_text' => '', // Text to be shown as a warning or subject before the actual content. Statuses are generally collapsed behind this field.
'visibility' => '', // Visibility of the posted status. One of: "public", "unlisted", "private" or "direct".
'scheduled_at' => '', // ISO 8601 Datetime at which to schedule a status. Providing this parameter will cause ScheduledStatus to be returned instead of Status. Must be at least 5 minutes in the future.
@@ -198,6 +200,7 @@ class Statuses extends BaseApi
$item['title'] = '';
$item['body'] = $this->formatStatus($request['status'], $uid);
$item['app'] = $this->getApp();
+ $item['sensitive'] = $request['sensitive'];
$item['visibility'] = $request['visibility'];
switch ($request['visibility']) {
@@ -400,11 +403,10 @@ class Statuses extends BaseApi
Photo::setPermissionForResource($media[0]['resource-id'], $item['uid'], $item['allow_cid'], $item['allow_gid'], $item['deny_cid'], $item['deny_gid']);
- $phototypes = Images::supportedTypes();
- $ext = $phototypes[$media[0]['type']];
+ $ext = Images::getExtensionByMimeType($media[0]['type']);
$attachment = ['type' => Post\Media::IMAGE, 'mimetype' => $media[0]['type'],
- 'url' => DI::baseUrl() . '/photo/' . $media[0]['resource-id'] . '-' . $media[0]['scale'] . '.' . $ext,
+ 'url' => DI::baseUrl() . '/photo/' . $media[0]['resource-id'] . '-' . $media[0]['scale'] . $ext,
'size' => $media[0]['datasize'],
'name' => $media[0]['filename'] ?: $media[0]['resource-id'],
'description' => $media[0]['desc'] ?? '',
@@ -412,7 +414,7 @@ class Statuses extends BaseApi
'height' => $media[0]['height']];
if (count($media) > 1) {
- $attachment['preview'] = DI::baseUrl() . '/photo/' . $media[1]['resource-id'] . '-' . $media[1]['scale'] . '.' . $ext;
+ $attachment['preview'] = DI::baseUrl() . '/photo/' . $media[1]['resource-id'] . '-' . $media[1]['scale'] . $ext;
$attachment['preview-width'] = $media[1]['width'];
$attachment['preview-height'] = $media[1]['height'];
}
diff --git a/src/Module/Api/Mastodon/Statuses/Bookmark.php b/src/Module/Api/Mastodon/Statuses/Bookmark.php
index 35ebf28d73..30007bec69 100644
--- a/src/Module/Api/Mastodon/Statuses/Bookmark.php
+++ b/src/Module/Api/Mastodon/Statuses/Bookmark.php
@@ -1,6 +1,6 @@
createFromUriId($ancestor, $uid, $display_quotes);
+ try {
+ $statuses['ancestors'][] = DI::mstdnStatus()->createFromUriId($ancestor, $uid, $display_quotes);
+ } catch (\Throwable $th) {
+ $this->logger->info('Post not fetchable', ['uri-id' => $ancestor, 'uid' => $uid, 'error' => $th]);
+ }
}
$descendants = array_diff(self::getChildren($id, $children), $deleted);
@@ -137,7 +141,11 @@ class Context extends BaseApi
asort($descendants);
foreach (array_slice($descendants, 0, $request['limit']) as $descendant) {
- $statuses['descendants'][] = DI::mstdnStatus()->createFromUriId($descendant, $uid, $display_quotes);
+ try {
+ $statuses['descendants'][] = DI::mstdnStatus()->createFromUriId($descendant, $uid, $display_quotes);
+ } catch (\Throwable $th) {
+ $this->logger->info('Post not fetchable', ['uri-id' => $descendant, 'uid' => $uid, 'error' => $th]);
+ }
}
$this->jsonExit($statuses);
diff --git a/src/Module/Api/Mastodon/Statuses/Favourite.php b/src/Module/Api/Mastodon/Statuses/Favourite.php
index 04e4c6256c..5735570e9e 100644
--- a/src/Module/Api/Mastodon/Statuses/Favourite.php
+++ b/src/Module/Api/Mastodon/Statuses/Favourite.php
@@ -1,6 +1,6 @@
Post\Media::IMAGE,
'mimetype' => $media[0]['type'],
- 'url' => DI::baseUrl() . '/photo/' . $media[0]['resource-id'] . '-' . $media[0]['scale'] . '.' . $ext,
+ 'url' => DI::baseUrl() . '/photo/' . $media[0]['resource-id'] . '-' . $media[0]['scale'] . $ext,
'size' => $media[0]['datasize'],
'name' => $media[0]['filename'] ?: $media[0]['resource-id'],
'description' => $media[0]['desc'] ?? '',
@@ -170,7 +169,7 @@ class Update extends BaseApi
];
if (count($media) > 1) {
- $attachment['preview'] = DI::baseUrl() . '/photo/' . $media[1]['resource-id'] . '-' . $media[1]['scale'] . '.' . $ext;
+ $attachment['preview'] = DI::baseUrl() . '/photo/' . $media[1]['resource-id'] . '-' . $media[1]['scale'] . $ext;
$attachment['preview-width'] = $media[1]['width'];
$attachment['preview-height'] = $media[1]['height'];
}
diff --git a/src/Module/Api/Twitter/Statuses/UserTimeline.php b/src/Module/Api/Twitter/Statuses/UserTimeline.php
index 361c8dba2f..c4e0730ff7 100644
--- a/src/Module/Api/Twitter/Statuses/UserTimeline.php
+++ b/src/Module/Api/Twitter/Statuses/UserTimeline.php
@@ -1,6 +1,6 @@
['admin/logs/view' , DI::l10n()->t('View Logs') , 'viewlogs'],
]],
'diagnostics' => [DI::l10n()->t('Diagnostics'), [
- 'phpinfo' => ['admin/phpinfo' , DI::l10n()->t('PHP Info') , 'phpinfo'],
+ 'phpinfo' => ['admin/phpinfo?t=' . self::getFormSecurityToken('phpinfo'), DI::l10n()->t('PHP Info') , 'phpinfo'],
'probe' => ['probe' , DI::l10n()->t('probe address') , 'probe'],
'webfinger' => ['webfinger' , DI::l10n()->t('check webfinger') , 'webfinger'],
'babel' => ['babel' , DI::l10n()->t('Babel') , 'babel'],
diff --git a/src/Module/BaseApi.php b/src/Module/BaseApi.php
index 7d21d7a8d4..dc75b0dd26 100644
--- a/src/Module/BaseApi.php
+++ b/src/Module/BaseApi.php
@@ -1,6 +1,6 @@
session->getLocalUserId();
- $cid = !empty($request['cid']) ? intval($request['cid']) : 0;
+ // No overwriting event.cid on edit
+ $cid = !empty($request['cid']) && !$eventId ? intval($request['cid']) : 0;
$strStartDateTime = Strings::escapeHtml($request['start_text'] ?? '');
$strFinishDateTime = Strings::escapeHtml($request['finish_text'] ?? '');
diff --git a/src/Module/Calendar/Event/Form.php b/src/Module/Calendar/Event/Form.php
index 80037c9818..14bd6d8816 100644
--- a/src/Module/Calendar/Event/Form.php
+++ b/src/Module/Calendar/Event/Form.php
@@ -1,6 +1,6 @@
page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css'));
$this->page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput-typeahead.css'));
- $this->page['aside'] .= Widget\VCard::getHTML($contact);
+ $this->page['aside'] .= Widget\VCard::getHTML($contact, true);
Nav::setSelected('contact');
- // We need the editor here to be able to reshare an item.
- $o = $this->conversation->statusEditor([], 0, true);
+ $options = [
+ 'lockstate' => ACL::getLockstateForUserId($this->userSession->getLocalUserId()) ? 'lock' : 'unlock',
+ 'acl' => ACL::getFullSelectorHTML($this->page, $this->userSession->getLocalUserId(), true, []),
+ 'bang' => '',
+ 'content' => ($contact['contact-type'] == ModelContact::TYPE_COMMUNITY ? '!' : '@') . ($contact['addr'] ?: $contact['url']),
+ ];
+ $o = $this->conversation->statusEditor($options);
$o .= Contact::getTabsHTML($contact, Contact::TAB_CONVERSATIONS);
$o .= Model\Contact::getThreadsFromId($contact['id'], $this->userSession->getLocalUserId(), 0, 0, $request['last_created'] ?? '');
diff --git a/src/Module/Contact/Follow.php b/src/Module/Contact/Follow.php
index f54baadac6..28a13da033 100644
--- a/src/Module/Contact/Follow.php
+++ b/src/Module/Contact/Follow.php
@@ -1,6 +1,6 @@
parseContacts(json_decode($result->getBody()), $entries, $limit);
+ $entries = $this->parseContacts(json_decode($result->getBodyString()), $entries, $limit);
}
if (empty($entries)) {
diff --git a/src/Module/Contact/Media.php b/src/Module/Contact/Media.php
index 2472cd3e20..b8a8afa8e7 100644
--- a/src/Module/Contact/Media.php
+++ b/src/Module/Contact/Media.php
@@ -1,6 +1,6 @@
page['aside'] .= Widget::accountTypes('channel/' . $this->selectedTab, $this->accountTypeString);
- if (!in_array($this->selectedTab, [ChannelEntity::FOLLOWERS, ChannelEntity::FORYOU])) {
+ if (!in_array($this->selectedTab, [ChannelEntity::FOLLOWERS, ChannelEntity::FORYOU, ChannelEntity::DISCOVER])) {
$this->page['aside'] .= $this->getNoSharerWidget('channel');
}
@@ -128,7 +128,7 @@ class Channel extends Timeline
}
if ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) {
- $items = $this->getChannelItems();
+ $items = $this->getChannelItems($request);
$order = 'created';
} else {
$items = $this->getCommunityItems();
diff --git a/src/Module/Conversation/Community.php b/src/Module/Conversation/Community.php
index 6fec4cc94d..cdb4ddaa23 100644
--- a/src/Module/Conversation/Community.php
+++ b/src/Module/Conversation/Community.php
@@ -1,6 +1,6 @@
l10n,
$this->args->getQueryString(),
- $items[0]['received'],
- $items[count($items) - 1]['received'],
+ $items[array_key_first($items)]['received'],
+ $items[array_key_last($items)]['received'],
$this->itemsPerPage
);
diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index b98e9d3652..0a9d5e33b6 100644
--- a/src/Module/Conversation/Network.php
+++ b/src/Module/Conversation/Network.php
@@ -1,6 +1,6 @@
page['aside'] .= Circle::sidebarWidget($module, $module . '/circle', 'standard', $this->circleId);
- $this->page['aside'] .= GroupManager::widget($module . '/group', $this->session->getLocalUserId(), $this->groupContactId);
+ $this->page['aside'] .= GroupManager::widget($this->session->getLocalUserId());
$this->page['aside'] .= Widget::postedByYear($module . '/archive', $this->session->getLocalUserId(), false);
- $this->page['aside'] .= Widget::networks($module, !$this->groupContactId ? $this->network : '');
+ $this->page['aside'] .= Widget::networks($module, $this->network);
$this->page['aside'] .= Widget::accountTypes($module, $this->accountTypeString);
$this->page['aside'] .= Widget::channels($module, $this->selectedTab, $this->session->getLocalUserId());
$this->page['aside'] .= Widget\SavedSearches::getHTML($this->args->getQueryString());
$this->page['aside'] .= Widget::fileAs('filed', '');
+ if (($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) &&
+ !in_array($this->selectedTab, [Channel::FOLLOWERS, Channel::FORYOU, Channel::DISCOVER])) {
+ $this->page['aside'] .= $this->getNoSharerWidget('network');
+ }
+
if (Feature::isEnabled($this->session->getLocalUserId(), 'trending_tags')) {
$this->page['aside'] .= TrendingTags::getHTML($this->selectedTab);
}
@@ -162,26 +158,13 @@ class Network extends Timeline
Nav::setSelected($this->args->get(0));
- $content = '';
-
- if ($this->groupContactId) {
- // If $this->groupContactId belongs to a community group or a private group, add a mention to the status editor
- $condition = ["`id` = ? AND `contact-type` = ?", $this->groupContactId, Contact::TYPE_COMMUNITY];
- $contact = $this->database->selectFirst('contact', ['addr'], $condition);
- if (!empty($contact['addr'])) {
- $content = '!' . $contact['addr'];
- }
- }
-
$default_permissions = [];
if ($this->circleId) {
$default_permissions['allow_gid'] = [$this->circleId];
}
$allowedCids = [];
- if ($this->groupContactId) {
- $allowedCids[] = (int) $this->groupContactId;
- } elseif ($this->network) {
+ if ($this->network) {
$condition = [
'uid' => $this->session->getLocalUserId(),
'network' => $this->network,
@@ -203,10 +186,10 @@ class Network extends Timeline
}
$x = [
- 'lockstate' => $this->circleId || $this->groupContactId || $this->network || ACL::getLockstateForUserId($this->session->getLocalUserId()) ? 'lock' : 'unlock',
+ 'lockstate' => $this->circleId || $this->network || ACL::getLockstateForUserId($this->session->getLocalUserId()) ? 'lock' : 'unlock',
'acl' => ACL::getFullSelectorHTML($this->page, $this->session->getLocalUserId(), true, $default_permissions),
- 'bang' => (($this->circleId || $this->groupContactId || $this->network) ? '!' : ''),
- 'content' => $content,
+ 'bang' => (($this->circleId || $this->network) ? '!' : ''),
+ 'content' => '',
];
$o .= $this->conversation->statusEditor($x);
@@ -220,16 +203,6 @@ class Network extends Timeline
$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), [
'$title' => $this->l10n->t('Circle: %s', $circle['name'])
]) . $o;
- } elseif ($this->groupContactId) {
- $contact = Contact::getById($this->groupContactId);
- if ($this->database->isResult($contact)) {
- $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('contact/list.tpl'), [
- 'contacts' => [ModuleContact::getContactTemplateVars($contact)],
- 'id' => $this->args->get(0),
- ]) . $o;
- } else {
- $this->systemMessages->addNotice($this->l10n->t('Invalid contact.'));
- }
} elseif (Profile::shouldDisplayEventList($this->session->getLocalUserId(), $this->mode)) {
$o .= Profile::getBirthdays($this->session->getLocalUserId());
$o .= Profile::getEventsReminderHTML($this->session->getLocalUserId(), $this->session->getPublicContactId());
@@ -238,7 +211,7 @@ class Network extends Timeline
try {
if ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) {
- $items = $this->getChannelItems();
+ $items = $this->getChannelItems($request);
} elseif ($this->community->isTimeline($this->selectedTab)) {
$items = $this->getCommunityItems();
} else {
@@ -321,15 +294,13 @@ class Network extends Timeline
$this->circleId = (int)($this->parameters['circle_id'] ?? 0);
- $this->groupContactId = (int)($this->parameters['contact_id'] ?? 0);
-
if (!$this->selectedTab) {
$this->selectedTab = self::getTimelineOrderBySession($this->session, $this->pConfig);
} elseif (!$this->networkFactory->isTimeline($this->selectedTab) && !$this->channel->isTimeline($this->selectedTab) && !$this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) && !$this->community->isTimeline($this->selectedTab)) {
throw new HTTPException\BadRequestException($this->l10n->t('Network feed not available.'));
}
- if (($this->network || $this->circleId || $this->groupContactId) && ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) || $this->community->isTimeline($this->selectedTab))) {
+ if (($this->network || $this->circleId) && ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) || $this->community->isTimeline($this->selectedTab))) {
$this->selectedTab = NetworkEntity::RECEIVED;
}
@@ -385,24 +356,7 @@ class Network extends Timeline
$this->dateFrom = $this->parameters['from'] ?? '';
$this->dateTo = $this->parameters['to'] ?? '';
- switch ($this->order) {
- case 'received':
- $this->maxId = $request['last_received'] ?? $this->maxId;
- $this->minId = $request['first_received'] ?? $this->minId;
- break;
- case 'created':
- $this->maxId = $request['last_created'] ?? $this->maxId;
- $this->minId = $request['first_created'] ?? $this->minId;
- break;
- case 'uriid':
- $this->maxId = $request['last_uriid'] ?? $this->maxId;
- $this->minId = $request['first_uriid'] ?? $this->minId;
- break;
- default:
- $this->order = 'commented';
- $this->maxId = $request['last_commented'] ?? $this->maxId;
- $this->minId = $request['first_commented'] ?? $this->minId;
- }
+ $this->setMaxMinByOrder($request);
}
protected function getItems()
@@ -433,10 +387,6 @@ class Network extends Timeline
if ($this->circleId) {
$conditionStrings = DBA::mergeConditions($conditionStrings, ["`contact-id` IN (SELECT `contact-id` FROM `group_member` WHERE `gid` = ?)", $this->circleId]);
- } elseif ($this->groupContactId) {
- $conditionStrings = DBA::mergeConditions($conditionStrings,
- ["((`contact-id` = ?) OR `uri-id` IN (SELECT `parent-uri-id` FROM `post-user-view` WHERE (`contact-id` = ? AND `gravity` = ? AND `vid` = ? AND `uid` = ?)))",
- $this->groupContactId, $this->groupContactId, Item::GRAVITY_ACTIVITY, Verb::getID(Activity::ANNOUNCE), $this->session->getLocalUserId()]);
}
// Currently only the order modes "received" and "commented" are in use
@@ -505,7 +455,7 @@ class Network extends Timeline
// We aren't going to try and figure out at the item, circle, and page
// level which items you've seen and which you haven't. If you're looking
// at the top level network page just mark everything seen.
- if (!$this->circleId && !$this->groupContactId && !$this->star && !$this->mention) {
+ if (!$this->circleId && !$this->star && !$this->mention) {
$condition = ['unseen' => true, 'uid' => $this->session->getLocalUserId()];
$this->setItemsSeenByCondition($condition);
} elseif (!empty($parents)) {
diff --git a/src/Module/Conversation/Timeline.php b/src/Module/Conversation/Timeline.php
index b5c936b13f..88d2f83711 100644
--- a/src/Module/Conversation/Timeline.php
+++ b/src/Module/Conversation/Timeline.php
@@ -1,6 +1,6 @@
itemUriId = 0;
}
+ $this->order = 'created';
+
$this->minId = $request['min_id'] ?? null;
$this->maxId = $request['max_id'] ?? null;
@@ -145,14 +153,36 @@ class Timeline extends BaseModule
$this->raw = !empty($request['mode']) && ($request['mode'] == 'raw');
}
+ protected function setMaxMinByOrder(array $request)
+ {
+ switch ($this->order) {
+ case 'received':
+ $this->maxId = $request['last_received'] ?? $this->maxId;
+ $this->minId = $request['first_received'] ?? $this->minId;
+ break;
+ case 'created':
+ $this->maxId = $request['last_created'] ?? $this->maxId;
+ $this->minId = $request['first_created'] ?? $this->minId;
+ break;
+ case 'uriid':
+ $this->maxId = $request['last_uriid'] ?? $this->maxId;
+ $this->minId = $request['first_uriid'] ?? $this->minId;
+ break;
+ default:
+ $this->order = 'commented';
+ $this->maxId = $request['last_commented'] ?? $this->maxId;
+ $this->minId = $request['first_commented'] ?? $this->minId;
+ }
+ }
+
protected function getNoSharerWidget(string $base): string
{
$path = $this->selectedTab;
- if (!empty($this->accountTypeString)) {
- $path .= '/' . $this->accountTypeString;
- }
- $query_parameters = [];
+ $query_parameters = [];
+ if (!empty($this->accountTypeString)) {
+ $query_parameters['accounttype'] = $this->accountTypeString;
+ }
if (!empty($this->minId)) {
$query_parameters['min_id'] = $this->minId;
}
@@ -202,9 +232,9 @@ class Timeline extends BaseModule
* @return array
* @throws \Exception
*/
- protected function getChannelItems()
+ protected function getChannelItems(array $request)
{
- $items = $this->getRawChannelItems();
+ $items = $this->getRawChannelItems($request);
$contacts = $this->database->selectToArray('user-contact', ['cid'], ['channel-frequency' => Contact\User::FREQUENCY_REDUCED, 'cid' => array_column($items, 'owner-id')]);
$reduced = array_column($contacts, 'cid');
@@ -218,8 +248,8 @@ class Timeline extends BaseModule
while (count($selected_items) < $this->itemsPerPage && ++$count < 50 && count($items) > 0) {
$maxposts = round((count($items) / $this->itemsPerPage) * $maxpostperauthor);
- $minId = $items[array_key_first($items)]['created'];
- $maxId = $items[array_key_last($items)]['created'];
+ $minId = $items[array_key_first($items)][$this->order];
+ $maxId = $items[array_key_last($items)][$this->order];
foreach ($items as $item) {
if (!in_array($item['owner-id'], $reduced)) {
@@ -250,7 +280,7 @@ class Timeline extends BaseModule
}
if (count($selected_items) < $this->itemsPerPage) {
- $items = $this->getRawChannelItems();
+ $items = $this->getRawChannelItems($request);
}
}
} else {
@@ -269,10 +299,12 @@ class Timeline extends BaseModule
* @return array
* @throws \Exception
*/
- private function getRawChannelItems()
+ private function getRawChannelItems(array $request)
{
$uid = $this->session->getLocalUserId();
+ $table = 'post-engagement';
+
if ($this->selectedTab == ChannelEntity::WHATSHOT) {
if (!is_null($this->accountType)) {
$condition = ["(`comments` > ? OR `activities` > ?) AND `contact-type` = ?", $this->getMedianComments($uid, 4), $this->getMedianActivities($uid, 4), $this->accountType];
@@ -289,6 +321,20 @@ class Timeline extends BaseModule
$cid, $this->getMedianRelationThreadScore($cid, 4), $this->getMedianComments($uid, 4), $this->getMedianActivities($uid, 4), $cid,
$uid, Contact\User::FREQUENCY_ALWAYS
];
+ } elseif ($this->selectedTab == ChannelEntity::DISCOVER) {
+ $cid = Contact::getPublicIdByUserId($uid);
+
+ $condition = [
+ "`owner-id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ? AND NOT `follows`) AND
+ (`owner-id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ? AND NOT `follows` AND `relation-thread-score` > ?) OR
+ `owner-id` IN (SELECT `cid` FROM `contact-relation` WHERE `cid` = ? AND `relation-thread-score` > ?) OR
+ ((`comments` >= ? OR `activities` >= ?) AND
+ (`owner-id` IN (SELECT `cid` FROM `contact-relation` WHERE `cid` = ? AND `relation-thread-score` > ?)) OR
+ (`owner-id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ? AND `relation-thread-score` > ?))))",
+ $cid, $cid, $this->getMedianRelationThreadScore($cid, 4), $cid, $this->getMedianRelationThreadScore($cid, 4),
+ $this->getMedianComments($uid, 4), $this->getMedianActivities($uid, 4), $cid, 0, $cid, 0
+ ];
+
} elseif ($this->selectedTab == ChannelEntity::FOLLOWERS) {
$condition = ["`owner-id` IN (SELECT `pid` FROM `account-user-view` WHERE `uid` = ? AND `rel` = ?)", $uid, Contact::FOLLOWER];
} elseif ($this->selectedTab == ChannelEntity::SHARERSOFSHARERS) {
@@ -301,6 +347,13 @@ class Timeline extends BaseModule
AND NOT `cid` IN (SELECT `cid` FROM `contact-relation` WHERE `follows` AND `relation-cid` = ?))",
DateTimeFormat::utc('now - ' . $this->config->get('channel', 'sharer_interaction_days') . ' day'), $cid, $this->getMedianRelationThreadScore($cid, 4), $cid
];
+ } elseif ($this->selectedTab == ChannelEntity::QUIETSHARERS) {
+ $cid = Contact::getPublicIdByUserId($uid);
+
+ $condition = [
+ "`owner-id` IN (SELECT `cid` FROM `contact-relation` WHERE `follows` AND `relation-cid` = ? AND `post-score` <= ?)",
+ $cid, $this->getMedianPostScore($cid, 2)
+ ];
} elseif ($this->selectedTab == ChannelEntity::IMAGE) {
$condition = ["`media-type` & ?", 1];
} elseif ($this->selectedTab == ChannelEntity::VIDEO) {
@@ -308,48 +361,62 @@ class Timeline extends BaseModule
} elseif ($this->selectedTab == ChannelEntity::AUDIO) {
$condition = ["`media-type` & ?", 4];
} elseif ($this->selectedTab == ChannelEntity::LANGUAGE) {
- $condition = ["JSON_EXTRACT(JSON_KEYS(language), '$[0]') = ?", User::getLanguageCode($uid)];
- } elseif (is_numeric($this->selectedTab)) {
- $condition = $this->getUserChannelConditions($this->selectedTab, $this->session->getLocalUserId());
+ $condition = ["`language` = ?", User::getLanguageCode($uid)];
+ } elseif (is_numeric($this->selectedTab) && !empty($channel = $this->channelRepository->selectById($this->selectedTab, $uid))) {
+ $condition = $this->getUserChannelConditions($channel, $uid);
+ if (in_array($channel->circle, [-3, -4, -5])) {
+ $table = 'post-searchindex-user-view';
+ $condition = DBA::mergeConditions($condition, ['uid' => $uid]);
+ $orders = ['-3' => 'created', '-4' => 'received', '-5' => 'commented'];
+ $this->order = $orders[$channel->circle];
+ }
}
- if ($this->selectedTab != ChannelEntity::LANGUAGE) {
+ $this->setMaxMinByOrder($request);
+
+ if (!empty($this->network)) {
+ $condition = DBA::mergeConditions($condition, ['network' => $this->network]);
+ }
+
+ if (($this->selectedTab != ChannelEntity::LANGUAGE) && !is_numeric($this->selectedTab)) {
$condition = $this->addLanguageCondition($uid, $condition);
}
- $condition = DBA::mergeConditions($condition, ["(NOT `restricted` OR EXISTS(SELECT `id` FROM `post-user` WHERE `uid` = ? AND `uri-id` = `post-engagement`.`uri-id`))", $uid]);
+ $condition = DBA::mergeConditions($condition, ["(NOT `restricted` OR EXISTS(SELECT `id` FROM `post-user` WHERE `uid` = ? AND `uri-id` = `$table`.`uri-id`))", $uid]);
- $condition = DBA::mergeConditions($condition, ["NOT EXISTS(SELECT `cid` FROM `user-contact` WHERE `uid` = ? AND `cid` = `post-engagement`.`owner-id` AND (`ignored` OR `blocked` OR `collapsed` OR `is-blocked` OR `channel-frequency` = ?))", $uid, Contact\User::FREQUENCY_NEVER]);
+ $condition = DBA::mergeConditions($condition, ["NOT EXISTS(SELECT `cid` FROM `user-contact` WHERE `uid` = ? AND `cid` = `$table`.`owner-id` AND (`ignored` OR `blocked` OR `collapsed` OR `is-blocked` OR `channel-frequency` = ?))", $uid, Contact\User::FREQUENCY_NEVER]);
if (($this->selectedTab != ChannelEntity::WHATSHOT) && !is_null($this->accountType)) {
$condition = DBA::mergeConditions($condition, ['contact-type' => $this->accountType]);
}
- $params = ['order' => ['created' => true], 'limit' => $this->itemsPerPage];
+ $params = ['order' => [$this->order => true], 'limit' => $this->itemsPerPage];
if (!empty($this->itemUriId)) {
$condition = DBA::mergeConditions($condition, ['uri-id' => $this->itemUriId]);
} else {
if ($this->noSharer) {
- $condition = DBA::mergeConditions($condition, ["NOT `uri-id` IN (SELECT `uri-id` FROM `post-user` WHERE `post-user`.`uid` = ? AND `post-user`.`uri-id` = `post-engagement`.`uri-id`)", $this->session->getLocalUserId()]);
+ $condition = DBA::mergeConditions($condition, ["NOT `uri-id` IN (SELECT `uri-id` FROM `post-user` WHERE `post-user`.`uid` = ? AND `post-user`.`uri-id` = `$table`.`uri-id`)", $this->session->getLocalUserId()]);
}
if (isset($this->maxId)) {
- $condition = DBA::mergeConditions($condition, ["`created` < ?", $this->maxId]);
+ $condition = DBA::mergeConditions($condition, ["`$this->order` < ?", $this->maxId]);
}
if (isset($this->minId)) {
- $condition = DBA::mergeConditions($condition, ["`created` > ?", $this->minId]);
+ $condition = DBA::mergeConditions($condition, ["`$this->order` > ?", $this->minId]);
// Previous page case: we want the items closest to min_id but for that we need to reverse the query order
if (!isset($this->maxId)) {
- $params['order']['created'] = false;
+ $params['order'][$this->order] = false;
}
}
}
$items = [];
- $result = $this->database->select('post-engagement', ['uri-id', 'created', 'owner-id', 'comments', 'activities'], $condition, $params);
+ $fields = ['uri-id', 'owner-id', 'comments', 'activities'];
+ $fields[] = $this->order;
+ $result = $this->database->select($table, $fields, $condition, $params);
if ($this->database->errorNo()) {
throw new \Exception($this->database->errorMessage(), $this->database->errorNo());
}
@@ -374,13 +441,8 @@ class Timeline extends BaseModule
return $items;
}
- private function getUserChannelConditions(int $id, int $uid): array
+ private function getUserChannelConditions(UserDefinedChannelEntity $channel, int $uid): array
{
- $channel = $this->channelRepository->selectById($id, $uid);
- if (empty($channel)) {
- return [];
- }
-
$condition = [];
if (!empty($channel->circle)) {
@@ -388,51 +450,129 @@ class Timeline extends BaseModule
$condition = ["`owner-id` IN (SELECT `pid` FROM `account-user-view` WHERE `uid` = ? AND `rel` IN (?, ?))", $uid, Contact::SHARING, Contact::FRIEND];
} elseif ($channel->circle == -2) {
$condition = ["`owner-id` IN (SELECT `pid` FROM `account-user-view` WHERE `uid` = ? AND `rel` = ?)", $uid, Contact::FOLLOWER];
- } elseif ($channel->circle == -3) {
- $condition = ["EXISTS(SELECT `uri-id` FROM `post-thread-user` WHERE `uid` = ? AND `post-thread-user`.`uri-id` = `post-engagement`.`uri-id`)", $uid];
} elseif ($channel->circle > 0) {
$condition = DBA::mergeConditions($condition, ["`owner-id` IN (SELECT `pid` FROM `group_member` INNER JOIN `account-user-view` ON `group_member`.`contact-id` = `account-user-view`.`id` WHERE `gid` = ? AND `account-user-view`.`uid` = ?)", $channel->circle, $uid]);
}
}
if (!empty($channel->fullTextSearch)) {
- $search = $channel->fullTextSearch;
- foreach (Engagement::KEYWORDS as $keyword) {
- $search = preg_replace('~(' . $keyword . ':.[\w@\.-]+)~', '"$1"', $search);
+ if (!empty($channel->includeTags)) {
+ $additional = self:: addIncludeTags($channel->includeTags);
+ } else {
+ $additional = '';
}
- $condition = DBA::mergeConditions($condition, ["MATCH (`searchtext`) AGAINST (? IN BOOLEAN MODE)", $search]);
+
+ if (!empty($channel->excludeTags)) {
+ foreach (explode(',', mb_strtolower($channel->excludeTags)) as $tag) {
+ $additional .= ' -tag:' . $tag;
+ }
+ }
+
+ if (!empty($channel->mediaType)) {
+ $additional .= self::addMediaTerms($channel->mediaType);
+ }
+
+ $additional .= self::addLanguageSearchTerms($uid, $channel->languages);
+
+ if ($additional) {
+ $searchterms = '+(' . trim($channel->fullTextSearch) . ')' . $additional;
+ } else {
+ $searchterms = $channel->fullTextSearch;
+ }
+
+ $condition = DBA::mergeConditions($condition, ["MATCH (`searchtext`) AGAINST (? IN BOOLEAN MODE)", Engagement::escapeKeywords($searchterms)]);
+ } else {
+ if (!empty($channel->includeTags)) {
+ $search = explode(',', mb_strtolower($channel->includeTags));
+ $placeholders = substr(str_repeat("?, ", count($search)), 0, -2);
+ $condition = DBA::mergeConditions($condition, array_merge(["`uri-id` IN (SELECT `uri-id` FROM `post-tag` INNER JOIN `tag` ON `tag`.`id` = `post-tag`.`tid` WHERE `post-tag`.`type` = 1 AND `name` IN (" . $placeholders . "))"], $search));
+ }
+
+ if (!empty($channel->excludeTags)) {
+ $search = explode(',', mb_strtolower($channel->excludeTags));
+ $placeholders = substr(str_repeat("?, ", count($search)), 0, -2);
+ $condition = DBA::mergeConditions($condition, array_merge(["NOT `uri-id` IN (SELECT `uri-id` FROM `post-tag` INNER JOIN `tag` ON `tag`.`id` = `post-tag`.`tid` WHERE `post-tag`.`type` = 1 AND `name` IN (" . $placeholders . "))"], $search));
+ }
+
+ if (!empty($channel->mediaType)) {
+ $condition = DBA::mergeConditions($condition, ["`media-type` & ?", $channel->mediaType]);
+ }
+
+ // For "addLanguageCondition" to work, the condition must not be empty
+ $condition = $this->addLanguageCondition($uid, $condition ?: ["true"], $channel->languages);
}
- if (!empty($channel->includeTags)) {
- $search = explode(',', mb_strtolower($channel->includeTags));
- $placeholders = substr(str_repeat("?, ", count($search)), 0, -2);
- $condition = DBA::mergeConditions($condition, array_merge(["`uri-id` IN (SELECT `uri-id` FROM `post-tag` INNER JOIN `tag` ON `tag`.`id` = `post-tag`.`tid` WHERE `post-tag`.`type` = 1 AND `name` IN (" . $placeholders . "))"], $search));
+ if (!is_null($channel->minSize)) {
+ $condition = DBA::mergeConditions($condition, ["`size` >= ?", $channel->minSize]);
}
- if (!empty($channel->excludeTags)) {
- $search = explode(',', mb_strtolower($channel->excludeTags));
- $placeholders = substr(str_repeat("?, ", count($search)), 0, -2);
- $condition = DBA::mergeConditions($condition, array_merge(["NOT `uri-id` IN (SELECT `uri-id` FROM `post-tag` INNER JOIN `tag` ON `tag`.`id` = `post-tag`.`tid` WHERE `post-tag`.`type` = 1 AND `name` IN (" . $placeholders . "))"], $search));
+ if (!is_null($channel->maxSize)) {
+ $condition = DBA::mergeConditions($condition, ["`size` <= ?", $channel->maxSize]);
}
- if (!empty($channel->mediaType)) {
- $condition = DBA::mergeConditions($condition, ["`media-type` & ?", $channel->mediaType]);
- }
-
- // For "addLanguageCondition" to work, the condition must not be empty
- return $condition ?: ["true"];
+ return $condition;
}
- private function addLanguageCondition(int $uid, array $condition): array
+ private function addIncludeTags(string $includeTags): string
+ {
+ $tagterms = '';
+ foreach (explode(',', mb_strtolower($includeTags)) as $tag) {
+ $tagterms .= ' tag:' . $tag;
+ }
+
+ if ($tagterms) {
+ return ' +(' . trim($tagterms) . ')';
+ } else {
+ return '';
+ }
+ }
+
+ private function addMediaTerms(int $mediaType): string
+ {
+ $mediaterms = '';
+ if ($mediaType & 1) {
+ $mediaterms .= ' media:image';
+ }
+
+ if ($mediaType & 2) {
+ $mediaterms .= ' media:video';
+ }
+
+ if ($mediaType & 4) {
+ $mediaterms .= ' media:audio';
+ }
+
+ if ($mediaterms) {
+ return ' +(' . trim($mediaterms) . ')';
+ } else {
+ return '';
+ }
+ }
+
+ private function addLanguageSearchTerms(int $uid, $languages = null): string
+ {
+ $langterms = '';
+ foreach ($languages ?: User::getWantedLanguages($uid) as $language) {
+ $langterms .= ' language:' . $language;
+ }
+
+ if ($langterms) {
+ return ' +(' . trim($langterms) . ')';
+ } else {
+ return '';
+ }
+ }
+
+ private function addLanguageCondition(int $uid, array $condition, $languages = null): array
{
$conditions = [];
- $languages = User::getWantedLanguages($uid);
- foreach ($languages as $language) {
- $conditions[] = "JSON_EXTRACT(JSON_KEYS(language), '$[0]') = ?";
+ foreach ($languages ?: User::getWantedLanguages($uid) as $language) {
+ $conditions[] = "`language` = ?";
$condition[] = $language;
}
+
if (!empty($conditions)) {
- $condition[0] .= " AND (`language` IS NULL OR " . implode(' OR ', $conditions) . ")";
+ $condition[0] .= " AND (" . implode(' OR ', $conditions) . ")";
}
return $condition;
}
@@ -507,6 +647,28 @@ class Timeline extends BaseModule
return $score;
}
+ private function getMedianPostScore(int $cid, int $divider): int
+ {
+ $cache_key = 'Channel:getPostScore:' . $cid . ':' . $divider;
+ $score = $this->cache->get($cache_key);
+ if (!empty($score)) {
+ return $score;
+ }
+
+ $condition = ["`relation-cid` = ? AND `post-score` > ?", $cid, 0];
+
+ $limit = $this->database->count('contact-relation', $condition) / $divider;
+ $relation = $this->database->selectToArray('contact-relation', ['post-score'], $condition, ['order' => ['post-score' => true], 'limit' => [$limit, 1]]);
+ $score = $relation[0]['post-score'] ?? 0;
+ if (empty($score)) {
+ return 0;
+ }
+
+ $this->cache->set($cache_key, $score, Duration::HALF_HOUR);
+ $this->logger->debug('Calculated median score', ['cid' => $cid, 'divider' => $divider, 'median' => $score]);
+ return $score;
+ }
+
/**
* Computes the displayed items.
*
@@ -520,37 +682,53 @@ class Timeline extends BaseModule
{
$items = $this->selectItems();
- $maxpostperauthor = (int) $this->config->get('system', 'max_author_posts_community_page');
- if ($maxpostperauthor != 0 && $this->selectedTab == 'local') {
+ if ($this->selectedTab == 'local') {
+ $maxpostperauthor = (int)$this->config->get('system', 'max_author_posts_community_page');
+ $key = 'author-id';
+ } elseif ($this->selectedTab == 'global') {
+ $maxpostperauthor = (int)$this->config->get('system', 'max_server_posts_community_page');
+ $key = 'author-gsid';
+ } else {
+ $maxpostperauthor = 0;
+ }
+ if ($maxpostperauthor != 0) {
$count = 1;
- $previousauthor = '';
- $numposts = 0;
+ $author_posts = [];
$selected_items = [];
while (count($selected_items) < $this->itemsPerPage && ++$count < 50 && count($items) > 0) {
- foreach ($items as $item) {
- if ($previousauthor == $item["author-link"]) {
- ++$numposts;
- } else {
- $numposts = 0;
- }
- $previousauthor = $item["author-link"];
+ $maxposts = round((count($items) / $this->itemsPerPage) * $maxpostperauthor);
+ $minId = $items[array_key_first($items)]['received'];
+ $maxId = $items[array_key_last($items)]['received'];
- if (($numposts < $maxpostperauthor) && (count($selected_items) < $this->itemsPerPage)) {
- $selected_items[] = $item;
+ foreach ($items as $item) {
+ $author_posts[$item[$key]][$item['uri-id']] = $item['received'];
+ }
+ foreach ($author_posts as $posts) {
+ if (count($posts) <= $maxposts) {
+ continue;
+ }
+ asort($posts);
+ while (count($posts) > $maxposts) {
+ $uri_id = array_key_first($posts);
+ unset($posts[$uri_id]);
+ unset($items[$uri_id]);
}
}
+ $selected_items = array_merge($selected_items, $items);
// If we're looking at a "previous page", the lookup continues forward in time because the list is
// sorted in chronologically decreasing order
- if (isset($this->minId)) {
- $this->minId = $items[0]['received'];
+ if (!empty($this->minId)) {
+ $this->minId = $minId;
} else {
// In any other case, the lookup continues backwards in time
- $this->maxId = $items[count($items) - 1]['received'];
+ $this->maxId = $maxId;
}
- $items = $this->selectItems();
+ if (count($selected_items) < $this->itemsPerPage) {
+ $items = $this->selectItems();
+ }
}
} else {
$selected_items = $items;
@@ -571,6 +749,8 @@ class Timeline extends BaseModule
*/
private function selectItems()
{
+ $this->order = 'received';
+
if ($this->selectedTab == 'local') {
$condition = ["`wall` AND `origin` AND `private` = ?", Item::PUBLIC];
} elseif ($this->selectedTab == 'global') {
@@ -606,13 +786,26 @@ class Timeline extends BaseModule
}
}
- $r = Post::selectThreadForUser($this->session->getLocalUserId() ?: 0, ['uri-id', 'received', 'author-link'], $condition, $params);
+ $items = [];
+ $result = Post::selectThreadForUser($this->session->getLocalUserId() ?: 0, ['uri-id', 'received', 'author-id', 'author-gsid'], $condition, $params);
+
+ while ($item = $this->database->fetch($result)) {
+ $item['comments'] = 0;
+
+ $items[$item['uri-id']] = $item;
+ }
+ $this->database->close($result);
- $items = Post::toArray($r);
if (empty($items)) {
return [];
}
+ $uriids = array_keys($items);
+
+ foreach (Post\Counts::get(['parent-uri-id' => $uriids, 'verb' => Activity::POST]) as $count) {
+ $items[$count['parent-uri-id']]['comments'] += $count['count'];
+ }
+
// Previous page case: once we get the relevant items closest to min_id, we need to restore the expected display order
if (empty($this->itemUriId) && isset($this->minId) && !isset($this->maxId)) {
$items = array_reverse($items);
diff --git a/src/Module/Credits.php b/src/Module/Credits.php
index d16879f7d8..27ea3c5865 100644
--- a/src/Module/Credits.php
+++ b/src/Module/Credits.php
@@ -1,6 +1,6 @@
DI::l10n()->t('Source input'),
'content' => visible_whitespace($bbcode)
@@ -136,7 +137,7 @@ class Babel extends BaseModule
];
break;
case 'diaspora':
- $diaspora = trim($_REQUEST['text']);
+ $diaspora = trim($request['text']);
$results[] = [
'title' => DI::l10n()->t('Source input (Diaspora format)'),
'content' => visible_whitespace($diaspora),
@@ -144,7 +145,7 @@ class Babel extends BaseModule
$markdown = XML::unescape($diaspora);
case 'markdown':
- $markdown = $markdown ?? trim($_REQUEST['text']);
+ $markdown = $markdown ?? trim($request['text']);
$results[] = [
'title' => DI::l10n()->t('Source input (Markdown)'),
@@ -169,7 +170,7 @@ class Babel extends BaseModule
];
break;
case 'html' :
- $html = trim($_REQUEST['text']);
+ $html = trim($request['text']);
$results[] = [
'title' => DI::l10n()->t('Raw HTML input'),
'content' => visible_whitespace($html),
@@ -239,7 +240,7 @@ class Babel extends BaseModule
];
break;
case 'twitter':
- $json = trim($_REQUEST['text']);
+ $json = trim($request['text']);
if (file_exists('addon/twitter/twitter.php')) {
require_once 'addon/twitter/twitter.php';
@@ -302,13 +303,14 @@ class Babel extends BaseModule
$tpl = Renderer::getMarkupTemplate('babel.tpl');
$o = Renderer::replaceMacros($tpl, [
'$title' => DI::l10n()->t('Babel Diagnostic'),
- '$text' => ['text', DI::l10n()->t('Source text'), $_REQUEST['text'] ?? '', ''],
- '$type_bbcode' => ['type', DI::l10n()->t('BBCode'), 'bbcode', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'bbcode'],
- '$type_diaspora' => ['type', DI::l10n()->t('Diaspora'), 'diaspora', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'diaspora'],
- '$type_markdown' => ['type', DI::l10n()->t('Markdown'), 'markdown', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'markdown'],
- '$type_html' => ['type', DI::l10n()->t('HTML'), 'html', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'html'],
+ '$form_security_token' => self::getFormSecurityToken('babel'),
+ '$text' => ['text', DI::l10n()->t('Source text'), $request['text'] ?? '', ''],
+ '$type_bbcode' => ['type', DI::l10n()->t('BBCode'), 'bbcode', '', (($request['type'] ?? '') ?: 'bbcode') == 'bbcode'],
+ '$type_diaspora' => ['type', DI::l10n()->t('Diaspora'), 'diaspora', '', (($request['type'] ?? '') ?: 'bbcode') == 'diaspora'],
+ '$type_markdown' => ['type', DI::l10n()->t('Markdown'), 'markdown', '', (($request['type'] ?? '') ?: 'bbcode') == 'markdown'],
+ '$type_html' => ['type', DI::l10n()->t('HTML'), 'html', '', (($request['type'] ?? '') ?: 'bbcode') == 'html'],
'$flag_twitter' => file_exists('addon/twitter/twitter.php'),
- '$type_twitter' => ['type', DI::l10n()->t('Twitter Source / Tweet URL (requires API key)'), 'twitter', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'twitter'],
+ '$type_twitter' => ['type', DI::l10n()->t('Twitter Source / Tweet URL (requires API key)'), 'twitter', '', (($request['type'] ?? '') ?: 'bbcode') == 'twitter'],
'$results' => $results,
'$submit' => DI::l10n()->t('Submit'),
]);
diff --git a/src/Module/Debug/Feed.php b/src/Module/Debug/Feed.php
index 2bb84250a4..954a86aba4 100644
--- a/src/Module/Debug/Feed.php
+++ b/src/Module/Debug/Feed.php
@@ -1,6 +1,6 @@
getBody(), true);
+ $j = json_decode($curlResult->getBodyString(), true);
if (empty($j) || !$j['success']) {
$this->logger->notice('Invalid JSON, redirecting to destination.', ['json' => $j, 'dest' => $dest]);
$this->app->redirect($dest);
diff --git a/src/Module/Maintenance.php b/src/Module/Maintenance.php
index 67f65b8e39..57a452ade7 100644
--- a/src/Module/Maintenance.php
+++ b/src/Module/Maintenance.php
@@ -1,6 +1,6 @@
baseUrl, $this->app->getLoggedInUserNickname(), $record['resource-id']),
$filename_e,
- sprintf('%s/photo/%s-%s.%s', $this->baseUrl, $record['resource-id'], $scale, $ext),
+ sprintf('%s/photo/%s-%s%s', $this->baseUrl, $record['resource-id'], $scale, $ext),
$record['desc'],
];
}
diff --git a/src/Module/Media/Photo/Upload.php b/src/Module/Media/Photo/Upload.php
index d5c15ea5bd..6594b453f8 100644
--- a/src/Module/Media/Photo/Upload.php
+++ b/src/Module/Media/Photo/Upload.php
@@ -1,6 +1,6 @@
return(401, $this->t('Invalid request.'), true);
}
- $filetype = Images::getMimeTypeBySource($src, $filename, $filetype);
-
$this->logger->info('File upload:', [
'src' => $src,
'filename' => $filename,
@@ -145,7 +143,7 @@ class Upload extends \Friendica\BaseModule
]);
$imagedata = @file_get_contents($src);
- $image = new Image($imagedata, $filetype);
+ $image = new Image($imagedata, $filetype, $filename);
if (!$image->isValid()) {
@unlink($src);
diff --git a/src/Module/Moderation/BaseUsers.php b/src/Module/Moderation/BaseUsers.php
index 33a013961f..f92348c08a 100644
--- a/src/Module/Moderation/BaseUsers.php
+++ b/src/Module/Moderation/BaseUsers.php
@@ -1,6 +1,6 @@
$domain) {
+ foreach ((array)$request['domain'] as $id => $domain) {
// Trimming whitespaces as well as any lingering slashes
$domain = trim($domain);
$reason = trim($request['reason'][$id]);
- if (empty($request['delete'][$id])) {
+ if (empty($request['delete'][$id]) && !empty($domain)) {
$blocklist[] = [
'domain' => $domain,
'reason' => $reason
diff --git a/src/Module/Moderation/Item/Delete.php b/src/Module/Moderation/Item/Delete.php
index 069928a80f..10e6616af9 100644
--- a/src/Module/Moderation/Item/Delete.php
+++ b/src/Module/Moderation/Item/Delete.php
@@ -1,6 +1,6 @@
t('Normal Account'), 0],
- [$this->t('Automatic Follower Account'), 0],
- [$this->t('Public Group Account'), 0],
- [$this->t('Automatic Friend Account'), 0],
- [$this->t('Blog Account'), 0],
- [$this->t('Private Group Account'), 0]
+ [$this->t('Personal Page'), 0],
+ [$this->t('Organisation Page'), 0],
+ [$this->t('News Page'), 0],
+ [$this->t('Community Group'), 0],
+ [$this->t('Channel Relay'), 0],
];
$users = 0;
- $pageFlagsCountStmt = $this->database->p('SELECT `page-flags`, COUNT(`uid`) AS `count` FROM `user` WHERE `uid` != ? GROUP BY `page-flags`', 0);
- while ($pageFlagsCount = $this->database->fetch($pageFlagsCountStmt)) {
- $accounts[$pageFlagsCount['page-flags']][1] = $pageFlagsCount['count'];
- $users += $pageFlagsCount['count'];
+ $accountTypeCountStmt = $this->database->p('SELECT `account-type`, COUNT(`uid`) AS `count` FROM `user` WHERE `uid` != ? GROUP BY `account-type`', 0);
+ while ($AccountTypeCount = $this->database->fetch($accountTypeCountStmt)) {
+ $accounts[$AccountTypeCount['account-type']][1] = $AccountTypeCount['count'];
+ $users += $AccountTypeCount['count'];
}
- $this->database->close($pageFlagsCountStmt);
+ $this->database->close($accountTypeCountStmt);
$this->logger->debug('accounts', ['accounts' => $accounts]);
diff --git a/src/Module/Moderation/Users/Active.php b/src/Module/Moderation/Users/Active.php
index 1476578e03..e90baf8c68 100644
--- a/src/Module/Moderation/Users/Active.php
+++ b/src/Module/Moderation/Users/Active.php
@@ -1,6 +1,6 @@
httpClient->fetchFull($hub_callback . $separator . $params);
- $body = $fetchResult->getBody();
+ $body = $fetchResult->getBodyString();
$returnCode = $fetchResult->getReturnCode();
// give up if the HTTP return code wasn't a success (2xx)
diff --git a/src/Module/OStatus/Repair.php b/src/Module/OStatus/Repair.php
index c98eb2e34c..c6aeb6c073 100644
--- a/src/Module/OStatus/Repair.php
+++ b/src/Module/OStatus/Repair.php
@@ -1,6 +1,6 @@
t('Couldn\'t fetch friends for contact.');
}
- $friends = $curlResult->getBody();
+ $friends = $curlResult->getBodyString();
if (empty($friends)) {
$this->pConfig->delete($uid, 'ostatus', 'legacy_contact');
return $o . $this->t('Couldn\'t fetch following contacts.');
diff --git a/src/Module/Oembed.php b/src/Module/Oembed.php
deleted file mode 100644
index 7a28115d44..0000000000
--- a/src/Module/Oembed.php
+++ /dev/null
@@ -1,74 +0,0 @@
-.
- *
- */
-
-namespace Friendica\Module;
-
-use Friendica\BaseModule;
-use Friendica\Content;
-use Friendica\Core\System;
-use Friendica\DI;
-use Friendica\Util\Strings;
-
-/**
- * Oembed module
- *
- * Displays stored embed content based on a base64 hash of a remote URL
- *
- * Example: /oembed/aHR0cHM6Ly9...
- *
- * @author Hypolite Petovan
- */
-class Oembed extends BaseModule
-{
- protected function content(array $request = []): string
- {
- // Unused form: /oembed/b2h?url=...
- if (DI::args()->getArgv()[1] == 'b2h') {
- $url = ["", trim(hex2bin($_REQUEST['url']))];
- echo Content\OEmbed::replaceCallback($url);
- System::exit();
- }
-
- // Unused form: /oembed/h2b?text=...
- if (DI::args()->getArgv()[1] == 'h2b') {
- $text = trim(hex2bin($_REQUEST['text']));
- echo Content\OEmbed::HTML2BBCode($text);
- System::exit();
- }
-
- // @TODO: Replace with parameter from router
- if (DI::args()->getArgc() == 2) {
- echo '';
- $url = Strings::base64UrlDecode(DI::args()->getArgv()[1]);
- $j = Content\OEmbed::fetchURL($url);
-
- // workaround for media.ccc.de (and any other endpoint that return size 0)
- if (substr($j->html, 0, 7) == "html, 'width="0"')) {
- $j->html = '' . $j->html;
- $j->html = str_replace('width="0"', '', $j->html);
- $j->html = str_replace('height="0"', '', $j->html);
- }
- echo $j->html;
- echo '';
- }
- System::exit();
- }
-}
diff --git a/src/Module/OpenSearch.php b/src/Module/OpenSearch.php
index 1a4303a683..04865be180 100644
--- a/src/Module/OpenSearch.php
+++ b/src/Module/OpenSearch.php
@@ -1,6 +1,6 @@
parameters['contact_id'])) {
$id = intval($this->parameters['contact_id']);
}
@@ -115,12 +114,6 @@ class Photo extends BaseApi
$id = $user['uid'];
}
- // User Id Fallback, to remove after version 2021.12
- if (!empty($this->parameters['uid_ext'])) {
- $id = intval(pathinfo($this->parameters['uid_ext'], PATHINFO_FILENAME));
- }
-
- // Please refactor this for the love of everything that's good
if (isset($this->parameters['id'])) {
$id = $this->parameters['id'];
}
@@ -166,13 +159,17 @@ class Photo extends BaseApi
$stamp = microtime(true);
- $imgdata = MPhoto::getImageDataForPhoto($photo);
+ if (empty($request['blur']) || empty($photo['blurhash'])) {
+ $imgdata = MPhoto::getImageDataForPhoto($photo);
+ $mimetype = $photo['type'];
+ }
if (empty($imgdata) && empty($photo['blurhash'])) {
throw new HTTPException\NotFoundException();
} elseif (empty($imgdata) && !empty($photo['blurhash'])) {
- $image = New Image('', 'image/png');
+ $image = New Image('', image_type_to_mime_type(IMAGETYPE_WEBP));
$image->getFromBlurHash($photo['blurhash'], $photo['width'], $photo['height']);
- $imgdata = $image->asString();
+ $imgdata = $image->asString();
+ $mimetype = $image->getType();
}
// The mimetype for an external or system resource can only be known reliably after it had been fetched
@@ -197,20 +194,23 @@ class Photo extends BaseApi
}
if (!empty($request['static'])) {
- $img = new Image($imgdata, $photo['type']);
+ $img = new Image($imgdata, $photo['type'], $photo['filename']);
$img->toStatic();
- $imgdata = $img->asString();
+ $imgdata = $img->asString();
+ $mimetype = $img->getType();
}
- // if customsize is set and image is not a gif, resize it
- if ($photo['type'] !== 'image/gif' && $customsize > 0 && $customsize <= Proxy::PIXEL_THUMB && $square_resize) {
- $img = new Image($imgdata, $photo['type']);
+ // if customsize is set and image resizing is supported for this image, resize it
+ if (Images::canResize($photo['type']) && $customsize > 0 && $customsize <= Proxy::PIXEL_THUMB && $square_resize) {
+ $img = new Image($imgdata, $photo['type'], $photo['filename']);
$img->scaleToSquare($customsize);
- $imgdata = $img->asString();
- } elseif ($photo['type'] !== 'image/gif' && $customsize > 0) {
- $img = new Image($imgdata, $photo['type']);
+ $imgdata = $img->asString();
+ $mimetype = $img->getType();
+ } elseif (Images::canResize($photo['type']) && $customsize > 0) {
+ $img = new Image($imgdata, $photo['type'], $photo['filename']);
$img->scaleDown($customsize);
- $imgdata = $img->asString();
+ $imgdata = $img->asString();
+ $mimetype = $img->getType();
}
if (function_exists('header_remove')) {
@@ -218,7 +218,7 @@ class Photo extends BaseApi
header_remove('pragma');
}
- header('Content-type: ' . $photo['type']);
+ header('Content-type: ' . $mimetype);
$stamp = microtime(true);
if (!$cacheable) {
@@ -389,7 +389,7 @@ class Photo extends BaseApi
}
}
if (empty($mimetext) && !empty($contact['blurhash'])) {
- $image = New Image('', 'image/png');
+ $image = New Image('', image_type_to_mime_type(IMAGETYPE_WEBP));
$image->getFromBlurHash($contact['blurhash'], $customsize, $customsize);
return MPhoto::createPhotoForImageData($image->asString());
} elseif (empty($mimetext)) {
diff --git a/src/Module/Post/Edit.php b/src/Module/Post/Edit.php
index 1505c301ac..62ecedbc76 100644
--- a/src/Module/Post/Edit.php
+++ b/src/Module/Post/Edit.php
@@ -1,6 +1,6 @@
logger->info('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes');
$maximagesize = Strings::getBytesFromShorthand($this->config->get('system', 'maximagesize'));
@@ -210,7 +208,7 @@ class Photos extends \Friendica\Module\BaseProfile
$imagedata = @file_get_contents($src);
- $image = new Image($imagedata, $type);
+ $image = new Image($imagedata, $type, $filename);
if (!$image->isValid()) {
$this->logger->notice('unable to process image');
@@ -322,12 +320,12 @@ class Photos extends \Friendica\Module\BaseProfile
$photos = $this->database->toArray($this->database->p(
"SELECT
`resource-id`,
- ANY_VALUE(`id`) AS `id`,
- ANY_VALUE(`filename`) AS `filename`,
- ANY_VALUE(`type`) AS `type`,
- ANY_VALUE(`album`) AS `album`,
- max(`scale`) AS `scale`,
- ANY_VALUE(`created`) AS `created`
+ MIN(`id`) AS `id`,
+ MIN(`filename`) AS `filename`,
+ MIN(`type`) AS `type`,
+ MIN(`album`) AS `album`,
+ MAX(`scale`) AS `scale`,
+ MIN(`created`) AS `created`
FROM `photo`
WHERE `uid` = ?
AND `photo-type` = ?
@@ -341,14 +339,12 @@ class Photos extends \Friendica\Module\BaseProfile
$pager->getItemsPerPage()
));
- $phototypes = Images::supportedTypes();
-
- $photos = array_map(function ($photo) use ($phototypes) {
+ $photos = array_map(function ($photo){
return [
'id' => $photo['id'],
'link' => 'photos/' . $this->owner['nickname'] . '/image/' . $photo['resource-id'],
'title' => $this->t('View Photo'),
- 'src' => 'photo/' . $photo['resource-id'] . '-' . ((($photo['scale']) == 6) ? 4 : $photo['scale']) . '.' . $phototypes[$photo['type']],
+ 'src' => 'photo/' . $photo['resource-id'] . '-' . ((($photo['scale']) == 6) ? 4 : $photo['scale']) . Images::getExtensionByMimeType($photo['type']),
'alt' => $photo['filename'],
'album' => [
'link' => 'photos/' . $this->owner['nickname'] . '/album/' . bin2hex($photo['album']),
diff --git a/src/Module/Profile/Profile.php b/src/Module/Profile/Profile.php
index e639c6801b..afc65e8fe1 100644
--- a/src/Module/Profile/Profile.php
+++ b/src/Module/Profile/Profile.php
@@ -1,6 +1,6 @@
'/search?tag=' . $tag_label,
+ 'url' => '/search?tag=' . urlencode($tag_label),
'label' => Tag::TAG_CHARACTER[Tag::HASHTAG] . $tag_label,
];
}
@@ -348,10 +348,10 @@ class Profile extends BaseProfile
$htmlhead .= 'help/Channels ')],
'image' => ['new_image', $this->t("Images"), false, $this->t("Check to display images in the channel.")],
'video' => ["new_video", $this->t("Videos"), false, $this->t("Check to display videos in the channel.")],
'audio' => ["new_audio", $this->t("Audio"), false, $this->t("Check to display audio in the channel.")],
+ 'languages' => ["new_languages[]", $this->t('Languages'), $channel_languages, $this->t('Select all languages that you want to see in this channel.'), $languages, 'multiple'],
'$l10n' => [
'title' => $this->t('Channels'),
- 'intro' => $this->t('This page can be used to define your own channels.'),
+ 'intro' => $intro,
'addtitle' => $this->t('Add new entry to the channel list'),
'addsubmit' => $this->t('Add'),
'savechanges' => $this->t('Save'),
@@ -181,18 +233,4 @@ class Channels extends BaseSettings
'$form_security_token' => self::getFormSecurityToken('settings_channels'),
]);
}
-
- private function cleanTags(string $tag_list): string
- {
- $tags = [];
-
- $tagitems = explode(',', mb_strtolower($tag_list));
- foreach ($tagitems as $tag) {
- $tag = trim($tag, '# ');
- if (!empty($tag)) {
- $tags[] = preg_replace('#\s#u', '', $tag);
- }
- }
- return implode(',', $tags);
- }
}
diff --git a/src/Module/Settings/Connectors.php b/src/Module/Settings/Connectors.php
index 0032f087d5..0373cab5cc 100644
--- a/src/Module/Settings/Connectors.php
+++ b/src/Module/Settings/Connectors.php
@@ -1,6 +1,6 @@
pConfig->set($uid, 'system', 'no_smart_threading' , !$enable_smart_threading);
$this->pConfig->set($uid, 'system', 'hide_dislike' , !$enable_dislike);
$this->pConfig->set($uid, 'system', 'display_resharer' , $display_resharer);
+ $this->pConfig->set($uid, 'system', 'display_sensitive' , $display_sensitive);
$this->pConfig->set($uid, 'system', 'stay_local' , $stay_local);
$this->pConfig->set($uid, 'system', 'show_page_drop' , $show_page_drop);
$this->pConfig->set($uid, 'system', 'display_eventlist' , $display_eventlist);
@@ -251,6 +253,7 @@ class Display extends BaseSettings
$enable_smart_threading = !$this->pConfig->get($uid, 'system', 'no_smart_threading', false);
$enable_dislike = !$this->pConfig->get($uid, 'system', 'hide_dislike', false);
$display_resharer = $this->pConfig->get($uid, 'system', 'display_resharer', false);
+ $display_sensitive = $this->pConfig->get($uid, 'system', 'display_sensitive', false);
$stay_local = $this->pConfig->get($uid, 'system', 'stay_local', false);
$show_page_drop = $this->pConfig->get($uid, 'system', 'show_page_drop', true);
$display_eventlist = $this->pConfig->get($uid, 'system', 'display_eventlist', true);
@@ -330,6 +333,7 @@ class Display extends BaseSettings
'$enable_smart_threading' => ['enable_smart_threading' , $this->t('Enable Smart Threading'), $enable_smart_threading, $this->t('Enable the automatic suppression of extraneous thread indentation.')],
'$enable_dislike' => ['enable_dislike' , $this->t('Display the Dislike feature'), $enable_dislike, $this->t('Display the Dislike button and dislike reactions on posts and comments.')],
'$display_resharer' => ['display_resharer' , $this->t('Display the resharer'), $display_resharer, $this->t('Display the first resharer as icon and text on a reshared item.')],
+ '$display_sensitive' => ['display_sensitive' , $this->t('Display sensitive content'), $display_sensitive, $this->t('If enabled, pictures in posts marked as "sensitive" will not be blurred.')],
'$stay_local' => ['stay_local' , $this->t('Stay local'), $stay_local, $this->t("Don't go to a remote system when following a contact link.")],
'$show_page_drop' => ['show_page_drop' , $this->t('Show the post deletion checkbox'), $show_page_drop, $this->t("Display the checkbox for the post deletion on the network page.")],
'$display_eventlist' => ['display_eventlist' , $this->t('DIsplay the event list'), $display_eventlist, $this->t("Display the birthday reminder and event list on the network page.")],
diff --git a/src/Module/Settings/Features.php b/src/Module/Settings/Features.php
index c1766f6b92..906e03629a 100644
--- a/src/Module/Settings/Features.php
+++ b/src/Module/Settings/Features.php
@@ -1,6 +1,6 @@
$filename,
diff --git a/src/Module/Settings/Profile/Photo/Index.php b/src/Module/Settings/Profile/Photo/Index.php
index 47c4455d2e..90cbc9f886 100644
--- a/src/Module/Settings/Profile/Photo/Index.php
+++ b/src/Module/Settings/Profile/Photo/Index.php
@@ -1,6 +1,6 @@
get('system', 'maximagesize', 0));
if ($maximagesize && $filesize > $maximagesize) {
@@ -63,7 +61,7 @@ class Index extends BaseSettings
}
$imagedata = @file_get_contents($src);
- $Image = new Image($imagedata, $filetype);
+ $Image = new Image($imagedata, $filetype, $filename);
if (!$Image->isValid()) {
DI::sysmsg()->addNotice(DI::l10n()->t('Unable to process image.'));
diff --git a/src/Module/Settings/RemoveMe.php b/src/Module/Settings/RemoveMe.php
index 800c2cd6c8..333fca5b7e 100644
--- a/src/Module/Settings/RemoveMe.php
+++ b/src/Module/Settings/RemoveMe.php
@@ -1,6 +1,6 @@
l10n->t('Export account'), $this->l10n->t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')],
- ['settings/userexport/backup', $this->l10n->t('Export all'), $this->l10n->t('Export your account info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)')],
- ['settings/userexport/contact', $this->l10n->t('Export Contacts to CSV'), $this->l10n->t('Export the list of the accounts you are following as CSV file. Compatible to e.g. Mastodon.')],
+ ['settings/userexport/account?t=' . $t, $this->l10n->t('Export account'), $this->l10n->t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')],
+ ['settings/userexport/backup?t=' . $t, $this->l10n->t('Export all'), $this->l10n->t('Export your account info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)')],
+ ['settings/userexport/contact?t=' . $t, $this->l10n->t('Export Contacts to CSV'), $this->l10n->t('Export the list of the accounts you are following as CSV file. Compatible to e.g. Mastodon.')],
];
Hook::callAll('uexport_options', $options);
@@ -115,20 +115,21 @@ class UserExport extends BaseSettings
}
if (isset($this->parameters['action'])) {
+ self::checkFormSecurityTokenForbiddenOnError('userexport', 't');
switch ($this->parameters['action']) {
case 'backup':
header('Content-type: application/json');
- header('Content-Disposition: attachment; filename="' . DI::app()->getLoggedInUserNickname() . '.' . $this->parameters['action'] . '"');
+ header('Content-Disposition: attachment; filename="' . $this->session->getLocalUserNickname() . '.' . $this->parameters['action'] . '"');
$this->echoAll($this->session->getLocalUserId());
break;
case 'account':
header('Content-type: application/json');
- header('Content-Disposition: attachment; filename="' . DI::app()->getLoggedInUserNickname() . '.' . $this->parameters['action'] . '"');
+ header('Content-Disposition: attachment; filename="' . $this->session->getLocalUserNickname() . '.' . $this->parameters['action'] . '"');
$this->echoAccount($this->session->getLocalUserId());
break;
case 'contact':
header('Content-type: application/csv');
- header('Content-Disposition: attachment; filename="' . DI::app()->getLoggedInUserNickname() . '-contacts.csv' . '"');
+ header('Content-Disposition: attachment; filename="' . $this->session->getLocalUserNickname() . '-contacts.csv' . '"');
$this->echoContactsAsCSV($this->session->getLocalUserId());
break;
}
@@ -156,11 +157,8 @@ class UserExport extends BaseSettings
if (!isset($row[$column])) {
continue;
}
- if ($field['type'] == 'datetime') {
- $p[$column] = $row[$column] ?? DBA::NULL_DATETIME;
- } else {
- $p[$column] = $row[$column];
- }
+
+ $p[$column] = $row[$column];
}
$result[] = $p;
}
diff --git a/src/Module/Smilies.php b/src/Module/Smilies.php
index 52acb19242..db82257661 100644
--- a/src/Module/Smilies.php
+++ b/src/Module/Smilies.php
@@ -1,6 +1,6 @@
update || $this->force) {
if ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) {
- $items = $this->getChannelItems();
+ $items = $this->getChannelItems($request);
} else {
$items = $this->getCommunityItems();
}
diff --git a/src/Module/Update/Community.php b/src/Module/Update/Community.php
index 05ea8f828c..468214b39c 100644
--- a/src/Module/Update/Community.php
+++ b/src/Module/Update/Community.php
@@ -1,6 +1,6 @@
channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) {
- $items = $this->getChannelItems();
+ $items = $this->getChannelItems($request);
} elseif ($this->community->isTimeline($this->selectedTab)) {
$items = $this->getCommunityItems();
} else {
diff --git a/src/Module/Update/Profile.php b/src/Module/Update/Profile.php
index 4453a36ede..cc5d61e13f 100644
--- a/src/Module/Update/Profile.php
+++ b/src/Module/Update/Profile.php
@@ -1,6 +1,6 @@
get('system', 'relay_server_tags');
- $tagitems = explode(',', $server_tags);
-
- /// @todo Check if it was better to use "strtolower" on the tags
- foreach ($tagitems as $tag) {
- $systemTags[] = trim($tag, '# ');
- }
+ $systemTags = Strings::getTagArrayByString($config->get('system', 'relay_server_tags'));
if ($config->get('system', 'relay_user_tags')) {
$userTags = Search::getUserTags();
diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php
index 097ec3c322..8e31440018 100644
--- a/src/Module/Xrd.php
+++ b/src/Module/Xrd.php
@@ -1,6 +1,6 @@
logger->debug('URL cannot be resolved.', ['url' => $url]);
$this->profiler->stopRecording();
return CurlResult::createErrorCurl($this->logger, $url);
@@ -271,7 +271,7 @@ class HttpClient implements ICanSendHttpRequests
{
$ret = $this->fetchFull($url, $accept_content, $timeout, $cookiejar);
- return $ret->getBody();
+ return $ret->getBodyString();
}
/**
diff --git a/src/Network/HTTPClient/Client/HttpClientAccept.php b/src/Network/HTTPClient/Client/HttpClientAccept.php
index c1ff55364c..11c317acb4 100644
--- a/src/Network/HTTPClient/Client/HttpClientAccept.php
+++ b/src/Network/HTTPClient/Client/HttpClientAccept.php
@@ -1,6 +1,6 @@
setMaxRedirects(10);
$resolver->setRequestTimeout(10);
// if the file is too large then exit
- $resolver->setMaxResponseDataSize(1000000);
+ $resolver->setMaxResponseDataSize($this->config->get('performance', 'max_response_data_size', 1000000));
// Designate a temporary file that will store cookies during the session.
// Some websites test the browser for cookie support, so this enhances results.
$resolver->setCookieJar(System::getTempPath() .'/resolver-cookie-' . Strings::getRandomName(10));
diff --git a/src/Network/HTTPClient/Response/CurlResult.php b/src/Network/HTTPClient/Response/CurlResult.php
index 9db2f1304f..561c8c47ab 100644
--- a/src/Network/HTTPClient/Response/CurlResult.php
+++ b/src/Network/HTTPClient/Response/CurlResult.php
@@ -1,6 +1,6 @@
body;
}
diff --git a/src/Network/HTTPClient/Response/GuzzleResponse.php b/src/Network/HTTPClient/Response/GuzzleResponse.php
index 468ab996f3..d277f2a8df 100644
--- a/src/Network/HTTPClient/Response/GuzzleResponse.php
+++ b/src/Network/HTTPClient/Response/GuzzleResponse.php
@@ -1,6 +1,6 @@
isTimeout;
}
- /// @todo - fix mismatching use of "getBody()" as string here and parent "getBody()" as streaminterface
- public function getBody(): string
+ public function getBodyString(): string
{
return (string) parent::getBody();
}
diff --git a/src/Network/HTTPException.php b/src/Network/HTTPException.php
index c2f5c4867d..f5092d52da 100644
--- a/src/Network/HTTPException.php
+++ b/src/Network/HTTPException.php
@@ -1,6 +1,6 @@
get($ssl_url, HttpClientAccept::XRD_XML, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
$ssl_connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
if ($curlResult->isSuccess()) {
- $xml = $curlResult->getBody();
+ $xml = $curlResult->getBodyString();
$xrd = XML::parseString($xml, true);
if (!empty($url)) {
$host_url = 'https://' . $host;
@@ -250,7 +253,7 @@ class Probe
return [];
}
- $xml = $curlResult->getBody();
+ $xml = $curlResult->getBodyString();
$xrd = XML::parseString($xml, true);
$host_url = 'http://'.$host;
}
@@ -426,7 +429,7 @@ class Probe
if (!empty($data['baseurl']) && empty($data['gsid'])) {
$data['gsid'] = GServer::getID($data['baseurl']);
- }
+ }
// Ensure that local connections always are DFRN
if (($network == '') && ($data['network'] != Protocol::PHANTOM) && (self::ownHost($data['baseurl'] ?? '') || self::ownHost($data['url']))) {
@@ -459,7 +462,7 @@ class Probe
return false;
}
- $body = $curlResult->getBody();
+ $body = $curlResult->getBodyString();
if (empty($body)) {
return false;
}
@@ -865,7 +868,7 @@ class Probe
if ($curlResult->isTimeout()) {
return $data;
}
- $content = $curlResult->getBody();
+ $content = $curlResult->getBodyString();
if (!$content) {
return $data;
}
@@ -971,7 +974,7 @@ class Probe
self::$isTimeout = true;
return [];
}
- $data = $curlResult->getBody();
+ $data = $curlResult->getBodyString();
$webfinger = json_decode($data, true);
if (!empty($webfinger)) {
@@ -1040,7 +1043,7 @@ class Probe
self::$isTimeout = true;
return $data;
}
- $content = $curlResult->getBody();
+ $content = $curlResult->getBodyString();
if (!$content) {
Logger::info('Empty body', ['url' => $noscrape_url]);
return $data;
@@ -1303,7 +1306,7 @@ class Probe
self::$isTimeout = true;
return [];
}
- $content = $curlResult->getBody();
+ $content = $curlResult->getBodyString();
if (empty($content)) {
return [];
}
@@ -1580,7 +1583,7 @@ class Probe
return $short ? false : [];
}
Logger::debug('Fetched public key', ['Content-Type' => $curlResult->getHeader('Content-Type'), 'url' => $pubkey]);
- $pubkey = $curlResult->getBody();
+ $pubkey = $curlResult->getBodyString();
}
try {
@@ -1612,7 +1615,7 @@ class Probe
self::$isTimeout = true;
return [];
}
- $feed = $curlResult->getBody();
+ $feed = $curlResult->getBodyString();
$feed_data = Feed::import($feed);
if (!$feed_data) {
return [];
@@ -1660,12 +1663,12 @@ class Probe
private static function pumpioProfileData(string $profile_link, string $baseurl): array
{
$curlResult = DI::httpClient()->get($profile_link, HttpClientAccept::HTML);
- if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
+ if (!$curlResult->isSuccess() || empty($curlResult->getBodyString())) {
return [];
}
$doc = new DOMDocument();
- if (!@$doc->loadHTML($curlResult->getBody())) {
+ if (!@$doc->loadHTML($curlResult->getBodyString())) {
return [];
}
@@ -1887,7 +1890,7 @@ class Probe
return [];
}
- $feed = $curlResult->getBody();
+ $feed = $curlResult->getBodyString();
$feed_data = Feed::import($feed);
if (!$feed_data) {
@@ -2112,8 +2115,8 @@ class Probe
$curlResult = DI::httpClient()->get($gserver['noscrape'] . '/' . $data['nick'], HttpClientAccept::JSON);
- if ($curlResult->isSuccess() && !empty($curlResult->getBody())) {
- $noscrape = json_decode($curlResult->getBody(), true);
+ if ($curlResult->isSuccess() && !empty($curlResult->getBodyString())) {
+ $noscrape = json_decode($curlResult->getBodyString(), true);
if (!empty($noscrape) && !empty($noscrape['updated'])) {
return DateTimeFormat::utc($noscrape['updated'], DateTimeFormat::MYSQL);
}
@@ -2187,12 +2190,12 @@ class Probe
{
// Search for the newest entry in the feed
$curlResult = DI::httpClient()->get($data['poll'], HttpClientAccept::ATOM_XML);
- if (!$curlResult->isSuccess() || !$curlResult->getBody()) {
+ if (!$curlResult->isSuccess() || !$curlResult->getBodyString()) {
return '';
}
$doc = new DOMDocument();
- @$doc->loadXML($curlResult->getBody());
+ @$doc->loadXML($curlResult->getBodyString());
$xpath = new DOMXPath($doc);
$xpath->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
diff --git a/src/Object/Api/Friendica/Circle.php b/src/Object/Api/Friendica/Circle.php
index 5ff1a32cce..604720fdd5 100644
--- a/src/Object/Api/Friendica/Circle.php
+++ b/src/Object/Api/Friendica/Circle.php
@@ -1,6 +1,6 @@
client_id = $client_id;
$this->client_secret = $client_secret;
@@ -57,6 +59,7 @@ class Application extends BaseDataTransferObject
$this->name = $name;
$this->redirect_uri = $redirect_uri;
$this->website = $website;
+ $this->vapid_key = $vapid_key;
}
/**
diff --git a/src/Object/Api/Mastodon/Attachment.php b/src/Object/Api/Mastodon/Attachment.php
index aa6c5baacd..86b9ecb0ef 100644
--- a/src/Object/Api/Mastodon/Attachment.php
+++ b/src/Object/Api/Mastodon/Attachment.php
@@ -1,6 +1,6 @@
author_url = $attachment['author_url'] ?? '';
$this->provider_name = $attachment['provider_name'] ?? '';
$this->provider_url = $attachment['provider_url'] ?? '';
+ $this->html = '';
$this->width = $attachment['width'] ?? 0;
$this->height = $attachment['height'] ?? 0;
$this->image = $attachment['image'] ?? '';
+ $this->embed_url = '';
$this->blurhash = $attachment['blurhash'] ?? '';
$this->history = $history;
}
diff --git a/src/Object/Api/Mastodon/Conversation.php b/src/Object/Api/Mastodon/Conversation.php
index 453783235c..7ad6fe8d3e 100644
--- a/src/Object/Api/Mastodon/Conversation.php
+++ b/src/Object/Api/Mastodon/Conversation.php
@@ -1,6 +1,6 @@
.
+ *
+ */
+
+namespace Friendica\Object\Api\Mastodon;
+
+use Friendica\BaseDataTransferObject;
+use Friendica\Util\DateTimeFormat;
+
+/**
+ * Class ExtendedDescription
+ *
+ * @see https://docs.joinmastodon.org/entities/ExtendedDescription/
+ */
+class ExtendedDescription extends BaseDataTransferObject
+{
+ /** @var string (Datetime) */
+ protected $updated_at;
+ /** @var string */
+ protected $content;
+
+ public function __construct(\DateTime $updated_at, string $content)
+ {
+ $this->updated_at = $updated_at->format(DateTimeFormat::JSON);
+ $this->content = $content;
+ }
+}
diff --git a/src/Object/Api/Mastodon/Field.php b/src/Object/Api/Mastodon/Field.php
index 086432b40a..ad7bfdb516 100644
--- a/src/Object/Api/Mastodon/Field.php
+++ b/src/Object/Api/Mastodon/Field.php
@@ -1,6 +1,6 @@
id = (string)$question['id'];
$this->expires_at = !empty($question['end-time']) ? DateTimeFormat::utc($question['end-time'], DateTimeFormat::JSON) : null;
@@ -69,9 +69,23 @@ class Poll extends BaseDataTransferObject
$this->multiple = (bool)$question['multiple'];
$this->votes_count = $votes;
$this->voters_count = $this->multiple ? $question['voters'] : null;
- $this->voted = null;
+ $this->voted = $voted;
$this->own_votes = $ownvotes;
$this->options = $options;
$this->emojis = [];
}
+
+ public function toArray(): array
+ {
+ $status = parent::toArray();
+
+ if (is_null($status['voted'])) {
+ unset($status['voted']);
+ }
+
+ if (is_null($status['own_votes'])) {
+ unset($status['own_votes']);
+ }
+ return $status;
+ }
}
diff --git a/src/Object/Api/Mastodon/Preferences.php b/src/Object/Api/Mastodon/Preferences.php
index 99e706d20a..1b619f0cad 100644
--- a/src/Object/Api/Mastodon/Preferences.php
+++ b/src/Object/Api/Mastodon/Preferences.php
@@ -1,6 +1,6 @@
imagick = class_exists('Imagick');
- $this->types = Images::supportedTypes();
- if (!array_key_exists($type, $this->types)) {
- $type = 'image/jpeg';
+ $this->filename = $filename;
+ $type = Images::addMimeTypeByDataIfInvalid($type, $data);
+ $type = Images::addMimeTypeByExtensionIfInvalid($type, $filename);
+
+ if (Images::isSupportedMimeType($type)) {
+ $this->originType = $this->outputType = Images::getImageTypeByMimeType($type);
+ } elseif (($type == '') || substr($type, 0, 6) == 'image/' || substr($type, 0, 12) == ' application/') {
+ $this->originType = IMAGETYPE_UNKNOWN;
+ $this->outputType = IMAGETYPE_WEBP;
+ DI::logger()->debug('Unhandled image mime type, use WebP instead', ['type' => $type, 'filename' => $filename, 'size' => strlen($data)]);
+ } else {
+ DI::logger()->debug('Unhandled mime type', ['type' => $type, 'filename' => $filename, 'size' => strlen($data)]);
+ $this->valid = false;
+ return;
}
- $this->type = $type;
+
+ $this->imagick = $imagick && $this->useImagick($data);
if ($this->isImagick() && (empty($data) || $this->loadData($data))) {
$this->valid = !empty($data);
@@ -75,6 +89,53 @@ class Image
$this->loadData($data);
}
+ /**
+ * Check if Imagick will be used
+ *
+ * @param string $data
+ * @return boolean
+ */
+ private function useImagick(string $data): bool
+ {
+ if (!class_exists('Imagick')) {
+ return false;
+ }
+
+ if ($this->outputType == IMAGETYPE_PNG) {
+ return true;
+ }
+
+ if ($this->originType == IMAGETYPE_GIF) {
+ $count = preg_match_all("#\\x00\\x21\\xF9\\x04.{4}\\x00[\\x2C\\x21]#s", $data);
+ return ($count > 0);
+ }
+
+ return (($this->originType == IMAGETYPE_WEBP) && $this->isAnimatedWebP(substr($data, 0, 90)));
+ }
+
+ /**
+ * Detect if a WebP image is animated.
+ * @see https://www.php.net/manual/en/function.imagecreatefromwebp.php#126269
+ * @param string $data
+ * @return boolean
+ */
+ private function isAnimatedWebP(string $data) {
+ $header_format = 'A4Riff/I1Filesize/A4Webp/A4Vp/A74Chunk';
+ $header = @unpack($header_format, $data);
+
+ if (!isset($header['Riff']) || strtoupper($header['Riff']) !== 'RIFF') {
+ return false;
+ }
+ if (!isset($header['Webp']) || strtoupper($header['Webp']) !== 'WEBP') {
+ return false;
+ }
+ if (!isset($header['Vp']) || strpos(strtoupper($header['Vp']), 'VP8') === false) {
+ return false;
+ }
+
+ return strpos(strtoupper($header['Chunk']), 'ANIM') !== false || strpos(strtoupper($header['Chunk']), 'ANMF') !== false;
+ }
+
/**
* Destructor
*
@@ -118,28 +179,28 @@ class Image
$this->image->readImageBlob($data);
} catch (Exception $e) {
// Imagick couldn't use the data
+ DI::logger()->debug('Error during readImageBlob', ['message' => $e->getMessage(), 'code' => $e->getCode(), 'trace' => $e->getTraceAsString(), 'previous' => $e->getPrevious(), 'file' => $this->filename]);
return false;
}
/*
* Setup the image to the format it will be saved to
*/
- $map = Images::getFormatsMap();
- $format = $map[$this->type];
- $this->image->setFormat($format);
+ $this->image->setFormat(Images::getImagickFormatByImageType($this->outputType));
// Always coalesce, if it is not a multi-frame image it won't hurt anyway
try {
$this->image = $this->image->coalesceImages();
} catch (Exception $e) {
+ DI::logger()->debug('Error during coalesceImages', ['message' => $e->getMessage(), 'code' => $e->getCode(), 'trace' => $e->getTraceAsString(), 'previous' => $e->getPrevious(), 'file' => $this->filename]);
return false;
}
/*
* setup the compression here, so we'll do it only once
*/
- switch ($this->getType()) {
- case 'image/png':
+ switch ($this->getImageType()) {
+ case IMAGETYPE_PNG:
$quality = DI::config()->get('system', 'png_quality');
/*
* From http://www.imagemagick.org/script/command-line-options.php#quality:
@@ -150,13 +211,12 @@ class Image
* unless the image has a color map, in which case it means compression level 7 with no PNG filtering'
*/
$quality = $quality * 10;
- $this->image->setCompressionQuality($quality);
+ $this->image->setImageCompressionQuality($quality);
break;
- case 'image/jpg':
- case 'image/jpeg':
+ case IMAGETYPE_JPEG:
$quality = DI::config()->get('system', 'jpeg_quality');
- $this->image->setCompressionQuality($quality);
+ $this->image->setImageCompressionQuality($quality);
}
$this->width = $this->image->getImageWidth();
@@ -175,15 +235,16 @@ class Image
$this->valid = true;
imagealphablending($this->image, false);
imagesavealpha($this->image, true);
+ imageinterlace($this->image, true);
return true;
}
} catch (\Throwable $error) {
/** @see https://github.com/php/doc-en/commit/d09a881a8e9059d11e756ee59d75bf404d6941ed */
if (strstr($error->getMessage(), "gd-webp cannot allocate temporary buffer")) {
- DI::logger()->notice('Image is probably animated and therefore unsupported', ['error' => $error]);
+ DI::logger()->notice('Image is probably animated and therefore unsupported', ['message' => $error->getMessage(), 'code' => $error->getCode(), 'trace' => $error->getTraceAsString(), 'file' => $this->filename]);
} else {
- DI::logger()->warning('Unexpected throwable.', ['error' => $error]);
+ DI::logger()->warning('Unexpected throwable.', ['message' => $error->getMessage(), 'code' => $error->getCode(), 'trace' => $error->getTraceAsString(), 'file' => $this->filename]);
}
}
@@ -255,7 +316,19 @@ class Image
return false;
}
- return $this->type;
+ return image_type_to_mime_type($this->outputType);
+ }
+
+ /**
+ * @return mixed
+ */
+ public function getImageType()
+ {
+ if (!$this->isValid()) {
+ return false;
+ }
+
+ return $this->outputType;
}
/**
@@ -267,7 +340,7 @@ class Image
return false;
}
- return $this->types[$this->getType()];
+ return Images::getExtensionByImageType($this->outputType);
}
/**
@@ -397,7 +470,7 @@ class Image
return false;
}
- if ((!function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg')) {
+ if ((!function_exists('exif_read_data')) || ($this->getImageType() !== IMAGETYPE_JPEG)) {
return;
}
@@ -544,7 +617,7 @@ class Image
imagealphablending($dest, false);
imagesavealpha($dest, true);
- if ($this->type=='image/png') {
+ if ($this->outputType == IMAGETYPE_PNG) {
imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
}
@@ -569,13 +642,13 @@ class Image
*/
public function toStatic()
{
- if ($this->type != 'image/gif') {
+ if ($this->outputType != IMAGETYPE_GIF) {
return;
}
if ($this->isImagick()) {
- $this->type == 'image/png';
- $this->image->setFormat('png');
+ $this->outputType = IMAGETYPE_PNG;
+ $this->image->setFormat(Images::getImagickFormatByImageType($this->outputType));
}
}
@@ -613,7 +686,7 @@ class Image
imagealphablending($dest, false);
imagesavealpha($dest, true);
- if ($this->type=='image/png') {
+ if ($this->outputType == IMAGETYPE_PNG) {
imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
}
imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $max, $max, $w, $h);
@@ -667,20 +740,28 @@ class Image
$stream = fopen('php://memory','r+');
- // Enable interlacing
- imageinterlace($this->image, true);
-
- switch ($this->getType()) {
- case 'image/png':
+ switch ($this->getImageType()) {
+ case IMAGETYPE_PNG:
$quality = DI::config()->get('system', 'png_quality');
imagepng($this->image, $stream, $quality);
break;
- case 'image/jpeg':
- case 'image/jpg':
+ case IMAGETYPE_JPEG:
$quality = DI::config()->get('system', 'jpeg_quality');
imagejpeg($this->image, $stream, $quality);
break;
+
+ case IMAGETYPE_GIF:
+ imagegif($this->image, $stream);
+ break;
+
+ case IMAGETYPE_WEBP:
+ @imagewebp($this->image, $stream, DI::config()->get('system', 'jpeg_quality'));
+ break;
+
+ case IMAGETYPE_BMP:
+ imagebmp($this->image, $stream);
+ break;
}
rewind($stream);
return stream_get_contents($stream);
@@ -694,7 +775,7 @@ class Image
*/
public function getBlurHash(): string
{
- $image = New Image($this->asString());
+ $image = New Image($this->asString(), $this->getType(), $this->filename, false);
if (empty($image) || !$this->isValid()) {
return '';
}
diff --git a/src/Object/Log/ParsedLogLine.php b/src/Object/Log/ParsedLogLine.php
index 33f9ad6650..c5aa884428 100644
--- a/src/Object/Log/ParsedLogLine.php
+++ b/src/Object/Log/ParsedLogLine.php
@@ -1,6 +1,6 @@
countDescendants();
+ $total_children = $item['counts'] ?? $this->countDescendants();
$conv = $this->getThread();
@@ -697,6 +697,11 @@ class Post
$icon = ['fa' => 'fa-eye', 'icon' => 'icon-eye-open'];
break;
+ case Activity::READ:
+ $title = DI::l10n()->t('Read by: %s', $actors);
+ $icon = ['fa' => 'fa-book', 'icon' => 'icon-book'];
+ break;
+
case Activity::LIKE:
$title = DI::l10n()->t('Liked by: %s', $actors);
$icon = ['fa' => 'fa-thumbs-up', 'icon' => 'icon-thumbs-up'];
diff --git a/src/Object/Search/ContactResult.php b/src/Object/Search/ContactResult.php
index c46b9b6e4c..6d901dece9 100644
--- a/src/Object/Search/ContactResult.php
+++ b/src/Object/Search/ContactResult.php
@@ -1,6 +1,6 @@
'http://ostatus.org#',
'vcard' => 'http://www.w3.org/2006/vcard/ns#',
'dfrn' => 'http://purl.org/macgirvin/dfrn/1.0/',
'diaspora' => 'https://diasporafoundation.org/ns/',
@@ -295,7 +296,7 @@ class ActivityPub
return false;
}
- if (empty($apcontact['gsid'] || empty($apcontact['baseurl']))) {
+ if (empty($apcontact['gsid']) || empty($apcontact['baseurl'])) {
Logger::debug('No server found', ['uid' => $uid, 'signer' => $signer, 'called_by' => $called_by]);
return false;
}
@@ -315,7 +316,9 @@ class ActivityPub
}
}
- // @todo Look for user blocked domains
+ if (DI::userGServer()->isIgnoredByUser($uid, $apcontact['gsid'])) {
+ return false;
+ }
Logger::debug('Server is an accepted requester', ['uid' => $uid, 'id' => $apcontact['gsid'], 'url' => $apcontact['baseurl'], 'signer' => $signer, 'called_by' => $called_by]);
diff --git a/src/Protocol/ActivityPub/ClientToServer.php b/src/Protocol/ActivityPub/ClientToServer.php
index 8bc4dcc059..49c13d1e50 100644
--- a/src/Protocol/ActivityPub/ClientToServer.php
+++ b/src/Protocol/ActivityPub/ClientToServer.php
@@ -1,6 +1,6 @@
notice('published or updated keys are empty for activity', ['activity' => $activity]);
@@ -614,7 +615,7 @@ class Processor
}
if ($curlResult->isSuccess()) {
- $object = json_decode($curlResult->getBody(), true);
+ $object = json_decode($curlResult->getBodyString(), true);
if (!empty($object)) {
$activity = JsonLD::compact($object);
if (JsonLD::fetchElement($activity, '@type') == 'as:Tombstone') {
@@ -850,6 +851,7 @@ class Processor
}
$item['title'] = trim(BBCode::toPlaintext($item['title']));
+ $item['content-warning'] = HTML::toBBCode($activity['summary'] ?? '');
if (!empty($activity['languages'])) {
$item['language'] = self::processLanguages($activity['languages']);
@@ -896,7 +898,6 @@ class Processor
}
$content = self::removeImplicitMentionsFromBody($content, $parent);
}
- $item['content-warning'] = HTML::toBBCode($activity['summary'] ?? '');
$item['raw-body'] = $item['body'] = $content;
}
@@ -1537,6 +1538,11 @@ class Processor
}
$object = HTTPSignature::fetch($url, $uid);
+
+ if (!empty($object)) {
+ $object = self::refetchObjectOnHostDifference($object, $url);
+ }
+
if (empty($object)) {
Logger::notice('Activity was not fetchable, aborting.', ['url' => $url, 'uid' => $uid]);
// We perform negative caching.
@@ -1548,6 +1554,11 @@ class Processor
Logger::notice('Activity has got not id, aborting. ', ['url' => $url, 'object' => $object]);
return [];
}
+
+ if (!self::isValidObject($object, $url)) {
+ return [];
+ }
+
DI::cache()->set($cachekey, $object, Duration::FIVE_MINUTES);
Logger::debug('Activity was fetched successfully', ['url' => $url, 'uid' => $uid]);
@@ -1584,7 +1595,7 @@ class Processor
return '';
}
- $body = $curlResult->getBody();
+ $body = $curlResult->getBodyString();
if (!$curlResult->isSuccess() || empty($body)) {
if (in_array($curlResult->getReturnCode(), [403, 404, 406, 410])) {
return null;
@@ -1593,14 +1604,22 @@ class Processor
}
$object = json_decode($body, true);
+
+ if (!empty($object)) {
+ $object = self::refetchObjectOnHostDifference($object, $url);
+ }
+
if (empty($object) || !is_array($object)) {
- $element = explode(';', $curlResult->getContentType());
- if (!in_array($element[0], ['application/activity+json', 'application/ld+json', 'application/json'])) {
- Logger::debug('Unexpected content-type', ['url' => $url, 'content-type' => $curlResult->getContentType()]);
- return null;
- }
- Logger::notice('Invalid JSON data', ['url' => $url, 'content-type' => $curlResult->getContentType(), 'body' => $body]);
- return '';
+ Logger::notice('Invalid JSON data', ['url' => $url, 'content-type' => $curlResult->getContentType()]);
+ return null;
+ }
+
+ if (!self::isValidObject($object, $url)) {
+ return null;
+ }
+
+ if (!HTTPSignature::isValidContentType($curlResult->getContentType(), $url)) {
+ return null;
}
$ldobject = JsonLD::compact($object);
@@ -1692,6 +1711,79 @@ class Processor
return $activity['id'];
}
+ private static function refetchObjectOnHostDifference(array $object, string $url): array
+ {
+ $ldobject = JsonLD::compact($object);
+ if (empty($ldobject)) {
+ Logger::info('Invalid object', ['url' => $url]);
+ return $object;
+ }
+
+ $id = JsonLD::fetchElement($ldobject, '@id');
+ if (empty($id)) {
+ Logger::info('No id found in object', ['url' => $url, 'object' => $object]);
+ return $object;
+ }
+
+ $url_host = parse_url($url, PHP_URL_HOST);
+ $id_host = parse_url($id, PHP_URL_HOST);
+
+ if ($id_host == $url_host) {
+ return $object;
+ }
+
+ Logger::notice('Refetch activity because of a host mismatch between requested and received id', ['url-host' => $url_host, 'id-host' => $id_host, 'url' => $url, 'id' => $id]);
+ return HTTPSignature::fetch($id);
+ }
+
+ private static function isValidObject(array $object): bool
+ {
+ $ldobject = JsonLD::compact($object);
+ if (empty($ldobject)) {
+ Logger::info('Invalid object');
+ return false;
+ }
+
+ $id = JsonLD::fetchElement($ldobject, '@id');
+ if (empty($id)) {
+ Logger::info('No id found in object');
+ return false;
+ }
+
+ $type = JsonLD::fetchElement($ldobject, '@type');
+ $object_id = JsonLD::fetchElement($ldobject, 'as:object', '@id');
+ $object_type = JsonLD::fetchElement($ldobject, 'as:object', '@type');
+ $actor = JsonLD::fetchElement($ldobject, 'as:actor', '@id');
+ $attributed_to = JsonLD::fetchElement($ldobject, 'as:attributedTo', '@id');
+
+ $id_host = parse_url($id, PHP_URL_HOST);
+
+ if (!empty($actor) && !in_array($type, Receiver::CONTENT_TYPES) && !empty($object_id)) {
+ $actor_host = parse_url($actor, PHP_URL_HOST);
+ if ($actor_host != $id_host) {
+ Logger::notice('Host mismatch between received id and actor', ['id-host' => $id_host, 'actor-host' => $actor_host, 'id' => $id, 'type' => $type, 'object-id' => $object_id, 'object_type' => $object_type, 'actor' => $actor, 'attributed_to' => $attributed_to]);
+ return false;
+ }
+ if (!empty($object_type)) {
+ $object_attributed_to = JsonLD::fetchElement($ldobject['as:object'], 'as:attributedTo', '@id');
+ $attributed_to_host = parse_url($object_attributed_to, PHP_URL_HOST);
+ $object_id_host = parse_url($object_id, PHP_URL_HOST);
+ if (!empty($attributed_to_host) && ($attributed_to_host != $object_id_host)) {
+ Logger::notice('Host mismatch between received object id and attributed actor', ['id-object-host' => $object_id_host, 'attributed-host' => $attributed_to_host, 'id' => $id, 'type' => $type, 'object-id' => $object_id, 'object_type' => $object_type, 'actor' => $actor, 'object_attributed_to' => $object_attributed_to]);
+ return false;
+ }
+ }
+ } elseif (!empty($attributed_to)) {
+ $attributed_to_host = parse_url($attributed_to, PHP_URL_HOST);
+ if ($attributed_to_host != $id_host) {
+ Logger::notice('Host mismatch between received id and attributed actor', ['id-host' => $id_host, 'attributed-host' => $attributed_to_host, 'id' => $id, 'type' => $type, 'object-id' => $object_id, 'object_type' => $object_type, 'actor' => $actor, 'attributed_to' => $attributed_to]);
+ return false;
+ }
+ }
+
+ return true;
+ }
+
private static function getActivityForObject(array $object, string $actor): array
{
if (!empty($object['published'])) {
diff --git a/src/Protocol/ActivityPub/Queue.php b/src/Protocol/ActivityPub/Queue.php
index 3046c24580..384675a88e 100644
--- a/src/Protocol/ActivityPub/Queue.php
+++ b/src/Protocol/ActivityPub/Queue.php
@@ -1,6 +1,6 @@
isTooOld($published) && !Post::exists(['uri' => $object_id])) {
+ Logger::debug('Activity is too old. It will not be processed', ['push' => $push, 'completion' => $completion, 'type' => $type, 'object-type' => $object_type, 'published' => $published, 'id' => $id, 'object-id' => $object_id]);
+ return true;
+ }
} else {
$attributed_to = '';
}
@@ -652,7 +662,6 @@ class Receiver
// For announced "create" activities we remove the middle layer.
// For the rest (like, dislike, update, ...) we just process the activity directly.
$original_actor = '';
- $object_type = JsonLD::fetchElement($activity['as:object'] ?? [], '@type');
if (($type == 'as:Announce') && !empty($object_type) && !in_array($object_type, self::CONTENT_TYPES) && self::isGroup($actor)) {
$object_object_type = JsonLD::fetchElement($activity['as:object']['as:object'] ?? [], '@type');
if (in_array($object_type, ['as:Create']) && in_array($object_object_type, self::CONTENT_TYPES)) {
@@ -1272,6 +1281,11 @@ class Receiver
}
}
+ if (empty($receivers) && !empty($parent['parent-author-link'])) {
+ $uid = User::getIdForURL($parent['parent-author-link']);
+ $receivers[$uid] = ['uid' => $uid, 'type' => self::TARGET_BTO];
+ }
+
if (!empty($reply) && (!empty($receivers[0]) || !empty($receivers[-1]))) {
$parents = Post::select(['uid'], DBA::mergeConditions(['uri' => $reply], ["`uid` != ?", 0]));
while ($parent = Post::fetch($parents)) {
diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index 94655eead1..f322278574 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -1,6 +1,6 @@
$owner['url'] . '#main-key',
'owner' => $owner['url'],
'publicKeyPem' => $owner['pubkey']];
@@ -1164,6 +1164,7 @@ class Transmitter
}
$mail['content-warning'] = '';
+ $mail['sensitive'] = false;
$mail['author-link'] = $mail['owner-link'] = $mail['from-url'];
$mail['owner-id'] = $mail['author-id'];
$mail['allow_cid'] = '<'.$mail['contact-id'].'>';
@@ -1697,18 +1698,6 @@ class Transmitter
});
}
- /**
- * Returns if the post contains sensitive content ("nsfw")
- *
- * @param integer $uri_id URI id
- * @return boolean Whether URI id was found
- * @throws \Exception
- */
- private static function isSensitive(int $uri_id): bool
- {
- return DBA::exists('tag-view', ['uri-id' => $uri_id, 'name' => 'nsfw', 'type' => Tag::HASHTAG]);
- }
-
/**
* Creates event data
*
@@ -1812,7 +1801,7 @@ class Transmitter
} else {
$data['attributedTo'] = $item['author-link'];
}
- $data['sensitive'] = self::isSensitive($item['uri-id']);
+ $data['sensitive'] = (bool)$item['sensitive'];
if (!empty($item['conversation']) && ($item['conversation'] != './')) {
$data['conversation'] = $data['context'] = $item['conversation'];
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 1ab12089de..b58faed679 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1,6 +1,6 @@
true, 'uid' => $uid], ['order' => ['scale']]);
$photos = [];
- $ext = Images::supportedTypes();
-
foreach ($profilephotos as $p) {
- $photos[$p['scale']] = DI::baseUrl() . '/photo/' . $p['resource-id'] . '-' . $p['scale'] . '.' . $ext[$p['type']];
+ $photos[$p['scale']] = DI::baseUrl() . '/photo/' . $p['resource-id'] . '-' . $p['scale'] . Images::getExtensionByMimeType($p['type']);
}
$doc = new DOMDocument('1.0', 'utf-8');
@@ -1012,7 +1010,7 @@ class DFRN
$content_type = ($public_batch ? 'application/magic-envelope+xml' : 'application/json');
$postResult = DI::httpClient()->post($dest_url, $envelope, ['Content-Type' => $content_type]);
- $xml = $postResult->getBody();
+ $xml = $postResult->getBodyString();
$curl_stat = $postResult->getReturnCode();
if (!empty($contact['gsid']) && ($postResult->isTimeout() || empty($curl_stat))) {
diff --git a/src/Protocol/Delivery.php b/src/Protocol/Delivery.php
index 9f8174e2d4..d479ad4422 100644
--- a/src/Protocol/Delivery.php
+++ b/src/Protocol/Delivery.php
@@ -1,6 +1,6 @@
= 200) && ($deliver_status <= 299)) {
- Post\DeliveryData::incrementQueueDone($target_item['uri-id'], $protocol);
+ $success = ($deliver_status >= 200) && ($deliver_status <= 299);
- GServer::setProtocol($contact['gsid'] ?? 0, $protocol);
- $success = true;
- } else {
- Post\DeliveryData::incrementQueueFailed($target_item['uri-id']);
- $success = false;
- }
+ if ($cmd == Delivery::POST) {
+ Post\DeliveryData::incrementQueueDone($target_item['uri-id'], $protocol);
+ GServer::setProtocol($contact['gsid'] ?? 0, $protocol);
+ } else {
+ Post\DeliveryData::incrementQueueFailed($target_item['uri-id']);
}
return $success;
}
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 59918287ab..f78c0902cb 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -1,6 +1,6 @@
isTooOld($datarray['created'], $datarray['uid'])) {
Logger::info('Comment is too old', ['created' => $datarray['created'], 'uid' => $datarray['uid'], 'guid' => $datarray['guid']]);
return false;
}
@@ -1860,7 +1861,7 @@ class Diaspora
$datarray['diaspora_signed_text'] = json_encode($data);
}
- if (Item::isTooOld($datarray)) {
+ if (DI::contentItem()->isTooOld($datarray['created'], $datarray['uid'])) {
Logger::info('Like is too old', ['created' => $datarray['created'], 'uid' => $datarray['uid'], 'guid' => $datarray['guid']]);
return false;
}
@@ -2023,7 +2024,7 @@ class Diaspora
// Diaspora doesn't provide a date for a participation
$datarray['changed'] = $datarray['created'] = $datarray['edited'] = DateTimeFormat::utcNow();
- if (Item::isTooOld($datarray)) {
+ if (DI::contentItem()->isTooOld($datarray['created'], $datarray['uid'])) {
Logger::info('Participation is too old', ['created' => $datarray['created'], 'uid' => $datarray['uid'], 'guid' => $datarray['guid']]);
return false;
}
@@ -2393,7 +2394,7 @@ class Diaspora
self::fetchGuid($datarray);
- if (Item::isTooOld($datarray)) {
+ if (DI::contentItem()->isTooOld($datarray['created'], $datarray['uid'])) {
Logger::info('Reshare is too old', ['created' => $datarray['created'], 'uid' => $datarray['uid'], 'guid' => $datarray['guid']]);
return false;
}
@@ -2738,7 +2739,7 @@ class Diaspora
self::fetchGuid($datarray);
- if (Item::isTooOld($datarray)) {
+ if (DI::contentItem()->isTooOld($datarray['created'], $datarray['uid'])) {
Logger::info('Status is too old', ['created' => $datarray['created'], 'uid' => $datarray['uid'], 'guid' => $datarray['guid']]);
return false;
}
@@ -3259,7 +3260,9 @@ class Diaspora
/// @todo - establish "all day" events in Friendica
$eventdata['all_day'] = 'false';
- $eventdata['timezone'] = 'UTC';
+ // @todo Should be user timezone - but only if the event is supposed to be displayed
+ // in that specific timezone and not the user's timezone.
+ // $eventdata['timezone'] = 'UTC';
if ($event['start']) {
$eventdata['start'] = DateTimeFormat::utc($event['start'], $mask);
@@ -3403,8 +3406,7 @@ class Diaspora
if ($item['event-id'] > 0) {
$event = self::buildEvent($item['event-id']);
if (count($event)) {
- // Deactivated, since Diaspora seems to have problems with the processing.
- // $message['event'] = $event;
+ $message['event'] = $event;
if (
!empty($event['location']['address']) &&
@@ -3885,7 +3887,7 @@ class Diaspora
*/
private static function createProfileData(int $uid): array
{
- $profile = DBA::selectFirst('owner-view', ['uid', 'addr', 'name', 'location', 'net-publish', 'dob', 'about', 'pub_keywords', 'updated'], ['uid' => $uid]);
+ $profile = User::getOwnerDataById($uid);
if (!DBA::isResult($profile)) {
return [];
@@ -3899,9 +3901,9 @@ class Diaspora
'full_name' => $profile['name'],
'first_name' => $split_name['first'],
'last_name' => $split_name['last'],
- 'image_url' => DI::baseUrl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
- 'image_url_medium' => DI::baseUrl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
- 'image_url_small' => DI::baseUrl() . '/photo/custom/50/' . $profile['uid'] . '.jpg',
+ 'image_url' => User::getAvatarUrl($profile, Proxy::SIZE_SMALL),
+ 'image_url_medium' => User::getAvatarUrl($profile, Proxy::SIZE_THUMB),
+ 'image_url_small' => User::getAvatarUrl($profile, Proxy::SIZE_MICRO),
'bio' => null,
'birthday' => null,
'gender' => null,
diff --git a/src/Protocol/Diaspora/Entity/DiasporaContact.php b/src/Protocol/Diaspora/Entity/DiasporaContact.php
index a8b19d292d..76a92bfb57 100644
--- a/src/Protocol/Diaspora/Entity/DiasporaContact.php
+++ b/src/Protocol/Diaspora/Entity/DiasporaContact.php
@@ -1,6 +1,6 @@
$item['created'], 'uid' => $item['uid'], 'uri' => $item['uri']]);
continue;
- } elseif (Item::isTooOld($item)) {
+ } elseif (DI::contentItem()->isTooOld($item['created'], $item['uid'])) {
Logger::info('Feed is too old', ['created' => $item['created'], 'uid' => $item['uid'], 'uri' => $item['uri']]);
continue;
}
@@ -573,7 +574,7 @@ class Feed
if (in_array($fetch_further_information, [LocalRelationship::FFI_INFORMATION, LocalRelationship::FFI_BOTH])) {
// Handle enclosures and treat them as preview picture
foreach ($attachments as $attachment) {
- if ($attachment['mimetype'] == 'image/jpeg') {
+ if (Images::isSupportedMimeType($attachment['mimetype'])) {
$preview = $attachment['url'];
}
}
diff --git a/src/Protocol/HTTP/MediaType.php b/src/Protocol/HTTP/MediaType.php
index 285f4e6df7..f7ebe0a2a5 100644
--- a/src/Protocol/HTTP/MediaType.php
+++ b/src/Protocol/HTTP/MediaType.php
@@ -1,6 +1,6 @@
get($related, HttpClientAccept::ATOM_XML);
- if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
+ if (!$curlResult->isSuccess() || empty($curlResult->getBodyString())) {
return;
}
@@ -745,12 +745,12 @@ class OStatus
if ($curlResult->inHeader('Content-Type') &&
in_array('application/atom+xml', $curlResult->getHeader('Content-Type'))) {
Logger::info('Directly fetched XML for URI ' . $related_uri);
- $xml = $curlResult->getBody();
+ $xml = $curlResult->getBodyString();
}
if ($xml == '') {
$doc = new DOMDocument();
- if (!@$doc->loadHTML($curlResult->getBody())) {
+ if (!@$doc->loadHTML($curlResult->getBodyString())) {
return;
}
$xpath = new DOMXPath($doc);
@@ -770,7 +770,7 @@ class OStatus
if ($curlResult->isSuccess()) {
Logger::info('Fetched XML for URI ' . $related_uri);
- $xml = $curlResult->getBody();
+ $xml = $curlResult->getBodyString();
}
}
}
@@ -782,7 +782,7 @@ class OStatus
if ($curlResult->isSuccess()) {
Logger::info('GNU Social workaround to fetch XML for URI ' . $related_uri);
- $xml = $curlResult->getBody();
+ $xml = $curlResult->getBodyString();
}
}
@@ -793,7 +793,7 @@ class OStatus
if ($curlResult->isSuccess()) {
Logger::info('GNU Social workaround 2 to fetch XML for URI ' . $related_uri);
- $xml = $curlResult->getBody();
+ $xml = $curlResult->getBodyString();
}
}
diff --git a/src/Protocol/Relay.php b/src/Protocol/Relay.php
index e7e878a02d..8dd5e13c04 100644
--- a/src/Protocol/Relay.php
+++ b/src/Protocol/Relay.php
@@ -1,6 +1,6 @@
get('system', 'relay_deny_tags');
- $tagitems = explode(',', mb_strtolower($deny_tags));
- foreach ($tagitems as $tag) {
- $tag = trim($tag, '# ');
- $denyTags[] = $tag;
- }
+ $denyTags = Strings::getTagArrayByString($config->get('system', 'relay_deny_tags'));
if (!empty($tagList) || !empty($denyTags)) {
$content = mb_strtolower(BBCode::toPlaintext($body, false));
+ $max_tags = $config->get('system', 'relay_max_tags');
+ if ($max_tags && (count($tags) > $max_tags) && preg_match('/[^@!#]\[url\=.*?\].*?\[\/url\]/ism', $body)) {
+ $cleaned = preg_replace('/[@!#]\[url\=.*?\].*?\[\/url\]/ism', '', $body);
+ $content_cleaned = mb_strtolower(BBCode::toPlaintext($cleaned, false));
+
+ if (strlen($content_cleaned) < strlen($content) / 2) {
+ Logger::info('Possible hashtag spam detected - rejected', ['hashtags' => $tags, 'network' => $network, 'url' => $url, 'causer' => $causer, 'content' => $content]);
+ return false;
+ }
+ }
+
foreach ($tags as $tag) {
$tag = mb_strtolower($tag);
if (in_array($tag, $denyTags)) {
@@ -157,20 +161,13 @@ class Relay
*/
public static function getSubscribedTags(): array
{
- $systemTags = [];
- $server_tags = DI::config()->get('system', 'relay_server_tags');
-
- foreach (explode(',', mb_strtolower($server_tags)) as $tag) {
- $systemTags[] = trim($tag, '# ');
- }
+ $tags = Strings::getTagArrayByString(DI::config()->get('system', 'relay_server_tags'));
if (DI::config()->get('system', 'relay_user_tags')) {
- $userTags = Search::getUserTags();
- } else {
- $userTags = [];
+ $tags = array_merge($tags, Search::getUserTags());
}
- return array_unique(array_merge($systemTags, $userTags));
+ return array_unique($tags);
}
/**
@@ -192,34 +189,31 @@ class Relay
}
}
- if (empty($languages) && empty($detected) && (empty($body) || Smilies::isEmojiPost($body))) {
+ if (empty($detected) && empty($languages)) {
+ $detected = [L10n::UNDETERMINED_LANGUAGE];
+ }
+
+ if (empty($body) || Smilies::isEmojiPost($body)) {
Logger::debug('Empty body or only emojis', ['body' => $body]);
return true;
}
- if (!empty($languages) || !empty($detected)) {
- $user_languages = User::getLanguages();
+ $user_languages = User::getLanguages();
- foreach ($detected as $language) {
- if (in_array($language, $user_languages)) {
- Logger::debug('Wanted language found in detected languages', ['language' => $language, 'detected' => $detected, 'userlang' => $user_languages, 'body' => $body]);
- return true;
- }
+ foreach ($detected as $language) {
+ if (in_array($language, $user_languages)) {
+ Logger::debug('Wanted language found in detected languages', ['language' => $language, 'detected' => $detected, 'userlang' => $user_languages, 'body' => $body]);
+ return true;
}
- foreach ($languages as $language) {
- if (in_array($language, $user_languages)) {
- Logger::debug('Wanted language found in defined languages', ['language' => $language, 'languages' => $languages, 'detected' => $detected, 'userlang' => $user_languages, 'body' => $body]);
- return true;
- }
- }
- Logger::debug('No wanted language found', ['languages' => $languages, 'detected' => $detected, 'userlang' => $user_languages, 'body' => $body]);
- return false;
- } elseif (DI::config()->get('system', 'relay_deny_undetected_language')) {
- Logger::info('Undetected language found', ['body' => $body]);
- return false;
}
-
- return true;
+ foreach ($languages as $language) {
+ if (in_array($language, $user_languages)) {
+ Logger::debug('Wanted language found in defined languages', ['language' => $language, 'languages' => $languages, 'detected' => $detected, 'userlang' => $user_languages, 'body' => $body]);
+ return true;
+ }
+ }
+ Logger::debug('No wanted language found', ['languages' => $languages, 'detected' => $detected, 'userlang' => $user_languages, 'body' => $body]);
+ return false;
}
/**
@@ -252,13 +246,14 @@ class Relay
$fields['contact-type'] = Contact::TYPE_RELAY;
Logger::info('Assigning missing data for relay contact', ['server' => $gserver['url'], 'id' => $old['id']]);
}
- } elseif (empty($fields)) {
+ } elseif (empty($fields) && $old['unsearchable']) {
Logger::info('No content to update, quitting', ['server' => $gserver['url']]);
return;
}
if (DBA::isResult($old)) {
- $fields['updated'] = DateTimeFormat::utcNow();
+ $fields['updated'] = DateTimeFormat::utcNow();
+ $fields['unsearchable'] = true;
Logger::info('Update relay contact', ['server' => $gserver['url'], 'id' => $old['id'], 'fields' => $fields]);
Contact::update($fields, ['id' => $old['id']], $old);
@@ -271,6 +266,7 @@ class Relay
'rel' => Contact::FOLLOWER, 'blocked' => false,
'pending' => false, 'writable' => true,
'gsid' => $gserver['id'],
+ 'unsearchable' => true,
'baseurl' => $gserver['url'], 'contact-type' => Contact::TYPE_RELAY];
$fields = array_merge($default, $fields);
diff --git a/src/Protocol/Salmon.php b/src/Protocol/Salmon.php
index 5047375ea0..03e2b8b782 100644
--- a/src/Protocol/Salmon.php
+++ b/src/Protocol/Salmon.php
@@ -1,6 +1,6 @@
baseUrl->redirect();
}
- // Make sure to refresh the last login time for the user if the user
- // stays logged in for a long time, e.g. with "Remember Me"
- $login_refresh = false;
- if (!$this->session->get('last_login_date')) {
- $this->session->set('last_login_date', DateTimeFormat::utcNow());
- }
- if (strcmp(DateTimeFormat::utc('now - 12 hours'), $this->session->get('last_login_date')) > 0) {
- $this->session->set('last_login_date', DateTimeFormat::utcNow());
- $login_refresh = true;
- }
-
- $this->setForUser($a, $user, false, false, $login_refresh);
+ $this->setForUser($a, $user);
}
}
}
@@ -283,7 +272,6 @@ class Authentication
// if we haven't failed up this point, log them in.
$this->session->set('remember', $remember);
- $this->session->set('last_login_date', DateTimeFormat::utcNow());
$openid_identity = $this->session->get('openid_identity');
$openid_server = $this->session->get('openid_server');
@@ -311,7 +299,7 @@ class Authentication
* @param array $user_record The current "user" record
* @param bool $login_initial
* @param bool $interactive
- * @param bool $login_refresh
+ * @param bool $refresh_login
*
* @throws HTTPException\FoundException
* @throws HTTPException\MovedPermanentlyException
@@ -321,7 +309,7 @@ class Authentication
* @throws HTTPException\InternalServerErrorException In case of Friendica specific exceptions
*
*/
- public function setForUser(App $a, array $user_record, bool $login_initial = false, bool $interactive = false, bool $login_refresh = false)
+ public function setForUser(App $a, array $user_record, bool $login_initial = false, bool $interactive = false, bool $refresh_login = true)
{
$my_url = $this->baseUrl . '/profile/' . $user_record['nickname'];
@@ -354,13 +342,9 @@ class Authentication
$this->setXAccMgmtStatusHeader($user_record);
- if ($login_initial || $login_refresh) {
- $this->dba->update('user', ['last-activity' => DateTimeFormat::utcNow('Y-m-d'), 'login_date' => DateTimeFormat::utcNow()], ['uid' => $user_record['uid']]);
-
- // Set the login date for all identities of the user
- $this->dba->update('user', ['last-activity' => DateTimeFormat::utcNow('Y-m-d'), 'login_date' => DateTimeFormat::utcNow()],
- ['parent-uid' => $user_record['uid'], 'account_removed' => false]);
+ User::updateLastActivity($user_record, $refresh_login);
+ if ($login_initial) {
// Regularly update suggestions
if (Contact\Relation::areSuggestionsOutdated($user_record['uid'])) {
Worker::add(Worker::PRIORITY_MEDIUM, 'UpdateSuggestions', $user_record['uid']);
diff --git a/src/Security/BasicAuth.php b/src/Security/BasicAuth.php
index 51da7a98ad..9627b62bb0 100644
--- a/src/Security/BasicAuth.php
+++ b/src/Security/BasicAuth.php
@@ -1,6 +1,6 @@
0;
-
- DI::auth()->setForUser($a, $record, false, false, $login_refresh);
+ DI::auth()->setForUser($a, $record, false, false, false);
Hook::callAll('logged_in', $record);
diff --git a/src/Security/ExAuth.php b/src/Security/ExAuth.php
index cc1f03f8cc..eda2f398e6 100644
--- a/src/Security/ExAuth.php
+++ b/src/Security/ExAuth.php
@@ -1,6 +1,6 @@
getBody());
+ $json = @json_decode($curlResult->getBodyString());
if (!is_object($json)) {
return false;
}
diff --git a/src/Security/OAuth.php b/src/Security/OAuth.php
index 7a0edfef2c..88dbdf4c2d 100644
--- a/src/Security/OAuth.php
+++ b/src/Security/OAuth.php
@@ -1,6 +1,6 @@
isSuccess() || empty($curlResult->getBody())) {
+ if (!$curlResult->isSuccess() || empty($curlResult->getBodyString())) {
Logger::debug('Fetching was unsuccessful', ['url' => $request, 'return-code' => $curlResult->getReturnCode(), 'error-number' => $curlResult->getErrorNumber(), 'error' => $curlResult->getError()]);
return [];
}
- $content = json_decode($curlResult->getBody(), true);
+ $content = json_decode($curlResult->getBodyString(), true);
if (empty($content) || !is_array($content)) {
return [];
}
+ if (!self::isValidContentType($curlResult->getContentType(), $request)) {
+ return [];
+ }
+
return $content;
}
+ /**
+ * Check if the provided content type is a valid LD JSON mime type
+ *
+ * @param string $contentType
+ * @return boolean
+ */
+ public static function isValidContentType(string $contentType, string $url = ''): bool
+ {
+ if (in_array(current(explode(';', $contentType)), ['application/activity+json', 'application/ld+json'])) {
+ return true;
+ }
+
+ if (current(explode(';', $contentType)) == 'application/json') {
+ Logger::notice('Unexpected content type, possibly from a remote system that is not standard compliant.', ['content-type' => $contentType, 'url' => $url]);
+ }
+ return false;
+ }
+
/**
* Fetches raw data for a user
*
diff --git a/src/Util/Images.php b/src/Util/Images.php
index 1305441304..f5a7e5af3d 100644
--- a/src/Util/Images.php
+++ b/src/Util/Images.php
@@ -1,6 +1,6 @@
'JPG',
- 'image/jpg' => 'JPG',
- 'image/png' => 'PNG',
- 'image/gif' => 'GIF',
+ $formats = [
+ // @todo add "IMAGETYPE_AVIF => 'AVIF'" once our minimal supported PHP version is 8.1.0
+ IMAGETYPE_WEBP => 'WEBP',
+ IMAGETYPE_PNG => 'PNG',
+ IMAGETYPE_JPEG => 'JPEG',
+ IMAGETYPE_GIF => 'GIF',
+ IMAGETYPE_BMP => 'BMP',
];
+
+ if (empty($formats[$imagetype])) {
+ return '';
+ }
+
+ return $formats[$imagetype];
+ }
+
+ /**
+ * Sanitize the provided mime type, replace invalid mime types with valid ones.
+ *
+ * @param string $mimetype
+ * @return string
+ */
+ private static function sanitizeMimeType(string $mimetype): string
+ {
+ $mimetype = current(explode(';', $mimetype));
+
+ if ($mimetype == 'image/jpg') {
+ $mimetype = image_type_to_mime_type(IMAGETYPE_JPEG);
+ } elseif (in_array($mimetype, ['image/vnd.mozilla.apng', 'image/apng'])) {
+ $mimetype = image_type_to_mime_type(IMAGETYPE_PNG);
+ } elseif (in_array($mimetype, ['image/x-ms-bmp', 'image/x-bmp'])) {
+ $mimetype = image_type_to_mime_type(IMAGETYPE_BMP);
+ }
+
+ return $mimetype;
+ }
+
+ /**
+ * Replace invalid extensions with valid ones.
+ *
+ * @param string $extension
+ * @return string
+ */
+ private static function sanitizeExtensions(string $extension): string
+ {
+ if (in_array($extension, ['jpg', 'jpe', 'jfif'])) {
+ $extension = image_type_to_extension(IMAGETYPE_JPEG, false);
+ } elseif ($extension == 'apng') {
+ $extension = image_type_to_extension(IMAGETYPE_PNG, false);
+ } elseif ($extension == 'dib') {
+ $extension = image_type_to_extension(IMAGETYPE_BMP, false);
+ }
+
+ return $extension;
+ }
+
+ /**
+ * Get the image type for the given mime type
+ *
+ * @param string $mimetype
+ * @return integer
+ */
+ public static function getImageTypeByMimeType(string $mimetype): int
+ {
+ $mimetype = self::sanitizeMimeType($mimetype);
+
+ foreach (self::IMAGETYPES as $type) {
+ if ($mimetype == image_type_to_mime_type($type)) {
+ return $type;
+ }
+ }
+
+ Logger::debug('Undetected mimetype', ['mimetype' => $mimetype]);
+ return 0;
+ }
+
+ /**
+ * Get the extension for the given image type
+ *
+ * @param integer $type
+ * @return string
+ */
+ public static function getExtensionByImageType(int $type): string
+ {
+ if (empty($type)) {
+ Logger::debug('Invalid image type', ['type' => $type]);
+ return '';
+ }
+
+ return image_type_to_extension($type);
}
/**
@@ -55,56 +144,60 @@ class Images
*/
public static function getExtensionByMimeType(string $mimetype): string
{
- switch ($mimetype) {
- case 'image/png':
- $imagetype = IMAGETYPE_PNG;
- break;
-
- case 'image/gif':
- $imagetype = IMAGETYPE_GIF;
- break;
-
- case 'image/jpeg':
- case 'image/jpg':
- $imagetype = IMAGETYPE_JPEG;
- break;
-
- default: // Unknown type must be a blob then
- return 'blob';
- break;
+ if (empty($mimetype)) {
+ return '';
}
- return image_type_to_extension($imagetype);
+ return self::getExtensionByImageType(self::getImageTypeByMimeType($mimetype));
}
/**
- * Returns supported image mimetypes and corresponding file extensions
+ * Returns supported image mimetypes
*
* @return array
*/
- public static function supportedTypes(): array
+ public static function supportedMimeTypes(): array
{
- $types = [
- 'image/jpeg' => 'jpg',
- 'image/jpg' => 'jpg',
- ];
+ $types = [];
- if (class_exists('Imagick')) {
- // Imagick::queryFormats won't help us a lot there...
- // At least, not yet, other parts of friendica uses this array
- $types += [
- 'image/png' => 'png',
- 'image/gif' => 'gif'
- ];
- } elseif (imagetypes() & IMG_PNG) {
- $types += [
- 'image/png' => 'png'
- ];
+ // @todo enable, once our lowest supported PHP version is 8.1.0
+ //if (imagetypes() & IMG_AVIF) {
+ // $types[] = image_type_to_mime_type(IMAGETYPE_AVIF);
+ //}
+ if (imagetypes() & IMG_WEBP) {
+ $types[] = image_type_to_mime_type(IMAGETYPE_WEBP);
+ }
+ if (imagetypes() & IMG_PNG) {
+ $types[] = image_type_to_mime_type(IMAGETYPE_PNG);
+ }
+ if (imagetypes() & IMG_JPG) {
+ $types[] = image_type_to_mime_type(IMAGETYPE_JPEG);
+ }
+ if (imagetypes() & IMG_GIF) {
+ $types[] = image_type_to_mime_type(IMAGETYPE_GIF);
+ }
+ if (imagetypes() & IMG_BMP) {
+ $types[] = image_type_to_mime_type(IMAGETYPE_BMP);
}
return $types;
}
+ /**
+ * Checks if the provided mime type can be handled for resizing.
+ * Only with Imagick installed, animated GIF and WebP keep their animation after resize.
+ *
+ * @param string $mimetype
+ * @return boolean
+ */
+ public static function canResize(string $mimetype): bool
+ {
+ if (in_array(self::getImageTypeByMimeType($mimetype), [IMAGETYPE_GIF, IMAGETYPE_WEBP])) {
+ return class_exists('Imagick');
+ }
+ return true;
+ }
+
/**
* Fetch image mimetype from the image data or guessing from the file name
*
@@ -114,45 +207,69 @@ class Images
* @return string MIME type
* @throws \Exception
*/
- public static function getMimeTypeByData(string $image_data, string $filename = '', string $default = ''): string
+ public static function getMimeTypeByData(string $image_data): string
{
- if (substr($default, 0, 6) == 'image/') {
- Logger::info('Using default mime type', ['filename' => $filename, 'mime' => $default]);
- return $default;
- }
-
$image = @getimagesizefromstring($image_data);
if (!empty($image['mime'])) {
- Logger::info('Mime type detected via data', ['filename' => $filename, 'default' => $default, 'mime' => $image['mime']]);
return $image['mime'];
}
- return self::guessTypeByExtension($filename);
+ Logger::debug('Undetected mime type', ['image' => $image, 'size' => strlen($image_data)]);
+
+ return '';
}
/**
- * Fetch image mimetype from the image data or guessing from the file name
+ * Checks if the provided mime type is supported by the system
*
- * @param string $sourcefile Source file of the image
- * @param string $filename File name (for guessing the type via the extension)
- * @param string $default default MIME type
- * @return string MIME type
- * @throws \Exception
+ * @param string $mimetype
+ * @return boolean
*/
- public static function getMimeTypeBySource(string $sourcefile, string $filename = '', string $default = ''): string
+ public static function isSupportedMimeType(string $mimetype): bool
{
- if (substr($default, 0, 6) == 'image/') {
- Logger::info('Using default mime type', ['filename' => $filename, 'mime' => $default]);
- return $default;
+ if (substr($mimetype, 0, 6) != 'image/') {
+ return false;
}
- $image = @getimagesize($sourcefile);
- if (!empty($image['mime'])) {
- Logger::info('Mime type detected via file', ['filename' => $filename, 'default' => $default, 'image' => $image]);
- return $image['mime'];
+ return in_array(self::sanitizeMimeType($mimetype), self::supportedMimeTypes());
+ }
+
+ /**
+ * Checks if the provided mime type is supported. If not, it is fetched from the provided image data.
+ *
+ * @param string $mimetype
+ * @param string $image_data
+ * @return string
+ */
+ public static function addMimeTypeByDataIfInvalid(string $mimetype, string $image_data): string
+ {
+ $mimetype = self::sanitizeMimeType($mimetype);
+
+ if (($image_data == '') || self::isSupportedMimeType($mimetype)) {
+ return $mimetype;
}
- return self::guessTypeByExtension($filename);
+ $alternative = self::getMimeTypeByData($image_data);
+ return $alternative ?: $mimetype;
+ }
+
+ /**
+ * Checks if the provided mime type is supported. If not, it is fetched from the provided file name.
+ *
+ * @param string $mimetype
+ * @param string $filename
+ * @return string
+ */
+ public static function addMimeTypeByExtensionIfInvalid(string $mimetype, string $filename): string
+ {
+ $mimetype = self::sanitizeMimeType($mimetype);
+
+ if (($filename == '') || self::isSupportedMimeType($mimetype)) {
+ return $mimetype;
+ }
+
+ $alternative = self::guessTypeByExtension($filename);
+ return $alternative ?: $mimetype;
}
/**
@@ -164,27 +281,35 @@ class Images
*/
public static function guessTypeByExtension(string $filename): string
{
- $ext = pathinfo(parse_url($filename, PHP_URL_PATH), PATHINFO_EXTENSION);
- $types = self::supportedTypes();
- $type = 'image/jpeg';
- foreach ($types as $m => $e) {
- if ($ext == $e) {
- $type = $m;
+ if (empty($filename)) {
+ return '';
+ }
+
+ $ext = strtolower(pathinfo(parse_url($filename, PHP_URL_PATH), PATHINFO_EXTENSION));
+ $ext = self::sanitizeExtensions($ext);
+ if ($ext == '') {
+ return '';
+ }
+
+ foreach (self::IMAGETYPES as $type) {
+ if ($ext == image_type_to_extension($type, false)) {
+ return image_type_to_mime_type($type);
}
}
- Logger::info('Mime type guessed via extension', ['filename' => $filename, 'type' => $type]);
- return $type;
+ Logger::debug('Unhandled extension', ['filename' => $filename, 'extension' => $ext]);
+ return '';
}
/**
* Gets info array from given URL, cached data has priority
*
* @param string $url
+ * @param bool $ocr
* @return array Info
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public static function getInfoFromURLCached(string $url): array
+ public static function getInfoFromURLCached(string $url, bool $ocr = false): array
{
$data = [];
@@ -192,12 +317,12 @@ class Images
return $data;
}
- $cacheKey = 'getInfoFromURL:' . sha1($url);
+ $cacheKey = 'getInfoFromURL:' . sha1($url . $ocr);
$data = DI::cache()->get($cacheKey);
if (empty($data) || !is_array($data)) {
- $data = self::getInfoFromURL($url);
+ $data = self::getInfoFromURL($url, $ocr);
DI::cache()->set($cacheKey, $data);
}
@@ -209,10 +334,11 @@ class Images
* Gets info from URL uncached
*
* @param string $url
+ * @param bool $ocr
* @return array Info array
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public static function getInfoFromURL(string $url): array
+ public static function getInfoFromURL(string $url, bool $ocr = false): array
{
$data = [];
@@ -253,10 +379,18 @@ class Images
return [];
}
- $image = new Image($img_str);
+ $image = new Image($img_str, '', $url);
if ($image->isValid()) {
$data['blurhash'] = $image->getBlurHash();
+
+ if ($ocr) {
+ $media = ['img_str' => $img_str];
+ Hook::callAll('ocr-detection', $media);
+ if (!empty($media['description'])) {
+ $data['description'] = $media['description'];
+ }
+ }
}
$data['size'] = $filesize;
@@ -333,7 +467,7 @@ class Images
{
return self::getBBCodeByUrl(
DI::baseUrl() . '/photos/' . $nickname . '/image/' . $resource_id,
- DI::baseUrl() . '/photo/' . $resource_id . '-' . $preview. '.' . $ext,
+ DI::baseUrl() . '/photo/' . $resource_id . '-' . $preview. $ext,
$description
);
}
diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index 5bf6593aed..8b70933217 100644
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -1,6 +1,6 @@
getHost()))) {
+ if (!empty($domain_block['domain']) && fnmatch(strtolower($domain_block['domain']), strtolower($uri->getHost()))) {
return true;
}
}
@@ -271,14 +271,17 @@ class Network
return false;
}
- $str_allowed = DI::config()->get('system', 'allowed_email', '');
- if (empty($str_allowed)) {
+ $allowed = DI::config()->get('system', 'allowed_email');
+ if (!empty($allowed) && self::isDomainMatch($domain, explode(',', $allowed))) {
return true;
}
- $allowed = explode(',', $str_allowed);
+ $disallowed = DI::config()->get('system', 'disallowed_email');
+ if (!empty($disallowed) && self::isDomainMatch($domain, explode(',', $disallowed))) {
+ return false;
+ }
- return self::isDomainAllowed($domain, $allowed);
+ return true;
}
/**
@@ -289,7 +292,7 @@ class Network
*
* @return boolean
*/
- public static function isDomainAllowed(string $domain, array $domain_list): bool
+ public static function isDomainMatch(string $domain, array $domain_list): bool
{
$found = false;
@@ -659,6 +662,29 @@ class Network
return !empty($scheme) && in_array($scheme, ['http', 'https']) && parse_url($url, PHP_URL_HOST);
}
+ /**
+ * Remove invalid parts from an URL
+ *
+ * @param string $url
+ * @return string sanitized URL
+ */
+ public static function sanitizeUrl(string $url): string
+ {
+ $sanitized = $url = trim($url);
+
+ foreach (['"', ' '] as $character) {
+ $pos = strpos($sanitized, $character);
+ if ($pos !== false) {
+ $sanitized = trim(substr($sanitized, 0, $pos));
+ }
+ }
+
+ if ($sanitized != $url) {
+ Logger::debug('Link got sanitized', ['url' => $url, 'sanitzed' => $sanitized]);
+ }
+ return $sanitized;
+ }
+
/**
* Creates an Uri object out of a given Uri string
*
diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index 79f427a654..093a8233d0 100644
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -1,6 +1,6 @@
getHeader('Content-Type')[0] ?? '';
+ $contenttype = $curlResult->getContentType();
if (empty($contenttype)) {
return ['application', 'octet-stream'];
}
@@ -99,8 +98,6 @@ class ParseUrl
* Search for cached embeddable data of an url otherwise fetch it
*
* @param string $url The url of the page which should be scraped
- * @param bool $do_oembed The false option is used by the function fetch_oembed()
- * to avoid endless loops
*
* @return array which contains needed data for embedding
* string 'url' => The url of the parsed page
@@ -115,7 +112,7 @@ class ParseUrl
* @see ParseUrl::getSiteinfo() for more information about scraping
* embeddable content
*/
- public static function getSiteinfoCached(string $url, bool $do_oembed = true): array
+ public static function getSiteinfoCached(string $url): array
{
if (empty($url)) {
return [
@@ -127,14 +124,14 @@ class ParseUrl
$urlHash = hash('sha256', $url);
$parsed_url = DBA::selectFirst('parsed_url', ['content'],
- ['url_hash' => $urlHash, 'oembed' => $do_oembed]
+ ['url_hash' => $urlHash, 'oembed' => false]
);
if (!empty($parsed_url['content'])) {
$data = unserialize($parsed_url['content']);
return $data;
}
- $data = self::getSiteinfo($url, $do_oembed);
+ $data = self::getSiteinfo($url);
$expires = $data['expires'];
@@ -144,7 +141,7 @@ class ParseUrl
'parsed_url',
[
'url_hash' => $urlHash,
- 'oembed' => $do_oembed,
+ 'oembed' => false,
'url' => $url,
'content' => serialize($data),
'created' => DateTimeFormat::utcNow(),
@@ -167,8 +164,6 @@ class ParseUrl
* \ 
-
+
+
- Friendica Bookmarklet