Merge remote-tracking branch 'upstream/2023.09-rc' into server-discovery

src/Content/Smilies.php

@@ -224,10 +224,10 @@ class Smilies
 			if (strlen($word) < 2) {
 				continue;
 			}
-			$ord1 = ord($word);
+			$ord1 = ord($word[0]);
 			$ord2 = ord($word[1]);
 			// A smiley shortcode must not begin or end with whitespaces.
-			if (ctype_space($ord1) || ctype_space($word[strlen($word) - 1])) {
+			if (ctype_space($word[0]) || ctype_space($word[strlen($word) - 1])) {
 				continue;
 			}
 			$ord1_bitset |= 1 << ($ord1 & 31);

src/Module/Api/Mastodon/Instance.php

@@ -26,6 +26,8 @@ use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\Database;
+use Friendica\Factory\Api\Mastodon\Account as AccountFactory;
+use Friendica\Model\User;
 use Friendica\Module\Api\ApiResponse;
 use Friendica\Module\BaseApi;
 use Friendica\Object\Api\Mastodon\Instance as InstanceEntity;
@@ -46,12 +48,16 @@ class Instance extends BaseApi
 	/** @var IManageConfigValues */
 	private $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, Database $database, IManageConfigValues $config, array $server, array $parameters = [])
+	/** @var AccountFactory */
+	private $accountFactory;
+
+	public function __construct(AccountFactory $accountFactory, \Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, Database $database, IManageConfigValues $config, array $server, array $parameters = [])
 	{
 		parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
 		$this->database = $database;
 		$this->config = $config;
+		$this->accountFactory = $accountFactory;
 	}
 
 	/**
@@ -62,7 +68,13 @@ class Instance extends BaseApi
 	 */
 	protected function rawContent(array $request = [])
 	{
-		$this->jsonExit(new InstanceEntity($this->config, $this->baseUrl, $this->database, System::getRules(), $this->buildConfigurationInfo()));
+		$administrator = User::getFirstAdmin(['nickname']);
+		if ($administrator) {
+			$adminContact = $this->database->selectFirst('contact', ['uri-id'], ['nick' => $administrator['nickname'], 'self' => true]);
+			$contact_account = $this->accountFactory->createFromUriId($adminContact['uri-id']);
+		}
+
+		$this->jsonExit(new InstanceEntity($this->config, $this->baseUrl, $this->database, $this->buildConfigurationInfo(), $contact_account ?? null, System::getRules()));
 	}
 
 	private function buildConfigurationInfo(): InstanceV2Entity\Configuration

src/Object/Api/Mastodon/Instance.php

@@ -27,10 +27,8 @@ use Friendica\BaseDataTransferObject;
 use Friendica\Contact\Header;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Database\Database;
-use Friendica\DI;
 use Friendica\Model\User;
 use Friendica\Module\Register;
-use Friendica\Network\HTTPException;
 use Friendica\Object\Api\Mastodon\InstanceV2\Configuration;
 
 /**
@@ -68,23 +66,14 @@ class Instance extends BaseDataTransferObject
 	protected $approval_required;
 	/** @var bool */
 	protected $invites_enabled;
-	/** @var Account|null */
 	/** @var Configuration  */
 	protected $configuration;
+	/** @var Account|null */
 	protected $contact_account = null;
 	/** @var array */
 	protected $rules = [];
 
-	/**
+	public function __construct(IManageConfigValues $config, BaseURL $baseUrl, Database $database, Configuration $configuration, ?Account $contact_account, array $rules)
-	 * @param IManageConfigValues $config
-	 * @param BaseURL             $baseUrl
-	 * @param Database            $database
-	 * @param array               $rules
-	 * @throws HTTPException\InternalServerErrorException
-	 * @throws HTTPException\NotFoundException
-	 * @throws \ImagickException
-	 */
-	public function __construct(IManageConfigValues $config, BaseURL $baseUrl, Database $database, array $rules = [], Configuration $configuration)
 	{
 		$register_policy = intval($config->get('config', 'register_policy'));
 
@@ -102,13 +91,7 @@ class Instance extends BaseDataTransferObject
 		$this->approval_required = ($register_policy == Register::APPROVE);
 		$this->invites_enabled   = false;
 		$this->configuration     = $configuration;
-		$this->contact_account   = [];
+		$this->contact_account   = $contact_account ?? [];
 		$this->rules             = $rules;
-
-		$administrator = User::getFirstAdmin(['nickname']);
-		if ($administrator) {
-			$adminContact = $database->selectFirst('contact', ['uri-id'], ['nick' => $administrator['nickname'], 'self' => true]);
-			$this->contact_account = DI::mstdnAccount()->createFromUriId($adminContact['uri-id']);
-		}
 	}
 }

src/Protocol/ActivityPub/Processor.php

@@ -1725,7 +1725,7 @@ class Processor
 		$tags = Receiver::processTags(JsonLD::fetchElementArray($activity['as:object'], 'as:tag') ?? []);
 		if (!empty($tags)) {
 			foreach ($tags as $tag) {
-				if (($tag['type'] != 'Hashtag') && !strpos($tag['type'], ':Hashtag')) {
+				if (($tag['type'] != 'Hashtag') && !strpos($tag['type'], ':Hashtag') || empty($tag['name'])) {
 					continue;
 				}
 				$messageTags[] = ltrim(mb_strtolower($tag['name']), '#');

view/templates/field_select.tpl

@@ -4,7 +4,7 @@
 		<select name="{{$field.0}}" id="id_{{$field.0}}" aria-describedby="{{$field.0}}_tip" {{$field.5 nofilter}}>
 	{{foreach $field.4 as $opt => $val}}
 		{{if $field.5 == 'multiple'}}
-			<option value="{{$opt}}" dir="auto"{{if $opt|in_array:$field.2}} selected="selected"{{/if}}>{{$val}}</option>
+			<option value="{{$opt}}" dir="auto"{{if in_array($opt, $field.2)}} selected="selected"{{/if}}>{{$val}}</option>
 		{{else}}
 			<option value="{{$opt}}" dir="auto"{{if $opt == $field.2}} selected="selected"{{/if}}>{{$val}}</option>
 		{{/if}}

view/theme/frio/templates/field_select.tpl

@@ -4,7 +4,7 @@
 		<select name="{{$field.0}}" id="id_{{$field.0}}" class="form-control" aria-describedby="{{$field.0}}_tip" {{$field.5 nofilter}}>
 	{{foreach $field.4 as $opt => $val}}
 		{{if $field.5 == 'multiple'}}
-			<option value="{{$opt}}" {{if $opt|in_array:$field.2}}selected="selected"{{/if}}>{{$val}}</option>
+			<option value="{{$opt}}" {{if in_array($opt, $field.2)}}selected="selected"{{/if}}>{{$val}}</option>
 		{{else}}
 			<option value="{{$opt}}" {{if $opt == $field.2}}selected="selected"{{/if}}>{{$val}}</option>
 		{{/if}}