diff --git a/assets/css/frontend.less b/assets/css/frontend.less
index 8b5a43c..bea24cb 100644
--- a/assets/css/frontend.less
+++ b/assets/css/frontend.less
@@ -16,7 +16,7 @@
}
&--view-block &__date,
- &__sender {
+ &--view-block &__sender {
&:not(:last-child) {
margin-right: 0.5rem;
}
diff --git a/assets/css/frontend.min.css b/assets/css/frontend.min.css
index 33566b0..981f205 100644
--- a/assets/css/frontend.min.css
+++ b/assets/css/frontend.min.css
@@ -1 +1 @@
-.hp-message--view-block .hp-message__header:not(:last-child),.hp-message--view-block .hp-message__listing:not(:last-child){margin-bottom:.5rem}.hp-message--view-block .hp-message__details{display:flex;align-items:center}.hp-message--view-block .hp-message__date:not(:last-child),.hp-message__sender:not(:last-child){margin-right:.5rem}.hp-message--view-block .hp-message__date{font-size:80%}.hp-message__text p{margin-bottom:.5rem}.hp-message__text p:last-child{margin-bottom:0}
+.hp-message--view-block .hp-message__header:not(:last-child),.hp-message--view-block .hp-message__listing:not(:last-child){margin-bottom:.5rem}.hp-message--view-block .hp-message__details{display:flex;align-items:center}.hp-message--view-block .hp-message__date:not(:last-child),.hp-message--view-block .hp-message__sender:not(:last-child){margin-right:.5rem}.hp-message--view-block .hp-message__date{font-size:80%}.hp-message__text p{margin-bottom:.5rem}.hp-message__text p:last-child{margin-bottom:0}
diff --git a/hivepress-messages.php b/hivepress-messages.php
index 6949493..2061204 100644
--- a/hivepress-messages.php
+++ b/hivepress-messages.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: HivePress Messages
* Description: Private messages extension for HivePress plugin.
- * Version: 1.1.0
+ * Version: 1.1.1
* Author: HivePress
* Author URI: https://hivepress.io/
* Text Domain: hivepress-messages
diff --git a/includes/blocks/class-messages.php b/includes/blocks/class-messages.php
index 57ae7bb..27a9ee3 100644
--- a/includes/blocks/class-messages.php
+++ b/includes/blocks/class-messages.php
@@ -45,7 +45,7 @@ public function render() {
// Get messages.
$messages = [];
- if ( 'select' === $this->template ) {
+ if ( 'thread' === $this->template ) {
$all_messages = wp_list_sort(
array_merge(
get_comments(
@@ -108,7 +108,7 @@ public function render() {
// Render messages.
if ( ! empty( $messages ) ) {
- if ( 'select' === $this->template ) {
+ if ( 'thread' === $this->template ) {
$output .= '
';
} else {
$output .= '';
@@ -120,7 +120,7 @@ public function render() {
$message = Models\Message::get( $message_args->comment_ID );
if ( ! is_null( $message ) ) {
- if ( 'select' === $this->template ) {
+ if ( 'thread' === $this->template ) {
// Set sender.
if ( $message->get_sender_id() === get_current_user_id() ) {
@@ -147,13 +147,13 @@ public function render() {
]
) )->render();
- if ( 'select' !== $this->template ) {
+ if ( 'thread' !== $this->template ) {
$output .= '
';
}
}
}
- if ( 'select' === $this->template ) {
+ if ( 'thread' === $this->template ) {
$output .= '
';
} else {
$output .= '';
diff --git a/includes/components/class-message.php b/includes/components/class-message.php
index 2d241e3..26efe74 100644
--- a/includes/components/class-message.php
+++ b/includes/components/class-message.php
@@ -27,7 +27,16 @@ public function __construct() {
// Delete messages.
add_action( 'delete_user', [ $this, 'delete_messages' ] );
- if ( ! is_admin() ) {
+ if ( is_admin() ) {
+
+ // Hide messages.
+ add_filter( 'comments_clauses', [ $this, 'hide_messages' ] );
+ } else {
+
+ // Alter templates.
+ add_filter( 'hivepress/v1/templates/listing_view_block', [ $this, 'alter_listing_view_block' ] );
+ add_filter( 'hivepress/v1/templates/listing_view_page', [ $this, 'alter_listing_view_page' ] );
+ add_filter( 'hivepress/v1/templates/vendor_view_page', [ $this, 'alter_vendor_view_page' ] );
// Set page title.
add_filter( 'hivepress/v1/controllers/message/routes/view_messages', [ $this, 'set_page_title' ] );
@@ -49,14 +58,14 @@ public function delete_messages( $user_id ) {
get_comments(
[
'type' => 'hp_message',
- 'user_id' => get_current_user_id(),
+ 'user_id' => $user_id,
'fields' => 'ids',
]
),
get_comments(
[
'type' => 'hp_message',
- 'karma' => get_current_user_id(),
+ 'karma' => $user_id,
'fields' => 'ids',
]
)
@@ -68,6 +77,149 @@ public function delete_messages( $user_id ) {
}
}
+ /**
+ * Hides messages.
+ *
+ * @param array $query Query arguments.
+ * @return array
+ */
+ public function hide_messages( $query ) {
+ global $pagenow;
+
+ if ( in_array( $pagenow, [ 'index.php', 'edit-comments.php' ], true ) ) {
+ $query['where'] .= ' AND comment_type != "hp_message"';
+ }
+
+ return $query;
+ }
+
+ /**
+ * Alters listing view block.
+ *
+ * @param array $template Template arguments.
+ * @return array
+ */
+ public function alter_listing_view_block( $template ) {
+ return hp\merge_trees(
+ $template,
+ [
+ 'blocks' => [
+ 'listing_actions_primary' => [
+ 'blocks' => [
+ 'message_send_modal' => [
+ 'type' => 'modal',
+ 'model' => 'listing',
+ 'caption' => esc_html__( 'Reply to Listing', 'hivepress-messages' ),
+
+ 'blocks' => [
+ 'message_send_form' => [
+ 'type' => 'message_send_form',
+ 'order' => 10,
+
+ 'attributes' => [
+ 'class' => [ 'hp-form--narrow' ],
+ ],
+ ],
+ ],
+ ],
+
+ 'message_send_link' => [
+ 'type' => 'element',
+ 'filepath' => 'listing/view/block/message-send-link',
+ 'order' => 10,
+ ],
+ ],
+ ],
+ ],
+ ],
+ 'blocks'
+ );
+ }
+
+ /**
+ * Alters listing view page.
+ *
+ * @param array $template Template arguments.
+ * @return array
+ */
+ public function alter_listing_view_page( $template ) {
+ return hp\merge_trees(
+ $template,
+ [
+ 'blocks' => [
+ 'listing_actions_primary' => [
+ 'blocks' => [
+ 'message_send_modal' => [
+ 'type' => 'modal',
+ 'caption' => esc_html__( 'Reply to Listing', 'hivepress-messages' ),
+
+ 'blocks' => [
+ 'message_send_form' => [
+ 'type' => 'message_send_form',
+ 'order' => 10,
+
+ 'attributes' => [
+ 'class' => [ 'hp-form--narrow' ],
+ ],
+ ],
+ ],
+ ],
+
+ 'message_send_button' => [
+ 'type' => 'element',
+ 'filepath' => 'listing/view/page/message-send-link',
+ 'order' => 10,
+ ],
+ ],
+ ],
+ ],
+ ],
+ 'blocks'
+ );
+ }
+
+ /**
+ * Alters vendor view page.
+ *
+ * @param array $template Template arguments.
+ * @return array
+ */
+ public function alter_vendor_view_page( $template ) {
+ return hp\merge_trees(
+ $template,
+ [
+ 'blocks' => [
+ 'vendor_actions_primary' => [
+ 'blocks' => [
+ 'message_send_modal' => [
+ 'type' => 'modal',
+ 'caption' => esc_html__( 'Send Message', 'hivepress-messages' ),
+
+ 'blocks' => [
+ 'message_send_form' => [
+ 'type' => 'message_send_form',
+ 'order' => 10,
+
+ 'attributes' => [
+ 'class' => [ 'hp-form--narrow' ],
+ ],
+ ],
+ ],
+ ],
+
+ 'message_send_button' => [
+ 'type' => 'element',
+ 'filepath' => 'vendor/view/page/message-send-link',
+ 'order' => 10,
+ ],
+ ],
+ ],
+ ],
+ ],
+ 'blocks'
+ );
+ }
+
/**
* Sets page title.
*
@@ -115,8 +267,8 @@ public function add_menu_items( $menu ) {
if ( ! empty( $message_ids ) ) {
// Add menu item.
- $menu['items']['select_messages'] = [
- 'route' => 'message/select_messages',
+ $menu['items']['thread_messages'] = [
+ 'route' => 'message/thread_messages',
'order' => 30,
];
}
diff --git a/includes/configs/templates/listing-view-block.php b/includes/configs/templates/listing-view-block.php
deleted file mode 100644
index d6bacea..0000000
--- a/includes/configs/templates/listing-view-block.php
+++ /dev/null
@@ -1,50 +0,0 @@
- [
- 'listing_container' => [
- 'blocks' => [
- 'listing_footer' => [
- 'blocks' => [
- 'listing_actions_primary' => [
- 'blocks' => [
- 'message_send_modal' => [
- 'type' => 'modal',
- 'model' => 'listing',
- 'caption' => esc_html__( 'Send Message', 'hivepress-messages' ),
-
- 'blocks' => [
- 'message_send_form' => [
- 'type' => 'message_send_form',
- 'order' => 10,
-
- 'attributes' => [
- 'class' => [ 'hp-form--narrow' ],
- ],
- ],
- ],
- ],
-
- 'message_send_link' => [
- 'type' => 'element',
- 'filepath' => 'message/send/send-link',
- 'order' => 10,
- ],
- ],
- ],
- ],
- ],
- ],
- ],
- ],
-];
diff --git a/includes/configs/templates/listing-view-page.php b/includes/configs/templates/listing-view-page.php
deleted file mode 100644
index 3a48c71..0000000
--- a/includes/configs/templates/listing-view-page.php
+++ /dev/null
@@ -1,53 +0,0 @@
- [
- 'page_container' => [
- 'blocks' => [
- 'page_columns' => [
- 'blocks' => [
- 'page_sidebar' => [
- 'blocks' => [
- 'listing_actions_primary' => [
- 'blocks' => [
- 'message_send_modal' => [
- 'type' => 'modal',
- 'caption' => esc_html__( 'Send Message', 'hivepress-messages' ),
-
- 'blocks' => [
- 'message_send_form' => [
- 'type' => 'message_send_form',
- 'order' => 10,
-
- 'attributes' => [
- 'class' => [ 'hp-form--narrow' ],
- ],
- ],
- ],
- ],
-
- 'message_send_button' => [
- 'type' => 'element',
- 'filepath' => 'message/send/send-button',
- 'order' => 10,
- ],
- ],
- ],
- ],
- ],
- ],
- ],
- ],
- ],
- ],
-];
diff --git a/includes/configs/templates/message-select-block.php b/includes/configs/templates/message-select-block.php
deleted file mode 100644
index c6adbcc..0000000
--- a/includes/configs/templates/message-select-block.php
+++ /dev/null
@@ -1,45 +0,0 @@
- [
- 'message_container' => [
- 'type' => 'container',
- 'tag' => 'tr',
- 'order' => 10,
-
- 'attributes' => [
- 'class' => [ 'hp-message', 'hp-message--select-block' ],
- ],
-
- 'blocks' => [
- 'message_sender' => [
- 'type' => 'element',
- 'filepath' => 'message/select/sender',
- 'order' => 10,
- ],
-
- 'message_listing' => [
- 'type' => 'element',
- 'filepath' => 'message/select/listing',
- 'order' => 20,
- ],
-
- 'message_date' => [
- 'type' => 'element',
- 'filepath' => 'message/select/date',
- 'order' => 30,
- ],
- ],
- ],
- ],
-];
diff --git a/includes/configs/templates/message-view-block.php b/includes/configs/templates/message-view-block.php
deleted file mode 100644
index e51c748..0000000
--- a/includes/configs/templates/message-view-block.php
+++ /dev/null
@@ -1,84 +0,0 @@
- [
- 'message_container' => [
- 'type' => 'container',
- 'order' => 10,
-
- 'attributes' => [
- 'class' => [ 'hp-message', 'hp-message--view-block' ],
- ],
-
- 'blocks' => [
- 'message_header' => [
- 'type' => 'container',
- 'tag' => 'header',
- 'order' => 10,
-
- 'attributes' => [
- 'class' => [ 'hp-message__header' ],
- ],
-
- 'blocks' => [
- 'message_listing' => [
- 'type' => 'element',
- 'filepath' => 'message/view/listing',
- 'order' => 10,
- ],
-
- 'message_details' => [
- 'type' => 'container',
- 'order' => 20,
-
- 'attributes' => [
- 'class' => [ 'hp-message__details' ],
- ],
-
- 'blocks' => [
- 'message_sender' => [
- 'type' => 'element',
- 'filepath' => 'message/view/sender',
- 'order' => 10,
- ],
-
- 'message_date' => [
- 'type' => 'element',
- 'filepath' => 'message/view/date',
- 'order' => 20,
- ],
- ],
- ],
- ],
- ],
-
- 'message_content' => [
- 'type' => 'container',
- 'order' => 20,
-
- 'attributes' => [
- 'class' => [ 'hp-message__content' ],
- ],
-
- 'blocks' => [
- 'message_text' => [
- 'type' => 'element',
- 'filepath' => 'message/view/text',
- 'order' => 10,
- ],
- ],
- ],
- ],
- ],
- ],
-];
diff --git a/includes/configs/templates/messages-select-page.php b/includes/configs/templates/messages-select-page.php
deleted file mode 100644
index 7951866..0000000
--- a/includes/configs/templates/messages-select-page.php
+++ /dev/null
@@ -1,27 +0,0 @@
- 'account_page',
-
- 'blocks' => [
- 'page_content' => [
- 'blocks' => [
- 'messages' => [
- 'type' => 'messages',
- 'template' => 'select',
- 'order' => 10,
- ],
- ],
- ],
- ],
-];
diff --git a/includes/configs/templates/messages-view-page.php b/includes/configs/templates/messages-view-page.php
deleted file mode 100644
index e864dc8..0000000
--- a/includes/configs/templates/messages-view-page.php
+++ /dev/null
@@ -1,31 +0,0 @@
- 'account_page',
-
- 'blocks' => [
- 'page_content' => [
- 'blocks' => [
- 'messages' => [
- 'type' => 'messages',
- 'order' => 10,
- ],
-
- 'message_send_form' => [
- 'type' => 'message_send_form',
- 'order' => 20,
- ],
- ],
- ],
- ],
-];
diff --git a/includes/configs/templates/vendor-view-page.php b/includes/configs/templates/vendor-view-page.php
deleted file mode 100644
index ea8aa0a..0000000
--- a/includes/configs/templates/vendor-view-page.php
+++ /dev/null
@@ -1,53 +0,0 @@
- [
- 'page_container' => [
- 'blocks' => [
- 'page_columns' => [
- 'blocks' => [
- 'page_sidebar' => [
- 'blocks' => [
- 'vendor_actions_primary' => [
- 'blocks' => [
- 'message_send_modal' => [
- 'type' => 'modal',
- 'caption' => esc_html__( 'Send Message', 'hivepress-messages' ),
-
- 'blocks' => [
- 'message_send_form' => [
- 'type' => 'message_send_form',
- 'order' => 10,
-
- 'attributes' => [
- 'class' => [ 'hp-form--narrow' ],
- ],
- ],
- ],
- ],
-
- 'message_send_button' => [
- 'type' => 'element',
- 'filepath' => 'message/send/send-button',
- 'order' => 10,
- ],
- ],
- ],
- ],
- ],
- ],
- ],
- ],
- ],
- ],
-];
diff --git a/includes/controllers/class-message.php b/includes/controllers/class-message.php
index 9b4fa2f..e57a974 100644
--- a/includes/controllers/class-message.php
+++ b/includes/controllers/class-message.php
@@ -58,11 +58,11 @@ public static function init( $args = [] ) {
],
],
- 'select_messages' => [
+ 'thread_messages' => [
'title' => esc_html__( 'My Messages', 'hivepress-messages' ),
'path' => '/account/messages',
- 'redirect' => 'redirect_messages_select_page',
- 'action' => 'render_messages_select_page',
+ 'redirect' => 'redirect_messages_thread_page',
+ 'action' => 'render_messages_thread_page',
],
'view_messages' => [
@@ -174,11 +174,11 @@ public function send_message( $request ) {
}
/**
- * Redirects messages select page.
+ * Redirects messages thread page.
*
* @return mixed
*/
- public function redirect_messages_select_page() {
+ public function redirect_messages_thread_page() {
// Check authentication.
if ( ! is_user_logged_in() ) {
@@ -211,12 +211,12 @@ public function redirect_messages_select_page() {
}
/**
- * Renders messages select page.
+ * Renders messages thread page.
*
* @return string
*/
- public function render_messages_select_page() {
- return ( new Blocks\Template( [ 'template' => 'messages_select_page' ] ) )->render();
+ public function render_messages_thread_page() {
+ return ( new Blocks\Template( [ 'template' => 'messages_thread_page' ] ) )->render();
}
/**
diff --git a/includes/forms/class-message-send.php b/includes/forms/class-message-send.php
index 2d904db..fb2f96e 100644
--- a/includes/forms/class-message-send.php
+++ b/includes/forms/class-message-send.php
@@ -91,7 +91,7 @@ public static function init( $args = [] ) {
$args = hp\merge_arrays(
[
'title' => esc_html__( 'Send Message', 'hivepress-messages' ),
- 'message' => esc_html__( 'Message has been sent', 'hivepress-messages' ),
+ 'message' => esc_html__( 'Your message has been sent', 'hivepress-messages' ),
'model' => 'message',
'action' => hp\get_rest_url( '/messages' ),
diff --git a/includes/templates/class-message-thread-block.php b/includes/templates/class-message-thread-block.php
new file mode 100644
index 0000000..a3aa1c6
--- /dev/null
+++ b/includes/templates/class-message-thread-block.php
@@ -0,0 +1,82 @@
+ [
+ 'message_container' => [
+ 'type' => 'container',
+ 'tag' => 'tr',
+ 'order' => 10,
+
+ 'attributes' => [
+ 'class' => [ 'hp-message', 'hp-message--thread-block' ],
+ ],
+
+ 'blocks' => [
+ 'message_sender' => [
+ 'type' => 'element',
+ 'filepath' => 'message/thread/message-sender',
+ 'order' => 10,
+ ],
+
+ 'message_listing' => [
+ 'type' => 'element',
+ 'filepath' => 'message/thread/message-listing',
+ 'order' => 20,
+ ],
+
+ 'message_date' => [
+ 'type' => 'element',
+ 'filepath' => 'message/thread/message-date',
+ 'order' => 30,
+ ],
+ ],
+ ],
+ ],
+ ],
+ $args,
+ 'blocks'
+ );
+
+ parent::init( $args );
+ }
+}
diff --git a/includes/templates/class-message-view-block.php b/includes/templates/class-message-view-block.php
new file mode 100644
index 0000000..95a15a0
--- /dev/null
+++ b/includes/templates/class-message-view-block.php
@@ -0,0 +1,121 @@
+ [
+ 'message_container' => [
+ 'type' => 'container',
+ 'order' => 10,
+
+ 'attributes' => [
+ 'class' => [ 'hp-message', 'hp-message--view-block' ],
+ ],
+
+ 'blocks' => [
+ 'message_header' => [
+ 'type' => 'container',
+ 'tag' => 'header',
+ 'order' => 10,
+
+ 'attributes' => [
+ 'class' => [ 'hp-message__header' ],
+ ],
+
+ 'blocks' => [
+ 'message_listing' => [
+ 'type' => 'element',
+ 'filepath' => 'message/view/message-listing',
+ 'order' => 10,
+ ],
+
+ 'message_details' => [
+ 'type' => 'container',
+ 'order' => 20,
+
+ 'attributes' => [
+ 'class' => [ 'hp-message__details' ],
+ ],
+
+ 'blocks' => [
+ 'message_sender' => [
+ 'type' => 'element',
+ 'filepath' => 'message/view/message-sender',
+ 'order' => 10,
+ ],
+
+ 'message_date' => [
+ 'type' => 'element',
+ 'filepath' => 'message/view/message-date',
+ 'order' => 20,
+ ],
+ ],
+ ],
+ ],
+ ],
+
+ 'message_content' => [
+ 'type' => 'container',
+ 'order' => 20,
+
+ 'attributes' => [
+ 'class' => [ 'hp-message__content' ],
+ ],
+
+ 'blocks' => [
+ 'message_text' => [
+ 'type' => 'element',
+ 'filepath' => 'message/view/message-text',
+ 'order' => 10,
+ ],
+ ],
+ ],
+ ],
+ ],
+ ],
+ ],
+ $args,
+ 'blocks'
+ );
+
+ parent::init( $args );
+ }
+}
diff --git a/includes/templates/class-messages-thread-page.php b/includes/templates/class-messages-thread-page.php
new file mode 100644
index 0000000..d098c8d
--- /dev/null
+++ b/includes/templates/class-messages-thread-page.php
@@ -0,0 +1,62 @@
+ [
+ 'page_content' => [
+ 'blocks' => [
+ 'messages' => [
+ 'type' => 'messages',
+ 'template' => 'thread',
+ 'order' => 10,
+ ],
+ ],
+ ],
+ ],
+ ],
+ $args,
+ 'blocks'
+ );
+
+ parent::init( $args );
+ }
+}
diff --git a/includes/templates/class-messages-view-page.php b/includes/templates/class-messages-view-page.php
new file mode 100644
index 0000000..415d65d
--- /dev/null
+++ b/includes/templates/class-messages-view-page.php
@@ -0,0 +1,66 @@
+ [
+ 'page_content' => [
+ 'blocks' => [
+ 'messages' => [
+ 'type' => 'messages',
+ 'order' => 10,
+ ],
+
+ 'message_send_form' => [
+ 'type' => 'message_send_form',
+ 'order' => 20,
+ ],
+ ],
+ ],
+ ],
+ ],
+ $args,
+ 'blocks'
+ );
+
+ parent::init( $args );
+ }
+}
diff --git a/languages/hivepress-messages.pot b/languages/hivepress-messages.pot
index f614128..7a336b5 100644
--- a/languages/hivepress-messages.pot
+++ b/languages/hivepress-messages.pot
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: HivePress Messages\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-06-01 17:53+0000\n"
+"POT-Creation-Date: 2019-06-06 18:10+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: \n"
@@ -15,7 +15,21 @@ msgstr ""
"X-Generator: Loco https://localise.biz/\n"
"X-Loco-Version: 2.2.2; wp-5.2"
-#: includes/components/class-message.php:81
+#: includes/components/class-message.php:92
+#: includes/components/class-message.php:134
+#: templates/listing/view/block/message-send-link.php:5
+#: templates/listing/view/page/message-send-link.php:5
+msgid "Reply to Listing"
+msgstr ""
+
+#: includes/components/class-message.php:176
+#: includes/forms/class-message-send.php:93
+#: includes/forms/class-message-send.php:113
+#: templates/vendor/view/page/message-send-link.php:5
+msgid "Send Message"
+msgstr ""
+
+#: includes/components/class-message.php:213
#, php-format
msgid "Messages from %s"
msgstr ""
@@ -45,18 +59,8 @@ msgstr ""
msgid "You can't send messages to yourself"
msgstr ""
-#: includes/forms/class-message-send.php:93
-#: includes/forms/class-message-send.php:113
-#: includes/configs/templates/listing-view-block.php:24
-#: includes/configs/templates/listing-view-page.php:25
-#: includes/configs/templates/vendor-view-page.php:25
-#: templates/message/send/send-button.php:5
-#: templates/message/send/send-link.php:5
-msgid "Send Message"
-msgstr ""
-
#: includes/forms/class-message-send.php:94
-msgid "Message has been sent"
+msgid "Your message has been sent"
msgstr ""
#: includes/models/class-message.php:53
diff --git a/readme.txt b/readme.txt
index 81b9885..abeaa85 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Tags: hivepress, messages, directory, listings, classifieds
Requires at least: 4.7
Tested up to: 5.2.1
Requires PHP: 5.6
-Stable tag: 1.1.0
+Stable tag: 1.1.1
License: GPLv3
License URI: https://www.gnu.org/licenses/gpl-3.0.html
diff --git a/templates/listing/view/block/message-send-link.php b/templates/listing/view/block/message-send-link.php
new file mode 100644
index 0000000..4fcbdd4
--- /dev/null
+++ b/templates/listing/view/block/message-send-link.php
@@ -0,0 +1,5 @@
+
+
diff --git a/templates/listing/view/page/message-send-link.php b/templates/listing/view/page/message-send-link.php
new file mode 100644
index 0000000..b037e1d
--- /dev/null
+++ b/templates/listing/view/page/message-send-link.php
@@ -0,0 +1,5 @@
+
+
diff --git a/templates/message/send/send-button.php b/templates/message/send/send-button.php
deleted file mode 100644
index 70a2b9b..0000000
--- a/templates/message/send/send-button.php
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
diff --git a/templates/message/send/send-link.php b/templates/message/send/send-link.php
deleted file mode 100644
index 863498b..0000000
--- a/templates/message/send/send-link.php
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
diff --git a/templates/message/select/date.php b/templates/message/thread/message-date.php
similarity index 100%
rename from templates/message/select/date.php
rename to templates/message/thread/message-date.php
diff --git a/templates/message/select/listing.php b/templates/message/thread/message-listing.php
similarity index 100%
rename from templates/message/select/listing.php
rename to templates/message/thread/message-listing.php
diff --git a/templates/message/select/sender.php b/templates/message/thread/message-sender.php
similarity index 100%
rename from templates/message/select/sender.php
rename to templates/message/thread/message-sender.php
diff --git a/templates/message/view/date.php b/templates/message/view/message-date.php
similarity index 100%
rename from templates/message/view/date.php
rename to templates/message/view/message-date.php
diff --git a/templates/message/view/listing.php b/templates/message/view/message-listing.php
similarity index 100%
rename from templates/message/view/listing.php
rename to templates/message/view/message-listing.php
diff --git a/templates/message/view/sender.php b/templates/message/view/message-sender.php
similarity index 100%
rename from templates/message/view/sender.php
rename to templates/message/view/message-sender.php
diff --git a/templates/message/view/text.php b/templates/message/view/message-text.php
similarity index 100%
rename from templates/message/view/text.php
rename to templates/message/view/message-text.php
diff --git a/templates/vendor/view/page/message-send-link.php b/templates/vendor/view/page/message-send-link.php
new file mode 100644
index 0000000..2144903
--- /dev/null
+++ b/templates/vendor/view/page/message-send-link.php
@@ -0,0 +1,5 @@
+
+