Merge branch 'master' into improve_build

.github/workflows/release.yml

@@ -92,11 +92,10 @@ jobs:
       env:
         NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
       run: |
-        mkdir -p target/npm-build        
-        cp mastodon-bot.js target/npm-build/
-        cp target/mastodon-bot.js.sha256 target/npm-build/
-        cp target/mastodon-bot.js.sha512 target/npm-build/
-        cp package.json target/npm-build/
-        cp README.md target/npm-build/
-        tar -cz -C target/npm-build -f target/npm-build.tgz .
-        npm publish ./target/npm-build.tgz --access public --dry-run
+        mkdir -p target/npm-build/mastodon_bot
+        cp mastodon-bot.js target/npm-build/mastodon_bot/
+        cp target/mastodon-bot.js.sha256 target/npm-build/mastodon_bot/
+        cp target/mastodon-bot.js.sha512 target/npm-build/mastodon_bot/
+        cp package.json target/npm-build/mastodon_bot/
+        cp README.md target/npm-build/mastodon_bot/
+        npm publish ./target/npm-build --access public --dry-run

RELEASING.md

@@ -8,12 +8,11 @@ shadow-cljs release app
 chmod a+x mastodon-bot.js
 rm -rf target/npm-build 
 mkdir target/npm-build
-cp mastodon-bot.js target/npm-build/
-cp package.json target/npm-build/
-cp README.md target/npm-build/
-tar -cz -C target/npm-build -f target/npm-build.tgz .
+cp mastodon-bot.js target/npm-build
+cp package.json target/npm-build
+cp README.md target/npm-build
 
-npm publish ./target/npm-build.tgz --access public
+npm publish ./target/npm-build --access public
 ```
 
 ## prod release (should be done from master)
@@ -32,13 +31,12 @@ shadow-cljs release app
 shadow-cljs release app
 chmod a+x mastodon-bot.js
 rm -rf target/npm-build 
-mkdir -p target/npm-build
-cp mastodon-bot.js target/npm-build/
-cp package.json target/npm-build/
-cp README.md target/npm-build/
-tar -cz -C target/npm-build -f target/npm-build.tgz .
+mkdir target/npm-build
+cp mastodon-bot.js target/npm-build
+cp package.json target/npm-build
+cp README.md target/npm-build
 
-npm publish ./target/npm-build.tgz --access public
+npm publish ./target/npm-build --access public
 
 # Bump version
 vi shadow-cljs.edn

package.json

@@ -2,7 +2,7 @@
   "name": "mastodon-bot",
   "description": "Bot to publish twitter, tumblr or rss posts to an mastodon account.",
   "author": "Dmitri Sotnikov",
-  "version": "1.0.1",
+  "version": "1.0.4",
   "homepage": "https://github.com/yogthos/mastodon-bot",
   "repository": "https://github.com/yogthos/mastodon-bot",
   "license": "MIT",

src/main/mastodon_bot/twitter_api.cljs

@@ -54,8 +54,9 @@
 (defn-spec nitter-url map?
   [source twitter-source?
    parsed-tweet map?]
-  (when (:nitter-urls? source)
-    (update parsed-tweet :text #(string/replace % #"https://twitter.com" "https://nitter.net"))))
+  (if (:nitter-urls? source)
+    (update parsed-tweet :text #(string/replace % #"https://twitter.com" "https://nitter.net"))
+    parsed-tweet))
 
 (defn-spec user-timeline any?
   [twitter-auth twitter-auth?