Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve room types usage #16753

Merged
merged 9 commits into from
Mar 17, 2020
Merged

Improve room types usage #16753

merged 9 commits into from
Mar 17, 2020

Conversation

ggazzo
Copy link
Member

@ggazzo ggazzo commented Feb 28, 2020

No description provided.

@ggazzo ggazzo requested a review from sampaiodiego February 28, 2020 17:31
@ggazzo ggazzo added this to the 3.1.0 milestone Feb 28, 2020
app/ui/client/views/app/room.js Outdated Show resolved Hide resolved
app/lib/lib/roomTypes/public.js Outdated Show resolved Hide resolved
app/lib/lib/roomTypes/direct.js Outdated Show resolved Hide resolved
app/lib/server/methods/leaveRoom.js Show resolved Hide resolved
app/ui-flextab/client/tabs/userActions.js Outdated Show resolved Hide resolved
@@ -30,7 +30,7 @@ Meteor.methods({
const userInRoom = subscription != null;

// Can't add to direct room ever
if (room.t === 'd') {
if (room.t === 'd') { // TODO CHANGE
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its for a future feature :x

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which future feature? Or you describe what is expected there or you just forgot your reminder there, no one else will understand this.

app/lib/lib/roomTypes/direct.js Outdated Show resolved Hide resolved
@@ -30,7 +30,7 @@ Meteor.methods({
const userInRoom = subscription != null;

// Can't add to direct room ever
if (room.t === 'd') {
if (room.t === 'd') { // TODO CHANGE
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which future feature? Or you describe what is expected there or you just forgot your reminder there, no one else will understand this.

app/utils/lib/RoomTypeConfig.js Show resolved Hide resolved
server/methods/removeUserFromRoom.js Outdated Show resolved Hide resolved
app/utils/lib/RoomTypeConfig.js Show resolved Hide resolved
app/e2e/client/rocketchat.e2e.room.js Show resolved Hide resolved
@rodrigok rodrigok changed the title [CHORE] Improve room types usage Improve room types usage Mar 13, 2020
@@ -30,7 +30,7 @@ Meteor.methods({
const userInRoom = subscription != null;

// Can't add to direct room ever
if (room.t === 'd') { // TODO CHANGE
if (room.t === 'd') {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this one isn't a check against the enum?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just because I have a feeling we gonna change this very soon (direct messages between multiple users)

@lgtm-com
Copy link

lgtm-com bot commented Mar 16, 2020

This pull request introduces 2 alerts when merging 9afea45 into 6914d11 - view on LGTM.com

new alerts:

  • 2 for Unused variable, import, function or class

@rodrigok
Copy link
Member

@ggazzo your push broke the build

@ggazzo ggazzo force-pushed the roomTypes/improve branch from 9afea45 to aacb65b Compare March 16, 2020 13:47
@ggazzo ggazzo merged commit 0ace4aa into develop Mar 17, 2020
ggazzo added a commit to wreiske/Rocket.Chat that referenced this pull request Mar 19, 2020
…4892-wreiske-user-status-bubbles

* 'develop' of github.com:RocketChat/Rocket.Chat: (540 commits)
  [FIX] Show error message if password and confirm password not equal (RocketChat#16247)
  [FIX] Message quote button inside threads (RocketChat#16925)
  Fix wrong imported library meteor/tap:i18n
  lint
  [IMPROVE] User gets feedback when a message has been starred or unstarred (RocketChat#13860)
  [FIX] admin can sort users by email in directory view (RocketChat#15796)
  [FIX] Pinned messages wouldn't collapse (RocketChat#16188)
  [IMPROVE] Added border to page header. (RocketChat#16792)
  [FIX] Correct thread messages display in context bar. (RocketChat#16835)
  [FIX] Public channel cannot be acessed via URL when 'Allow Anonymous Read' is active (RocketChat#16914)
  Fixed Line break incorrectly being called apostrophe (RocketChat#16918)
  [IMPROVE] Context menu autofocus (RocketChat#16915)
  Improve room types usage (RocketChat#16753)
  [NEW] API `users.deactivateIdle` for mass-disabling of idle users (RocketChat#16849)
  [NEW] API to logout from other locations (RocketChat#16193)
  [IMPROVE] Add option to require authentication on user's shield endpoint (RocketChat#16845)
  [FIX] Custom OAuth Bug (RocketChat#16811)
  [FIX] Integrations page pagination (RocketChat#16838)
  reset package-lock to upstream
  Apply suggestions from code review
  ...
ggazzo added a commit that referenced this pull request Mar 20, 2020
…ultiple-users* 'develop' of github.com:RocketChat/Rocket.Chat: (53 commits) [FIX] Show error message if password and confirm password not equal (#16247)  [FIX] Message quote button inside threads (#16925)  Fix wrong imported library meteor/tap:i18n  lint  [IMPROVE] User gets feedback when a message has been starred or unstarred (#13860)  [FIX] admin can sort users by email in directory view (#15796)  [FIX] Pinned messages wouldn't collapse (#16188)  [IMPROVE] Added border to page header. (#16792)  [FIX] Correct thread messages display in context bar. (#16835)  [FIX] Public channel cannot be acessed via URL when 'Allow Anonymous Read' is active (#16914)  Fixed Line break incorrectly being called apostrophe (#16918)  [IMPROVE] Context menu autofocus (#16915)  Improve room types usage (#16753)  [NEW] API `users.deactivateIdle` for mass-disabling of idle users (#16849)  [NEW] API to logout from other locations (#16193)  [IMPROVE] Add option to require authentication on user's shield endpoint (#16845)  [FIX] Custom OAuth Bug (#16811)  [FIX] Integrations page pagination (#16838)  reset package-lock to upstream  Apply suggestions from code review  ...
@rodrigok rodrigok deleted the roomTypes/improve branch March 29, 2020 03:46
@sampaiodiego sampaiodiego mentioned this pull request Apr 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants