Merge branch 'master' into feature/external-player.js-cleanup

.github/config.yml

@@ -1,17 +1,17 @@
 # ProBot Request Info (https://probot.github.io/apps/request-info/)
 
 requestInfoReplyComment: >
-  We would appreciate it if you could provide us with more information about this
+  👋 We would appreciate it if you could provide us with more information about this
   issue. <br><br> ![](https://feross.net/s/cats/14.gif)
 requestInfoLabelToAdd: 'need more info'
 
 # ProBot Welcome (https://probot.github.io/apps/welcome/)
 
 newPRWelcomeComment: >
-  Thanks for opening this pull request! You're awesome.
+  🙌 Thanks for opening this pull request! You're awesome.
   <br><br> ![](https://feross.net/s/cats/6.gif)
 firstPRMergeComment: >
-  Congrats on getting your first pull request landed! <br><br>
+  🎉 Congrats on getting your first pull request landed! <br><br>
   ![](https://feross.net/s/cats/29.gif)
 
 # ProBot WIP (https://probot.github.io/apps/wip/)

.github/lock.yml

@@ -1,4 +1,4 @@
 # ProBot Lock (https://probot.github.io/apps/lock/)
 
-daysUntilLock: 180
+daysUntilLock: 90
 lockComment: false

.github/no-response.yml

@@ -3,9 +3,7 @@
 daysUntilClose: 7
 responseRequiredLabel: 'need more info'
 closeComment: >
-  This issue has been automatically closed because there was no response to the
+  This issue has been automatically closed because there was no response to a
-  maintainer's request for more information from the issue opener. With only the
+  request for more information from the issue opener. Please leave a comment or
-  information that is currently in the issue, we don't have enough information to
+  open a new issue if you have additional information related to this issue.
-  take action. Please leave a comment or open a new issue if you have the additional
+  <br><br> ![](https://feross.net/s/cats/7.gif)
-  information we need to investigate further. <br><br>
-  ![](https://feross.net/s/cats/7.gif)

package.json

@@ -34,7 +34,7 @@
     "mkdirp": "^0.5.1",
     "music-metadata": "^1.0.0",
     "network-address": "^1.1.0",
-    "parse-torrent": "^5.7.3",
+    "parse-torrent": "^6.0.1",
     "prettier-bytes": "^1.0.1",
     "react": "^15.4.2",
     "react-dom": "^15.4.2",

src/renderer/pages/create-torrent-page.js

@@ -191,9 +191,14 @@ function handleSubmit () {
     path: this.state.basePath,
     files: this.state.files,
     announce: announceList,
-    private: this.state.isPrivate,
     comment: this.state.comment.trim()
   }
+
+  // If torrent is not private, leave private flag unset. This ensures that
+  // the torrent info hash will match the result generated by other tools,
+  // including webtorrent-cli.
+  if (this.state.isPrivate) options.private = true
+
   dispatch('createTorrent', options)
 }