Skip to content
This repository has been archived by the owner on Aug 30, 2024. It is now read-only.

Commit

Permalink
DEV 8121 Hide UserName from Chat in all places (#19)
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergey-Volkov authored Jul 31, 2020
1 parent b6ad9c9 commit f4fda67
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 36 deletions.
28 changes: 14 additions & 14 deletions app/lib/lib/MessageTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Meteor.startup(function() {
data(message) {
return {
room_name: message.msg,
user_by: message.u.username,
user_by: message.u.name,
};
},
});
Expand All @@ -22,7 +22,7 @@ Meteor.startup(function() {
data(message) {
return {
user_added: message.msg,
user_by: message.u.username,
user_by: message.u.name,
};
},
});
Expand All @@ -33,7 +33,7 @@ Meteor.startup(function() {
data(message) {
return {
user_removed: message.msg,
user_by: message.u.username,
user_by: message.u.name,
};
},
});
Expand All @@ -43,7 +43,7 @@ Meteor.startup(function() {
message: 'User_left',
data(message) {
return {
user_left: message.u.username,
user_left: message.u.name,
};
},
});
Expand All @@ -53,7 +53,7 @@ Meteor.startup(function() {
message: 'User_joined_channel',
data(message) {
return {
user: message.u.username,
user: message.u.name,
};
},
});
Expand All @@ -63,7 +63,7 @@ Meteor.startup(function() {
message: 'User_joined_conversation',
data(message) {
return {
user: message.u.username,
user: message.u.name,
};
},
});
Expand All @@ -73,7 +73,7 @@ Meteor.startup(function() {
message: 'Welcome',
data(message) {
return {
user: message.u.username,
user: message.u.name,
};
},
});
Expand All @@ -83,7 +83,7 @@ Meteor.startup(function() {
message: 'Message_removed',
data(message) {
return {
user: message.u.username,
user: message.u.name,
};
},
});
Expand All @@ -100,7 +100,7 @@ Meteor.startup(function() {
data(message) {
return {
user_muted: message.msg,
user_by: message.u.username,
user_by: message.u.name,
};
},
});
Expand All @@ -111,7 +111,7 @@ Meteor.startup(function() {
data(message) {
return {
user_unmuted: message.msg,
user_by: message.u.username,
user_by: message.u.name,
};
},
});
Expand All @@ -123,7 +123,7 @@ Meteor.startup(function() {
return {
username: message.msg,
role: message.role,
user_by: message.u.username,
user_by: message.u.name,
};
},
});
Expand All @@ -135,7 +135,7 @@ Meteor.startup(function() {
return {
username: message.msg,
role: message.role,
user_by: message.u.username,
user_by: message.u.name,
};
},
});
Expand All @@ -145,7 +145,7 @@ Meteor.startup(function() {
message: 'This_room_has_been_archived_by__username_',
data(message) {
return {
username: message.u.username,
username: message.u.name,
};
},
});
Expand All @@ -155,7 +155,7 @@ Meteor.startup(function() {
message: 'This_room_has_been_unarchived_by__username_',
data(message) {
return {
username: message.u.username,
username: message.u.name,
};
},
});
Expand Down
30 changes: 15 additions & 15 deletions app/models/server/models/Messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -805,27 +805,27 @@ export class Messages extends Base {
}

createUserJoinWithRoomIdAndUser(roomId, user, extraData) {
const message = user.username;
const message = user.name;
return this.createWithTypeRoomIdMessageAndUser('uj', roomId, message, user, extraData);
}

createUserJoinWithRoomIdAndUserDiscussion(roomId, user, extraData) {
const message = user.username;
const message = user.name;
return this.createWithTypeRoomIdMessageAndUser('ut', roomId, message, user, extraData);
}

createUserLeaveWithRoomIdAndUser(roomId, user, extraData) {
const message = user.username;
const message = user.name;
return this.createWithTypeRoomIdMessageAndUser('ul', roomId, message, user, extraData);
}

createUserRemovedWithRoomIdAndUser(roomId, user, extraData) {
const message = user.username;
const message = user.name;
return this.createWithTypeRoomIdMessageAndUser('ru', roomId, message, user, extraData);
}

createUserAddedWithRoomIdAndUser(roomId, user, extraData) {
const message = user.username;
const message = user.name;
return this.createWithTypeRoomIdMessageAndUser('au', roomId, message, user, extraData);
}

Expand All @@ -834,52 +834,52 @@ export class Messages extends Base {
}

createUserMutedWithRoomIdAndUser(roomId, user, extraData) {
const message = user.username;
const message = user.name;
return this.createWithTypeRoomIdMessageAndUser('user-muted', roomId, message, user, extraData);
}

createUserUnmutedWithRoomIdAndUser(roomId, user, extraData) {
const message = user.username;
const message = user.name;
return this.createWithTypeRoomIdMessageAndUser('user-unmuted', roomId, message, user, extraData);
}

createNewModeratorWithRoomIdAndUser(roomId, user, extraData) {
const message = user.username;
const message = user.name;
return this.createWithTypeRoomIdMessageAndUser('new-moderator', roomId, message, user, extraData);
}

createModeratorRemovedWithRoomIdAndUser(roomId, user, extraData) {
const message = user.username;
const message = user.name;
return this.createWithTypeRoomIdMessageAndUser('moderator-removed', roomId, message, user, extraData);
}

createNewOwnerWithRoomIdAndUser(roomId, user, extraData) {
const message = user.username;
const message = user.name;
return this.createWithTypeRoomIdMessageAndUser('new-owner', roomId, message, user, extraData);
}

createOwnerRemovedWithRoomIdAndUser(roomId, user, extraData) {
const message = user.username;
const message = user.name;
return this.createWithTypeRoomIdMessageAndUser('owner-removed', roomId, message, user, extraData);
}

createNewLeaderWithRoomIdAndUser(roomId, user, extraData) {
const message = user.username;
const message = user.name;
return this.createWithTypeRoomIdMessageAndUser('new-leader', roomId, message, user, extraData);
}

createLeaderRemovedWithRoomIdAndUser(roomId, user, extraData) {
const message = user.username;
const message = user.name;
return this.createWithTypeRoomIdMessageAndUser('leader-removed', roomId, message, user, extraData);
}

createSubscriptionRoleAddedWithRoomIdAndUser(roomId, user, extraData) {
const message = user.username;
const message = user.name;
return this.createWithTypeRoomIdMessageAndUser('subscription-role-added', roomId, message, user, extraData);
}

createSubscriptionRoleRemovedWithRoomIdAndUser(roomId, user, extraData) {
const message = user.username;
const message = user.name;
return this.createWithTypeRoomIdMessageAndUser('subscription-role-removed', roomId, message, user, extraData);
}

Expand Down
2 changes: 1 addition & 1 deletion app/ui-message/client/message.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<div class="message-body-wrapper">
<div class="title border-component-color color-info-font-color">
<button type="button" class="user user-card-message color-primary-font-color" data-username="{{msg.u.username}}" tabindex="1">
{{getName}}{{#if showUsername}} <span class="message-alias border-component-color color-info-font-color">@{{msg.u.username}}</span>{{/if}}
{{getName}}
</button>
<span class="info border-component-color color-info-font-color"></span>
{{#each role in roleTags}}
Expand Down
2 changes: 1 addition & 1 deletion app/ui-message/client/popup/messagePopupUser.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<div class="popup-user-status border-transparent-dark popup-user-status-{{status}}"></div>
<div class="popup-user-avatar" style="background-image:url({{avatarUrlFromUsername username}});"></div>
{{/unless}}
<strong>{{username}}</strong> {{name}}
<strong>{{name}}</strong>
</template>
4 changes: 0 additions & 4 deletions app/ui/client/components/header/headerRoom.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,7 @@
{{/if}}

<div class="rc-header__data">
{{#unless secondaryName}}
<div class="rc-header__name">{{> icon block="rc-header__icon" icon=roomIcon}}{{roomName}}</div>
{{else}}
<div class="rc-header__name">{{roomName}} <div class="rc-header__username">@{{secondaryName}}</div></div>
{{/unless}}

{{#if hasPresence}}
{{# userPresence uid=uid}}<span class="rc-header__status">
Expand Down
2 changes: 1 addition & 1 deletion app/ui/client/views/app/components/Directory/UserTab.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export function UserTab({
</Flex.Item>
<Box style={style} grow={1} mi='x8'>
<Box display='flex'>
<Box textStyle='p2' style={style} textColor='default'>{name || username}</Box> <Box mi='x4'/> <Box textStyle='p1' textColor='hint' style={style}>{username}</Box>
<Box textStyle='p2' style={style} textColor='default'>{name || username}</Box> <Box mi='x4'/>
</Box>
<Box textStyle='p1' textColor='hint' style={style}> {bio} </Box>
</Box>
Expand Down

0 comments on commit f4fda67

Please sign in to comment.