From 80ce3e38bc8eefdd47821c2a45bb4a198f727dd0 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 6 Jul 2022 06:36:00 +0000
Subject: [PATCH] Messages theming and reversing

FossilOrigin-Name: ad9ad08b617e3768defccfdbcd47313e108fd17eada75b46f86e082be87538a6
---
 dist/treebird20.css | 73 ++++++++++++++++++++++++++++++++++++++++-----
 src/conversations.c | 22 +++++++++-----
 static/message.tmpl | 12 +++++---
 3 files changed, 87 insertions(+), 20 deletions(-)

diff --git a/dist/treebird20.css b/dist/treebird20.css
index e1d5d01..b9040ef 100644
--- a/dist/treebird20.css
+++ b/dist/treebird20.css
@@ -1952,9 +1952,29 @@ input[type=checkbox].hidden:not(:checked) + .list-edit-content
 
 /* Chats */
 
-.message-wrapper
+.message-container
 {
     display: block;
+    margin: 10px;
+}
+
+.message-container .avatar
+{
+    display: inline-block;
+    vertical-align: middle;
+    width: 38px;
+    height: 38px;
+    border-radius: 4px;
+    background-position: center center;
+    background-repeat: no-repeat;
+    background-size: cover;
+}
+
+.message-wrapper
+{
+    display: inline-block;
+    vertical-align: middle;
+    max-width: 70%;
 }
 
 .message-wrapper .message
@@ -1963,8 +1983,7 @@ input[type=checkbox].hidden:not(:checked) + .list-edit-content
     display: inline-block;
     background-color: #e8e8e8;
     border-radius: 3px;
-    margin: 7px;
-    margin-left: 12px;
+    margin-left: 8px;
     padding: 10px 14px;
     box-shadow: 0px 1px 6px rgba(0, 0, 0, 0.04);
     color: #000;
@@ -1982,11 +2001,6 @@ input[type=checkbox].hidden:not(:checked) + .list-edit-content
     border-color: transparent #e8e8e8 transparent transparent;
 } 
 
-.message .content
-{
-    
-}
-
 .message .time
 {
     color: #606060;
@@ -1997,6 +2011,49 @@ input[type=checkbox].hidden:not(:checked) + .list-edit-content
     top: 4px;
 }
 
+.message-you .avatar
+{
+    float: right;
+}
+
+.message-you .message .time
+{
+    color: #805050;
+}
+
+.message-you
+{
+    text-align: right;
+}
+
+.message-you .message-wrapper
+{
+    margin-left: 0;
+    margin-right: 12px;
+}
+
+.message-you .message-wrapper .message
+{
+    background: linear-gradient(#ffcccc, #ffbbbb);
+}
+
+.message-you .message-wrapper .message:before {
+    content: unset;
+    display: none;
+}
+
+.message-you .message-wrapper .message:after {
+    content: " ";
+    position: absolute;
+    right: -10px;
+    top: 0;
+    /* margin-left: 10px; */
+    margin-top: 5px;
+    border-width: 5px;
+    border-style: solid;
+    border-color: transparent transparent transparent #ffc7c7;
+}
+
 
 /* Instance information */
 #instance-panel
diff --git a/src/conversations.c b/src/conversations.c
index 6ae47ea..6a36995 100644
--- a/src/conversations.c
+++ b/src/conversations.c
@@ -34,6 +34,7 @@ struct construct_message_args
     struct mstdnt_message* msg;
     struct mstdnt_account* you;
     struct mstdnt_account* them;
+    size_t msg_size; // Read messages backwards
 };
 
 char* construct_chat(struct mstdnt_chat* chat, size_t* size)
@@ -67,9 +68,13 @@ char* construct_message(struct mstdnt_message* msg,
                         size_t* size)
 {
     char* result;
+    if (!(you && them)) return NULL;
+    int is_you = strcmp(you->id, msg->account_id) == 0;
     struct message_template data = {
         .id = msg->id,
-        .content = msg->content
+        .content = msg->content,
+        .is_you = is_you ? "message-you" : NULL,
+        .avatar = is_you ? you->avatar : them->avatar
     };
     result = tmpl_gen_message(&data, size);
     return result;
@@ -78,7 +83,7 @@ char* construct_message(struct mstdnt_message* msg,
 static char* construct_message_voidwrap(void* passed, size_t index, size_t* res)
 {
     struct construct_message_args* args = passed;
-    return construct_message(args->msg + index, args->you, args->them, res);
+    return construct_message(args->msg + (args->msg_size - index - 1), args->you, args->them, res);
 }
 
 char* construct_messages(struct mstdnt_message* messages,
@@ -91,6 +96,7 @@ char* construct_messages(struct mstdnt_message* messages,
         .msg = messages,
         .you = you,
         .them = them,
+        .msg_size = size
     };
     return construct_func_strings(construct_message_voidwrap, &args, size, ret_size);
 }
@@ -156,7 +162,8 @@ void content_chat_view(struct session* ssn, mastodont_t* api, char** data)
     struct mstdnt_message* messages = NULL;
     /* struct mstdnt_account acct; */
     size_t messages_len = 0;
-    struct mstdnt_storage storage = { 0 };
+    struct mstdnt_storage storage = { 0 }, storage_chat = { 0 };
+    struct mstdnt_chat chat;
     struct mstdnt_storage acct_storage = { 0 };
     // char* chats_page = NULL;
     char* messages_html = NULL;
@@ -172,15 +179,14 @@ void content_chat_view(struct session* ssn, mastodont_t* api, char** data)
 
 
     if (mastodont_get_chat_messages(api, &m_args, data[0],
-                                    &args, &storage, &messages, &messages_len))
+                                    &args, &storage, &messages, &messages_len) ||
+        mastodont_get_chat(api, &m_args, data[0],
+                           &storage_chat, &chat))
     {
         messages_html = construct_error(storage.error, E_ERROR, 1, NULL);
     }
     else {
-        // Get other account
-        /* if (messages_len) */
-        /*     mastodont_get_account(api, &m_args, 1, messages[0].account_id */
-        messages_html = construct_messages(messages, &(ssn->acct), NULL, messages_len, NULL);
+        messages_html = construct_messages(messages, &(ssn->acct), &(chat.account), messages_len, NULL);
         if (!messages_html)
             messages_html = construct_error("This is the start of something new...", E_NOTICE, 1, NULL);
         /* messages_html = construct_chats_view(chats_html, NULL); */
diff --git a/static/message.tmpl b/static/message.tmpl
index 07c6fb4..77183f4 100644
--- a/static/message.tmpl
+++ b/static/message.tmpl
@@ -1,6 +1,10 @@
-<div class="message-wrapper">
-  <div class="message" id="{{ %s : id }}">
-    <span class="content">{{ %s : content }}</span>
-    <span class="time">12:00</span>
+<div class="message-container {{ %s : is_you }}">
+  <img src="{{ %s : avatar }}" class="avatar">
+  <div class="message-wrapper">
+    <div class="message" id="{{ %s : id }}">
+      <span class="content">{{ %s : content }}</span>
+      <span class="time">12:00</span>
+    </div>
   </div>
 </div>
+