Add Sandstorm activity/notification events #3743
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jparyani
force-pushed
the
add-sandstorm-notifications
branch
from
30fb960
to
31e8a2a
Compare
jparyani
force-pushed
the
add-sandstorm-notifications
branch
from
31e8a2a
to
3044a50
Compare
|
@rodrigok will this PR have any interaction with the soon-to-be-released (fusion engine) optimizations? If so, please comment on how it should be adapted. Thanks. |
jparyani
force-pushed
the
add-sandstorm-notifications
branch
2 times, most recently
from
25291b4
to
4243c9b
Compare
|
@jparyani Can you fix the conflicts for us? |
jparyani
force-pushed
the
add-sandstorm-notifications
branch
from
4243c9b
to
cd8b0b2
Compare
|
Rebased and ready to merge. |
This was referenced Dec 23, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@RocketChat/core
Sandstorm recently grew new mechanisms for notifications (see sandstorm-io/sandstorm#2174). This PR disables normal desktop notifications under Sandstorm and replaces them with the new Sandstorm notification system. I tried to be as non-invasive as possible, with the bulk of the custom code going in a new package named
rocketchat-sandstorm.I did end up editing rocketchat-lib/sendMessage to include the sandstorm session id. The only other invasive change was in rocketchat-lib/sendNotificationsOnMessage, where I thought it made the most sense to re-use the current notification logic. The new method
RocketChat.Sandstorm.notifyis a no-op under non-Sandstorm environments.