Skip to content

Commit

Permalink
Chore: Remove TimeSync usage (#26294)
Browse files Browse the repository at this point in the history
  • Loading branch information
ggazzo authored and weslley543 committed Jul 19, 2022
1 parent 04c1947 commit fcd75da
Show file tree
Hide file tree
Showing 22 changed files with 26 additions and 533 deletions.
1 change: 0 additions & 1 deletion apps/meteor/.eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ data/
tests/e2e/test-failures/
packages/autoupdate/
packages/meteor-streams/
packages/meteor-timesync/
app/emoji-emojione/generateEmojiIndex.js
packages/rocketchat-livechat/assets/rocketchat-livechat.min.js
packages/rocketchat-livechat/assets/rocket-livechat.js
Expand Down
1 change: 0 additions & 1 deletion apps/meteor/.meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ jalik:ufs-local@1.0.4

jparker:gravatar
kadira:flow-router
mizzao:timesync
mrt:reactive-store
mystor:device-detection
rocketchat:restivus
Expand Down
1 change: 0 additions & 1 deletion apps/meteor/.meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ meteorhacks:inject-initial@1.0.5
minifier-css@1.6.0
minifier-js@2.7.4
minimongo@1.8.0
mizzao:timesync@0.3.4
mobile-experience@1.1.0
mobile-status-bar@1.1.0
modern-browsers@0.1.8
Expand Down
8 changes: 1 addition & 7 deletions apps/meteor/app/e2e/client/rocketchat.e2e.room.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { Base64 } from 'meteor/base64';
import { EJSON } from 'meteor/ejson';
import { Random } from 'meteor/random';
import { Session } from 'meteor/session';
import { TimeSync } from 'meteor/mizzao:timesync';
import { Emitter } from '@rocket.chat/emitter';

import { e2e } from './rocketchat.e2e';
Expand Down Expand Up @@ -395,12 +394,7 @@ export class E2ERoom extends Emitter {

// Helper function for encryption of messages
encrypt(message) {
let ts;
if (isNaN(TimeSync.serverOffset())) {
ts = new Date();
} else {
ts = new Date(Date.now() + TimeSync.serverOffset());
}
const ts = new Date();

const data = new TextEncoder('UTF-8').encode(
EJSON.stringify({
Expand Down
3 changes: 1 addition & 2 deletions apps/meteor/app/lib/client/methods/sendMessage.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Meteor } from 'meteor/meteor';
import { TimeSync } from 'meteor/mizzao:timesync';
import s from 'underscore.string';

import { ChatMessage, Rooms } from '../../../models/client';
Expand All @@ -19,7 +18,7 @@ Meteor.methods({
return dispatchToastMessage({ type: 'error', message: t('Message_Already_Sent') });
}
const user = Meteor.user();
message.ts = isNaN(TimeSync.serverOffset()) ? new Date() : new Date(Date.now() + TimeSync.serverOffset());
message.ts = new Date();
message.u = {
_id: Meteor.userId(),
username: user.username,
Expand Down
8 changes: 1 addition & 7 deletions apps/meteor/app/otr/client/rocketchat.otr.room.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { Random } from 'meteor/random';
import { EJSON } from 'meteor/ejson';
import { Tracker } from 'meteor/tracker';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import { TimeSync } from 'meteor/mizzao:timesync';
import _ from 'underscore';

import { OTR } from './rocketchat.otr';
Expand Down Expand Up @@ -219,12 +218,7 @@ OTR.Room = class {
}

encrypt(message) {
let ts;
if (isNaN(TimeSync.serverOffset())) {
ts = new Date();
} else {
ts = new Date(Date.now() + TimeSync.serverOffset());
}
const ts = new Date();

const data = new TextEncoder('UTF-8').encode(
EJSON.stringify({
Expand Down
10 changes: 4 additions & 6 deletions apps/meteor/client/methods/updateMessage.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Meteor } from 'meteor/meteor';
import { TimeSync } from 'meteor/mizzao:timesync';
import { Tracker } from 'meteor/tracker';
import moment from 'moment';
import _ from 'underscore';
Expand All @@ -20,6 +19,9 @@ Meteor.methods({

const originalMessage = ChatMessage.findOne(message._id);

if (!originalMessage) {
return;
}
const hasPermission = hasAtLeastOnePermission('edit-message', message.rid);
const editAllowed = settings.get('Message_AllowEditing');
let editOwn = false;
Expand Down Expand Up @@ -59,11 +61,7 @@ Meteor.methods({
}

Tracker.nonreactive(() => {
if (isNaN(TimeSync.serverOffset())) {
message.editedAt = new Date();
} else {
message.editedAt = new Date(Date.now() + TimeSync.serverOffset());
}
message.editedAt = new Date(Date.now());

message.editedBy = {
_id: uid,
Expand Down
3 changes: 0 additions & 3 deletions apps/meteor/client/startup/startup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { UserStatus } from '@rocket.chat/core-typings';
import { Accounts } from 'meteor/accounts-base';
import { UserPresence } from 'meteor/konecty:user-presence';
import { Meteor } from 'meteor/meteor';
import { TimeSync } from 'meteor/mizzao:timesync';
import { Session } from 'meteor/session';
import { Tracker } from 'meteor/tracker';
import moment from 'moment';
Expand All @@ -21,8 +20,6 @@ Meteor.startup(() => {

Accounts.onLogout(() => Session.set('openedRoom', null));

TimeSync.loggingEnabled = false;

Session.setDefault('AvatarRandom', 0);

window.lastMessageWindow = {};
Expand Down
7 changes: 0 additions & 7 deletions apps/meteor/definition/externals/meteor/mizzao-timesync.d.ts

This file was deleted.

2 changes: 0 additions & 2 deletions apps/meteor/packages/meteor-timesync/.gitignore

This file was deleted.

5 changes: 0 additions & 5 deletions apps/meteor/packages/meteor-timesync/.travis.yml

This file was deleted.

72 changes: 0 additions & 72 deletions apps/meteor/packages/meteor-timesync/History.md

This file was deleted.

21 changes: 0 additions & 21 deletions apps/meteor/packages/meteor-timesync/LICENSE

This file was deleted.

38 changes: 0 additions & 38 deletions apps/meteor/packages/meteor-timesync/README.md

This file was deleted.

6 changes: 0 additions & 6 deletions apps/meteor/packages/meteor-timesync/client/index.js

This file was deleted.

Loading

0 comments on commit fcd75da

Please sign in to comment.