Skip to content

Commit 96c21d8

Browse files
MartinSchoelertassoevanggazzo
authored
[NEW] Enterprise tags (#18276)
Co-authored-by: Tasso Evangelista <[email protected]> Co-authored-by: Guilherme Gazzo <[email protected]>
1 parent 8ee38f6 commit 96c21d8

File tree

33 files changed

+63
-121
lines changed

33 files changed

+63
-121
lines changed

‎app/api/server/lib/users.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ export async function findUsersToAutocomplete({ uid, selector }) {
1313
fields: {
1414
name: 1,
1515
username: 1,
16-
nickname: 1,
1716
status: 1,
1817
avatarETag: 1,
1918
},

‎app/api/server/v1/users.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ API.v1.addRoute('users.create', { authRequired: true }, {
3131
username: String,
3232
active: Match.Maybe(Boolean),
3333
bio: Match.Maybe(String),
34-
nickname: Match.Maybe(String),
3534
statusText: Match.Maybe(String),
3635
roles: Match.Maybe(Array),
3736
joinDefaultChannels: Match.Maybe(Boolean),
@@ -437,7 +436,6 @@ API.v1.addRoute('users.update', { authRequired: true, twoFactorRequired: true },
437436
password: Match.Maybe(String),
438437
username: Match.Maybe(String),
439438
bio: Match.Maybe(String),
440-
nickname: Match.Maybe(String),
441439
statusText: Match.Maybe(String),
442440
active: Match.Maybe(Boolean),
443441
roles: Match.Maybe(Array),
@@ -475,7 +473,6 @@ API.v1.addRoute('users.updateOwnBasicInfo', { authRequired: true }, {
475473
email: Match.Maybe(String),
476474
name: Match.Maybe(String),
477475
username: Match.Maybe(String),
478-
nickname: Match.Maybe(String),
479476
statusText: Match.Maybe(String),
480477
currentPassword: Match.Maybe(String),
481478
newPassword: Match.Maybe(String),
@@ -487,7 +484,6 @@ API.v1.addRoute('users.updateOwnBasicInfo', { authRequired: true }, {
487484
email: this.bodyParams.data.email,
488485
realname: this.bodyParams.data.name,
489486
username: this.bodyParams.data.username,
490-
nickname: this.bodyParams.data.nickname,
491487
statusText: this.bodyParams.data.statusText,
492488
newPassword: this.bodyParams.data.newPassword,
493489
typedPassword: this.bodyParams.data.currentPassword,

‎app/apps/client/gameCenter/invitePlayers.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ Template.InvitePlayers.helpers({
5454
roomModifier() {
5555
return (filter, text = '') => {
5656
const f = filter.get();
57-
return `#${ f.length === 0 ? text : text.replace(new RegExp(filter.get(), 'i'), (part) => `<strong>${ part }</strong>`) }`;
57+
return `#${ f.length === 0 ? text : text.replace(new RegExp(filter.get()), (part) => `<strong>${ part }</strong>`) }`;
5858
};
5959
},
6060
userModifier() {
6161
return (filter, text = '') => {
6262
const f = filter.get();
63-
return `@${ f.length === 0 ? text : text.replace(new RegExp(filter.get(), 'i'), (part) => `<strong>${ part }</strong>`) }`;
63+
return `@${ f.length === 0 ? text : text.replace(new RegExp(filter.get()), (part) => `<strong>${ part }</strong>`) }`;
6464
};
6565
},
6666
nameSuggestion() {

‎app/discussion/client/views/creationDialog/CreateDiscussion.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ Template.CreateDiscussion.helpers({
7272
roomModifier() {
7373
return (filter, text = '') => {
7474
const f = filter.get();
75-
return `#${ f.length === 0 ? text : text.replace(new RegExp(filter.get(), 'i'), (part) => `<strong>${ part }</strong>`) }`;
75+
return `#${ f.length === 0 ? text : text.replace(new RegExp(filter.get()), (part) => `<strong>${ part }</strong>`) }`;
7676
};
7777
},
7878
userModifier() {
7979
return (filter, text = '') => {
8080
const f = filter.get();
81-
return `@${ f.length === 0 ? text : text.replace(new RegExp(filter.get(), 'i'), (part) => `<strong>${ part }</strong>`) }`;
81+
return `@${ f.length === 0 ? text : text.replace(new RegExp(filter.get()), (part) => `<strong>${ part }</strong>`) }`;
8282
};
8383
},
8484
nameSuggestion() {

‎app/lib/server/functions/getFullUserData.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ const logger = new Logger('getFullUserData');
1010
const defaultFields = {
1111
name: 1,
1212
username: 1,
13-
nickname: 1,
1413
status: 1,
1514
utcOffset: 1,
1615
type: 1,

‎app/lib/server/functions/saveUser.js‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -215,23 +215,6 @@ const handleBio = (updateUser, bio) => {
215215
}
216216
};
217217

218-
const handleNickname = (updateUser, nickname) => {
219-
if (nickname) {
220-
if (nickname.trim()) {
221-
if (typeof nickname !== 'string' || nickname.length > 120) {
222-
throw new Meteor.Error('error-invalid-field', 'nickname', {
223-
method: 'saveUserProfile',
224-
});
225-
}
226-
updateUser.$set = updateUser.$set || {};
227-
updateUser.$set.nickname = nickname;
228-
} else {
229-
updateUser.$unset = updateUser.$unset || {};
230-
updateUser.$unset.nickname = 1;
231-
}
232-
}
233-
};
234-
235218
export const saveUser = function(userId, userData) {
236219
validateUserData(userId, userData);
237220
let sendPassword = false;
@@ -278,7 +261,6 @@ export const saveUser = function(userId, userData) {
278261
}
279262

280263
handleBio(updateUser, userData.bio);
281-
handleNickname(updateUser, userData.nickname);
282264

283265
Meteor.users.update({ _id }, updateUser);
284266

@@ -338,7 +320,6 @@ export const saveUser = function(userId, userData) {
338320
};
339321

340322
handleBio(updateUser, userData.bio);
341-
handleNickname(updateUser, userData.nickname);
342323

343324
if (userData.roles) {
344325
updateUser.$set.roles = userData.roles;

‎app/lib/server/startup/settings.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ settings.addGroup('Accounts', function() {
9797
type: 'boolean',
9898
public: true,
9999
});
100-
this.add('Accounts_SearchFields', 'username, name, bio, nickname', {
100+
this.add('Accounts_SearchFields', 'username, name, bio', {
101101
type: 'string',
102102
});
103103
this.add('Accounts_Directory_DefaultView', 'channels', {

‎app/models/server/models/Users.js‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ export class Users extends Base {
3030

3131
this.tryEnsureIndex({ roles: 1 }, { sparse: 1 });
3232
this.tryEnsureIndex({ name: 1 });
33-
this.tryEnsureIndex({ bio: 1 }, { sparse: 1 });
34-
this.tryEnsureIndex({ nickname: 1 }, { sparse: 1 });
33+
this.tryEnsureIndex({ bio: 1 });
3534
this.tryEnsureIndex({ createdAt: 1 });
3635
this.tryEnsureIndex({ lastLogin: 1 });
3736
this.tryEnsureIndex({ status: 1 });
@@ -1152,21 +1151,6 @@ export class Users extends Base {
11521151
return this.update(_id, update);
11531152
}
11541153

1155-
setNickname(_id, nickname = '') {
1156-
const update = {
1157-
...nickname.trim() ? {
1158-
$set: {
1159-
nickname,
1160-
},
1161-
} : {
1162-
$unset: {
1163-
nickname: 1,
1164-
},
1165-
},
1166-
};
1167-
return this.update(_id, update);
1168-
}
1169-
11701154
clearSettings(_id) {
11711155
const update = {
11721156
$set: {

‎app/models/server/raw/Users.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,6 @@ export class UsersRaw extends BaseRaw {
126126
username: termRegex,
127127
}, {
128128
name: termRegex,
129-
}, {
130-
nickname: termRegex,
131129
}],
132130
active: true,
133131
type: {

‎app/theme/client/imports/components/messages.css‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
.message-actions {
66
position: absolute;
7-
z-index: 2;
87
top: -18px;
98
right: 0.4rem;
109

0 commit comments

Comments
 (0)