Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/containers/ReactionsList/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const useRoutes = (reactions: IReaction[] | undefined) => {
};
}

const sortedReactions = reactions?.sort((reaction1, reaction2) => reaction2.usernames.length - reaction1.usernames.length);
const sortedReactions = [...reactions].sort((reaction1, reaction2) => reaction2.usernames.length - reaction1.usernames.length);
const routes: IRoute[] = sortedReactions.map(reaction => ({
key: reaction.emoji,
title: reaction.emoji,
Expand Down
2 changes: 1 addition & 1 deletion app/lib/database/model/CustomEmoji.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default class CustomEmoji extends Model {

@field('name') name;

@json('aliases', sanitizer) aliases;
@json('aliases', sanitizer, { memo: true }) aliases;

@field('extension') extension;

Expand Down
26 changes: 13 additions & 13 deletions app/lib/database/model/Message.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,23 @@ export default class Message extends Model {

@date('ts') ts;

@json('u', sanitizer) u;
@json('u', sanitizer, { memo: true }) u;

@relation('subscriptions', 'rid') subscription;

@field('alias') alias;

@json('parse_urls', sanitizer) parseUrls;
@json('parse_urls', sanitizer, { memo: true }) parseUrls;

@field('groupable') groupable;

@field('avatar') avatar;

@field('emoji') emoji;

@json('attachments', sanitizer) attachments;
@json('attachments', sanitizer, { memo: true }) attachments;

@json('urls', sanitizer) urls;
@json('urls', sanitizer, { memo: true }) urls;

@date('_updated_at') _updatedAt;

Expand All @@ -44,9 +44,9 @@ export default class Message extends Model {

@field('starred') starred;

@json('edited_by', sanitizer) editedBy;
@json('edited_by', sanitizer, { memo: true }) editedBy;

@json('reactions', sanitizer) reactions;
@json('reactions', sanitizer, { memo: true }) reactions;

@field('role') role;

Expand All @@ -62,29 +62,29 @@ export default class Message extends Model {

@date('tlm') tlm;

@json('replies', sanitizer) replies;
@json('replies', sanitizer, { memo: true }) replies;

@json('mentions', sanitizer) mentions;
@json('mentions', sanitizer, { memo: true }) mentions;

@json('channels', sanitizer) channels;
@json('channels', sanitizer, { memo: true }) channels;

@field('unread') unread;

@field('auto_translate') autoTranslate;

@json('translations', sanitizer) translations;
@json('translations', sanitizer, { memo: true }) translations;

@field('tmsg') tmsg;

@json('blocks', sanitizer) blocks;
@json('blocks', sanitizer, { memo: true }) blocks;

@field('e2e') e2e;

@field('tshow') tshow;

@json('md', sanitizer) md;
@json('md', sanitizer, { memo: true }) md;

@json('content', sanitizer) content;
@json('content', sanitizer, { memo: true }) content;

@field('comment') comment;

Expand Down
2 changes: 1 addition & 1 deletion app/lib/database/model/Permission.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const PERMISSIONS_TABLE = 'permissions';
export default class Permission extends Model {
static table = PERMISSIONS_TABLE;

@json('roles', sanitizer) roles;
@json('roles', sanitizer, { memo: true }) roles;

@date('_updated_at') _updatedAt;
}
10 changes: 5 additions & 5 deletions app/lib/database/model/Room.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const ROOMS_TABLE = 'rooms';
export default class Room extends Model {
static table = ROOMS_TABLE;

@json('custom_fields', sanitizer) customFields;
@json('custom_fields', sanitizer, { memo: true }) customFields;

@field('broadcast') broadcast;

Expand All @@ -18,15 +18,15 @@ export default class Room extends Model {

@field('ro') ro;

@json('v', sanitizer) v;
@json('v', sanitizer, { memo: true }) v;

@json('served_by', sanitizer) servedBy;
@json('served_by', sanitizer, { memo: true }) servedBy;

@field('department_id') departmentId;

@json('livechat_data', sanitizer) livechatData;
@json('livechat_data', sanitizer, { memo: true }) livechatData;

@json('tags', sanitizer) tags;
@json('tags', sanitizer, { memo: true }) tags;

@field('avatar_etag') avatarETag;
}
2 changes: 1 addition & 1 deletion app/lib/database/model/Setting.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default class Setting extends Model {

@field('value_as_number') valueAsNumber;

@json('value_as_array', sanitizer) valueAsArray;
@json('value_as_array', sanitizer, { memo: true }) valueAsArray;

@date('_updated_at') _updatedAt;
}
42 changes: 21 additions & 21 deletions app/lib/database/model/Subscription.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,19 @@ export default class Subscription extends Model {

@field('alert') alert;

@json('roles', sanitizer) roles;
@json('roles', sanitizer, { memo: true }) roles;

@field('unread') unread;

@field('user_mentions') userMentions;

@field('group_mentions') groupMentions;

@json('tunread', sanitizer) tunread;
@json('tunread', sanitizer, { memo: true }) tunread;

@json('tunread_user', sanitizer) tunreadUser;
@json('tunread_user', sanitizer, { memo: true }) tunreadUser;

@json('tunread_group', sanitizer) tunreadGroup;
@json('tunread_group', sanitizer, { memo: true }) tunreadGroup;

@date('room_updated_at') roomUpdatedAt;

Expand Down Expand Up @@ -77,11 +77,11 @@ export default class Subscription extends Model {

@field('notifications') notifications;

@json('muted', sanitizer) muted;
@json('muted', sanitizer, { memo: true }) muted;

@json('unmuted', sanitizer) unmuted;
@json('unmuted', sanitizer, { memo: true }) unmuted;

@json('ignored', sanitizer) ignored;
@json('ignored', sanitizer, { memo: true }) ignored;

@field('broadcast') broadcast;

Expand All @@ -97,7 +97,7 @@ export default class Subscription extends Model {

@field('auto_translate_language') autoTranslateLanguage;

@json('last_message', sanitizer) lastMessage;
@json('last_message', sanitizer, { memo: true }) lastMessage;

@children('messages') messages;

Expand All @@ -109,33 +109,33 @@ export default class Subscription extends Model {

@field('hide_mention_status') hideMentionStatus;

@json('sys_mes', sanitizer) sysMes;
@json('sys_mes', sanitizer, { memo: true }) sysMes;

@json('uids', sanitizer) uids;
@json('uids', sanitizer, { memo: true }) uids;

@json('usernames', sanitizer) usernames;
@json('usernames', sanitizer, { memo: true }) usernames;

@json('visitor', sanitizer) visitor;
@json('visitor', sanitizer, { memo: true }) visitor;

@field('department_id') departmentId;

@json('served_by', sanitizer) servedBy;
@json('served_by', sanitizer, { memo: true }) servedBy;

@json('livechat_data', sanitizer) livechatData;
@json('livechat_data', sanitizer, { memo: true }) livechatData;

@json('tags', sanitizer) tags;
@json('tags', sanitizer, { memo: true }) tags;

@field('e2e_key') E2EKey;

@json('old_room_keys', sanitizer) oldRoomKeys;
@json('old_room_keys', sanitizer, { memo: true }) oldRoomKeys;

@field('e2e_suggested_key') E2ESuggestedKey;

@field('encrypted') encrypted;

@field('e2e_key_id') e2eKeyId;

@json('users_waiting_for_e2e_keys', sanitizer) usersWaitingForE2EKeys;
@json('users_waiting_for_e2e_keys', sanitizer, { memo: true }) usersWaitingForE2EKeys;

@field('avatar_etag') avatarETag;

Expand All @@ -147,19 +147,19 @@ export default class Subscription extends Model {

@field('users_count') usersCount;

@json('source', sanitizer) source;
@json('source', sanitizer, { memo: true }) source;

@field('disable_notifications') disableNotifications;

@field('federated') federated;

@json('abac_attributes', sanitizer) abacAttributes;
@json('abac_attributes', sanitizer, { memo: true }) abacAttributes;

@json('federation', sanitizer) federation;
@json('federation', sanitizer, { memo: true }) federation;

@field('status') status;

@json('inviter', sanitizer) inviter;
@json('inviter', sanitizer, { memo: true }) inviter;

asPlain() {
return {
Expand Down
22 changes: 11 additions & 11 deletions app/lib/database/model/Thread.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,23 @@ export default class Thread extends Model {

@date('ts') ts;

@json('u', sanitizer) u;
@json('u', sanitizer, { memo: true }) u;

@relation('subscriptions', 'rid') subscription;

@field('alias') alias;

@json('parse_urls', sanitizer) parseUrls;
@json('parse_urls', sanitizer, { memo: true }) parseUrls;

@field('groupable') groupable;

@field('avatar') avatar;

@field('emoji') emoji;

@json('attachments', sanitizer) attachments;
@json('attachments', sanitizer, { memo: true }) attachments;

@json('urls', sanitizer) urls;
@json('urls', sanitizer, { memo: true }) urls;

@date('_updated_at') _updatedAt;

Expand All @@ -44,9 +44,9 @@ export default class Thread extends Model {

@field('starred') starred;

@json('edited_by', sanitizer) editedBy;
@json('edited_by', sanitizer, { memo: true }) editedBy;

@json('reactions', sanitizer) reactions;
@json('reactions', sanitizer, { memo: true }) reactions;

@field('role') role;

Expand All @@ -62,19 +62,19 @@ export default class Thread extends Model {

@date('tlm') tlm;

@json('replies', sanitizer) replies;
@json('replies', sanitizer, { memo: true }) replies;

@json('mentions', sanitizer) mentions;
@json('mentions', sanitizer, { memo: true }) mentions;

@json('channels', sanitizer) channels;
@json('channels', sanitizer, { memo: true }) channels;

@field('unread') unread;

@field('auto_translate') autoTranslate;

@json('translations', sanitizer) translations;
@json('translations', sanitizer, { memo: true }) translations;

@json('content', sanitizer) content;
@json('content', sanitizer, { memo: true }) content;

@field('e2e') e2e;

Expand Down
22 changes: 11 additions & 11 deletions app/lib/database/model/ThreadMessage.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,25 @@ export default class ThreadMessage extends Model {

@date('ts') ts;

@json('u', sanitizer) u;
@json('u', sanitizer, { memo: true }) u;

@relation('subscriptions', 'subscription_id') subscription;

@field('rid') rid;

@field('alias') alias;

@json('parse_urls', sanitizer) parseUrls;
@json('parse_urls', sanitizer, { memo: true }) parseUrls;

@field('groupable') groupable;

@field('avatar') avatar;

@field('emoji') emoji;

@json('attachments', sanitizer) attachments;
@json('attachments', sanitizer, { memo: true }) attachments;

@json('urls', sanitizer) urls;
@json('urls', sanitizer, { memo: true }) urls;

@date('_updated_at') _updatedAt;

Expand All @@ -46,9 +46,9 @@ export default class ThreadMessage extends Model {

@field('starred') starred;

@json('edited_by', sanitizer) editedBy;
@json('edited_by', sanitizer, { memo: true }) editedBy;

@json('reactions', sanitizer) reactions;
@json('reactions', sanitizer, { memo: true }) reactions;

@field('role') role;

Expand All @@ -62,23 +62,23 @@ export default class ThreadMessage extends Model {

@date('tlm') tlm;

@json('replies', sanitizer) replies;
@json('replies', sanitizer, { memo: true }) replies;

@json('mentions', sanitizer) mentions;
@json('mentions', sanitizer, { memo: true }) mentions;

@json('channels', sanitizer) channels;
@json('channels', sanitizer, { memo: true }) channels;

@field('unread') unread;

@field('auto_translate') autoTranslate;

@json('translations', sanitizer) translations;
@json('translations', sanitizer, { memo: true }) translations;

@field('draft_message') draftMessage;

@field('e2e') e2e;

@json('content', sanitizer) content;
@json('content', sanitizer, { memo: true }) content;

asPlain() {
return {
Expand Down
2 changes: 1 addition & 1 deletion app/lib/database/model/User.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ export default class User extends Model {

@field('avatar_etag') avatarETag;

@json('roles', sanitizer) roles;
@json('roles', sanitizer, { memo: true }) roles;
}
Loading
Loading