Merge pull request #617 from travis-ci/ps-simplify-manual-repo-subscr…

…iption Don't add `private-` suffix manually to pusher channels
travis-ci · Jul 19, 2016 · dc8cc32 · dc8cc32
2 parents f500c1e + f5f29a1
commit dc8cc32
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/app/components/hook-switch.js b/app/components/hook-switch.js
@@ -16,11 +16,7 @@ export default Ember.Component.extend({
       repoId = hook.get('id');
 
     return hook.toggle().then(() => {
-      let channel = 'repo-' + repoId;
-      if (hook.get('private') || this.get('config').enterprise) {
-        channel = 'private-' + channel;
-      }
-      pusher.subscribe(channel);
+      pusher.subscribe(`repo-${repoId}`);
     }, () => {
       this.toggleProperty('hook.active');
       return this.sendAction('onToggleError', hook);

diff --git a/app/components/not-active.js b/app/components/not-active.js
@@ -26,7 +26,6 @@ export default Ember.Component.extend({
 
   activate: task(function * () {
     const apiEndpoint = config.apiEndpoint;
-    const repo = this.get('repo');
     const repoId = this.get('repo.id');
 
     try {
@@ -38,15 +37,7 @@ export default Ember.Component.extend({
       });
 
       if (response.active) {
-        const pusher = this.get('pusher');
-
-        let channel = `repo-${repoId}`;
-
-        if (repo.get('private') || this.get('config').enterprise) {
-          channel = `private-${channel}`;
-        }
-
-        pusher.subscribe(`repo-${repoId}`);
+        this.get('pusher').subscribe(`repo-${repoId}`);
 
         this.get('repo').set('active', true);
         this.get('flashes').success('Repository has been successfully activated.');