krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 22:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: allowing the flagging of system messages

Browse Source 
closes #7767
closes #7771
This commit is contained in:
Husman
2016-07-10 14:58:50 -07:00
committed by Blade Barringer
parent 0631e9ba15
commit 694cd8e555
5 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/locales/en/groups.json
View File

@@ -38,6 +38,7 @@
"joinNewParty": "Join New Party", "joinNewParty": "Join New Party",
"declineInvitation": "Decline Invitation", "declineInvitation": "Decline Invitation",
"loadingNewParty": "Your party is loading. Please wait...", "loadingNewParty": "Your party is loading. Please wait...",
"systemMessage": "System Message",
"newMsg": "New message in \"<%= name %>\"", "newMsg": "New message in \"<%= name %>\"",
"chat": "Chat", "chat": "Chat",
"sendChat": "Send Chat", "sendChat": "Send Chat",

15
website/client/js/controllers/chatCtrl.js
View File

@@ -94,13 +94,22 @@ habitrpg.controller('ChatCtrl', ['$scope', 'Groups', 'Chat', 'User', '$http', 'A
} else { } else {
$scope.abuseObject = message; $scope.abuseObject = message;
$scope.groupId = groupId; $scope.groupId = groupId;
Members.selectMember(message.uuid)
.then(function () { $scope.isSystemMessage = message.uuid === 'system';
if (message.uuid === 'system') {
$rootScope.openModal('abuse-flag',{ $rootScope.openModal('abuse-flag',{
controller:'MemberModalCtrl', controller:'MemberModalCtrl',
scope: $scope scope: $scope
}); });
}); } else {
Members.selectMember(message.uuid)
.then(function () {
$rootScope.openModal('abuse-flag',{
controller:'MemberModalCtrl',
scope: $scope
});
});
}
} }
}; };

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

@@ -217,7 +217,7 @@ api.flagChat = {
let reporterEmailContent = getUserInfo(user, ['email']).email; let reporterEmailContent = getUserInfo(user, ['email']).email;
let authorEmailContent = getUserInfo(author, ['email']).email; let authorEmailContent = author ? getUserInfo(author, ['email']).email : 'system';
let groupUrl = getGroupUrl(group); let groupUrl = getGroupUrl(group);

2
website/views/options/social/chat-message.jade
View File

@@ -31,7 +31,7 @@ mixin chatMessages(inbox)
span(ng-if='#{inbox ? "true" : ":: user.contributor.admin || message.uuid == user.id"}') &nbsp; &nbsp; span(ng-if='#{inbox ? "true" : ":: user.contributor.admin || message.uuid == user.id"}') &nbsp; &nbsp;
a(ng-click='#{inbox? "User.deletePM({params:{id:message.$key}})" : "deleteChatMessage(group, message)"}') a(ng-click='#{inbox? "User.deletePM({params:{id:message.$key}})" : "deleteChatMessage(group, message)"}')
span.glyphicon.glyphicon-trash(tooltip=env.t('delete')) span.glyphicon.glyphicon-trash(tooltip=env.t('delete'))
span(ng-if=':: user.contributor.admin || (!message.sent && user.flags.communityGuidelinesAccepted && message.uuid != user.id && message.uuid != "system")') &nbsp; &nbsp; span(ng-if=':: user.contributor.admin || (!message.sent && user.flags.communityGuidelinesAccepted && message.uuid != user.id)') &nbsp; &nbsp;
a(ng-click="flagChatMessage(group._id, message)") a(ng-click="flagChatMessage(group._id, message)")
span.glyphicon.glyphicon-flag(tooltip="{{message.flags[user._id] ? env.t('abuseAlreadyReported') : env.t('abuseFlag')}}" ng-class='message.flags[user._id] ? "text-danger" : ""') span.glyphicon.glyphicon-flag(tooltip="{{message.flags[user._id] ? env.t('abuseAlreadyReported') : env.t('abuseFlag')}}" ng-class='message.flags[user._id] ? "text-danger" : ""')
span &nbsp; &nbsp; span &nbsp; &nbsp;

2
website/views/shared/modals/members.jade
View File

@@ -102,7 +102,7 @@ script(type='text/ng-template', id='modals/send-gift.html')
script(type='text/ng-template', id='modals/abuse-flag.html') script(type='text/ng-template', id='modals/abuse-flag.html')
.modal-header .modal-header
h4!=env.t('abuseFlagModalHeading', {name: "<span class='text-danger'>{{profile.profile.name}}</span>"}) h4!=env.t('abuseFlagModalHeading', {name: "<span class='text-danger'>{{isSystemMessage ? env.t('systemMessage') : profile.profile.name}}</span>"})
.modal-body .modal-body
blockquote blockquote
markdown(text="abuseObject.text") markdown(text="abuseObject.text")