From 5cfbc17d76198db618712b0ba1434d157145c3e0 Mon Sep 17 00:00:00 2001
From: Sebastian Kippe <sebastian@kip.pe>
Date: Sun, 29 Aug 2021 17:12:51 +0200
Subject: [PATCH 1/6] Port some message-chat styles to Tailwind

refs #222
---
 app/components/message-chat/template.hbs | 11 ++++++-----
 app/styles/components/message-chat.scss  | 25 ------------------------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/app/components/message-chat/template.hbs b/app/components/message-chat/template.hbs
index d09964e7..5ba41c0b 100644
--- a/app/components/message-chat/template.hbs
+++ b/app/components/message-chat/template.hbs
@@ -1,11 +1,12 @@
-<div class="chat-message">
-  <span class="chat-message__username"
-        data-username={{@message.nickname}}
-        onclick={{fn this.usernameClick @message.nickname}}>
+<div class="chat-message break-words">
+  <span data-username={{@message.nickname}}
+        onclick={{fn this.usernameClick @message.nickname}}
+        class="mr-1 font-bold" >
     {{@message.nickname}}:
   </span>
 
-  <time class="chat-message__date" datetime={{this.datetime}} title={{this.dateTitle}}>
+  <time datetime={{this.datetime}} title={{this.dateTitle}}
+        class="block float-right text-sm text-gray-300" >
     {{moment-format @message.date "HH:mm"}}
   </time>
 
diff --git a/app/styles/components/message-chat.scss b/app/styles/components/message-chat.scss
index 0f7854b8..1e6d2a02 100644
--- a/app/styles/components/message-chat.scss
+++ b/app/styles/components/message-chat.scss
@@ -42,31 +42,6 @@
     font-style: italic;
   }
 
-  &__date {
-    display: block;
-    float: right;
-    font-size: 12px;
-    color: #ccc;
-  }
-
-  &__username {
-    margin-right: 0.2em;
-    font-weight: bold;
-
-    // &[data-username=raucao] {
-    //   background: url(/img/avatar-sk.png) 0 2px no-repeat;
-    // }
-    // &[data-username=silverbucket] {
-    //   background: url(/img/avatar-sb.png) 0 2px no-repeat;
-    // }
-    // &[data-username=galfert] {
-    //   background: url(/img/avatar-ga.jpeg) 0 2px no-repeat;
-    // }
-  }
-
-  &__message {
-  }
-
   a {
     text-decoration: underline;
     color: #339;

From 7f4aba26ba2374e6c92ec6d3a01c010026cd95ec Mon Sep 17 00:00:00 2001
From: Sebastian Kippe <sebastian@kip.pe>
Date: Sun, 29 Aug 2021 18:30:36 +0200
Subject: [PATCH 2/6] Add pending property and style to message objects

---
 app/components/message-chat/component.js | 4 ++++
 app/components/message-chat/template.hbs | 4 ++--
 app/models/message.js                    | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/components/message-chat/component.js b/app/components/message-chat/component.js
index 52d1a1f4..d171e787 100644
--- a/app/components/message-chat/component.js
+++ b/app/components/message-chat/component.js
@@ -47,6 +47,10 @@ export default class MessageChatComponent extends Component {
     return htmlSafe(out);
   }
 
+  get pendingClass () {
+    return this.args.message.pending ? 'text-gray-500' : '';
+  }
+
   @action
   usernameClick (username) {
     this.args.onUsernameClick(username);
diff --git a/app/components/message-chat/template.hbs b/app/components/message-chat/template.hbs
index 5ba41c0b..ded893c6 100644
--- a/app/components/message-chat/template.hbs
+++ b/app/components/message-chat/template.hbs
@@ -1,7 +1,7 @@
 <div class="chat-message break-words">
   <span data-username={{@message.nickname}}
         onclick={{fn this.usernameClick @message.nickname}}
-        class="mr-1 font-bold" >
+        class="mr-1 font-bold {{this.pendingClass}}" >
     {{@message.nickname}}:
   </span>
 
@@ -10,7 +10,7 @@
     {{moment-format @message.date "HH:mm"}}
   </time>
 
-  <span class="chat-message__message">
+    <span class="{{this.pendingClass}}">
     {{this.formattedContent}}
   </span>
 </div>
diff --git a/app/models/message.js b/app/models/message.js
index e8ba09d4..12660de6 100644
--- a/app/models/message.js
+++ b/app/models/message.js
@@ -6,6 +6,7 @@ export default class Message {
   @tracked date = null;
   @tracked nickname = null;
   @tracked content = null;
+  @tracked pending = null;
 
   constructor (props) {
     Object.assign(this, props);

From 6718457f3b3e4686885bb45a8e135453ce1c83c7 Mon Sep 17 00:00:00 2001
From: Sebastian Kippe <sebastian@kip.pe>
Date: Sun, 29 Aug 2021 18:31:08 +0200
Subject: [PATCH 3/6] Mark outgoing XMPP messages as pending

---
 app/controllers/base_channel.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/controllers/base_channel.js b/app/controllers/base_channel.js
index 770729dc..368a5a2d 100644
--- a/app/controllers/base_channel.js
+++ b/app/controllers/base_channel.js
@@ -16,14 +16,20 @@ export default class BaseChannelController extends Controller {
 
   @alias('application.showChannelMenu') showChannelMenu;
 
-  createMessage (message, type) {
-    return new Message({
+  createMessage (content, type) {
+    const message = new Message({
       type: type,
       date: new Date(),
       // TODO  nickname per channel
       nickname: this.model.account.nickname,
-      content: message
+      content: content
     });
+
+    if (this.model.protocol === 'XMPP') {
+      message.pending = true;
+    }
+
+    return message;
   }
 
   @computed('router.currentRouteName')

From a576cbfc6caa572888a0fdeb1834e19c01d757e0 Mon Sep 17 00:00:00 2001
From: Sebastian Kippe <sebastian@kip.pe>
Date: Sun, 29 Aug 2021 18:31:42 +0200
Subject: [PATCH 4/6] Formatting

---
 app/controllers/base_channel.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/controllers/base_channel.js b/app/controllers/base_channel.js
index 368a5a2d..da085abc 100644
--- a/app/controllers/base_channel.js
+++ b/app/controllers/base_channel.js
@@ -63,12 +63,10 @@ export default class BaseChannelController extends Controller {
   sendMessage (newMessage) {
     const message = this.createMessage(newMessage, 'message-chat');
 
-    this.coms.transferMessage(
-      this.model,
-      message.content
-    );
+    this.coms.transferMessage(this.model, message.content);
 
     this.model.addMessage(message);
+
     this.newMessage = null;
   }
 

From cc00d2ee1c35bf43dae5a1a1fc2c716382780936 Mon Sep 17 00:00:00 2001
From: Sebastian Kippe <sebastian@kip.pe>
Date: Sun, 29 Aug 2021 18:32:47 +0200
Subject: [PATCH 5/6] Confirm pending XMPP messages once received back

Also fixes own messages being missing in channel history.
---
 app/models/base_channel.js                 | 12 +++++++++
 app/services/sockethub-xmpp.js             | 13 +++++++---
 tests/fixtures/accounts.js                 |  1 +
 tests/unit/services/sockethub-xmpp-test.js | 30 ++++++++++++++++++++++
 4 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/app/models/base_channel.js b/app/models/base_channel.js
index 313dbc30..7c2baa0e 100644
--- a/app/models/base_channel.js
+++ b/app/models/base_channel.js
@@ -132,6 +132,18 @@ export default class BaseChannel {
     }
   }
 
+  confirmPendingMessage (content) {
+    const message = this.messages.filterBy('pending')
+                                 .findBy('content', content);
+
+    if (isPresent(message)) {
+      message.pending = false;
+      return true;
+    } else {
+      return false;
+    }
+  }
+
   addUser(username) {
     if (!this.userList.includes(username)) {
       this.userList.pushObject(username);
diff --git a/app/services/sockethub-xmpp.js b/app/services/sockethub-xmpp.js
index 2ce95042..15dbb397 100644
--- a/app/services/sockethub-xmpp.js
+++ b/app/services/sockethub-xmpp.js
@@ -188,12 +188,17 @@ export default class SockethubXmppService extends Service {
     if (isEmpty(message.object.content)) return;
 
     const channel = this.findOrCreateChannelForMessage(message);
-    const channelMessage = channelMessageFromSockethubObject(message);
 
-    // TODO should check for message and update sent status if exists
-    if (channelMessage.nickname !== channel.account.nickname) {
-      channel.addMessage(channelMessage);
+    // TODO implement message carbons
+    // https://xmpp.org/extensions/xep-0280.html
+    if (message.actor.displayName &&
+       (message.actor.displayName === channel.account.nickname)) {
+      const pendingConfirmed = channel.confirmPendingMessage(message.object.content);
+      if (pendingConfirmed) return;
     }
+
+    const channelMessage = channelMessageFromSockethubObject(message);
+    channel.addMessage(channelMessage);
   }
 
   /**
diff --git a/tests/fixtures/accounts.js b/tests/fixtures/accounts.js
index b0fc9d60..182762d2 100644
--- a/tests/fixtures/accounts.js
+++ b/tests/fixtures/accounts.js
@@ -7,5 +7,6 @@ export const ircAccount = new IrcAccount({
 });
 
 export const xmppAccount = new XmppAccount({
+  nickname: 'jimmy',
   username: 'jimmy@kosmos.org'
 });
diff --git a/tests/unit/services/sockethub-xmpp-test.js b/tests/unit/services/sockethub-xmpp-test.js
index 72a50e22..d05fb048 100644
--- a/tests/unit/services/sockethub-xmpp-test.js
+++ b/tests/unit/services/sockethub-xmpp-test.js
@@ -1,6 +1,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import Channel from 'hyperchannel/models/channel';
+import Message from 'hyperchannel/models/message';
 import { xmppAccount } from '../../fixtures/accounts';
 
 module('Unit | Service | sockethub xmpp', function(hooks) {
@@ -99,6 +100,35 @@ module('Unit | Service | sockethub xmpp', function(hooks) {
     assert.equal(channel.messages.lastObject.content, 'hello world');
   });
 
+  test('#addMessageToChannel updates pending status when receiving an outgoing message', function(assert) {
+    const channel = new Channel({ account: xmppAccount, name: 'kosmos-dev@kosmos.chat' });
+    const outgoingMessage = new Message({
+      type: 'message-chat',
+      date: new Date(),
+      nickname: 'jimmy',
+      content: 'yo, gang!',
+      pending: true
+    });
+    channel.messages.pushObject(outgoingMessage);
+
+    const comsService = this.owner.factoryFor('service:coms').create({
+      accounts: [ xmppAccount ], channels: [ channel ]
+    });
+    const service = this.owner.factoryFor('service:sockethub-xmpp').create({ coms: comsService });
+
+    const message = {
+      actor: { '@id': 'kosmos-dev@kosmos.chat/jimmy', '@type': 'person', displayName: 'jimmy' },
+      target: { '@id': 'kosmos-dev@kosmos.chat', '@type': 'room' },
+      object: { '@type': 'message', content: 'yo, gang!' }
+    };
+
+    service.addMessageToChannel(message);
+
+    assert.equal(channel.messages.filterBy('nickname', 'jimmy').length, 1);
+    assert.equal(channel.messages.lastObject.content, 'yo, gang!');
+    assert.notOk(channel.messages.lastObject.pending);
+  });
+
   test('#createUserChannel', function(assert) {
     const comsService = this.owner.factoryFor('service:coms').create({
       accounts: [ xmppAccount ]

From 65a107f73848dde668e26a797e5a783ca380e664 Mon Sep 17 00:00:00 2001
From: Sebastian Kippe <sebastian@kip.pe>
Date: Mon, 30 Aug 2021 16:32:05 +0200
Subject: [PATCH 6/6] Update README

The dependency label is almost always orange, so let's change the sort
order to make this look nicer.
---
 README.md                       | 2 +-
 app/controllers/base_channel.js | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d59a3249..22d86143 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![Build Status](https://travis-ci.com/67P/hyperchannel.svg?branch=master)](https://travis-ci.org/67P/hyperchannel)
-[![devDependency Status](https://david-dm.org/67P/hyperchannel/dev-status.svg)](https://david-dm.org/67P/hyperchannel#info=devDependencies)
 [![Code Climate](https://img.shields.io/codeclimate/maintainability/67P/hyperchannel.svg)](https://codeclimate.com/github/67P/hyperchannel)
+[![devDependency Status](https://david-dm.org/67P/hyperchannel/dev-status.svg)](https://david-dm.org/67P/hyperchannel#info=devDependencies)
 
 # Hyperchannel (pre-alpha!)
 
diff --git a/app/controllers/base_channel.js b/app/controllers/base_channel.js
index da085abc..0c460016 100644
--- a/app/controllers/base_channel.js
+++ b/app/controllers/base_channel.js
@@ -4,6 +4,7 @@ import { alias } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 import { isPresent } from '@ember/utils';
 import { tracked } from '@glimmer/tracking';
+import Channel from 'hyperchannel/models/channel';
 import Message from 'hyperchannel/models/message';
 
 export default class BaseChannelController extends Controller {
@@ -25,7 +26,10 @@ export default class BaseChannelController extends Controller {
       content: content
     });
 
-    if (this.model.protocol === 'XMPP') {
+    // We only receive our own message from XMPP MUCs (but not DMs)
+    // TODO implement message carbons or another way of verifying sent status
+    if (this.model.protocol === 'XMPP' &&
+       (this.model instanceof Channel)) {
       message.pending = true;
     }