krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Attach client to chat messages (#10845)

Browse Source 
* Attach client to chat messages

* Word

* Design tweaks

* Fix potential error
This commit is contained in:
Phillip Thelen
2018-11-26 10:45:42 +01:00
committed by Matteo Pagliazzi
parent 2bebaf2cf8
commit 42b146d5d0
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
website/client/components/chat/chatCard.vue
View File

@@ -15,7 +15,8 @@ div
p.time p.time
span.mr-1(v-if="msg.username") @{{ msg.username }} span.mr-1(v-if="msg.username") @{{ msg.username }}
span.mr-1(v-if="msg.username") • span.mr-1(v-if="msg.username") •
span(v-b-tooltip="", :title="msg.timestamp | date") {{ msg.timestamp | timeAgo }} span(v-b-tooltip="", :title="msg.timestamp | date") {{ msg.timestamp | timeAgo }} 
span(v-if="msg.client && user.contributor.level >= 4") ({{ msg.client }})
.text(v-html='atHighlight(parseMarkdown(msg.text))') .text(v-html='atHighlight(parseMarkdown(msg.text))')
hr hr
.d-flex(v-if='msg.id') .d-flex(v-if='msg.id')

6
website/server/controllers/api-v3/chat.js
View File

@@ -175,7 +175,11 @@ api.postChat = {
throw new NotAuthorized(res.t('messageGroupChatSpam')); throw new NotAuthorized(res.t('messageGroupChatSpam'));
} }
const newChatMessage = group.sendChat(req.body.message, user); let client = req.headers['x-client'] || '3rd Party';
if (client) {
client = client.replace('habitica-', '');
}
const newChatMessage = group.sendChat(req.body.message, user, null, client);
let toSave = [newChatMessage.save()]; let toSave = [newChatMessage.save()];
if (group.type === 'party') { if (group.type === 'party') {

4
website/server/models/group.js
View File

@@ -480,8 +480,8 @@ schema.methods.getMemberCount = async function getMemberCount () {
return await User.count(query).exec(); return await User.count(query).exec();
}; };
schema.methods.sendChat = function sendChat (message, user, metaData) { schema.methods.sendChat = function sendChat (message, user, metaData, client) {
let newMessage = messageDefaults(message, user); let newMessage = messageDefaults(message, user, client);
let newChatMessage = new Chat(); let newChatMessage = new Chat();
newChatMessage = Object.assign(newChatMessage, newMessage); newChatMessage = Object.assign(newChatMessage, newMessage);
newChatMessage.groupId = this._id; newChatMessage.groupId = this._id;

4
website/server/models/message.js
View File

@@ -19,6 +19,7 @@ const defaultSchema = () => ({
flags: {$type: mongoose.Schema.Types.Mixed, default: {}}, flags: {$type: mongoose.Schema.Types.Mixed, default: {}},
flagCount: {$type: Number, default: 0}, flagCount: {$type: Number, default: 0},
likes: {$type: mongoose.Schema.Types.Mixed}, likes: {$type: mongoose.Schema.Types.Mixed},
client: String,
_meta: {$type: mongoose.Schema.Types.Mixed}, _meta: {$type: mongoose.Schema.Types.Mixed},
}); });
@@ -100,7 +101,7 @@ export function setUserStyles (newMessage, user) {
newMessage.markModified('userStyles'); newMessage.markModified('userStyles');
} }
export function messageDefaults (msg, user) { export function messageDefaults (msg, user, client) {
const id = uuid(); const id = uuid();
const message = { const message = {
id, id,
@@ -110,6 +111,7 @@ export function messageDefaults (msg, user) {
likes: {}, likes: {},
flags: {}, flags: {},
flagCount: 0, flagCount: 0,
client,
}; };
if (user) { if (user) {