wnagrodzki/fediplan
1
0
Fork 0
mirror of https://framagit.org/tom79/fediplan.git synced 2025-04-05 21:51:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some issues

Browse source
This commit is contained in:
Thomas 2024-05-10 16:57:17 +02:00
parent 470dc8c714
commit cd6fad2e3b
2 changed files with 38 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/SocialEntity/Status.php
View file

@ -12,9 +12,9 @@ class Status
private string $uri; private string $uri;
private string $url; private string $url;
private MastodonAccount $account; private MastodonAccount $account;
private string $in_reply_to_id; private ?string $in_reply_to_id;
private string $in_reply_to_account_id; private ?string $in_reply_to_account_id;
private string $content; private ?string $content;
private DateTime $created_at; private DateTime $created_at;
private DateTime $scheduled_at; private DateTime $scheduled_at;
/** @var Emoji[] */ /** @var Emoji[] */
@ -26,7 +26,7 @@ class Status
private bool $favourited; private bool $favourited;
private bool $muted; private bool $muted;
private bool $sensitive_; private bool $sensitive_;
private string $spoiler_text; private ?string $spoiler_text;
private string $visibility; private string $visibility;
/** @var Attachment[] */ /** @var Attachment[] */
private array $media_attachments = []; private array $media_attachments = [];
@ -106,15 +106,15 @@ class Status
} }
/** /**
* @return string * @return string|null
*/ */
public function getInReplyToId(): string public function getInReplyToId(): ?string
{ {
return $this->in_reply_to_id; return $this->in_reply_to_id;
} }
/** /**
* @param string $in_reply_to_id * @param mixed $in_reply_to_id
*/ */
public function setInReplyToId(?string $in_reply_to_id): void public function setInReplyToId(?string $in_reply_to_id): void
{ {
@ -130,7 +130,7 @@ class Status
} }
/** /**
* @param string $in_reply_to_account_id * @param mixed $in_reply_to_account_id
*/ */
public function setInReplyToAccountId(?string $in_reply_to_account_id): void public function setInReplyToAccountId(?string $in_reply_to_account_id): void
{ {
@ -138,17 +138,17 @@ class Status
} }
/** /**
* @return string * @return string|null
*/ */
public function getContent(): string public function getContent(): ?string
{ {
return $this->content; return $this->content;
} }
/** /**
* @param string $content * @param mixed $content
*/ */
public function setContent(string $content): void public function setContent(?string $content): void
{ {
$this->content = $content; $this->content = $content;
} }
@ -162,7 +162,7 @@ class Status
} }
/** /**
* @param DateTime $created_at * @param mixed $created_at
*/ */
public function setCreatedAt(?DateTime $created_at): void public function setCreatedAt(?DateTime $created_at): void
{ {
@ -323,7 +323,7 @@ class Status
} }
/** /**
* @param string $spoiler_text * @param mixed $spoiler_text
*/ */
public function setSpoilerText(?string $spoiler_text): void public function setSpoilerText(?string $spoiler_text): void
{ {

26
templates/fediplan/Ajax/layout.html.twig
View file

@ -14,10 +14,27 @@
{% if status.spoilerText is defined %} {% if status.spoilerText is defined %}
<b>{{ status.spoilerText }}</b> <br/> <b>{{ status.spoilerText }}</b> <br/>
{% endif %} {% endif %}
{{ status.content | nl2br }} {% if status.content is not null %}
{{ status.content | nl2br }}
{% endif %}
</p> </p>
</div> </div>
</div> </div>
{% if status.getMediaAttachments() is not null and status.getMediaAttachments() | length > 0%}
<div class="card-horizontal" style=" display: flex;flex: 1 1 auto;">
<div class="img-square-wrapper">
{% for media in status.getMediaAttachments() %}
<img class="" width="150" src="{{ media.url }}"
style=" border-radius: 5%; margin: 5px;"
{% if media.getDescription is not null %}
alt="{{ media.getDescription() }}"
title="{{ media.getDescription() }}"
{% endif %}
/>
{% endfor %}
</div>
</div>
{% endif %}
<div class="card-footer"> <div class="card-footer">
<small class="text-muted"> <small class="text-muted">
{% if status.visibility == "public" %} {% if status.visibility == "public" %}
@ -32,7 +49,12 @@
</small> - {{ status.scheduledAt | date('d/m/y H:i') }} </small> - {{ status.scheduledAt | date('d/m/y H:i') }}
<button class="btn btn-danger small" data-record-id="{{ status.getId() }}" style="position: absolute;right: 5px;bottom: 5px;" <button class="btn btn-danger small" data-record-id="{{ status.getId() }}" style="position: absolute;right: 5px;bottom: 5px;"
data-record-title="{{ status.content }} - {{ status.scheduledAt | date('d/m/y H:m') }}" {% if status.content is not null %}
data-record-title="{{ status.content }} - {{ status.scheduledAt | date('d/m/y H:m') }}"
{% else %}
data-record-title="{{ status.scheduledAt | date('d/m/y H:m') }}"
{% endif %}
data-toggle="modal" data-target="#confirm-delete" data-toggle="modal" data-target="#confirm-delete"
>X</button> >X</button>
</div> </div>