aboutsummaryrefslogtreecommitdiffstats
path: root/server/src
diff options
context:
space:
mode:
authormarzavec <admin@marzavec.com>2019-10-14 16:26:42 +0200
committerGitHub <noreply@github.com>2019-10-14 16:26:42 +0200
commitea83e8c4770913a771f487ac266f0b3a1b0001bd (patch)
tree8e02a7bdfc73572365530715c3eca24275f01cba /server/src
parentOutgoing Hook Fix + Package Changes (diff)
parentadd trip to emotes (/me) (diff)
downloadhackchat-ea83e8c4770913a771f487ac266f0b3a1b0001bd.tar.gz
hackchat-ea83e8c4770913a771f487ac266f0b3a1b0001bd.zip
Merge pull request #79 from 0x17de/feature-emote-trip
add trip to emotes (/me)
Diffstat (limited to 'server/src')
-rw-r--r--server/src/commands/core/emote.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/server/src/commands/core/emote.js b/server/src/commands/core/emote.js
index f51f854..b0203cc 100644
--- a/server/src/commands/core/emote.js
+++ b/server/src/commands/core/emote.js
@@ -42,6 +42,9 @@ exports.run = async (core, server, socket, payload) => {
nick: socket.nick,
text: `@${socket.nick} ${text}`
};
+ if (socket.trip) {
+ newPayload.trip = socket.trip;
+ }
// broadcast to channel peers
server.broadcast( newPayload, { channel: socket.channel});