Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enh #188: Add "Like" to message entries #391

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Changelog
=========

3.2.4 (Unreleased)
--------------------
- Enh #188: Add "Like" to message entries

3.2.3 (Unreleased)
--------------------
- Enh #411: Standardization of Modal Button Positions
Expand Down
2 changes: 1 addition & 1 deletion models/AbstractMessageEntry.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* @property int $id
* @property int $message_id
* @property int $user_id
* @property string $content
* @property string|null $content
* @property int $type
* @property string $created_at
* @property int $created_by
Expand Down
31 changes: 30 additions & 1 deletion models/MessageEntry.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,22 @@

use DateTime;
use humhub\interfaces\ViewableInterface;
use humhub\modules\content\widgets\richtext\AbstractRichText;
use humhub\modules\content\widgets\richtext\converter\RichTextToEmailHtmlConverter;
use humhub\modules\content\widgets\richtext\RichText;
use humhub\modules\like\interfaces\LikeNotificationInterface;
use humhub\modules\mail\helpers\Url;
use humhub\modules\user\models\User;
use Yii;
use yii\base\InvalidConfigException;

/**
* This class represents a message text within a conversation.
*
* @package humhub.modules.mail.models
* @since 0.5
*/
class MessageEntry extends AbstractMessageEntry implements ViewableInterface
class MessageEntry extends AbstractMessageEntry implements ViewableInterface, LikeNotificationInterface
{
/**
* @inheritdoc
Expand Down Expand Up @@ -72,4 +78,27 @@ public function canView($user = null): bool

return $message instanceof Message && $message->isParticipant($user);
}

/**
* @inerhitdoc
* @throws InvalidConfigException
*/
public function getLikeNotificationPlainTextPreview(): string
{
return Yii::t('MailModule.base', 'Message') . ' ' . RichText::convert($this->content, AbstractRichText::FORMAT_SHORTTEXT);
}

/**
* @inerhitdoc
* @throws InvalidConfigException
*/
public function getLikeNotificationHtmlPreview(): string
{
return RichTextToEmailHtmlConverter::process($this->content);
}

public function getLikeNotificationUrl(bool $scheme = false): string
{
return Url::toMessenger($this->message, $scheme);
}
}
2 changes: 1 addition & 1 deletion module.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
],
"version": "3.2.3",
"humhub": {
"minVersion": "1.16"
"minVersion": "1.17"
},
"homepage": "https://github.com/humhub/mail",
"authors": [
Expand Down
2 changes: 1 addition & 1 deletion resources/js/humhub.mail.notification.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 40 additions & 0 deletions widgets/ConversationEntryLinks.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?php
/**
* @link https://www.humhub.org/
* @copyright Copyright (c) 2023 HumHub GmbH & Co. KG
* @license https://www.humhub.com/licences
*/

namespace humhub\modules\mail\widgets;

use humhub\modules\like\widgets\LikeLink;
use humhub\modules\mail\models\MessageEntry;
use humhub\widgets\BaseStack;

class ConversationEntryLinks extends BaseStack
{
/**
* @var MessageEntry
*/
public $object = null;

/**
* @inheritdoc
*/
public $seperator = '&nbsp;&middot;&nbsp;';

/**
* @inheritdoc
*/
public function init()
{
$this->initDefaultWidgets();
parent::init();
}

public function initDefaultWidgets()
{
$this->addWidget(LikeLink::class, ['object' => $this->object], ['sortOrder' => 200]);
}

}
9 changes: 5 additions & 4 deletions widgets/views/conversationEntry.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use humhub\modules\file\widgets\ShowFiles;
use humhub\modules\mail\models\MessageEntry;
use humhub\modules\mail\widgets\ConversationDateBadge;
use humhub\modules\mail\widgets\ConversationEntryMenu;
use humhub\modules\mail\widgets\ConversationEntryLinks;
use humhub\modules\mail\widgets\MessageEntryTime;
use humhub\modules\ui\view\components\View;
use humhub\modules\user\widgets\Image;
Expand Down Expand Up @@ -44,10 +44,11 @@
<?= RichText::output($entry->content) ?>
<?= ShowFiles::widget(['object' => $entry]) ?>
</div>
<?= MessageEntryTime::widget(['entry' => $entry]) ?>
<div class="conversation-entry-controls wall-entry-controls">
<?= ConversationEntryLinks::widget(['object' => $entry]) ?>
<?= MessageEntryTime::widget(['entry' => $entry]) ?>
</div>
</div>

<?= ConversationEntryMenu::widget(['entry' => $entry]) ?>
</div>

<?= Html::endTag('div') ?>
Loading