Merge tag '3.1.1' into sc

3.1.1 (2023-03-28)
==================

Bugfixes
--------

- Fix the bridge spamming RSS feeds repeatedly. ([\matrix-org#694](matrix-org#694))

Internal Changes
----------------

- Fix release script setting the tag message to "-". ([\matrix-org#693](matrix-org#693))

CHANGELOG.md

@@ -1,3 +1,18 @@
+3.1.1 (2023-03-28)
+==================
+
+Bugfixes
+--------
+
+- Fix the bridge spamming RSS feeds repeatedly. ([\#694](https://github.com/matrix-org/matrix-hookshot/issues/694))
+
+
+Internal Changes
+----------------
+
+- Fix release script setting the tag message to "-". ([\#693](https://github.com/matrix-org/matrix-hookshot/issues/693))
+
+
 3.1.0 (2023-03-28)
 ==================
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "matrix-hookshot",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.",
   "main": "lib/app.js",
   "repository": "https://github.com/matrix-org/matrix-hookshot",

scripts/release.sh

@@ -38,7 +38,7 @@ towncrier build --version $VERSION
 git commit CHANGELOG.md changelog.d/ package.json -m $TAG
 
 echo "Proceeding to generate tags"
-cat draft-release.txt | git tag --force -m - -s $TAG
+git tag -F draft-release.txt -s $TAG
 rm draft-release.txt
 echo "Generated tag $TAG"
 

src/feeds/FeedReader.ts

@@ -379,7 +379,7 @@ export class FeedReader {
         const elapsed = Date.now() - fetchingStarted;
         Metrics.feedFetchMs.set(elapsed);
 
-        const sleepFor = Math.min(this.sleepingInterval - elapsed, 0);
+        const sleepFor = Math.max(this.sleepingInterval - elapsed, 0);
         log.debug(`Feed fetching took ${elapsed / 1000}s, sleeping for ${sleepFor / 1000}s`);
 
         if (elapsed > this.sleepingInterval) {