From 2cc9488ef968731cda0b04778c636b970e8ff306 Mon Sep 17 00:00:00 2001
From: rebron1900 <me@1900.live>
Date: Sat, 30 Dec 2023 12:28:31 +0800
Subject: [PATCH 1/8] add auto set Feed Url,adapter Rsshub

---
 src/assets/index.html         |  2 +-
 src/assets/javascripts/app.js | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/assets/index.html b/src/assets/index.html
index 33e44c0..a736207 100644
--- a/src/assets/index.html
+++ b/src/assets/index.html
@@ -358,7 +358,7 @@
                 <p class="cursor-default"><b>New Feed</b></p>
                 <form action="" @submit.prevent="createFeed(event)" class="mt-4">
                     <label for="feed-url">URL</label>
-                    <input id="feed-url" name="url" type="url" class="form-control" required autocomplete="off" :readonly="feedNewChoice.length > 0" placeholder="https://example.com/feed" v-focus>
+                    <input id="feed-url" name="url" type="url" class="form-control" required autocomplete="off" :readonly="feedNewChoice.length > 0" placeholder="https://example.com/feed" v-focus V-model="autoFeedUrl">
                     <label for="feed-folder" class="mt-3 d-block">
                         Folder
                         <a href="#" class="float-right text-decoration-none" @click.prevent="createNewFeedFolder()">new folder</a>
diff --git a/src/assets/javascripts/app.js b/src/assets/javascripts/app.js
index 6814b02..d5942ba 100644
--- a/src/assets/javascripts/app.js
+++ b/src/assets/javascripts/app.js
@@ -183,6 +183,14 @@ Vue.component('relative-time', {
 })
 
 var vm = new Vue({
+  mounted:function(){
+    const subscribe_to = new URLSearchParams(window.location.search).get('subscribe_to');
+    if(subscribe_to){
+      vm.settings = 'create'
+      //document.getElementById("feed-url").value = subscribe_to;
+      this.autoFeedUrl = subscribe_to;
+    }
+  },
   created: function() {
     this.refreshStats()
       .then(this.refreshFeeds.bind(this))
@@ -191,6 +199,8 @@ var vm = new Vue({
     api.feeds.list_errors().then(function(errors) {
       vm.feed_errors = errors
     })
+
+    alert(new URLSearchParams(window.location.search).get('test'))
   },
   data: function() {
     var s = app.settings
@@ -676,6 +686,7 @@ var vm = new Vue({
       this.filteredTotalStats = statsTotal
     },
   }
+  
 })
 
 vm.$mount('#app')

From de7e8eb7fc4f64da04aea357e3903f4ba696ec7c Mon Sep 17 00:00:00 2001
From: rebron1900 <me@1900.live>
Date: Sat, 30 Dec 2023 12:31:44 +0800
Subject: [PATCH 2/8] remove test code

---
 src/assets/javascripts/app.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/assets/javascripts/app.js b/src/assets/javascripts/app.js
index d5942ba..b0dd226 100644
--- a/src/assets/javascripts/app.js
+++ b/src/assets/javascripts/app.js
@@ -199,8 +199,6 @@ var vm = new Vue({
     api.feeds.list_errors().then(function(errors) {
       vm.feed_errors = errors
     })
-
-    alert(new URLSearchParams(window.location.search).get('test'))
   },
   data: function() {
     var s = app.settings

From 773f8fbd63c2e597aa9d17c8e7228936fab4dc94 Mon Sep 17 00:00:00 2001
From: rebron1900 <me@1900.live>
Date: Sat, 30 Dec 2023 12:45:46 +0800
Subject: [PATCH 3/8] change readme.md and app.css

---
 readme.md                      | 72 ++++++++++++++++++++++++++++++++--
 src/assets/stylesheets/app.css | 42 +++++++++++++++++++-
 2 files changed, 109 insertions(+), 5 deletions(-)

diff --git a/readme.md b/readme.md
index 1e1af7c..a2077fb 100644
--- a/readme.md
+++ b/readme.md
@@ -12,6 +12,29 @@ The app is a single binary with an embedded database (SQLite).
 The latest prebuilt binaries for Linux/MacOS/Windows AMD64 are available
 [here](https://github.com/nkanaev/yarr/releases/latest). Installation instructions:
 
+* Command Arges
+  
+  ```
+    -addr string
+          address to run server on (default "127.0.0.1:7070")
+    -auth-file path
+          path to a file containing username:password
+    -base string
+          base path of the service url
+    -cert-file path
+          path to cert file for https
+    -db path
+          storage file path
+    -key-file path
+          path to key file for https
+    -log-file path
+          path to log file to use instead of stdout
+    -open
+          open the server in browser
+    -version
+          print application version
+  ```
+
 * MacOS
 
   Download `yarr-*-macos64.zip`, unzip it, place `yarr.app` in `/Applications` folder, [open the app][macos-open], click the anchor menu bar icon, select "Open".
@@ -27,12 +50,53 @@ and run [the script](etc/install-linux.sh).
 
 [macos-open]: https://support.apple.com/en-gb/guide/mac-help/mh40616/mac
 
-For self-hosting, see `yarr -h` for auth, tls & server configuration flags.
+* Docker environment
+  
+  You can use docker or docker-compose to run yarr, and you can also use environment variables to configure startup parameters.
+  
+  - `YARR_ADDR` ：address to run server on (default "127.0.0.1:7070")
+  - `YARR_BASE` ：base path of the service url
+  - `YARR_AUTHFILE` ：path to a file containing username:password
+  - `YARR_CERTFILE` ：path to cert file for https
+  - `YARR_KEYFILE` ：path to key file for https
+  - `YARR_DB` ：storage file path
+  - `YARR_LOGFILE` ：path to log file to use instead of stdout
+  
+* Docker run：
+  ```
+  docker run -d \
+  --name yarr \
+  -p 25255:7070 \
+  -e YARR_AUTHFILE="/data/.auth.list" \
+  -v /data/yarr-data:/data \
+  --restart always \
+  arsfeld/yarr:latest
+  ```
+  
+* Docker-Compose Run
 
-See more:
+  Create a file named `.auth.list` under the `/data/` directory, and the content format should be: `username:password`.
+  Then start by running docker-compose up -d and enjoy!
 
-* [Building from source code](doc/build.md)
-* [Fever API support](doc/fever.md)
+  ```yaml
+  version: '3.3'
+  services:
+      yarr:
+          container_name: yarr
+          image: 'arsfeld/yarr:latest'
+          restart: always
+          ports:
+              - '25255:7070'
+          environment:
+            YARR_AUTHFILE: "/data/.auth.list"
+          volumes:
+              - '/data/yarr-data:/data'
+  ```
+  
+* See more:
+
+  * [Building from source code](doc/build.md)
+  * [Fever API support](doc/fever.md)
 
 ## credits
 
diff --git a/src/assets/stylesheets/app.css b/src/assets/stylesheets/app.css
index 70a7f7f..71ed987 100644
--- a/src/assets/stylesheets/app.css
+++ b/src/assets/stylesheets/app.css
@@ -525,6 +525,46 @@ a,
   margin: 0 !important;
 }
 
+/* Beautify the scroll bar. */
+:root {
+  --custom-thumb-color: #6c757d;
+  --custom-track-color: rgba(0, 0, 0, 0);
+  --custom-width: thin;
+  --custom-thumb-color-hover: #ef4c4c;
+  --custom-track-color-hover: rgba(0, 0, 0, 0);
+  --webkit-scrollbar-width-height: 7px;
+  --webkit-scrollbar-border-radius: 6px;
+  --workaround-gh-scrollbars: 0;
+}
+*:not(select) {
+  scrollbar-color: var(--custom-thumb-color) var(--custom-track-color) !important;
+  scrollbar-width: var(--custom-width) !important;
+}
+/* Chrome and derivatives*/
+::-webkit-scrollbar {
+  max-width: var(--webkit-scrollbar-width-height) !important;
+  max-height: var(--webkit-scrollbar-width-height) !important;
+  background: var(--custom-track-color) !important;
+}
+::-webkit-scrollbar-corner,
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-track-piece {
+  background: var(--custom-track-color) !important;
+}
+::-webkit-scrollbar-thumb {
+  background: var(--custom-thumb-color) !important;
+  border-radius: var(--webkit-scrollbar-border-radius) !important;
+}
+::-webkit-scrollbar-corner:hover,
+::-webkit-scrollbar-track:hover,
+::-webkit-scrollbar-track-piece:hover {
+  background: var(--custom-track-color-hover) !important;
+}
+::-webkit-scrollbar-thumb:hover {
+  background: var(--custom-thumb-color-hover) !important;
+}
+
+
 /* responsive layout
 
    tablet:
@@ -607,4 +647,4 @@ a,
   .toolbar-search {
     padding: .5rem;
   }
-}
+}
\ No newline at end of file

From 63a357330cc4b06e0edc1dd344fcd9f180d8dcf5 Mon Sep 17 00:00:00 2001
From: rebron1900 <me@1900.live>
Date: Sat, 30 Dec 2023 20:02:54 +0800
Subject: [PATCH 4/8] build docker v2.5

---
 .github/workflows/build-docker-image     | 38 -------------------
 .github/workflows/build-docker-image.yml | 47 ++++++++++++++++++++++++
 yarr-version.txt                         |  1 +
 3 files changed, 48 insertions(+), 38 deletions(-)
 delete mode 100644 .github/workflows/build-docker-image
 create mode 100644 .github/workflows/build-docker-image.yml
 create mode 100644 yarr-version.txt

diff --git a/.github/workflows/build-docker-image b/.github/workflows/build-docker-image
deleted file mode 100644
index 8d5a88a..0000000
--- a/.github/workflows/build-docker-image
+++ /dev/null
@@ -1,38 +0,0 @@
-name: Publish Docker Image
-on:
-  push:
-    tags: [ 'v*.*.*', 'v*.*', 'v*', 'latest' ]
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: nkanaev/yarr
-jobs:
-  build-and-push-image:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a
-        with:
-          context: .
-          file: ./etc/dockerfile
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
new file mode 100644
index 0000000..7ecf2dd
--- /dev/null
+++ b/.github/workflows/build-docker-image.yml
@@ -0,0 +1,47 @@
+name: Build Yarr Docker image
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - 'yarr-version.txt'
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Read latest release tag
+        id: read-tag
+        run: |
+          echo ::set-output name=tag::$(curl -sL https://raw.githubusercontent.com/rebron1900/yarr/main/yarr-version.txt)
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+        with:
+          repository: 'rebron1900/yarr'
+          ref: ${{ steps.read-tag.outputs.tag }}
+      - 
+        name: Remove GOARCH
+        run: |
+          sed -i -e 's/GOARCH=amd64//g' makefile
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - 
+        name: Login to registry
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - 
+        name: Push to Docker
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
+          tags: |
+            ${{ secrets.DOCKER_USERNAME }}/yarr:latest
+            ${{ secrets.DOCKER_USERNAME }}/yarr:${{ steps.read-tag.outputs.tag }}
\ No newline at end of file
diff --git a/yarr-version.txt b/yarr-version.txt
new file mode 100644
index 0000000..0d81cd0
--- /dev/null
+++ b/yarr-version.txt
@@ -0,0 +1 @@
+v2.5
\ No newline at end of file

From d45b6c0e795616dc0ab957a2654ef3df5627b6a1 Mon Sep 17 00:00:00 2001
From: rebron1900 <me@1900.live>
Date: Sat, 30 Dec 2023 20:35:27 +0800
Subject: [PATCH 5/8] build docker v2.5

---
 .github/workflows/{build-docker-image.yml => build-docker-image} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{build-docker-image.yml => build-docker-image} (100%)

diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image
similarity index 100%
rename from .github/workflows/build-docker-image.yml
rename to .github/workflows/build-docker-image

From dd79d9404d8f7b9d800e2e8225ae713795e5bf3a Mon Sep 17 00:00:00 2001
From: rebron1900 <me@1900.live>
Date: Sat, 30 Dec 2023 20:49:51 +0800
Subject: [PATCH 6/8] build docker v2.5

---
 .github/workflows/build.yml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7f5191a..d8670bc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -142,3 +142,38 @@ jobs:
           asset_path: ./yarr-linux.zip
           asset_name: yarr-${{ github.ref }}-linux64.zip
           asset_content_type: application/zip
+
+  build_docker:
+    runs-on: ubuntu-latest
+    needs: [create_release]
+    steps:
+      - name: Read latest release tag
+        id: read-tag
+        run: |
+          echo ::set-output name=tag::$(curl -sL https://raw.githubusercontent.com/rebron1900/yarr/main/yarr-version.txt)
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          repository: 'rebron1900/yarr'
+          ref: ${{ steps.read-tag.outputs.tag }}
+      - name: Remove GOARCH
+        run: |
+          sed -i -e 's/GOARCH=amd64//g' makefile
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to registry
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Push to Docker
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
+          tags: |
+            ${{ secrets.DOCKER_USERNAME }}/yarr:latest
+            ${{ secrets.DOCKER_USERNAME }}/yarr:${{ steps.read-tag.outputs.tag }}

From 01cadf644c38b55a35a2d1828df0dc9e8fad6126 Mon Sep 17 00:00:00 2001
From: rebron1900 <me@1900.live>
Date: Sat, 30 Dec 2023 21:02:03 +0800
Subject: [PATCH 7/8] build docker v2.5

---
 .github/workflows/build-docker-image | 2 +-
 .github/workflows/build.yml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-docker-image b/.github/workflows/build-docker-image
index 7ecf2dd..9c16fe0 100644
--- a/.github/workflows/build-docker-image
+++ b/.github/workflows/build-docker-image
@@ -44,4 +44,4 @@ jobs:
           push: true
           tags: |
             ${{ secrets.DOCKER_USERNAME }}/yarr:latest
-            ${{ secrets.DOCKER_USERNAME }}/yarr:${{ steps.read-tag.outputs.tag }}
\ No newline at end of file
+            ${{ secrets.DOCKER_USERNAME }}/yarr:${{ steps.read-tag.outputs.tag }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d8670bc..50546d2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -150,7 +150,7 @@ jobs:
       - name: Read latest release tag
         id: read-tag
         run: |
-          echo ::set-output name=tag::$(curl -sL https://raw.githubusercontent.com/rebron1900/yarr/main/yarr-version.txt)
+          echo ::set-output name=tag::$(curl -sL https://raw.githubusercontent.com/rebron1900/yarr/master/yarr-version.txt)
       - name: Checkout
         uses: actions/checkout@v2
         with:

From 14d1bd1fc30ad5bc7a52f08d751f9a9a499e55ab Mon Sep 17 00:00:00 2001
From: rebron1900 <me@1900.live>
Date: Sat, 30 Dec 2023 21:24:11 +0800
Subject: [PATCH 8/8] build docker v2.5

---
 makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/makefile b/makefile
index f8d3609..9ee9004 100644
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-VERSION=2.4
+VERSION=2.5
 GITHASH=$(shell git rev-parse --short=8 HEAD)
 
 CGO_ENABLED=1