Release v1.1.0

wb14123 · Jul 28, 2024 · cde7104 · cde7104
1 parent e554096
commit cde7104
Show file tree

Hide file tree

Showing 17 changed files with 7,467 additions and 1,706 deletions.
diff --git a/bin/download-rsshub-rules.sh b/bin/download-rsshub-rules.sh
@@ -1,4 +1,4 @@
-#/bin/sh
+#!/bin/sh
 
 wget -c 'https://rsshub.js.org/build/radar-rules.js'
 (echo "var a = " ; cat radar-rules.js ; echo "; console.log(JSON.stringify(a, null, 2));") > radar-rules-tmp.js

diff --git a/make_release.sh b/make_release.sh
@@ -19,6 +19,8 @@ rsync --delete -av --exclude .git --filter=':- .gitignore' . ../rss_brain_releas
 
 if [ $RELEASE_VERSION = 'amend' ] ; then
 	echo "Amend existing commit"
+	git tag --delete $RELEASE_VERSION
+	git tag $RELEASE_VERSION
 	cd ../rss_brain_release
 	git add -A .
 	git commit --amend --no-edit

diff --git a/readme.md b/readme.md
@@ -17,8 +17,9 @@ sbt assembly
 ## Download and Generate RSSHub rules
 
 ```
-./bin/download-rsshub-rules.sh
-sbt compile convertRsshubRules
+cd ./bin && ./download-rsshub-rules.sh
+sbt compile generateRsshubRules
+sbt validateRsshubRules
 ```
 
 ## Test

diff --git a/src/main/protobuf/grpc-api.proto b/src/main/protobuf/grpc-api.proto
@@ -1361,19 +1361,28 @@ message GetApiVersionRequest {
 
 }
 
+message CheckPaymentEnabledRequest {
+
+}
+
 message VersionIsCompatibleRequest {
     string version = 1;
 }
 message GetApiVersionResponse {
     string result = 1;
 }
 
+message CheckPaymentEnabledResponse {
+    bool result = 1;
+}
+
 message VersionIsCompatibleResponse {
     bool result = 1;
 }
 
 service SystemAPI {
     rpc GetApiVersion (GetApiVersionRequest) returns (GetApiVersionResponse);
+    rpc CheckPaymentEnabled (CheckPaymentEnabledRequest) returns (CheckPaymentEnabledResponse);
     rpc VersionIsCompatible (VersionIsCompatibleRequest) returns (VersionIsCompatibleResponse);
 }
 

diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
@@ -24,7 +24,7 @@ redis {
 }
 
 api {
-    version = "0.1.0"
+    version = "1.1.0"
 }
 
 grpc {
@@ -62,6 +62,8 @@ website {
 }
 
 payment {
+    # change this to false to disable payment, still need to set `stripe` section with empty strings like below
+    enabled = true
 
     stripe {
         apiKey = ""