Do not add filter for root folder, allowing ALL feeds to be marked as read.

Reeder Fever behavious is to send an id=0 when you mark all items as read

.github/actions/prepare/action.yml

@@ -0,0 +1,25 @@
+name: Build & Upload
+inputs:
+  id:
+    description: artifact name
+    required: true
+  cmd:
+    description: command to run
+    required: true
+  out:
+    description: path to output file
+    required: true
+runs:
+  using: composite
+  steps:
+    - name: compile
+      run: ${{ inputs.cmd }}
+      shell: bash
+    - name: archive
+      run: tar -cvf ${{ inputs.out }}.tar ${{ inputs.out }}
+      shell: bash
+    - name: upload
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ inputs.id }}
+        path: ${{ inputs.out }}.tar

.github/workflows/build-docker.yml

@@ -0,0 +1,49 @@
+name: Publish Docker Image
+on:
+  push:
+    tags:
+      - v*
+  workflow_dispatch:
+
+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@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./etc/dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64

.github/workflows/build.yml

@@ -1,144 +1,143 @@
-name: build
+name: Build
 
 on:
   push:
-    tags: ['v*', 'test*']
+    tags:
+      - v*
+  workflow_dispatch:
 
 jobs:
   build_macos:
     name: Build for MacOS
-    runs-on: macos-10.15
+    runs-on: macos-13
     steps:
-    - name: "Checkout"
-      uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Setup Go
+      uses: actions/setup-go@v4
       with:
-        submodules: 'recursive'
-    - name: "Setup Go"
-      uses: actions/setup-go@v2
+        go-version: '^1.23'
+    - name: Build arm64 gui
+      uses: ./.github/actions/prepare
       with:
-        go-version: '^1.16'
-    - name: Cache Go Modules
-      uses: actions/cache@v2
+        id: darwin_arm64_gui
+        cmd: make darwin_arm64_gui
+        out: out/darwin_arm64_gui/yarr.app
+    - name: Build amd64 gui
+      uses: ./.github/actions/prepare
       with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: |
-          ${{ runner.os }}-go-
-    - name: "Build"
-      run: make build_macos
-    - name: Upload
-      uses: actions/upload-artifact@v2
+        id: darwin_amd64_gui
+        cmd: make darwin_amd64_gui
+        out: out/darwin_amd64_gui/yarr.app
+    - name: Build arm64 cli
+      uses: ./.github/actions/prepare
       with:
-        name: macos
-        path: _output/macos/yarr.app
+        id: darwin_arm64
+        cmd: make darwin_arm64
+        out: out/darwin_arm64/yarr
+    - name: Build amd64 cli
+      uses: ./.github/actions/prepare
+      with:
+        id: darwin_amd64
+        cmd: make darwin_amd64
+        out: out/darwin_amd64/yarr
 
   build_windows:
     name: Build for Windows
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
-    - name: "Checkout"
-      uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Setup Go
+      uses: actions/setup-go@v4
       with:
-        submodules: 'recursive'
-    - name: "Setup Go"
-      uses: actions/setup-go@v2
+        go-version: '^1.23'
+    - name: Build amd64 gui
+      uses: ./.github/actions/prepare
       with:
-        go-version: '^1.16'
-    - name: Cache Go Modules
-      uses: actions/cache@v2
+        id: windows_amd64_gui
+        cmd: make windows_amd64_gui
+        out: out/windows_amd64_gui/yarr.exe
+    - name: Build arm64 gui
+      if: false
+      uses: ./.github/actions/prepare
       with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: |
-          ${{ runner.os }}-go-
-    - name: "Build"
-      run: make build_windows
-    - name: Upload
-      uses: actions/upload-artifact@v2
-      with:
-        name: windows
-        path: _output/windows/yarr.exe
+        id: windows_arm64_gui
+        cmd: make windows_arm64_gui
+        out: out/windows_arm64_gui/yarr.exe
 
-  build_linux:
-    name: Build for Linux
-    runs-on: ubuntu-18.04
+  build_multi_cli:
+    name: Build for Windows/MacOS/Linux CLI
+    runs-on: ubuntu-22.04
     steps:
-    - name: "Checkout"
-      uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Setup Go
+      uses: actions/setup-go@v4
       with:
-        submodules: 'recursive'
-    - name: "Setup Go"
-      uses: actions/setup-go@v2
+        go-version: '^1.23'
+    - name: Setup Zig
+      uses: mlugg/setup-zig@v1
       with:
-        go-version: '^1.16'
-    - name: Cache Go Modules
-      uses: actions/cache@v2
+        version: 0.14.0
+    - name: Build linux/amd64
+      uses: ./.github/actions/prepare
       with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: |
-          ${{ runner.os }}-go-
-    - name: "Build"
-      run: make build_linux
-    - name: Upload
-      uses: actions/upload-artifact@v2
+        id: linux_amd64
+        cmd: make linux_amd64
+        out: out/linux_amd64/yarr
+    - name: Build linux/arm64
+      uses: ./.github/actions/prepare
       with:
-        name: linux
-        path: _output/linux/yarr
+        id: linux_arm64
+        cmd: make linux_arm64
+        out: out/linux_arm64/yarr
+    - name: Build linux/armv7
+      uses: ./.github/actions/prepare
+      with:
+        id: linux_armv7
+        cmd: make linux_armv7
+        out: out/linux_armv7/yarr
+    - name: Build windows/amd64
+      uses: ./.github/actions/prepare
+      with:
+        id: windows_amd64
+        cmd: make windows_amd64
+        out: out/windows_amd64/yarr
+    - name: Build windows/arm64
+      uses: ./.github/actions/prepare
+      with:
+        id: windows_arm64
+        cmd: make windows_arm64
+        out: out/windows_arm64/yarr
 
   create_release:
     name: Create Release
     runs-on: ubuntu-latest
-    if: ${{ !contains(github.ref, 'test') }}
-    needs: [build_macos, build_windows, build_linux]
+    needs: [build_macos, build_windows, build_multi_cli]
     steps:
-    - name: Create Release
-      uses: actions/create-release@v1
-      id: create_release
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ github.ref }}
-          draft: true
-          prerelease: true
     - name: Download Artifacts
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v4.1.7
       with:
         path: .
     - name: Preparation
       run: |
+        set -ex
         ls -R
-        chmod u+x macos/Contents/MacOS/yarr
-        chmod u+x linux/yarr
-
-        mv macos yarr.app     && zip -r yarr-macos.zip yarr.app
-        mv windows/yarr.exe . && zip yarr-windows.zip yarr.exe
-        mv linux/yarr .       && zip yarr-linux.zip yarr
-    - name: Upload MacOS
-      uses: actions/upload-release-asset@v1
+        for tarfile in `ls **/*.tar`; do
+          tar -xvf $tarfile
+        done
+        for dir in out/*; do
+          echo "Compressing: $dir"
+          (test -d "$dir" && cd $dir && zip -r ../yarr_`basename $dir`.zip *)
+        done
+        ls out
+    - name: Upload Release
+      uses: softprops/action-gh-release@v2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./yarr-macos.zip
-          asset_name: yarr-${{ github.ref }}-macos64.zip
-          asset_content_type: application/zip
-    - name: Upload Windows
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./yarr-windows.zip
-          asset_name: yarr-${{ github.ref }}-windows64.zip
-          asset_content_type: application/zip
-    - name: Upload Linux
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./yarr-linux.zip
-          asset_name: yarr-${{ github.ref }}-linux64.zip
-          asset_content_type: application/zip
+          draft: true
+          prerelease: true
+          files: |
+            out/*.zip

.github/workflows/test.yml

@@ -0,0 +1,19 @@
+name: Test
+
+on: push
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Go
+      uses: actions/setup-go@v4
+      with:
+        go-version: '^1.18'
+
+    - name: Run tests
+      run: make test

.gitignore

@@ -1,5 +1,9 @@
 /_output
+/out
 /yarr
 *.db
+*.db-shm
+*.db-wal
 *.syso
 versioninfo.rc
+.DS_Store

bin/generate_versioninfo.go

@@ -1,48 +0,0 @@
-package main
-
-import (
-	"flag"
-	"io/ioutil"
-	"strings"
-)
-
-var rsrc = `1 VERSIONINFO
-FILEVERSION     {VERSION_COMMA},0,0
-PRODUCTVERSION  {VERSION_COMMA},0,0
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "080904E4"
-    BEGIN
-      VALUE "CompanyName", "Old MacDonald's Farm"
-      VALUE "FileDescription", "Yet another RSS reader"
-      VALUE "FileVersion", "{VERSION}"
-      VALUE "InternalName", "yarr"
-      VALUE "LegalCopyright", "nkanaev"
-      VALUE "OriginalFilename", "yarr.exe"
-      VALUE "ProductName", "yarr"
-      VALUE "ProductVersion", "{VERSION}"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x809, 1252
-  END
-END
-
-1 ICON "icon.ico"
-`
-
-func main() {
-	var version, outfile string
-	flag.StringVar(&version, "version", "0.0", "")
-	flag.StringVar(&outfile, "outfile", "versioninfo.rc", "")
-	flag.Parse()
-
-	version_comma := strings.ReplaceAll(version, ".", ",")
-
-	out := strings.ReplaceAll(rsrc, "{VERSION}", version)
-	out = strings.ReplaceAll(out, "{VERSION_COMMA}", version_comma)
-
-	ioutil.WriteFile(outfile, []byte(out), 0644)
-}

bin/package_macos.go

@@ -1,99 +0,0 @@
-package main
-
-import (
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"os/exec"
-	"path"
-	"strconv"
-	"strings"
-)
-
-var plist = `<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleName</key>
-	<string>yarr</string>
-	<key>CFBundleDisplayName</key>
-	<string>yarr</string>
-	<key>CFBundleIdentifier</key>
-	<string>nkanaev.yarr</string>
-	<key>CFBundleVersion</key>
-	<string>VERSION</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleExecutable</key>
-	<string>yarr</string>
-
-	<key>CFBundleIconFile</key>
-	<string>icon</string>
-	<key>LSApplicationCategoryType</key>
-	<string>public.app-category.news</string>
-
-	<key>NSHighResolutionCapable</key>
-	<string>True</string>
-
-	<key>LSMinimumSystemVersion</key>
-	<string>10.13</string>
-	<key>LSUIElement</key>
-	<true/>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2020 nkanaev. All rights reserved.</string>
-</dict>
-</plist>
-`
-
-func run(cmd ...string) {
-	fmt.Println(cmd)
-	err := exec.Command(cmd[0], cmd[1:]...).Run()
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-
-func main() {
-	var version, outdir string
-	flag.StringVar(&version, "version", "0.0", "")
-	flag.StringVar(&outdir, "outdir", "", "")
-	flag.Parse()
-
-	outfile := "yarr"
-
-	binDir := path.Join(outdir, "yarr.app", "Contents/MacOS")
-	resDir := path.Join(outdir, "yarr.app", "Contents/Resources")
-
-	plistFile := path.Join(outdir, "yarr.app", "Contents/Info.plist")
-	pkginfoFile := path.Join(outdir, "yarr.app", "Contents/PkgInfo")
-
-	os.MkdirAll(binDir, 0700)
-	os.MkdirAll(resDir, 0700)
-
-	f, _ := ioutil.ReadFile(path.Join(outdir, outfile))
-	ioutil.WriteFile(path.Join(binDir, outfile), f, 0755)
-
-	ioutil.WriteFile(plistFile, []byte(strings.Replace(plist, "VERSION", version, 1)), 0644)
-	ioutil.WriteFile(pkginfoFile, []byte("APPL????"), 0644)
-
-	iconFile := path.Join(outdir, "icon.png")
-	iconsetDir := path.Join(outdir, "icon.iconset")
-	os.Mkdir(iconsetDir, 0700)
-
-	for _, res := range []int{1024, 512, 256, 128, 64, 32, 16} {
-		outfile := fmt.Sprintf("icon_%dx%d.png", res, res)
-		if res == 1024 || res == 64 {
-			outfile = fmt.Sprintf("icon_%dx%d@2x.png", res/2, res/2)
-		}
-		cmd := []string{
-			"sips", "-s", "format", "png", "--resampleWidth", strconv.Itoa(res),
-			iconFile, "--out", path.Join(iconsetDir, outfile),
-		}
-		run(cmd...)
-	}
-
-	icnsFile := path.Join(resDir, "icon.icns")
-	run("iconutil", "-c", "icns", iconsetDir, "-o", icnsFile)
-}

cmd/yarr/main.go

@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"flag"
 	"fmt"
+	"io"
 	"log"
 	"os"
 	"path/filepath"
@@ -12,6 +13,7 @@ import (
 	"github.com/nkanaev/yarr/src/platform"
 	"github.com/nkanaev/yarr/src/server"
 	"github.com/nkanaev/yarr/src/storage"
+	"github.com/nkanaev/yarr/src/worker"
 )
 
 var Version string = "0.0"
@@ -28,10 +30,24 @@ func opt(envVar, defaultValue string) string {
 	return defaultValue
 }
 
+func parseAuthfile(authfile io.Reader) (username, password string, err error) {
+	scanner := bufio.NewScanner(authfile)
+	if scanner.Scan() {
+		line := scanner.Text()
+		parts := strings.SplitN(line, ":", 2)
+		if len(parts) != 2 {
+			return "", "", fmt.Errorf("wrong syntax (expected `username:password`)")
+		}
+		username = parts[0]
+		password = parts[1]
+	}
+	return username, password, nil
+}
+
 func main() {
 	platform.FixConsoleIfNeeded()
 
-	var addr, db, authfile, certfile, keyfile, basepath, logfile string
+	var addr, db, authfile, auth, certfile, keyfile, basepath, logfile string
 	var ver, open bool
 
 	flag.CommandLine.SetOutput(os.Stdout)
@@ -46,7 +62,8 @@ func main() {
 
 	flag.StringVar(&addr, "addr", opt("YARR_ADDR", "127.0.0.1:7070"), "address to run server on")
 	flag.StringVar(&basepath, "base", opt("YARR_BASE", ""), "base path of the service url")
-	flag.StringVar(&authfile, "auth-file", opt("YARR_AUTHFILE", ""), "`path` to a file containing username:password")
+	flag.StringVar(&authfile, "auth-file", opt("YARR_AUTHFILE", ""), "`path` to a file containing username:password. Takes precedence over --auth (or YARR_AUTH)")
+	flag.StringVar(&auth, "auth", opt("YARR_AUTH", ""), "string with username and password in the format `username:password`")
 	flag.StringVar(&certfile, "cert-file", opt("YARR_CERTFILE", ""), "`path` to cert file for https")
 	flag.StringVar(&keyfile, "key-file", opt("YARR_KEYFILE", ""), "`path` to key file for https")
 	flag.StringVar(&db, "db", opt("YARR_DB", ""), "storage file `path`")
@@ -72,12 +89,16 @@ func main() {
 		log.SetOutput(os.Stdout)
 	}
 
-	configPath, err := os.UserConfigDir()
-	if err != nil {
-		log.Fatal("Failed to get config dir: ", err)
+	if open && strings.HasPrefix(addr, "unix:") {
+		log.Fatal("Cannot open ", addr, " in browser")
 	}
 
 	if db == "" {
+		configPath, err := os.UserConfigDir()
+		if err != nil {
+			log.Fatal("Failed to get config dir: ", err)
+		}
+
 		storagePath := filepath.Join(configPath, "yarr")
 		if err := os.MkdirAll(storagePath, 0755); err != nil {
 			log.Fatal("Failed to create app config dir: ", err)
@@ -88,22 +109,21 @@ func main() {
 	log.Printf("using db file %s", db)
 
 	var username, password string
+	var err error
 	if authfile != "" {
 		f, err := os.Open(authfile)
 		if err != nil {
 			log.Fatal("Failed to open auth file: ", err)
 		}
 		defer f.Close()
-		scanner := bufio.NewScanner(f)
-		for scanner.Scan() {
-			line := scanner.Text()
-			parts := strings.Split(line, ":")
-			if len(parts) != 2 {
-				log.Fatalf("Invalid auth: %v (expected `username:password`)", line)
-			}
-			username = parts[0]
-			password = parts[1]
-			break
+		username, password, err = parseAuthfile(f)
+		if err != nil {
+			log.Fatal("Failed to parse auth file: ", err)
+		}
+	} else if auth != "" {
+		username, password, err = parseAuthfile(strings.NewReader(auth))
+		if err != nil {
+			log.Fatal("Failed to parse auth literal: ", err)
 		}
 	}
 
@@ -116,6 +136,7 @@ func main() {
 		log.Fatal("Failed to initialise database: ", err)
 	}
 
+	worker.SetVersion(Version)
 	srv := server.NewServer(store, addr)
 
 	if basepath != "" {

cmd/yarr/main_test.go

@@ -0,0 +1,47 @@
+package main
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestPasswordFromAuthfile(t *testing.T) {
+	for _, tc := range [...]struct {
+		authfile         string
+		expectedUsername string
+		expectedPassword string
+		expectedError    bool
+	}{
+		{
+			authfile:         "username:password",
+			expectedUsername: "username",
+			expectedPassword: "password",
+			expectedError:    false,
+		},
+		{
+			authfile:      "username-and-no-password",
+			expectedError: true,
+		},
+		{
+			authfile:         "username:password:with:columns",
+			expectedUsername: "username",
+			expectedPassword: "password:with:columns",
+			expectedError:    false,
+		},
+	} {
+		t.Run(tc.authfile, func(t *testing.T) {
+			username, password, err := parseAuthfile(strings.NewReader(tc.authfile))
+			if tc.expectedUsername != username {
+				t.Errorf("expected username %q, got %q", tc.expectedUsername, username)
+			}
+			if tc.expectedPassword != password {
+				t.Errorf("expected password %q, got %q", tc.expectedPassword, password)
+			}
+			if tc.expectedError && err == nil {
+				t.Errorf("expected error, got nil")
+			} else if !tc.expectedError && err != nil {
+				t.Errorf("unexpected error: %v", err)
+			}
+		})
+	}
+}

doc/build.md

@@ -0,0 +1,56 @@
+## Compilation
+
+Prerequisies:
+
+* Go >= 1.23
+* C Compiler (GCC / Clang / ...)
+* Zig >= 0.14.0 (optional, for cross-compiling CLI versions)
+* binutils (optional, for building Windows GUI version)
+
+Get the source code:
+
+    git clone https://github.com/nkanaev/yarr.git
+
+Compile:
+
+    # create cli for the host OS/architecture
+    make host               # out/yarr
+
+    # create GUI, works only in the target OS
+    make windows_amd64_gui  # out/windows_amd64_gui/yarr.exe
+    make windows_arm64_gui  # out/windows_arm64_gui/yarr.exe
+    make darwin_arm64_gui   # out/darwin_arm64_gui/yarr.app
+    make darwin_amd64_gui   # out/darwin_amd64_gui/yarr.app
+
+    # create cli, cross-compiles within any OS/architecture
+    make linux_amd64
+    make linux_arm64
+    make linux_armv7
+    make windows_amd64
+    make windows_arm64
+
+    # ... or build a docker image
+    docker build -t yarr -f etc/dockerfile .
+
+## ARM compilation
+
+The instructions below are to cross-compile *yarr* to `Linux/ARM*`.
+
+Build:
+
+    docker build -t yarr.arm -f etc/dockerfile.arm .
+
+Test:
+
+    # inside host
+    docker run -it --rm yarr.arm
+
+    # then, inside container
+    cd /root/out
+    qemu-aarch64 -L /usr/aarch64-linux-gnu/ yarr.arm64
+
+Extract files from images:
+
+    CID=$(docker create yarr.arm)
+    docker cp -a "$CID:/root/out" .
+    docker rm "$CID"

doc/changelog.md

@@ -0,0 +1,132 @@
+# upcoming
+
+- (fix) articles not resetting immediately after feed/filter selection (thank to @scratchmex for the report)
+- (fix) crash on empty article list with article is selected (thanks to @rksvc)
+- (fix) invalid article title in RSS feeds with media containing titles (thanks to @bwwu-git for the report)
+- (fix) missing image enclosures in certain RSS feeds (thanks to @palinek for the report)
+
+# v2.6 (2025-11-24)
+
+- (new) serve on unix socket (thanks to @rvighne)
+- (new) more auto-refresh options: 12h & 24h (thanks to @aswerkljh for suggestion)
+- (fix) smooth scrolling on iOS (thanks to gatheraled)
+- (fix) displaying youtube shorts in "Read Here" (thanks to @Dean-Corso for the report)
+- (etc) theme-color support (thanks to @asimpson)
+- (etc) cookie security measures (thanks to Tom Fitzhenry)
+- (etc) restrict access to internal IPs for page crawler (thanks to Omar Kurt)
+
+# v2.5 (2025-03-26)
+
+- (new) Fever API support (thanks to @icefed)
+- (new) editable feed link (thanks to @adaszko)
+- (new) switch to feed by clicking the title in the article page (thanks to @tarasglek for suggestion)
+- (new) support multiple media links
+- (new) next/prev article navigation buttons (thanks to @tillcash)
+- (fix) duplicate articles caused by the same feed addition (thanks to @adaszko)
+- (fix) relative article links (thanks to @adazsko for the report)
+- (fix) atom article links stored in id element (thanks to @adazsko for the report)
+- (fix) parsing atom feed titles (thanks to @wnh)
+- (fix) sorting same-day batch articles (thanks to @lamescholar for the report)
+- (fix) showing login page in the selected theme (thanks to @feddiriko for the report)
+- (fix) parsing atom feeds with html elements (thanks to @tillcash & @toBeOfUse for the report, @krkk for the fix)
+- (fix) parsing feeds with missing guids (thanks to @hoyii for the report)
+- (fix) sending actual client version to servers (thanks to @aidanholm)
+- (fix) error caused by missing config dir (thanks to @timster)
+- (etc) load external images with no-referrer policy (thanks to @tillcash for the report)
+- (etc) open external links with no-referrer policy (thanks to @donovanglover)
+- (etc) show article content in the list if title is missing (thanks to @asimpson for suggestion)
+- (etc) accessibility improvements (thanks to @tseykovets)
+
+# v2.4 (2023-08-15)
+
+- (new) ARM build support (thanks to @tillcash & @fenuks)
+- (new) auth configuration via param or env variable (thanks to @pierreprinetti)
+- (new) web app manifest for an app-like experience on mobile (thanks to @qbit)
+- (fix) concurrency issue crashing the app (thanks to @quoing)
+- (fix) favicon visibility in dark mode (thanks to @caycaycarly for the report)
+- (fix) autoloading more articles not working in certain edge cases (thanks to @fenuks for the report)
+- (fix) handle Google URL redirects in "Read Here" (thanks to @cubbei for discovery)
+- (fix) handle failures to extract content in "Read Here" (thanks to @grigio for the report)
+- (fix) article view width for high resolution screens (thanks to @whaler-ragweed for the report)
+- (fix) make newly added feed searchable (thanks to @BMorearty for the report)
+- (fix) feed/article selection accessibility via arrow keys (thanks to @grigio and @tillcash)
+- (fix) keyboard shortcuts in Firefox (thanks to @kaloyan13)
+- (fix) keyboard shortcuts in non-English layouts (thanks to @kaloyan13)
+- (fix) sorting articles with timezone information (thanks to @x2cf)
+- (fix) handling links set in guid only for certain feeds (thanks to @adaszko for the report)
+- (fix) crashes caused by feed icon endpoint (thanks to @adaszko)
+
+# v2.3 (2022-05-03)
+
+- (fix) handling encodings (thanks to @f100024 & @fserb)
+- (fix) parsing xml feeds with illegal characters (thanks to @stepelu for the report)
+- (fix) old articles reappearing as unread (thanks to @adaszko for the report)
+- (fix) item list scrolling issue on large screens (thanks to @bielej for the report)
+- (fix) keyboard shortcuts color in dark mode (thanks to @John09f9 for the report)
+- (etc) autofocus when adding a new feed (thanks to @lakuapik)
+
+# v2.2 (2021-11-20)
+
+- (fix) windows console support (thanks to @dufferzafar for the report)
+- (fix) remove html tags from article titles (thanks to Alex Went for the report)
+- (etc) autoselect current folder when adding a new feed (thanks to @krkk)
+- (etc) folder/feed settings menu available across all filters
+
+# v2.1 (2021-08-16)
+
+- (new) configuration via env variables
+- (fix) missing `content-type` headers (thanks to @verahawk for the report)
+- (fix) handle opml files not following the spec (thanks to @huangnauh for the report)
+- (fix) pagination in unread/starred feeds (thanks to @Farow for the report)
+- (fix) handling feeds with non-utf8 encodings (thanks to @fserb for the report)
+- (fix) errors caused by empty feeds (thanks to @decke)
+- (fix) recognize all audio mime types as podcasts (thanks to @krkk)
+- (fix) ui tweaks (thanks to @Farow)
+
+# v2.0 (2021-04-18)
+
+- (new) user interface tweaks
+- (new) feed parser fully rewritten
+- (new) show youtube/vimeo iframes in "read here"
+- (new) keyboard shortcuts for article scrolling & toggling "read here"
+- (new) more options for auto-refresh intervals
+- (fix) `-base` not serving static files (thanks to @vfaronov)
+- (etc) 3rd-party dependencies reduced to the bare minimum
+
+special thanks to @tillcash for feedback & suggestions.
+
+# v1.4 (2021-03-11)
+
+- (new) keyboard shortcuts (thanks to @Duarte-Dias)
+- (new) show podcast audio
+- (fix) deleting feeds
+- (etc) minor ui tweaks & changes
+
+# v1.3 (2021-02-18)
+
+- (fix) log out functionality if authentication is set
+- (fix) import opml if authentication is set
+- (fix) login page if authentication is set (thanks to @einschmidt)
+
+# v1.2 (2021-02-11)
+
+- (new) autorefresh rate
+- (new) reduced bandwidth usage via stateful http headers `last-modified/etag`
+- (new) show feed errors in feed management modal
+- (new) `-open` flag for automatically opening the server url
+- (new) `-base` flag for serving urls under non-root path (thanks to @hcl)
+- (new) `-auth-file` flag for authentication
+- (new) `-cert-file` & `-key-file` flags for TLS
+- (fix) wrapping long words in the ui to prevent vertical scroll
+- (fix) increased toolbar height in mobile/tablet layout (thanks to @einschmidt)
+
+# v1.1 (2020-10-05)
+
+- (new) responsive design
+- (fix) server crash on favicon fetch timeout (reported by @minioin)
+- (fix) handling byte order marks in feeds (reported by @ilaer)
+- (fix) deleting a feed raises exception in the ui if the feed's items are shown.
+
+# v1.0 (2020-09-24)
+
+Initial Release

doc/changelog.txt

@@ -1,74 +0,0 @@
-# upcoming
-
-- (fix) handling encodings (thanks to @f100024 & @fserb)
-- (fix) parsing xml feeds with illegal characters (thanks to @stepelu for the report)
-- (fix) old articles reappearing as unread (thanks to @adaszko for the report)
-- (fix) item list scrolling issue on large screens (thanks to @bielej for the report)
-- (fix) keyboard shortcuts color in dark mode (thanks to @John09f9 for the report)
-- (etc) autofocus when adding a new feed (thanks to @lakuapik)
-
-# v2.2 (2021-11-20)
-
-- (fix) windows console support (thanks to @dufferzafar for the report)
-- (fix) remove html tags from article titles (thanks to Alex Went for the report)
-- (etc) autoselect current folder when adding a new feed (thanks to @krkk)
-- (etc) folder/feed settings menu available across all filters
-
-# v2.1 (2021-08-16)
-
-- (new) configuration via env variables
-- (fix) missing `content-type` headers (thanks to @verahawk for the report)
-- (fix) handle opml files not following the spec (thanks to @huangnauh for the report)
-- (fix) pagination in unread/starred feeds (thanks to @Farow for the report)
-- (fix) handling feeds with non-utf8 encodings (thanks to @fserb for the report)
-- (fix) errors caused by empty feeds (thanks to @decke)
-- (fix) recognize all audio mime types as podcasts (thanks to @krkk)
-- (fix) ui tweaks (thanks to @Farow)
-
-# v2.0 (2021-04-18)
-
-- (new) user interface tweaks
-- (new) feed parser fully rewritten
-- (new) show youtube/vimeo iframes in "read here"
-- (new) keyboard shortcuts for article scrolling & toggling "read here"
-- (new) more options for auto-refresh intervals
-- (fix) `-base` not serving static files (thanks to @vfaronov)
-- (etc) 3rd-party dependencies reduced to the bare minimum
-
-special thanks to @tillcash for feedback & suggestions.
-
-# v1.4 (2021-03-11)
-
-- (new) keyboard shortcuts (thanks to @Duarte-Dias)
-- (new) show podcast audio
-- (fix) deleting feeds
-- (etc) minor ui tweaks & changes
-
-# v1.3 (2021-02-18)
-
-- (fix) log out functionality if authentication is set
-- (fix) import opml if authentication is set
-- (fix) login page if authentication is set (thanks to @einschmidt)
-
-# v1.2 (2021-02-11)
-
-- (new) autorefresh rate
-- (new) reduced bandwidth usage via stateful http headers `last-modified/etag`
-- (new) show feed errors in feed management modal
-- (new) `-open` flag for automatically opening the server url
-- (new) `-base` flag for serving urls under non-root path (thanks to @hcl)
-- (new) `-auth-file` flag for authentication
-- (new) `-cert-file` & `-key-file` flags for TLS
-- (fix) wrapping long words in the ui to prevent vertical scroll
-- (fix) increased toolbar height in mobile/tablet layout (thanks to @einschmidt)
-
-# v1.1 (2020-10-05)
-
-- (new) responsive design
-- (fix) server crash on favicon fetch timeout (reported by @minioin)
-- (fix) handling byte order marks in feeds (reported by @ilaer)
-- (fix) deleting a feed raises exception in the ui if the feed's items are shown.
-
-# v1.0 (2020-09-24)
-
-Initial Release

doc/fever.md

@@ -0,0 +1,19 @@
+# Fever API support
+
+Fever API is a kind of RSS HTTP API interface, because the Fever API definition is not very clear, so the implementation of Fever server and Client may have some compatibility problems.
+
+The Fever API implemented by Yarr is based on the Fever API spec: https://github.com/DigitalDJ/tinytinyrss-fever-plugin/blob/master/fever-api.md.
+
+Here are some Apps that have been tested to work with yarr.  Feel free to test other Clients/Apps and update the list here.
+
+>  Different apps support different URL/Address formats.  Please note whether the URL entered has `http://` scheme and `/` suffix.
+
+| App                                                                       | Platforms        | Config Server URL                                   |
+|:------------------------------------------------------------------------- | ---------------- |:--------------------------------------------------- |
+| [Reeder](https://reederapp.com/)                                          | MacOS<br>iOS     | 127.0.0.1:7070/fever<br>http://127.0.0.1:7070/fever |
+| [ReadKit](https://readkit.app/)                                           | MacOS<br>iOS     | http://127.0.0.1:7070/fever                         |
+| [Fluent Reader](https://github.com/yang991178/fluent-reader)              | MacOS<br>Windows | http://127.0.0.1:7070/fever/                        |
+| [Unread](https://apps.apple.com/us/app/unread-an-rss-reader/id1363637349) | iOS              | http://127.0.0.1:7070/fever                         |
+| [Fiery Feeds](https://voidstern.net/fiery-feeds)                          | MacOS<br>iOS     | http://127.0.0.1:7070/fever                         |
+
+If you are having trouble using Fever, please open an issue and @icefed, thanks.

doc/thirdparty.txt

@@ -16,11 +16,6 @@ The licenses are included, and the authorship comments are left intact.
   - allowed uri schemes
   - added svg whitelist
 
-- systray
-  https://github.com/getlantern/systray (commit:2c0986d) Apache 2.0
-
-  removed golog dependency
-
 - fixconsole
   https://github.com/apenwarr/fixconsole (commit:5a9f648) Apache 2.0
 

dockerfile

@@ -1,12 +0,0 @@
-FROM golang:alpine AS build
-RUN apk add build-base git
-WORKDIR /src
-COPY . .
-RUN make build_linux
-
-FROM alpine:latest
-RUN apk add --no-cache ca-certificates && \
-    update-ca-certificates
-COPY --from=build /src/_output/linux/yarr /usr/local/bin/yarr
-EXPOSE 7070
-CMD ["/usr/local/bin/yarr", "-addr", "0.0.0.0:7070", "-db", "/data/yarr.db"]

etc/dockerfile

@@ -0,0 +1,14 @@
+FROM golang:alpine3.21 AS build
+RUN apk add build-base git
+WORKDIR /src
+COPY . .
+RUN --mount=type=cache,target=/root/.cache/go-build \
+    --mount=type=cache,target=/root/go/pkg \
+  make host
+
+FROM alpine:latest
+RUN apk add --no-cache ca-certificates && update-ca-certificates
+COPY --from=build /src/out/yarr /usr/local/bin/yarr
+EXPOSE 7070
+ENTRYPOINT ["/usr/local/bin/yarr"]
+CMD ["-addr", "0.0.0.0:7070", "-db", "/data/yarr.db"]

etc/dockerfile.arm

@@ -0,0 +1,38 @@
+FROM ubuntu:20.04
+
+# Install GCC
+RUN apt update
+RUN apt install -y \
+        wget build-essential \
+        gcc-aarch64-linux-gnu \
+        binutils-aarch64-linux-gnu binutils-aarch64-linux-gnu-dbg \
+        gcc-arm-linux-gnueabihf \
+        binutils-arm-linux-gnueabihf binutils-arm-linux-gnueabihf-dbg
+RUN env DEBIAN_FRONTEND=noninteractive \
+    apt install -y qemu-user qemu-user-static
+
+# Install Golang
+RUN wget --quiet https://go.dev/dl/go1.24.1.linux-amd64.tar.gz && \
+    rm -rf /usr/local/go && \
+    tar -C /usr/local -xzf go1.24.1.linux-amd64.tar.gz
+ENV PATH=$PATH:/usr/local/go/bin
+
+# Copy source code
+WORKDIR /root/src
+RUN mkdir /root/out
+COPY . .
+
+# Build ARM64
+RUN env \
+        CC=aarch64-linux-gnu-gcc \
+        CGO_ENABLED=1 \
+        GOOS=linux GOARCH=arm64 \
+    make host && mv out/yarr /root/out/yarr.arm64
+
+RUN env \
+        CC=arm-linux-gnueabihf-gcc \
+        CGO_ENABLED=1 \
+        GOOS=linux GOARCH=arm GOARM=7 \
+    make host && mv out/yarr /root/out/yarr.armv7
+
+CMD ["/bin/bash"]

etc/install-linux.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+if [[ ! -d "$HOME/.local/share/applications" ]]; then
+  mkdir -p "$HOME/.local/share/applications"
+fi
+
+cat >"$HOME/.local/share/applications/yarr.desktop" <<END
+[Desktop Entry]
+Name=yarr
+Exec=$HOME/.local/bin/yarr -open
+Icon=yarr
+Type=Application
+Categories=Internet;Network;News;Feed;
+END
+
+if [[ ! -d "$HOME/.local/share/icons" ]]; then
+  mkdir -p "$HOME/.local/share/icons"
+fi
+
+cat >"$HOME/.local/share/icons/yarr.svg" <<END
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-anchor-favicon">
+  <circle cx="12" cy="5" r="3" stroke-width="4" stroke="#ffffff"></circle>
+  <line x1="12" y1="22" x2="12" y2="8" stroke-width="4" stroke="#ffffff"></line>
+  <path d="M5 12H2a10 10 0 0 0 20 0h-3" stroke-width="4" stroke="#ffffff"></path>
+
+  <circle cx="12" cy="5" r="3"></circle>
+  <line x1="12" y1="22" x2="12" y2="8"></line>
+  <path d="M5 12H2a10 10 0 0 0 20 0h-3"></path>
+</svg>
+END

etc/macos_package.sh

@@ -0,0 +1,62 @@
+#/bin/sh
+
+set -e
+
+usage() {
+  echo "usage: $0 VERSION path/to/icon.icns path/to/binary output/dir"
+}
+
+if [ $# -eq 0 ]; then
+    usage
+    exit
+fi
+
+VERSION=$1
+ICNFILE=$2
+BINFILE=$3
+OUTPATH=$4
+
+mkdir -p $OUTPATH/yarr.app/Contents/MacOS
+mkdir -p $OUTPATH/yarr.app/Contents/Resources
+
+mv $BINFILE $OUTPATH/yarr.app/Contents/MacOS/yarr
+cp $ICNFILE $OUTPATH/yarr.app/Contents/Resources/icon.icns
+
+chmod u+x  $OUTPATH/yarr.app/Contents/MacOS/yarr
+
+echo -n 'APPL????' >$OUTPATH/yarr.app/Contents/PkgInfo
+cat <<EOF >$OUTPATH/yarr.app/Contents/Info.plist
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleName</key>
+	<string>yarr</string>
+	<key>CFBundleDisplayName</key>
+	<string>yarr</string>
+	<key>CFBundleIdentifier</key>
+	<string>nkanaev.yarr</string>
+	<key>CFBundleVersion</key>
+	<string>$VERSION</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleExecutable</key>
+	<string>yarr</string>
+
+	<key>CFBundleIconFile</key>
+	<string>icon</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.news</string>
+
+	<key>NSHighResolutionCapable</key>
+	<string>True</string>
+
+	<key>LSMinimumSystemVersion</key>
+	<string>10.13</string>
+	<key>LSUIElement</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2020 nkanaev. All rights reserved.</string>
+</dict>
+</plist>
+EOF

etc/samples.yml

@@ -0,0 +1,68 @@
+- site: https://vimeo.com/channels/staffpicks/videos
+  feed: https://vimeo.com/channels/staffpicks/videos/rss
+  tags: [vimeo, image]
+
+- site: https://www.youtube.com/@everyframeapainting/videos
+  feed: https://www.youtube.com/feeds/videos.xml?channel_id=UCjFqcJQXGZ6T6sxyFB-5i6A"
+  tags: [youtube, image]
+
+- site: https://iwdrm.tumblr.com/
+  feed: https://iwdrm.tumblr.com/rss
+  tags: [tumblr, image]
+
+- site: https://falseknees.tumblr.com/
+  feed: https://falseknees.tumblr.com/rss
+  tags: [tumblr, image]
+
+- site: https://accidentallyquadratic.tumblr.com/
+  feed: https://accidentallyquadratic.tumblr.com/rss
+  info: text blog with code sections
+  tags: [tumblr, text, code]
+
+- site: https://www.flickr.com/photos/maratsafin/
+  feed: https://www.flickr.com/services/feeds/photos_public.gne?id=59021497@N07&lang=en-us&format=atom
+  tags: [flickr, image]
+
+- site: https://www.reddit.com/r/comics
+  feed: https://www.reddit.com/r/comics.rss
+  tags: [reddit, image]
+
+- site: https://www.reddit.com/r/AITAH
+  feed: https://www.reddit.com/r/AITAH.rss
+  tags: [reddit, text]
+
+- site: https://idothei.wordpress.com/
+  feed: https://idothei.wordpress.com/feed/
+  tags: [wordpress, text]
+
+- site: https://www.vidarholen.net/contents/blog/
+  feed: https://www.vidarholen.net/contents/blog/?feed=rss2
+  tags: [wordpress, text]
+
+- site: https://blog.posthaven.com/
+  feed: https://blog.posthaven.com/posts.atom
+  tags: [posthaven, text]
+
+- site: https://medium.com/@dailynewsletter
+  feed: https://medium.com/feed/@dailynewsletter
+  tags: [medium, text]
+
+- site: https://thereveal.substack.com/
+  feed: https://thereveal.substack.com/feed
+  tags: [substack, text]
+
+- site: https://tema.livejournal.com/
+  feed: https://tema.livejournal.com/data/rss
+  tags: [livejournal, text]
+
+- site: https://mametter.hatenablog.com/
+  feed: https://mametter.hatenablog.com/feed
+  tags: [hatena, text]
+
+- site: https://juliepowell.blogspot.com/
+  feed: https://juliepowell.blogspot.com/feeds/posts/default
+  tags: [blogger, text]
+
+- site: https://micro.blog/val
+  feed: https://micro.blog/posts/val
+  tags: [json, microblog]

etc/windows_versioninfo.sh

@@ -0,0 +1,89 @@
+#!/bin/bash
+
+set -e
+
+# Function to display usage information
+usage() {
+  echo "Usage: $0 [-version VERSION] [-outfile FILENAME]"
+  echo "  -version VERSION   Set the version number (default: 0.0)"
+  echo "  -outfile FILENAME  Set the output file name (default: versioninfo.rc)"
+  echo ""
+  echo "This script generates a Windows resource file with version information."
+  exit 1
+}
+
+# Default values
+version="0.0"
+outfile="versioninfo.rc"
+
+# Check if help is requested
+if [[ "$1" == "-h" || "$1" == "--help" ]]; then
+  usage
+fi
+
+if [ $# -eq 0 ]; then
+  usage
+fi
+
+# Parse command-line options
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    -version)
+      if [[ -z "$2" || "$2" == -* ]]; then
+        echo "Error: Missing value for -version parameter"
+        usage
+      fi
+      version="$2"
+      shift 2
+      ;;
+    -outfile)
+      if [[ -z "$2" || "$2" == -* ]]; then
+        echo "Error: Missing value for -outfile parameter"
+        usage
+      fi
+      outfile="$2"
+      shift 2
+      ;;
+    *)
+      echo "Error: Unknown parameter: $1"
+      usage
+      ;;
+  esac
+done
+
+# Replace dots with commas for version_comma
+version_comma="${version//./,}"
+
+# Use a here document for the template with ENDFILE delimiter
+cat <<ENDFILE > "$outfile"
+1 VERSIONINFO
+FILEVERSION     $version_comma,0,0
+PRODUCTVERSION  $version_comma,0,0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "080904E4"
+    BEGIN
+      VALUE "CompanyName", "Old MacDonald's Farm"
+      VALUE "FileDescription", "Yet another RSS reader"
+      VALUE "FileVersion", "$version"
+      VALUE "InternalName", "yarr"
+      VALUE "LegalCopyright", "nkanaev"
+      VALUE "OriginalFilename", "yarr.exe"
+      VALUE "ProductName", "yarr"
+      VALUE "ProductVersion", "$version"
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x809, 1252
+  END
+END
+
+1 ICON "icon.ico"
+ENDFILE
+
+# Set the correct permissions
+chmod 644 "$outfile"
+
+echo "Generated $outfile with version $version"

go.mod

@@ -1,9 +1,17 @@
 module github.com/nkanaev/yarr
 
-go 1.16
+go 1.23.0
+
+toolchain go1.23.5
 
 require (
-	github.com/mattn/go-sqlite3 v1.14.7
-	golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420
-	golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6
+	fyne.io/systray v1.12.0
+	github.com/mattn/go-sqlite3 v1.14.24
+	golang.org/x/net v0.38.0
+	golang.org/x/sys v0.31.0
+)
+
+require (
+	github.com/godbus/dbus/v5 v5.1.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
 )

go.sum

@@ -1,12 +1,12 @@
-github.com/mattn/go-sqlite3 v1.14.7 h1:fxWBnXkxfM6sRiuH3bqJ4CfzZojMOLVc0UTsTglEghA=
-github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420 h1:a8jGStKg0XqKDlKqjLrXn0ioF5MH36pT7Z0BRTqLhbk=
-golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6 h1:cdsMqa2nXzqlgs183pHxtvoVwU7CyzaCTAUOg94af4c=
-golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+fyne.io/systray v1.12.0 h1:CA1Kk0e2zwFlxtc02L3QFSiIbxJ/P0n582YrZHT7aTM=
+fyne.io/systray v1.12.0/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs=
+github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
+github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM=
+github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
+golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=

makefile

@@ -1,33 +1,90 @@
-VERSION=2.3
+VERSION=2.6
 GITHASH=$(shell git rev-parse --short=8 HEAD)
 
-CGO_ENABLED=1
+GO_TAGS    = sqlite_foreign_keys sqlite_json
+GO_LDFLAGS = -s -w -X 'main.Version=$(VERSION)' -X 'main.GitHash=$(GITHASH)'
 
-GO_LDFLAGS  = -s -w
-GO_LDFLAGS := $(GO_LDFLAGS) -X 'main.Version=$(VERSION)' -X 'main.GitHash=$(GITHASH)'
+GO_FLAGS         = -tags "$(GO_TAGS)"     -ldflags="$(GO_LDFLAGS)"
+GO_FLAGS_DEBUG   = -tags "$(GO_TAGS) debug"
+GO_FLAGS_GUI     = -tags "$(GO_TAGS) gui" -ldflags="$(GO_LDFLAGS)"
+GO_FLAGS_GUI_WIN = -tags "$(GO_TAGS) gui" -ldflags="$(GO_LDFLAGS) -H windowsgui"
 
-build_default:
-	mkdir -p _output
-	go build -tags "sqlite_foreign_keys release" -ldflags="$(GO_LDFLAGS)" -o _output/yarr src/main.go
+export CGO_ENABLED=1
 
-build_macos:
-	mkdir -p _output/macos
-	GOOS=darwin GOARCH=amd64 go build -tags "sqlite_foreign_keys release macos" -ldflags="$(GO_LDFLAGS)" -o _output/macos/yarr src/main.go
-	cp src/platform/icon.png _output/macos/icon.png
-	go run bin/package_macos.go -outdir _output/macos -version "$(VERSION)"
+default: test host
 
-build_linux:
-	mkdir -p _output/linux
-	GOOS=linux GOARCH=amd64 go build -tags "sqlite_foreign_keys release linux" -ldflags="$(GO_LDFLAGS)" -o _output/linux/yarr src/main.go
+# platform-specific files
 
-build_windows:
-	mkdir -p _output/windows
-	go run bin/generate_versioninfo.go -version "$(VERSION)" -outfile src/platform/versioninfo.rc
+etc/icon.icns: etc/icon_macos.png
+	mkdir -p etc/icon.iconset
+	sips -s format png --resampleWidth 1024 etc/icon_macos.png --out etc/icon.iconset/icon_512x512@2x.png
+	sips -s format png --resampleWidth  512 etc/icon_macos.png --out etc/icon.iconset/icon_512x512.png
+	sips -s format png --resampleWidth  256 etc/icon_macos.png --out etc/icon.iconset/icon_256x256.png
+	sips -s format png --resampleWidth  128 etc/icon_macos.png --out etc/icon.iconset/icon_128x128.png
+	sips -s format png --resampleWidth   64 etc/icon_macos.png --out etc/icon.iconset/icon_32x32@2x.png
+	sips -s format png --resampleWidth   32 etc/icon_macos.png --out etc/icon.iconset/icon_32x32.png
+	sips -s format png --resampleWidth   16 etc/icon_macos.png --out etc/icon.iconset/icon_16x16.png
+	iconutil -c icns etc/icon.iconset -o etc/icon.icns
+
+src/platform/versioninfo.rc:
+	./etc/windows_versioninfo.sh -version "$(VERSION)" -outfile src/platform/versioninfo.rc
 	windres -i src/platform/versioninfo.rc -O coff -o src/platform/versioninfo.syso
-	GOOS=windows GOARCH=amd64 go build -tags "sqlite_foreign_keys release windows" -ldflags="$(GO_LDFLAGS) -H windowsgui" -o _output/windows/yarr.exe src/main.go
+
+# build targets
+
+host:
+	go build $(GO_FLAGS) -o out/yarr ./cmd/yarr
+
+darwin_amd64:
+	# cross-compilation not supported: CC="zig cc -target x86_64-macos-none"
+	GOOS=darwin GOARCH=arm64 go build $(GO_FLAGS) -o out/$@/yarr ./cmd/yarr
+
+darwin_arm64:
+	# cross-compilation not supported: CC="zig cc -target aarch64-macos-none"
+	GOOS=darwin GOARCH=arm64 go build $(GO_FLAGS) -o out/$@/yarr ./cmd/yarr
+
+linux_amd64:
+	CC="zig cc -target x86_64-linux-musl -O2 -g0" CGO_CFLAGS="-D_LARGEFILE64_SOURCE" GOOS=linux GOARCH=amd64 \
+	go build $(GO_FLAGS) -o out/$@/yarr ./cmd/yarr
+
+linux_arm64:
+	CC="zig cc -target aarch64-linux-musl -O2 -g0" CGO_CFLAGS="-D_LARGEFILE64_SOURCE" GOOS=linux GOARCH=arm64 \
+	go build $(GO_FLAGS) -o out/$@/yarr ./cmd/yarr
+
+linux_armv7:
+	CC="zig cc -target arm-linux-musleabihf -O2 -g0" CGO_CFLAGS="-D_LARGEFILE64_SOURCE" GOOS=linux GOARCH=arm GOARM=7 \
+	go build $(GO_FLAGS) -o out/$@/yarr ./cmd/yarr
+
+windows_amd64:
+	CC="zig cc -target x86_64-windows-gnu" GOOS=windows GOARCH=amd64 go build $(GO_FLAGS) -o out/$@/yarr ./cmd/yarr
+
+windows_arm64:
+	CC="zig cc -target aarch64-windows-gnu" GOOS=windows GOARCH=arm64 go build $(GO_FLAGS) -o out/$@/yarr ./cmd/yarr
+
+darwin_arm64_gui: etc/icon.icns
+	GOOS=darwin GOARCH=arm64 go build $(GO_FLAGS_GUI) -o out/$@/yarr ./cmd/yarr
+	./etc/macos_package.sh $(VERSION) etc/icon.icns out/$@/yarr out/$@
+
+darwin_amd64_gui: etc/icon.icns
+	GOOS=darwin GOARCH=amd64 go build $(GO_FLAGS_GUI) -o out/$@/yarr ./cmd/yarr
+	./etc/macos_package.sh $(VERSION) etc/icon.icns out/$@/yarr out/$@
+
+windows_amd64_gui: src/platform/versioninfo.rc
+	GOOS=windows GOARCH=amd64 go build $(GO_FLAGS_GUI_WIN) -o out/$@/yarr.exe ./cmd/yarr
+
+windows_arm64_gui: src/platform/versioninfo.rc
+	GOOS=windows GOARCH=arm64 go build $(GO_FLAGS_GUI_WIN) -o out/$@/yarr.exe ./cmd/yarr
 
 serve:
-	go run -tags "sqlite_foreign_keys" src/main.go -db local.db
+	go run $(GO_FLAGS_DEBUG) ./cmd/yarr -db local.db
 
 test:
-	cd src && go test -tags "sqlite_foreign_keys release" ./...
+	go test $(GO_FLAGS) ./...
+
+.PHONY: \
+	host \
+	darwin_amd64 darwin_amd64_gui \
+	darwin_arm64 darwin_arm64_gui \
+	windows_amd64 windows_amd64_gui \
+	windows_arm64 windows_arm64_gui \
+	serve test

readme.md

@@ -3,7 +3,7 @@
 **yarr** (yet another rss reader) is a web-based feed aggregator which can be used both
 as a desktop application and a personal self-hosted server.
 
-It is written in Go with the frontend in Vue.js. The storage is backed by SQLite.
+The app is a single binary with an embedded database (SQLite).
 
 ![screenshot](etc/promo.png)
 
@@ -11,59 +11,28 @@ It is written in Go with the frontend in Vue.js. The storage is backed by SQLite
 
 The latest prebuilt binaries for Linux/MacOS/Windows are available
 [here](https://github.com/nkanaev/yarr/releases/latest).
+The archives follow the naming convention `yarr_{OS}_{ARCH}[_gui].zip`, where:
 
-### macos
+* `OS` is the target operating system
+* `ARCH` is the CPU architecture (`arm64` for AArch64, `amd64` for X86-64)
+* `-gui` indicates that the binary ships with the GUI (tray icon), and is a command line application if omitted
 
-Download `yarr-*-macos64.zip`, unzip it, place `yarr.app` in `/Applications` folder.
-To open the app follow the instructions provided [here][macos-open] or run the command below:
+Usage instructions:
 
-    xattr -d com.apple.quarantine /Applications/yarr.app
+* MacOS: place `yarr.app` in `/Applications` folder, [open the app][macos-open], click the anchor menu bar icon, select "Open".
+
+* Windows: open `yarr.exe`, click the anchor system tray icon, select "Open".
+
+* Linux: place `yarr` in `$HOME/.local/bin` and run [the script](etc/install-linux.sh).
 
 [macos-open]: https://support.apple.com/en-gb/guide/mac-help/mh40616/mac
 
-### windows
-
-Download `yarr-*-windows32.zip`, unzip it, open `yarr.exe`
-
-### linux
-
-The Linux version doesn't come with the desktop environment integration.
-For easy access on DE it is recommended to create a desktop menu entry by
-by following the steps below:
-
-    unzip -x yarr*.zip
-    sudo mv yarr /usr/local/bin/yarr
-    sudo nano /usr/local/share/applications/yarr.desktop
-
-and pasting the content:
-
-    [Desktop Entry]
-    Name=yarr
-    Exec=/usr/local/bin/yarr -open
-    Icon=rss
-    Type=Application
-    Categories=Internet;
-
 For self-hosting, see `yarr -h` for auth, tls & server configuration flags.
 
-## build
+See more:
 
-Install `Go >= 1.16` and `gcc`. Get the source code:
-
-    git clone https://github.com/nkanaev/yarr.git
-
-Then run one of the corresponding commands:
-
-    # create an executable for the host os
-    make build_macos    # -> _output/macos/yarr.app
-    make build_linux    # -> _output/linux/yarr
-    make build_windows  # -> _output/windows/yarr.exe
-
-    # ... or start a dev server locally
-    make serve          # starts a server at http://localhost:7070
-
-    # ... or build a docker image
-    docker build -t yarr .
+* [Building from source code](doc/build.md)
+* [Fever API support](doc/fever.md)
 
 ## credits
 

src/assets/assets.go

@@ -5,7 +5,6 @@ import (
 	"html/template"
 	"io"
 	"io/fs"
-	"io/ioutil"
 	"log"
 	"os"
 )
@@ -37,7 +36,7 @@ func Template(path string) *template.Template {
 				}
 				defer svgfile.Close()
 
-				content, err := ioutil.ReadAll(svgfile)
+				content, err := io.ReadAll(svgfile)
 				// should never happen
 				if err != nil {
 					log.Fatal(err)
@@ -52,7 +51,7 @@ func Template(path string) *template.Template {
 	return tmpl
 }
 
-func Render(path string, writer io.Writer, data interface{}) {
+func Render(path string, writer io.Writer, data any) {
 	tmpl := Template(path)
 	tmpl.Execute(writer, data)
 }

src/assets/assetsfs.go

@@ -1,4 +1,4 @@
-// +build release
+//go:build !debug
 
 package assets
 

src/assets/graphicarts/chevron-down.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-chevron-down"><polyline points="6 9 12 15 18 9"></polyline></svg>

src/assets/graphicarts/chevron-up.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-chevron-up"><polyline points="18 15 12 9 6 15"></polyline></svg>

src/assets/graphicarts/favicon.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-anchor-favicon">
+  <circle cx="12" cy="5" r="3" stroke-width="4" stroke="#ffffff"></circle>
+  <line x1="12" y1="22" x2="12" y2="8" stroke-width="4" stroke="#ffffff"></line>
+  <path d="M5 12H2a10 10 0 0 0 20 0h-3" stroke-width="4" stroke="#ffffff"></path>
+
+  <circle cx="12" cy="5" r="3"></circle>
+  <line x1="12" y1="22" x2="12" y2="8"></line>
+  <path d="M5 12H2a10 10 0 0 0 20 0h-3"></path>
+</svg>

src/assets/index.html

@@ -5,7 +5,10 @@
     <title>yarr!</title>
     <link rel="stylesheet" href="./static/stylesheets/bootstrap.min.css">
     <link rel="stylesheet" href="./static/stylesheets/app.css">
-    <link rel="icon shortcut" href="./static/graphicarts/icon.png">
+    <link rel="icon" href="./static/graphicarts/favicon.svg" type="image/svg+xml">
+    <link rel="alternate icon" href="./static/graphicarts/favicon.png" type="image/png">
+    <link rel="manifest" href="./manifest.json" />
+    <meta name="theme-color" content="" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <script>
         window.app = window.app || {}
@@ -21,20 +24,23 @@
             <div class="p-2 toolbar d-flex align-items-center">
                 <div class="icon mx-2">{% inline "anchor.svg" %}</div>
                 <div class="flex-grow-1"></div>
-                <button class="toolbar-item"
+                <button class="toolbar-item ml-1"
                         :class="{active: filterSelected == 'unread'}"
+                        :aria-pressed="filterSelected == 'unread'"
                         title="Unread"
                         @click="filterSelected = 'unread'">
                     <span class="icon">{% inline "circle-full.svg" %}</span>
                 </button>
-                <button class="toolbar-item"
+                <button class="toolbar-item mx-1"
                         :class="{active: filterSelected == 'starred'}"
+                        :aria-pressed="filterSelected == 'starred'"
                         title="Starred"
                         @click="filterSelected = 'starred'">
                     <span class="icon">{% inline "star-full.svg" %}</span>
                 </button>
-                <button class="toolbar-item"
+                <button class="toolbar-item mr-1"
                         :class="{active: filterSelected == ''}"
+                        :aria-pressed="filterSelected == ''"
                         title="All"
                         @click="filterSelected = ''">
                     <span class="icon">{% inline "assorted.svg" %}</span>
@@ -57,10 +63,12 @@
 
                     <div class="dropdown-divider"></div>
 
-                    <header class="dropdown-header">Theme</header>
+                    <header class="dropdown-header" role="heading" aria-level="2">Theme</header>
                     <div class="row text-center m-0">
                         <button class="btn btn-link col-4 px-0 rounded-0"
                                 :class="'theme-'+t"
+                                :aria-label="t"
+                                :aria-pressed="theme.name == t"
                                 @click.stop="theme.name = t"
                                 v-for="t in ['light', 'sepia', 'night']">
                             <span class="icon" v-if="theme.name == t">{% inline "check.svg" %}</span>
@@ -69,25 +77,33 @@
 
                     <div class="dropdown-divider"></div>
 
-                    <header class="dropdown-header">Auto Refresh</header>
+                    <header class="dropdown-header" role="heading" aria-level="2">Auto Refresh</header>
                     <div class="row text-center m-0">
-                        <button class="dropdown-item col-4 px-0" :class="{active: !refreshRate}" @click.stop="refreshRate = 0">0</button>
-                        <button class="dropdown-item col-4 px-0" :class="{active: refreshRate == 10}" @click.stop="refreshRate = 10">10m</button>
-                        <button class="dropdown-item col-4 px-0" :class="{active: refreshRate == 30}" @click.stop="refreshRate = 30">30m</button>
-                        <button class="dropdown-item col-4 px-0" :class="{active: refreshRate == 60}" @click.stop="refreshRate = 60">1h</button>
-                        <button class="dropdown-item col-4 px-0" :class="{active: refreshRate == 120}" @click.stop="refreshRate = 120">2h</button>
-                        <button class="dropdown-item col-4 px-0" :class="{active: refreshRate == 240}" @click.stop="refreshRate = 240">4h</button>
+                        <button class="dropdown-item col-4 px-0"
+                                @click.stop="changeRefreshRate(-1)"
+                                :disabled="!refreshRate">
+                            <span class="icon">
+                                {% inline "chevron-down.svg" %}
+                            </span>
+                        </button>
+                        <div class="col-4 d-flex align-items-center justify-content-center">{{ refreshRateTitle }}</div>
+                        <button class="dropdown-item col-4 px-0"
+                                @click.stop="changeRefreshRate(1)" :disabled="refreshRate === refreshRateOptions.at(-1).value">
+                            <span class="icon">
+                                {% inline "chevron-up.svg" %}
+                            </span>
+                        </button>
                     </div>
 
                     <div class="dropdown-divider"></div>
 
-                    <header class="dropdown-header">Show first</header>
+                    <header class="dropdown-header" role="heading" aria-level="2">Show first</header>
                     <div class="d-flex text-center">
-                        <button class="dropdown-item px-0" :class="{active: itemSortNewestFirst}" @click.stop="itemSortNewestFirst=true">New</button>
-                        <button class="dropdown-item px-0" :class="{active: !itemSortNewestFirst}" @click.stop="itemSortNewestFirst=false">Old</button>
+                        <button class="dropdown-item px-0" :aria-pressed="itemSortNewestFirst"  :class="{active: itemSortNewestFirst}"  @click.stop="itemSortNewestFirst=true">New</button>
+                        <button class="dropdown-item px-0" :aria-pressed="!itemSortNewestFirst" :class="{active: !itemSortNewestFirst}" @click.stop="itemSortNewestFirst=false">Old</button>
                     </div>
                     <div class="dropdown-divider"></div>
-                    <header class="dropdown-header">Subscriptions</header>
+                    <header class="dropdown-header" role="heading" aria-level="2">Subscriptions</header>
                     <form id="opml-import-form" enctype="multipart/form-data" tabindex="-1">
                         <input type="file"
                                id="opml-import"
@@ -115,7 +131,7 @@
                     </button>
                 </dropdown>
             </div>
-            <div id="feed-list-scroll" class="p-2 overflow-auto border-top flex-grow-1">
+            <div id="feed-list-scroll" class="p-2 overflow-auto scroll-touch border-top flex-grow-1">
                 <label class="selectgroup">
                     <input type="radio" name="feed" value="" v-model="feedSelected">
                     <div class="selectgroup-label d-flex align-items-center w-100">
@@ -128,11 +144,9 @@
                 </label>
                 <div v-for="folder in foldersWithFeeds">
                     <label class="selectgroup mt-1"
-                           :class="{'d-none': filterSelected
-                                              && !(current.folder.id == folder.id || current.feed.folder_id == folder.id)
-                                              && !filteredFolderStats[folder.id]
-                                              && (!itemSelectedDetails || feedsById[itemSelectedDetails.feed_id].folder_id != folder.id)}">
-                        <input type="radio" name="feed" :value="'folder:'+folder.id" v-model="feedSelected">
+                           :class="{'d-none': mustHideFolder(folder)}"
+                           v-if="folder.id">
+                        <input type="radio" name="feed" :value="'folder:'+folder.id" v-model="feedSelected" v-if="folder.id">
                         <div class="selectgroup-label d-flex align-items-center w-100" v-if="folder.id">
                             <span class="icon mr-2"
                                   :class="{expanded: folder.is_expanded}"
@@ -145,10 +159,7 @@
                     </label>
                     <div v-show="!folder.id || folder.is_expanded" class="mt-1" :class="{'pl-3': folder.id}">
                         <label class="selectgroup"
-                              :class="{'d-none': filterSelected
-                                                 && !(current.feed.id == feed.id)
-                                                 && !filteredFeedStats[feed.id]
-                                                 && (!itemSelectedDetails || itemSelectedDetails.feed_id != feed.id)}"
+                              :class="{'d-none': mustHideFeed(feed)}"
                                v-for="feed in folder.feeds">
                             <input type="radio" name="feed" :value="'feed:'+feed.id" v-model="feedSelected">
                             <div class="selectgroup-label d-flex align-items-center w-100">
@@ -204,12 +215,12 @@
                     <template v-slot:button>
                         <span class="icon">{% inline "more-horizontal.svg" %}</span>
                     </template>
-                    <header class="dropdown-header">{{ current.feed.title }}</header>
-                    <a class="dropdown-item" :href="current.feed.link" target="_blank" v-if="current.feed.link">
+                    <header class="dropdown-header" role="heading" aria-level="2">{{ current.feed.title }}</header>
+                    <a class="dropdown-item" :href="current.feed.link" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer" v-if="current.feed.link">
                         <span class="icon mr-1">{% inline "globe.svg" %}</span>
                         Website
                     </a>
-                    <a class="dropdown-item" :href="current.feed.feed_link" target="_blank" v-if="current.feed.feed_link">
+                    <a class="dropdown-item" :href="current.feed.feed_link" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer" v-if="current.feed.feed_link">
                         <span class="icon mr-1">{% inline "rss.svg" %}</span>
                         Feed Link
                     </a>
@@ -218,8 +229,12 @@
                         <span class="icon mr-1">{% inline "edit.svg" %}</span>
                         Rename
                     </button>
+                    <button class="dropdown-item" @click="updateFeedLink(current.feed)" v-if="current.feed.feed_link">
+                        <span class="icon mr-1">{% inline "edit.svg" %}</span>
+                        Change Link
+                    </button>
                     <div class="dropdown-divider"></div>
-                    <header class="dropdown-header">Move to...</header>
+                    <header class="dropdown-header" role="heading" aria-level="2">Move to...</header>
                     <button class="dropdown-item"
                         v-if="folder.id != current.feed.folder_id"
                         v-for="folder in folders"
@@ -249,7 +264,7 @@
                     <template v-slot:button>
                         <span class="icon">{% inline "more-horizontal.svg" %}</span>
                     </template>
-                    <header class="dropdown-header">{{ current.folder.title }}</header>
+                    <header class="dropdown-header" role="heading" aria-level="2">{{ current.folder.title }}</header>
                     <button class="dropdown-item" @click="renameFolder(current.folder)">
                         <span class="icon mr-1">{% inline "edit.svg" %}</span>
                         Rename
@@ -261,18 +276,18 @@
                     </button>
                 </dropdown>
             </div>
-            <div id="item-list-scroll" class="p-2 overflow-auto border-top flex-grow-1" v-scroll="loadMoreItems" ref="itemlist">
+            <div id="item-list-scroll" class="p-2 overflow-auto scroll-touch border-top flex-grow-1" v-scroll="loadMoreItems" ref="itemlist">
                 <label v-for="item in items" :key="item.id"
                        class="selectgroup">
                     <input type="radio" name="item" :value="item.id" v-model="itemSelected">
                     <div class="selectgroup-label d-flex flex-column">
-                        <div style="line-height: 1; opacity: .7; margin-bottom: .1rem;" class="d-flex align-items-center">
+                        <div style="line-height: 100%; opacity: .7; margin-bottom: .1rem;" class="d-flex align-items-center">
                             <transition name="indicator">
                                 <span class="icon icon-small mr-1" v-if="item.status=='unread'">{% inline "circle-full.svg" %}</span>
                                 <span class="icon icon-small mr-1" v-if="item.status=='starred'">{% inline "star-full.svg" %}</span>
                             </transition>
                             <small class="flex-fill text-truncate mr-1">
-                                {{ feedsById[item.feed_id].title }}
+                                {{ (feedsById[item.feed_id] || {}).title }}
                             </small>
                             <small class="flex-shrink-0"><relative-time v-bind:title="formatDate(item.date)" :val="item.date"/></small>
                         </div>
@@ -320,30 +335,48 @@
                         title="Read Here">
                     <span class="icon" :class="{'icon-loading': loading.readability}">{% inline "book-open.svg" %}</span>
                 </button>
-                <a class="toolbar-item" :href="itemSelectedDetails.link" target="_blank" title="Open Link">
+                <a class="toolbar-item" :href="itemSelectedDetails.link" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer" title="Open Link">
                     <span class="icon">{% inline "external-link.svg" %}</span>
                 </a>
                 <div class="flex-grow-1"></div>
+                <button class="toolbar-item" @click="navigateToItem(-1)" title="Previous Article" :disabled="!items.length || itemSelected == items[0].id">
+                    <span class="icon">{% inline "chevron-left.svg" %}</span>
+                </button>
+                <button class="toolbar-item" @click="navigateToItem(+1)" title="Next Article" :disabled="!items.length || itemSelected == items[items.length - 1].id">
+                    <span class="icon">{% inline "chevron-right.svg" %}</span>
+                </button>
                 <button class="toolbar-item" @click="itemSelected=null" title="Close Article">
                     <span class="icon">{% inline "x.svg" %}</span>
                 </button>
             </div>
             <div v-if="itemSelectedDetails"
                  ref="content"
-                 class="content px-4 pt-3 pb-5 border-top overflow-auto"
+                 class="content px-4 pt-3 pb-5 border-top overflow-auto scroll-touch"
                  :class="{'font-serif': theme.font == 'serif', 'font-monospace': theme.font == 'monospace'}"
                  :style="{'font-size': theme.size + 'rem'}">
-                <h1><b>{{ itemSelectedDetails.title || 'untitled' }}</b></h1>
-                <div class="text-muted">
-                    <div>{{ feedsById[itemSelectedDetails.feed_id].title }}</div>
-                    <time>{{ formatDate(itemSelectedDetails.date) }}</time>
+                <div class="content-wrapper">
+                    <h1><b>{{ itemSelectedDetails.title || 'untitled' }}</b></h1>
+                    <div class="text-muted">
+                        <div>
+                            <span class="cursor-pointer" @click="feedSelected = 'feed:'+(feedsById[itemSelectedDetails.feed_id] || {}).id">
+                                {{ (feedsById[itemSelectedDetails.feed_id] || {}).title }}
+                            </span>
+                        </div>
+                        <time>{{ formatDate(itemSelectedDetails.date) }}</time>
+                    </div>
+                    <hr>
+                    <div v-if="!itemSelectedReadability">
+                        <div v-if="contentImages.length">
+                            <figure v-for="media in contentImages">
+                                <img :src="media.url" loading="lazy">
+                                <figcaption v-if="media.description">{{ media.description }}</figcaption>
+                            </figure>
+                        </div>
+                        <audio class="w-100" controls v-for="media in contentAudios" :src="media.url"></audio>
+                        <video class="w-100" controls v-for="media in contentVideos" :src="media.url"></video>
+                    </div>
+                    <div v-html="itemSelectedContent"></div>
                 </div>
-                <hr>
-                <div v-if="!itemSelectedReadability">
-                    <img :src="itemSelectedDetails.image" v-if="itemSelectedDetails.image" class="mb-3">
-                    <audio class="w-100" controls v-if="itemSelectedDetails.podcast_url" :src="itemSelectedDetails.podcast_url"></audio>
-                </div>
-                <div v-html="itemSelectedContent"></div>
             </div>
         </div>
         <modal :open="!!settings" @hide="settings = ''">
@@ -390,6 +423,7 @@
                     <tr><td colspan=2>&nbsp;</td></tr>
                     <tr><td><kbd>j</kbd> <kbd>k</kbd></td>  <td>next / prev article</td></tr>
                     <tr><td><kbd>l</kbd> <kbd>h</kbd></td>  <td>next / prev feed</td></tr>
+                    <tr><td><kbd>q</kbd></td>               <td>close article</td></tr>
 
                     <tr><td colspan=2>&nbsp;</td></tr>
                     <tr><td><kbd>R</kbd></td>               <td>mark all read</td></tr>

src/assets/javascripts/api.js

@@ -105,7 +105,7 @@
       return api('post', './logout')
     },
     crawl: function(url) {
-      return api('get', './page?url=' + url).then(json)
+      return api('get', './page?url=' + encodeURIComponent(url)).then(json)
     }
   }
 })()

src/assets/javascripts/app.js

@@ -2,6 +2,26 @@
 
 var TITLE = document.title
 
+function scrollto(target, scroll) {
+  var padding = 10
+  var targetRect = target.getBoundingClientRect()
+  var scrollRect = scroll.getBoundingClientRect()
+
+  // target
+  var relativeOffset = targetRect.y - scrollRect.y
+  var absoluteOffset = relativeOffset + scroll.scrollTop
+
+  if (padding <= relativeOffset && relativeOffset + targetRect.height <= scrollRect.height - padding) return
+
+  var newPos = scroll.scrollTop
+  if (relativeOffset < padding) {
+    newPos = absoluteOffset - padding
+  } else {
+    newPos = absoluteOffset - scrollRect.height + targetRect.height + padding
+  }
+  scroll.scrollTop = Math.round(newPos)
+}
+
 var debounce = function(callback, wait) {
   var timeout
   return function() {
@@ -191,6 +211,7 @@ var vm = new Vue({
     api.feeds.list_errors().then(function(errors) {
       vm.feed_errors = errors
     })
+    this.updateMetaTheme(app.settings.theme_name)
   },
   data: function() {
     var s = app.settings
@@ -229,9 +250,25 @@ var vm = new Vue({
         'font': s.theme_font,
         'size': s.theme_size,
       },
+      'themeColors': {
+        'night': '#0e0e0e',
+        'sepia': '#f4f0e5',
+        'light': '#fff',
+      },
       'refreshRate': s.refresh_rate,
       'authenticated': app.authenticated,
       'feed_errors': {},
+
+      'refreshRateOptions': [
+        { title: "0", value: 0 },
+        { title: "10m", value: 10 },
+        { title: "30m", value: 30 },
+        { title: "1h", value: 60 },
+        { title: "2h", value: 120 },
+        { title: "4h", value: 240 },
+        { title: "12h", value: 720 },
+        { title: "24h", value: 1440 },
+      ],
     }
   },
   computed: {
@@ -278,11 +315,28 @@ var vm = new Vue({
 
       return this.itemSelectedDetails.content || ''
     },
+    contentImages: function() {
+      if (!this.itemSelectedDetails) return []
+      return (this.itemSelectedDetails.media_links || []).filter(l => l.type === 'image')
+    },
+    contentAudios: function() {
+      if (!this.itemSelectedDetails) return []
+      return (this.itemSelectedDetails.media_links || []).filter(l => l.type === 'audio')
+    },
+    contentVideos: function() {
+      if (!this.itemSelectedDetails) return []
+      return (this.itemSelectedDetails.media_links || []).filter(l => l.type === 'video')
+    },
+    refreshRateTitle: function () {
+      const entry = this.refreshRateOptions.find(o => o.value === this.refreshRate)
+      return entry ? entry.title : '0'
+    },
   },
   watch: {
     'theme': {
       deep: true,
       handler: function(theme) {
+        this.updateMetaTheme(theme.name)
         document.body.classList.value = 'theme-' + theme.name
         api.settings.update({
           theme_name: theme.name,
@@ -307,14 +361,18 @@ var vm = new Vue({
     },
     'filterSelected': function(newVal, oldVal) {
       if (oldVal === undefined) return  // do nothing, initial setup
-      api.settings.update({filter: newVal}).then(this.refreshItems.bind(this, false))
       this.itemSelected = null
+      this.items = []
+      this.itemsHasMore = true
+      api.settings.update({filter: newVal}).then(this.refreshItems.bind(this, false))
       this.computeStats()
     },
     'feedSelected': function(newVal, oldVal) {
       if (oldVal === undefined) return  // do nothing, initial setup
-      api.settings.update({feed: newVal}).then(this.refreshItems.bind(this, false))
       this.itemSelected = null
+      this.items = []
+      this.itemsHasMore = true
+      api.settings.update({feed: newVal}).then(this.refreshItems.bind(this, false))
       if (this.$refs.itemlist) this.$refs.itemlist.scrollTop = 0
     },
     'itemSelected': function(newVal, oldVal) {
@@ -358,6 +416,9 @@ var vm = new Vue({
     },
   },
   methods: {
+    updateMetaTheme: function(theme) {
+      document.querySelector("meta[name='theme-color']").content = this.themeColors[theme]
+    },
     refreshStats: function(loopMode) {
       return api.status().then(function(data) {
         if (loopMode && !vm.itemSelected) vm.refreshItems()
@@ -407,9 +468,10 @@ var vm = new Vue({
           vm.feeds = values[1]
         })
     },
-    refreshItems: function(loadMore) {
+    refreshItems: function(loadMore = false) {
       if (this.feedSelected === null) {
         vm.items = []
+        vm.itemsHasMore = false
         return
       }
 
@@ -419,7 +481,7 @@ var vm = new Vue({
       }
 
       this.loading.items = true
-      api.items.list(query).then(function(data) {
+      return api.items.list(query).then(function(data) {
         if (loadMore) {
           vm.items = vm.items.concat(data.list)
         } else {
@@ -437,14 +499,22 @@ var vm = new Vue({
       })
     },
     itemListCloseToBottom: function() {
+      // approx. vertical space at the bottom of the list (loading el & paddings) when 1rem = 16px
+      var bottomSpace = 70
+      var scale = (parseFloat(getComputedStyle(document.documentElement).fontSize) || 16) / 16
+
       var el = this.$refs.itemlist
-      var closeToBottom = (el.scrollHeight - el.scrollTop - el.offsetHeight) < 50
+
+      if (el.scrollHeight === 0) return false  // element is invisible (responsive design)
+
+      var closeToBottom = (el.scrollHeight - el.scrollTop - el.offsetHeight) < bottomSpace * scale
       return closeToBottom
     },
     loadMoreItems: function(event, el) {
       if (!this.itemsHasMore) return
       if (this.loading.items) return
-      if (this.itemListCloseToBottom()) this.refreshItems(true)
+      if (this.itemListCloseToBottom()) return this.refreshItems(true)
+      if (this.itemSelected && this.itemSelected === this.items[this.items.length - 1].id) return this.refreshItems(true)
     },
     markItemsRead: function() {
       var query = this.getItemsQuery()
@@ -512,15 +582,20 @@ var vm = new Vue({
     deleteFolder: function(folder) {
       if (confirm('Are you sure you want to delete ' + folder.title + '?')) {
         api.folders.delete(folder.id).then(function() {
-          if (vm.feedSelected === 'folder:'+folder.id) {
-            vm.items = []
-            vm.feedSelected = ''
-          }
+          vm.feedSelected = null
           vm.refreshStats()
           vm.refreshFeeds()
         })
       }
     },
+    updateFeedLink: function(feed) {
+      var newLink = prompt('Enter feed link', feed.feed_link)
+      if (newLink) {
+        api.feeds.update(feed.id, {feed_link: newLink}).then(function() {
+          feed.feed_link = newLink
+        })
+      }
+    },
     renameFeed: function(feed) {
       var newTitle = prompt('Enter new title', feed.title)
       if (newTitle) {
@@ -532,12 +607,7 @@ var vm = new Vue({
     deleteFeed: function(feed) {
       if (confirm('Are you sure you want to delete ' + feed.title + '?')) {
         api.feeds.delete(feed.id).then(function() {
-          // unselect feed to prevent reading properties of null in template
-          var isSelected = !vm.feedSelected
-            || (vm.feedSelected === 'feed:'+feed.id
-            || (feed.folder_id && vm.feedSelected === 'folder:'+feed.folder_id));
-          if (isSelected) vm.feedSelected = null
-
+          vm.feedSelected = null
           vm.refreshStats()
           vm.refreshFeeds()
         })
@@ -678,6 +748,92 @@ var vm = new Vue({
       this.filteredFolderStats = statsFolders
       this.filteredTotalStats = statsTotal
     },
+    // navigation helper, navigate relative to selected item
+    navigateToItem: function(relativePosition) {
+      let vm = this
+      if (vm.itemSelected == null) {
+        // if no item is selected, select first
+        if (vm.items.length !== 0) vm.itemSelected = vm.items[0].id
+        return
+      }
+
+      var itemPosition = vm.items.findIndex(function(x) { return x.id === vm.itemSelected })
+      if (itemPosition === -1) {
+        if (vm.items.length !== 0) vm.itemSelected = vm.items[0].id
+        return
+      }
+
+      var newPosition = itemPosition + relativePosition
+      if (newPosition < 0 || newPosition >= vm.items.length) return
+
+      vm.itemSelected = vm.items[newPosition].id
+
+      vm.$nextTick(function() {
+        var scroll = document.querySelector('#item-list-scroll')
+
+        var handle = scroll.querySelector('input[type=radio]:checked')
+        var target = handle && handle.parentElement
+
+        if (target && scroll) scrollto(target, scroll)
+
+        vm.loadMoreItems()
+      })
+    },
+    // navigation helper, navigate relative to selected feed
+    navigateToFeed: function(relativePosition) {
+      let vm = this
+      const navigationList = this.foldersWithFeeds
+        .filter(folder => !folder.id || !vm.mustHideFolder(folder))
+        .map((folder) => {
+          if (this.mustHideFolder(folder)) return []
+          const folds = folder.id ? [`folder:${folder.id}`] : []
+          const feeds = (folder.is_expanded || !folder.id)
+            ? (folder.feeds || []).filter(f => !vm.mustHideFeed(f)).map(f => `feed:${f.id}`)
+            : []
+          return folds.concat(feeds)
+        })
+        .flat()
+      navigationList.unshift('')
+
+      var currentFeedPosition = navigationList.indexOf(vm.feedSelected)
+
+      if (currentFeedPosition == -1) {
+        vm.feedSelected = ''
+        return
+      }
+
+      var newPosition = currentFeedPosition+relativePosition
+      if (newPosition < 0 || newPosition >= navigationList.length) return
+
+      vm.feedSelected = navigationList[newPosition]
+
+      vm.$nextTick(function() {
+        var scroll = document.querySelector('#feed-list-scroll')
+
+        var handle = scroll.querySelector('input[type=radio]:checked')
+        var target = handle && handle.parentElement
+
+        if (target && scroll) scrollto(target, scroll)
+      })
+    },
+    changeRefreshRate: function(offset) {
+      const curIdx = this.refreshRateOptions.findIndex(o => o.value === this.refreshRate)
+      if (curIdx <= 0 && offset < 0) return
+      if (curIdx >= (this.refreshRateOptions.length - 1) && offset > 0) return
+      this.refreshRate = this.refreshRateOptions[curIdx + offset].value
+    },
+    mustHideFolder: function (folder) {
+      return this.filterSelected
+        && !(this.current.folder.id == folder.id || this.current.feed.folder_id == folder.id)
+        && !this.filteredFolderStats[folder.id]
+        && (!this.itemSelectedDetails || (this.feedsById[this.itemSelectedDetails.feed_id] || {}).folder_id != folder.id)
+    },
+    mustHideFeed: function (feed) {
+      return this.filterSelected
+        && !(this.current.feed.id == feed.id)
+        && !this.filteredFeedStats[feed.id]
+        && (!this.itemSelectedDetails || this.itemSelectedDetails.feed_id != feed.id)
+    },
   }
 })
 

src/assets/javascripts/key.js

@@ -1,79 +1,4 @@
-function scrollto(target, scroll) {
-  var padding = 10
-  var targetRect = target.getBoundingClientRect()
-  var scrollRect = scroll.getBoundingClientRect()
-
-  // target
-  var relativeOffset = targetRect.y - scrollRect.y
-  var absoluteOffset = relativeOffset + scroll.scrollTop
-
-  if (padding <= relativeOffset && relativeOffset + targetRect.height <= scrollRect.height - padding) return
-
-  var newPos = scroll.scrollTop
-  if (relativeOffset < padding) {
-    newPos = absoluteOffset - padding
-  } else {
-    newPos = absoluteOffset - scrollRect.height + targetRect.height + padding
-  }
-  scroll.scrollTop = Math.round(newPos)
-}
-
 var helperFunctions = {
-  // navigation helper, navigate relative to selected item
-  navigateToItem: function(relativePosition) {
-    if (vm.itemSelected == null) {
-      // if no item is selected, select first
-      if (vm.items.length !== 0) vm.itemSelected = vm.items[0].id
-      return
-    }
-
-    var itemPosition = vm.items.findIndex(function(x) { return x.id === vm.itemSelected })
-    if (itemPosition === -1) {
-      if (vm.items.length !== 0) vm.itemSelected = vm.items[0].id
-      return
-    }
-
-    var newPosition = itemPosition + relativePosition
-    if (newPosition < 0 || newPosition >= vm.items.length) return
-
-    vm.itemSelected = vm.items[newPosition].id
-
-    vm.$nextTick(function() {
-      var scroll = document.querySelector('#item-list-scroll')
-
-      var handle = scroll.querySelector('input[type=radio]:checked')
-      var target = handle && handle.parentElement
-
-      if (target && scroll) scrollto(target, scroll)
-    })
-  },
-  // navigation helper, navigate relative to selected feed
-  navigateToFeed: function(relativePosition) {
-    var navigationList = Array.from(document.querySelectorAll('#col-feed-list input[name=feed]'))
-      .filter(function(r) { return r.offsetParent !== null && r.value !== 'folder:null' })
-      .map(function(r) { return r.value })
-
-    var currentFeedPosition = navigationList.indexOf(vm.feedSelected)
-
-    if (currentFeedPosition == -1) {
-      vm.feedSelected = ''
-      return
-    }
-
-    var newPosition = currentFeedPosition+relativePosition
-    if (newPosition < 0 || newPosition >= navigationList.length) return
-
-    vm.feedSelected = navigationList[newPosition]
-
-    vm.$nextTick(function() {
-      var scroll = document.querySelector('#feed-list-scroll')
-
-      var handle = scroll.querySelector('input[type=radio]:checked')
-      var target = handle && handle.parentElement
-
-      if (target && scroll) scrollto(target, scroll)
-    })
-  },
   scrollContent: function(direction) {
     var padding = 40
     var scroll = document.querySelector('.content')
@@ -92,7 +17,7 @@ var helperFunctions = {
 var shortcutFunctions = {
   openItemLink: function() {
     if (vm.itemSelectedDetails && vm.itemSelectedDetails.link) {
-      window.open(vm.itemSelectedDetails.link, '_blank')
+      window.open(vm.itemSelectedDetails.link, '_blank', 'noopener,noreferrer')
     }
   },
   toggleReadability: function() {
@@ -118,16 +43,16 @@ var shortcutFunctions = {
     document.getElementById("searchbar").focus()
   },
   nextItem(){
-    helperFunctions.navigateToItem(+1)
+    vm.navigateToItem(+1)
   },
   previousItem() {
-    helperFunctions.navigateToItem(-1)
+    vm.navigateToItem(-1)
   },
   nextFeed(){
-    helperFunctions.navigateToFeed(+1)
+    vm.navigateToFeed(+1)
   },
   previousFeed() {
-    helperFunctions.navigateToFeed(-1)
+    vm.navigateToFeed(-1)
   },
   scrollForward: function() {
     helperFunctions.scrollContent(+1)
@@ -135,6 +60,9 @@ var shortcutFunctions = {
   scrollBackward: function() {
     helperFunctions.scrollContent(-1)
   },
+  closeItem: function () {
+    vm.itemSelected = null
+  },
   showAll() {
     vm.filterSelected = ''
   },
@@ -160,11 +88,31 @@ var keybindings = {
   "h": shortcutFunctions.previousFeed,
   "f": shortcutFunctions.scrollForward,
   "b": shortcutFunctions.scrollBackward,
+  "q": shortcutFunctions.closeItem,
   "1": shortcutFunctions.showUnread,
   "2": shortcutFunctions.showStarred,
   "3": shortcutFunctions.showAll,
 }
 
+var codebindings = {
+  "KeyO": shortcutFunctions.openItemLink,
+  "KeyI": shortcutFunctions.toggleReadability,
+  //"r": shortcutFunctions.toggleItemRead,
+  //"KeyR": shortcutFunctions.markAllRead,
+  "KeyS": shortcutFunctions.toggleItemStarred,
+  "Slash": shortcutFunctions.focusSearch,
+  "KeyJ": shortcutFunctions.nextItem,
+  "KeyK": shortcutFunctions.previousItem,
+  "KeyL": shortcutFunctions.nextFeed,
+  "KeyH": shortcutFunctions.previousFeed,
+  "KeyF": shortcutFunctions.scrollForward,
+  "KeyB": shortcutFunctions.scrollBackward,
+  "KeyQ": shortcutFunctions.closeItem,
+  "Digit1": shortcutFunctions.showUnread,
+  "Digit2": shortcutFunctions.showStarred,
+  "Digit3": shortcutFunctions.showAll,
+}
+
 function isTextBox(element) {
   var tagName = element.tagName.toLowerCase()
   // Input elements that aren't text
@@ -179,10 +127,10 @@ function isTextBox(element) {
 document.addEventListener('keydown',function(event) {
   // Ignore while focused on text or
   // when using modifier keys (to not clash with browser behaviour)
-  if (isTextBox(event.target) || event.metaKey || event.ctrlKey) {
+  if (isTextBox(event.target) || event.metaKey || event.ctrlKey || event.altKey) {
     return
   }
-  var keybindFunction = keybindings[event.key]
+  var keybindFunction = keybindings[event.key] || codebindings[event.code]
   if (keybindFunction) {
     event.preventDefault()
     keybindFunction()

src/assets/login.html

@@ -5,7 +5,8 @@
     <title>yarr!</title>
     <link rel="stylesheet" href="./static/stylesheets/bootstrap.min.css">
     <link rel="stylesheet" href="./static/stylesheets/app.css">
-    <link rel="icon shortcut" href="./static/graphicarts/icon.png">
+    <link rel="icon" href="./static/graphicarts/favicon.svg" type="image/svg+xml">
+    <link rel="alternate icon" href="./static/graphicarts/favicon.png" type="image/png">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <style>
         form {
@@ -21,7 +22,7 @@
         }
     </style>
 </head>
-<body>
+<body class="theme-{% .settings.theme_name %}">
     <form action="" method="post">
         <img src="./static/graphicarts/anchor.svg" alt="">
         {% if .error %}

src/assets/stylesheets/app.css

@@ -2,8 +2,11 @@
   display: none !important;
 }
 
-body {
+html {
   font-size: 15px !important;
+}
+
+body {
   overscroll-behavior: none;
 }
 
@@ -97,6 +100,10 @@ select.form-control:not([multiple]):not([size]) {
   padding-right: 0;
 }
 
+.scroll-touch {
+  -webkit-overflow-scrolling: touch;
+}
+
 /* custom elements */
 
 .font-serif {
@@ -164,7 +171,9 @@ select.form-control:not([multiple]):not([size]) {
   opacity: 0;
   position: absolute;
   z-index: -1;
-  top: 0; left: 0;
+  top: 0;
+  left: 0;
+  height: 100%;
 }
 
 .selectgroup + .selectgroup {
@@ -353,6 +362,11 @@ select.form-control:not([multiple]):not([size]) {
   line-height: 1.5;
 }
 
+.content-wrapper {
+  max-width: 60rem;
+  margin: 0 auto;
+}
+
 .content img, .content video {
   max-width: 100%;
   height: auto;
@@ -420,6 +434,11 @@ select.form-control:not([multiple]):not([size]) {
   font-size: 1rem;
 }
 
+.content p {
+  margin-top: 1rem;
+  margin-bottom: 1rem;
+}
+
 /* theme: light */
 
 button.theme-light {
@@ -427,11 +446,11 @@ button.theme-light {
 }
 
 a,
-.btn-link:hover,
-.toolbar-item.active {
+.btn-link:hover {
   color: #0080d4;
 }
 
+.toolbar-item.active,
 .dropdown-item.active,
 .dropdown-item:active,
 .selectgroup input:checked + .selectgroup-label {

src/content/htmlutil/urlutils.go

@@ -2,6 +2,7 @@ package htmlutil
 
 import (
 	"net/url"
+	"strings"
 )
 
 func Any(els []string, el string, match func(string, string) bool) bool {
@@ -31,3 +32,7 @@ func URLDomain(val string) string {
 	}
 	return val
 }
+
+func IsAPossibleLink(val string) bool {
+	return strings.HasPrefix(val, "http://") || strings.HasPrefix(val, "https://")
+}

src/content/htmlutil/utils.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"regexp"
 	"strings"
+	"unicode"
 
 	"golang.org/x/net/html"
 )
@@ -61,3 +62,16 @@ func ExtractText(content string) string {
 	text = whitespaceRegex.ReplaceAllLiteralString(text, " ")
 	return text
 }
+
+func TruncateText(input string, size int) string {
+	runes := []rune(input)
+	if len(runes) <= size {
+		return input
+	}
+	for i := size - 1; i > 0; i-- {
+		if unicode.IsSpace(runes[i]) {
+			return string(runes[:i]) + " ..."
+		}
+	}
+	return input
+}

src/content/htmlutil/utils_test.go

@@ -24,3 +24,21 @@ func TestExtractText(t *testing.T) {
 		}
 	}
 }
+
+func TestTruncateText(t *testing.T) {
+	input := "Lorem ipsum — классический текст-«рыба»"
+
+	size := 30
+	want := "Lorem ipsum — классический ..."
+	have := TruncateText(input, size)
+	if want != have {
+		t.Errorf("\nsize: %d\nwant: %#v\nhave: %#v", size, want, have)
+	}
+
+	size = 1000
+	want = input
+	have = TruncateText(input, size)
+	if want != have {
+		t.Errorf("\nsize: %d\nwant: %#v\nhave: %#v", size, want, have)
+	}
+}

src/content/readability/readability.go

@@ -6,6 +6,7 @@ package readability
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"io"
 	"math"
@@ -26,10 +27,16 @@ var (
 
 	blacklistCandidatesRegexp  = regexp.MustCompile(`(?i)popupbody|-ad|g-plus`)
 	okMaybeItsACandidateRegexp = regexp.MustCompile(`(?i)and|article|body|column|main|shadow`)
-	unlikelyCandidatesRegexp   = regexp.MustCompile(`(?i)banner|breadcrumbs|combx|comment|community|cover-wrap|disqus|extra|foot|header|legends|menu|modal|related|remark|replies|rss|shoutbox|sidebar|skyscraper|social|sponsor|supplemental|ad-break|agegate|pagination|pager|popup|yom-remote`)
+	unlikelyCandidatesRegexp   = regexp.MustCompile(
+		`(?i)banner|breadcrumbs|combx|comment|community|cover-wrap|disqus|extra|foot|header|legends|menu|modal|related|remark|replies|rss|shoutbox|sidebar|skyscraper|social|sponsor|supplemental|ad-break|agegate|pagination|pager|popup|yom-remote`,
+	)
 
-	negativeRegexp = regexp.MustCompile(`(?i)hidden|^hid$|hid$|hid|^hid |banner|combx|comment|com-|contact|foot|footer|footnote|masthead|media|meta|modal|outbrain|promo|related|scroll|share|shoutbox|sidebar|skyscraper|sponsor|shopping|tags|tool|widget|byline|author|dateline|writtenby|p-author`)
-	positiveRegexp = regexp.MustCompile(`(?i)article|body|content|entry|hentry|h-entry|main|page|pagination|post|text|blog|story`)
+	negativeRegexp = regexp.MustCompile(
+		`(?i)hidden|^hid$|hid$|hid|^hid |banner|combx|comment|com-|contact|foot|footer|footnote|masthead|media|meta|modal|outbrain|promo|related|scroll|share|shoutbox|sidebar|skyscraper|sponsor|shopping|tags|tool|widget|byline|author|dateline|writtenby|p-author`,
+	)
+	positiveRegexp = regexp.MustCompile(
+		`(?i)article|body|content|entry|hentry|h-entry|main|page|pagination|post|text|blog|story`,
+	)
 )
 
 type nodeScores map[*html.Node]float32
@@ -59,6 +66,9 @@ func ExtractContent(page io.Reader) (string, error) {
 			best = body
 			break
 		}
+		if best == nil {
+			return "", errors.New("failed to extract content")
+		}
 	}
 	//log.Printf("[Readability] TopCandidate: %v", topCandidate)
 

src/content/sanitizer/sanitizer.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"io"
 	"regexp"
+	"slices"
 	"strconv"
 	"strings"
 
@@ -146,7 +147,10 @@ func sanitizeAttributes(baseURL, tagName string, attributes []html.Attribute) ([
 		}
 
 		attrNames = append(attrNames, attribute.Key)
-		htmlAttrs = append(htmlAttrs, fmt.Sprintf(`%s="%s"`, attribute.Key, html.EscapeString(value)))
+		htmlAttrs = append(
+			htmlAttrs,
+			fmt.Sprintf(`%s="%s"`, attribute.Key, html.EscapeString(value)),
+		)
 	}
 
 	extraAttrNames, extraHTMLAttributes := getExtraAttributes(tagName)
@@ -161,13 +165,27 @@ func sanitizeAttributes(baseURL, tagName string, attributes []html.Attribute) ([
 func getExtraAttributes(tagName string) ([]string, []string) {
 	switch tagName {
 	case "a":
-		return []string{"rel", "target", "referrerpolicy"}, []string{`rel="noopener noreferrer"`, `target="_blank"`, `referrerpolicy="no-referrer"`}
+		return []string{
+				"rel",
+				"target",
+				"referrerpolicy",
+			}, []string{
+				`rel="noopener noreferrer"`,
+				`target="_blank"`,
+				`referrerpolicy="no-referrer"`,
+			}
 	case "video", "audio":
 		return []string{"controls"}, []string{"controls"}
 	case "iframe":
-		return []string{"sandbox", "loading"}, []string{`sandbox="allow-scripts allow-same-origin allow-popups"`, `loading="lazy"`}
+		return []string{
+				"sandbox",
+				"loading",
+			}, []string{
+				`sandbox="allow-scripts allow-same-origin allow-popups"`,
+				`loading="lazy"`,
+			}
 	case "img":
-		return []string{"loading"}, []string{`loading="lazy"`}
+		return []string{"loading"}, []string{`loading="lazy"`, `referrerpolicy="no-referrer"`}
 	default:
 		return nil, nil
 	}
@@ -208,10 +226,8 @@ func hasRequiredAttributes(tagName string, attributes []string) bool {
 	for element, attrs := range elements {
 		if tagName == element {
 			for _, attribute := range attributes {
-				for _, attr := range attrs {
-					if attr == attribute {
-						return true
-					}
+				if slices.Contains(attrs, attribute) {
+					return true
 				}
 			}
 
@@ -268,13 +284,7 @@ func isValidIframeSource(baseURL, src string) bool {
 		return true
 	}
 
-	for _, safeDomain := range whitelist {
-		if safeDomain == domain {
-			return true
-		}
-	}
-
-	return false
+	return slices.Contains(whitelist, domain)
 }
 
 func getTagAllowList() map[string][]string {
@@ -338,13 +348,7 @@ func getTagAllowList() map[string][]string {
 }
 
 func inList(needle string, haystack []string) bool {
-	for _, element := range haystack {
-		if element == needle {
-			return true
-		}
-	}
-
-	return false
+	return slices.Contains(haystack, needle)
 }
 
 func isBlockedTag(tagName string) bool {
@@ -354,17 +358,10 @@ func isBlockedTag(tagName string) bool {
 		"style",
 	}
 
-	for _, element := range blacklist {
-		if element == tagName {
-			return true
-		}
-	}
-
-	return false
+	return slices.Contains(blacklist, tagName)
 }
 
 /*
-
 One or more strings separated by commas, indicating possible image sources for the user agent to use.
 
 Each string is composed of:
@@ -372,7 +369,6 @@ Each string is composed of:
 - Optionally, whitespace followed by one of:
 - A width descriptor (a positive integer directly followed by w). The width descriptor is divided by the source size given in the sizes attribute to calculate the effective pixel density.
 - A pixel density descriptor (a positive floating point number directly followed by x).
-
 */
 func sanitizeSrcsetAttr(baseURL, value string) string {
 	var sanitizedSources []string

src/content/sanitizer/sanitizer_test.go

@@ -8,10 +8,11 @@ import "testing"
 
 func TestValidInput(t *testing.T) {
 	input := `<p>This is a <strong>text</strong> with an image: <img src="http://example.org/" alt="Test" loading="lazy">.</p>`
-	output := Sanitize("http://example.org/", input)
+	want := `<p>This is a <strong>text</strong> with an image: <img src="http://example.org/" alt="Test" loading="lazy" referrerpolicy="no-referrer">.</p>`
+	have := Sanitize("http://example.org/", input)
 
-	if input != output {
-		t.Errorf(`Wrong output: "%s" != "%s"`, input, output)
+	if have != want {
+		t.Errorf("Wrong output: \nwant: %#v\nhave: %#v", want, have)
 	}
 }
 
@@ -27,31 +28,31 @@ func TestImgWithTextDataURL(t *testing.T) {
 
 func TestImgWithDataURL(t *testing.T) {
 	input := `<img src="data:image/gif;base64,test" alt="Example">`
-	expected := `<img src="data:image/gif;base64,test" alt="Example" loading="lazy">`
-	output := Sanitize("http://example.org/", input)
+	want := `<img src="data:image/gif;base64,test" alt="Example" loading="lazy" referrerpolicy="no-referrer">`
+	have := Sanitize("http://example.org/", input)
 
-	if output != expected {
-		t.Errorf(`Wrong output: %s`, output)
+	if have != want {
+		t.Errorf("Wrong output:\nwant: %s\nhave: %s", want, have)
 	}
 }
 
 func TestImgWithSrcset(t *testing.T) {
 	input := `<img srcset="example-320w.jpg, example-480w.jpg 1.5x,   example-640w.jpg 2x, example-640w.jpg 640w" src="example-640w.jpg" alt="Example">`
-	expected := `<img srcset="http://example.org/example-320w.jpg, http://example.org/example-480w.jpg 1.5x, http://example.org/example-640w.jpg 2x, http://example.org/example-640w.jpg 640w" src="http://example.org/example-640w.jpg" alt="Example" loading="lazy">`
-	output := Sanitize("http://example.org/", input)
+	want := `<img srcset="http://example.org/example-320w.jpg, http://example.org/example-480w.jpg 1.5x, http://example.org/example-640w.jpg 2x, http://example.org/example-640w.jpg 640w" src="http://example.org/example-640w.jpg" alt="Example" loading="lazy" referrerpolicy="no-referrer">`
+	have := Sanitize("http://example.org/", input)
 
-	if output != expected {
-		t.Errorf(`Wrong output: %s`, output)
+	if have != want {
+		t.Errorf("Wrong output:\nwant: %s\nhave: %s", want, have)
 	}
 }
 
 func TestImgWithSrcsetAndDataURL(t *testing.T) {
 	input := `<img srcset="data:image/gif;base64,test" src="http://example.org/example-320w.jpg" alt="Example">`
-	expected := `<img srcset="data:image/gif;base64,test" src="http://example.org/example-320w.jpg" alt="Example" loading="lazy">`
-	output := Sanitize("http://example.org/", input)
+	want := `<img srcset="data:image/gif;base64,test" src="http://example.org/example-320w.jpg" alt="Example" loading="lazy" referrerpolicy="no-referrer">`
+	have := Sanitize("http://example.org/", input)
 
-	if output != expected {
-		t.Errorf(`Wrong output: %s`, output)
+	if have != want {
+		t.Errorf("Wrong output:\nwant: %s\nhave: %s", want, have)
 	}
 }
 
@@ -67,16 +68,16 @@ func TestSourceWithSrcsetAndMedia(t *testing.T) {
 
 func TestMediumImgWithSrcset(t *testing.T) {
 	input := `<img alt="Image for post" class="t u v ef aj" src="https://miro.medium.com/max/5460/1*aJ9JibWDqO81qMfNtqgqrw.jpeg" srcset="https://miro.medium.com/max/552/1*aJ9JibWDqO81qMfNtqgqrw.jpeg 276w, https://miro.medium.com/max/1000/1*aJ9JibWDqO81qMfNtqgqrw.jpeg 500w" sizes="500px" width="2730" height="3407">`
-	expected := `<img alt="Image for post" src="https://miro.medium.com/max/5460/1*aJ9JibWDqO81qMfNtqgqrw.jpeg" srcset="https://miro.medium.com/max/552/1*aJ9JibWDqO81qMfNtqgqrw.jpeg 276w, https://miro.medium.com/max/1000/1*aJ9JibWDqO81qMfNtqgqrw.jpeg 500w" sizes="500px" loading="lazy">`
-	output := Sanitize("http://example.org/", input)
+	want := `<img alt="Image for post" src="https://miro.medium.com/max/5460/1*aJ9JibWDqO81qMfNtqgqrw.jpeg" srcset="https://miro.medium.com/max/552/1*aJ9JibWDqO81qMfNtqgqrw.jpeg 276w, https://miro.medium.com/max/1000/1*aJ9JibWDqO81qMfNtqgqrw.jpeg 500w" sizes="500px" loading="lazy" referrerpolicy="no-referrer">`
+	have := Sanitize("http://example.org/", input)
 
-	if output != expected {
-		t.Errorf(`Wrong output: %s`, output)
+	if have != want {
+		t.Errorf("Wrong output:\nwant: %s\nhave: %s", want, have)
 	}
 }
 
 func TestSelfClosingTags(t *testing.T) {
-	input := `<p>This <br> is a <strong>text</strong> <br/>with an image: <img src="http://example.org/" alt="Test" loading="lazy"/>.</p>`
+	input := `<p>This <br> is a <strong>text</strong><br/>.</p>`
 	output := Sanitize("http://example.org/", input)
 
 	if input != output {
@@ -95,11 +96,11 @@ func TestTable(t *testing.T) {
 
 func TestRelativeURL(t *testing.T) {
 	input := `This <a href="/test.html">link is relative</a> and this image: <img src="../folder/image.png"/>`
-	expected := `This <a href="http://example.org/test.html" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">link is relative</a> and this image: <img src="http://example.org/folder/image.png" loading="lazy"/>`
-	output := Sanitize("http://example.org/", input)
+	want := `This <a href="http://example.org/test.html" rel="noopener noreferrer" target="_blank" referrerpolicy="no-referrer">link is relative</a> and this image: <img src="http://example.org/folder/image.png" loading="lazy" referrerpolicy="no-referrer"/>`
+	have := Sanitize("http://example.org/", input)
 
-	if expected != output {
-		t.Errorf(`Wrong output: "%s" != "%s"`, expected, output)
+	if want != have {
+		t.Errorf("Wrong output:\nwant: %s\nhave: %s", want, have)
 	}
 }
 
@@ -165,11 +166,11 @@ func TestInvalidNestedTag(t *testing.T) {
 
 func TestValidIFrame(t *testing.T) {
 	input := `<iframe src="http://example.org/"></iframe>`
-	expected := `<iframe src="http://example.org/" sandbox="allow-scripts allow-same-origin allow-popups" loading="lazy"></iframe>`
-	output := Sanitize("http://example.org/", input)
+	want := `<iframe src="http://example.org/" sandbox="allow-scripts allow-same-origin allow-popups" loading="lazy"></iframe>`
+	have := Sanitize("http://example.org/", input)
 
-	if expected != output {
-		t.Errorf("Wrong output:\nwant: %s\nhave: %s", expected, output)
+	if want != have {
+		t.Errorf("Wrong output:\nwant: %s\nhave: %s", want, have)
 	}
 }
 

src/content/scraper/finder.go

@@ -1,6 +1,8 @@
 package scraper
 
 import (
+	"net/url"
+	"slices"
 	"strings"
 
 	"github.com/nkanaev/yarr/src/content/htmlutil"
@@ -21,10 +23,8 @@ func FindFeeds(body string, base string) map[string]string {
 	isFeedLink := func(n *html.Node) bool {
 		if n.Type == html.ElementNode && n.Data == "link" {
 			t := htmlutil.Attr(n, "type")
-			for _, tt := range linkTypes {
-				if tt == t {
-					return true
-				}
+			if slices.Contains(linkTypes, t) {
+				return true
 			}
 		}
 		return false
@@ -35,6 +35,18 @@ func FindFeeds(body string, base string) map[string]string {
 		link := htmlutil.AbsoluteUrl(href, base)
 		if link != "" {
 			candidates[link] = name
+
+			l, err := url.Parse(link)
+			if err == nil && l.Host == "www.youtube.com" && l.Path == "/feeds/videos.xml" {
+				// https://wiki.archiveteam.org/index.php/YouTube/Technical_details#Playlists
+				channelID, found := strings.CutPrefix(l.Query().Get("channel_id"), "UC")
+				if found {
+					const url string = "https://www.youtube.com/feeds/videos.xml?playlist_id="
+					candidates[url+"UULF"+channelID] = name + " - Videos"
+					candidates[url+"UULV"+channelID] = name + " - Live Streams"
+					candidates[url+"UUSH"+channelID] = name + " - Short videos"
+				}
+			}
 		}
 	}
 

src/content/silo/iframe.go

@@ -22,6 +22,8 @@ func VideoIFrame(link string) string {
 	youtubeID := ""
 	if l.Host == "www.youtube.com" && l.Path == "/watch" {
 		youtubeID = l.Query().Get("v")
+	} else if l.Host == "www.youtube.com" && strings.HasPrefix(l.Path, "/shorts/") {
+		youtubeID = strings.TrimPrefix(l.Path, "/shorts/")
 	} else if l.Host == "youtu.be" {
 		youtubeID = strings.TrimLeft(l.Path, "/")
 	}

src/content/silo/url.go

@@ -0,0 +1,17 @@
+package silo
+
+import (
+	"net/url"
+	"strings"
+)
+
+func RedirectURL(link string) string {
+	if strings.HasPrefix(link, "https://www.google.com/url?") {
+		if u, err := url.Parse(link); err == nil {
+			if u2 := u.Query().Get("url"); u2 != "" {
+				return u2
+			}
+		}
+	}
+	return link
+}

src/content/silo/url_test.go

@@ -0,0 +1,24 @@
+package silo
+
+import "testing"
+
+func TestRedirectURL(t *testing.T) {
+	link := "https://www.google.com/url?rct=j&sa=t&url=https://www.cryptoglobe.com/latest/2022/08/investment-strategist-lyn-alden-explains-why-she-is-still-bullish-on-bitcoin-long-term/&ct=ga&cd=CAIyGjlkMjI1NjUyODE3ODFjMDQ6Y29tOmVuOlVT&usg=AOvVaw16C2fJtw6m8QVEbto2HCKK"
+	want := "https://www.cryptoglobe.com/latest/2022/08/investment-strategist-lyn-alden-explains-why-she-is-still-bullish-on-bitcoin-long-term/"
+	have := RedirectURL(link)
+	if have != want {
+		t.Logf("want: %s", want)
+		t.Logf("have: %s", have)
+		t.Fail()
+	}
+
+	link = "https://example.com"
+	if RedirectURL(link) != link {
+		t.Fail()
+	}
+
+	link = "https://example.com/url?url=test.com"
+	if RedirectURL(link) != link {
+		t.Fail()
+	}
+}

src/parser/atom.go

@@ -3,7 +3,6 @@ package parser
 
 import (
 	"encoding/xml"
-	"html"
 	"io"
 	"strings"
 
@@ -47,6 +46,8 @@ type atomLinks []atomLink
 func (a *atomText) Text() string {
 	if a.Type == "html" {
 		return htmlutil.ExtractText(a.Data)
+	} else if a.Type == "xhtml" {
+		return htmlutil.ExtractText(a.XML)
 	}
 	return a.Data
 }
@@ -56,7 +57,7 @@ func (a *atomText) String() string {
 	if a.Type == "xhtml" {
 		data = a.XML
 	}
-	return html.UnescapeString(strings.TrimSpace(data))
+	return strings.TrimSpace(data)
 }
 
 func (links atomLinks) First(rel string) string {
@@ -81,15 +82,32 @@ func ParseAtom(r io.Reader) (*Feed, error) {
 		SiteURL: firstNonEmpty(srcfeed.Links.First("alternate"), srcfeed.Links.First("")),
 	}
 	for _, srcitem := range srcfeed.Entries {
-		link := firstNonEmpty(srcitem.OrigLink, srcitem.Links.First("alternate"), srcitem.Links.First(""))
+		linkFromID := ""
+		guidFromID := ""
+		if htmlutil.IsAPossibleLink(srcitem.ID) {
+			linkFromID = srcitem.ID
+			guidFromID = srcitem.ID + "::" + srcitem.Updated
+		}
+
+		mediaLinks := srcitem.mediaLinks()
+
+		link := firstNonEmpty(
+			srcitem.OrigLink,
+			srcitem.Links.First("alternate"),
+			srcitem.Links.First(""),
+			linkFromID,
+		)
 		dstfeed.Items = append(dstfeed.Items, Item{
-			GUID:     firstNonEmpty(srcitem.ID, link),
-			Date:     dateParse(firstNonEmpty(srcitem.Published, srcitem.Updated)),
-			URL:      link,
-			Title:    srcitem.Title.Text(),
-			Content:  firstNonEmpty(srcitem.Content.String(), srcitem.Summary.String(), srcitem.firstMediaDescription()),
-			ImageURL: srcitem.firstMediaThumbnail(),
-			AudioURL: "",
+			GUID:  firstNonEmpty(guidFromID, srcitem.ID, link),
+			Date:  dateParse(firstNonEmpty(srcitem.Published, srcitem.Updated)),
+			URL:   link,
+			Title: srcitem.Title.Text(),
+			Content: firstNonEmpty(
+				srcitem.Content.String(),
+				srcitem.Summary.String(),
+				srcitem.firstMediaDescription(),
+			),
+			MediaLinks: mediaLinks,
 		})
 	}
 	return dstfeed, nil

src/parser/atom_test.go

@@ -40,13 +40,11 @@ func TestAtom(t *testing.T) {
 		SiteURL: "http://example.org/",
 		Items: []Item{
 			{
-				GUID:     "urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a",
-				Date:     time.Unix(1071340202, 0).UTC(),
-				URL:      "http://example.org/2003/12/13/atom03.html",
-				Title:    "Atom-Powered Robots Run Amok",
-				Content:  `<div xmlns="http://www.w3.org/1999/xhtml"><p>This is the entry content.</p></div>`,
-				ImageURL: "",
-				AudioURL: "",
+				GUID:    "urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a",
+				Date:    time.Unix(1071340202, 0).UTC(),
+				URL:     "http://example.org/2003/12/13/atom03.html",
+				Title:   "Atom-Powered Robots Run Amok",
+				Content: `<div xmlns="http://www.w3.org/1999/xhtml"><p>This is the entry content.</p></div>`,
 			},
 		},
 	}
@@ -94,6 +92,44 @@ func TestAtomHTMLTitle(t *testing.T) {
 	}
 }
 
+func TestAtomXHTMLTitle(t *testing.T) {
+	feed, _ := Parse(strings.NewReader(`
+		<?xml version="1.0" encoding="utf-8"?>
+		<feed xmlns="http://www.w3.org/2005/Atom">
+			<entry><title type="xhtml">say &lt;code&gt;what&lt;/code&gt;?</entry>
+		</feed>
+	`))
+	have := feed.Items[0].Title
+	want := "say what?"
+	if !reflect.DeepEqual(want, have) {
+		t.Logf("want: %#v", want)
+		t.Logf("have: %#v", have)
+		t.FailNow()
+	}
+}
+
+func TestAtomXHTMLNestedTitle(t *testing.T) {
+	feed, _ := Parse(strings.NewReader(`
+		<?xml version="1.0" encoding="utf-8"?>
+		<feed xmlns="http://www.w3.org/2005/Atom">
+			<entry>
+				<title type="xhtml">
+					<div xmlns="http://www.w3.org/1999/xhtml">
+						<a href="https://example.com">Link to Example</a>
+					</div>
+				</title>
+			</entry>
+		</feed>
+	`))
+	have := feed.Items[0].Title
+	want := "Link to Example"
+	if !reflect.DeepEqual(want, have) {
+		t.Logf("want: %#v", want)
+		t.Logf("have: %#v", have)
+		t.FailNow()
+	}
+}
+
 func TestAtomImageLink(t *testing.T) {
 	feed, _ := Parse(strings.NewReader(`
 		<?xml version="1.0" encoding="UTF-8"?>
@@ -103,9 +139,15 @@ func TestAtomImageLink(t *testing.T) {
 			</entry>
 		</feed>
 	`))
-	have := feed.Items[0].ImageURL
-	want := `https://example.com/image.png?width=100&height=100`
-	if want != have {
+	if len(feed.Items[0].MediaLinks) != 1 {
+		t.Fatalf("Expected 1 media link, got: %#v", feed.Items[0].MediaLinks)
+	}
+	have := feed.Items[0].MediaLinks[0]
+	want := MediaLink{
+		URL:  `https://example.com/image.png?width=100&height=100`,
+		Type: "image",
+	}
+	if !reflect.DeepEqual(want, have) {
 		t.Fatalf("item.image_url doesn't match\nwant: %#v\nhave: %#v\n", want, have)
 	}
 }
@@ -127,7 +169,68 @@ func TestAtomImageLinkDuplicated(t *testing.T) {
 	if want != have {
 		t.Fatalf("want: %#v\nhave: %#v\n", want, have)
 	}
-	if feed.Items[0].ImageURL != "" {
-		t.Fatal("item.image_url must be unset if present in the content")
+	if len(feed.Items[0].MediaLinks) != 0 {
+		t.Fatal("item media link must be excluded if present in the content")
+	}
+}
+
+func TestAtomLinkInID(t *testing.T) {
+	feed, _ := Parse(strings.NewReader(`
+		<?xml version="1.0" encoding="utf-8"?>
+		<feed xmlns="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/">
+			<entry>
+                <title>one updated</title>
+                <id>https://example.com/posts/1</id>
+                <updated>2003-12-13T09:17:51</updated>
+			</entry>
+			<entry>
+                <title>two</title>
+                <id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id>
+			</entry>
+			<entry>
+                <title>one</title>
+                <id>https://example.com/posts/1</id>
+			</entry>
+		</feed>
+	`))
+	have := feed.Items
+	want := []Item{
+		Item{
+			GUID:  "https://example.com/posts/1::2003-12-13T09:17:51",
+			Date:  time.Date(2003, time.December, 13, 9, 17, 51, 0, time.UTC),
+			URL:   "https://example.com/posts/1",
+			Title: "one updated",
+		},
+		Item{
+			GUID: "urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6",
+			Date: time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC), URL: "",
+			Title: "two",
+		},
+		Item{
+			GUID:    "https://example.com/posts/1::",
+			Date:    time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC),
+			URL:     "https://example.com/posts/1",
+			Title:   "one",
+			Content: "",
+		},
+	}
+	if !reflect.DeepEqual(want, have) {
+		t.Fatalf("\nwant: %#v\nhave: %#v\n", want, have)
+	}
+}
+
+func TestAtomDoesntEscapeHTMLTags(t *testing.T) {
+	feed, _ := Parse(strings.NewReader(`
+		<?xml version="1.0" encoding="utf-8"?>
+		<feed xmlns="http://www.w3.org/2005/Atom">
+			<entry><summary type="html">&amp;lt;script&amp;gt;alert(1);&amp;lt;/script&amp;gt;</summary></entry>
+		</feed>
+	`))
+	have := feed.Items[0].Content
+	want := "&lt;script&gt;alert(1);&lt;/script&gt;"
+	if !reflect.DeepEqual(want, have) {
+		t.Logf("want: %#v", want)
+		t.Logf("have: %#v", have)
+		t.FailNow()
 	}
 }

src/parser/feed.go

@@ -2,6 +2,7 @@ package parser
 
 import (
 	"bytes"
+	"crypto/sha256"
 	"encoding/xml"
 	"errors"
 	"fmt"
@@ -14,7 +15,7 @@ import (
 	"golang.org/x/net/html/charset"
 )
 
-var UnknownFormat = errors.New("unknown feed format")
+var ErrUnknownFormat = errors.New("unknown feed format")
 
 type feedProbe struct {
 	feedType string
@@ -88,7 +89,7 @@ func ParseWithEncoding(r io.Reader, fallbackEncoding string) (*Feed, error) {
 
 	out := sniff(string(lookup))
 	if out.feedType == "" {
-		return nil, UnknownFormat
+		return nil, ErrUnknownFormat
 	}
 
 	if out.encoding == "" && fallbackEncoding != "" {
@@ -119,6 +120,7 @@ func ParseAndFix(r io.Reader, baseURL, fallbackEncoding string) (*Feed, error) {
 	}
 	feed.TranslateURLs(baseURL)
 	feed.SetMissingDatesTo(time.Now())
+	feed.SetMissingGUIDs()
 	return feed, nil
 }
 
@@ -132,11 +134,14 @@ func (feed *Feed) cleanup() {
 		feed.Items[i].Title = strings.TrimSpace(htmlutil.ExtractText(item.Title))
 		feed.Items[i].Content = strings.TrimSpace(item.Content)
 
-		if item.ImageURL != "" && strings.Contains(item.Content, item.ImageURL) {
-			feed.Items[i].ImageURL = ""
-		}
-		if item.AudioURL != "" && strings.Contains(item.Content, item.AudioURL) {
-			feed.Items[i].AudioURL = ""
+		if len(feed.Items[i].MediaLinks) > 0 {
+			mediaLinks := make([]MediaLink, 0)
+			for _, link := range item.MediaLinks {
+				if !strings.Contains(item.Content, link.URL) {
+					mediaLinks = append(mediaLinks, link)
+				}
+			}
+			feed.Items[i].MediaLinks = mediaLinks
 		}
 	}
 }
@@ -168,3 +173,12 @@ func (feed *Feed) TranslateURLs(base string) error {
 	}
 	return nil
 }
+
+func (feed *Feed) SetMissingGUIDs() {
+	for i, item := range feed.Items {
+		if item.GUID == "" {
+			id := strings.Join([]string{item.Title, item.Date.Format(time.RFC3339), item.URL}, ";;")
+			feed.Items[i].GUID = fmt.Sprintf("%x", sha256.Sum256([]byte(id)))
+		}
+	}
+}

src/parser/feed_test.go

@@ -7,9 +7,9 @@ import (
 )
 
 func TestSniff(t *testing.T) {
-	testcases := []struct{
+	testcases := []struct {
 		input string
-		want feedProbe
+		want  feedProbe
 	}{
 		{
 			`<?xml version="1.0"?><rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"></rdf:RDF>`,
@@ -40,7 +40,12 @@ func TestSniff(t *testing.T) {
 		want := testcase.want
 		have := sniff(testcase.input)
 		if want.encoding != have.encoding || want.feedType != have.feedType {
-			t.Errorf("Invalid output\n---\n%s\n---\n\nwant=%#v\nhave=%#v", testcase.input, want, have)
+			t.Errorf(
+				"Invalid output\n---\n%s\n---\n\nwant=%#v\nhave=%#v",
+				testcase.input,
+				want,
+				have,
+			)
 		}
 	}
 }
@@ -150,3 +155,32 @@ func TestParseCleanIllegalCharsInNonUTF8(t *testing.T) {
 		t.Fatalf("invalid feed, got: %v", feed)
 	}
 }
+
+func TestParseMissingGUID(t *testing.T) {
+	data := `
+		<?xml version="1.0" encoding="windows-1251"?>
+		<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/">
+			<channel>
+				<item>
+					<title>foo</title>
+				</item>
+				<item>
+					<title>bar</title>
+				</item>
+			</channel>
+		</rss>
+	`
+	feed, err := ParseAndFix(strings.NewReader(data), "", "")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(feed.Items) != 2 {
+		t.Fatalf("expected 2 items, got %d", len(feed.Items))
+	}
+	if feed.Items[0].GUID == "" || feed.Items[1].GUID == "" {
+		t.Fatalf("item GUIDs are missing, got %#v", feed.Items)
+	}
+	if feed.Items[0].GUID == feed.Items[1].GUID {
+		t.Fatalf("item GUIDs are not unique, got %#v", feed.Items)
+	}
+}

src/parser/media.go

@@ -1,5 +1,9 @@
 package parser
 
+import (
+	"strings"
+)
+
 type media struct {
 	MediaGroups       []mediaGroup       `xml:"http://search.yahoo.com/mrss/ group"`
 	MediaContents     []mediaContent     `xml:"http://search.yahoo.com/mrss/ content"`
@@ -8,12 +12,17 @@ type media struct {
 }
 
 type mediaGroup struct {
+	MediaContent      []mediaContent     `xml:"http://search.yahoo.com/mrss/ content"`
 	MediaThumbnails   []mediaThumbnail   `xml:"http://search.yahoo.com/mrss/ thumbnail"`
 	MediaDescriptions []mediaDescription `xml:"http://search.yahoo.com/mrss/ description"`
 }
 
 type mediaContent struct {
-	MediaThumbnails []mediaThumbnail `xml:"http://search.yahoo.com/mrss/ thumbnail"`
+	MediaThumbnails  []mediaThumbnail `xml:"http://search.yahoo.com/mrss/ thumbnail"`
+	MediaType        string           `xml:"type,attr"`
+	MediaMedium      string           `xml:"medium,attr"`
+	MediaURL         string           `xml:"url,attr"`
+	MediaDescription mediaDescription `xml:"http://search.yahoo.com/mrss/ description"`
 }
 
 type mediaThumbnail struct {
@@ -21,35 +30,68 @@ type mediaThumbnail struct {
 }
 
 type mediaDescription struct {
-	Type        string `xml:"type,attr"`
-	Description string `xml:",chardata"`
-}
-
-func (m *media) firstMediaThumbnail() string {
-	for _, c := range m.MediaContents {
-		for _, t := range c.MediaThumbnails {
-			return t.URL
-		}
-	}
-	for _, t := range m.MediaThumbnails {
-		return t.URL
-	}
-	for _, g := range m.MediaGroups {
-		for _, t := range g.MediaThumbnails {
-			return t.URL
-		}
-	}
-	return ""
+	Type string `xml:"type,attr"`
+	Text string `xml:",chardata"`
 }
 
 func (m *media) firstMediaDescription() string {
 	for _, d := range m.MediaDescriptions {
-		return plain2html(d.Description)
+		return plain2html(d.Text)
 	}
 	for _, g := range m.MediaGroups {
 		for _, d := range g.MediaDescriptions {
-			return plain2html(d.Description)
+			return plain2html(d.Text)
 		}
 	}
 	return ""
 }
+
+func (m *media) mediaLinks() []MediaLink {
+	links := make([]MediaLink, 0)
+	for _, thumbnail := range m.MediaThumbnails {
+		links = append(links, MediaLink{URL: thumbnail.URL, Type: "image"})
+	}
+	for _, group := range m.MediaGroups {
+		for _, thumbnail := range group.MediaThumbnails {
+			links = append(links, MediaLink{
+				URL:  thumbnail.URL,
+				Type: "image",
+			})
+		}
+	}
+	for _, content := range m.MediaContents {
+		if content.MediaURL != "" {
+			url := content.MediaURL
+			description := content.MediaDescription.Text
+			if strings.HasPrefix(content.MediaType, "image/") {
+				links = append(links, MediaLink{URL: url, Type: "image", Description: description})
+			} else if strings.HasPrefix(content.MediaType, "audio/") {
+				links = append(links, MediaLink{URL: url, Type: "audio", Description: description})
+			} else if strings.HasPrefix(content.MediaType, "video/") {
+				links = append(links, MediaLink{URL: url, Type: "video", Description: description})
+			} else if content.MediaMedium == "image" || content.MediaMedium == "audio" || content.MediaMedium == "video" {
+				links = append(
+					links,
+					MediaLink{URL: url, Type: content.MediaMedium, Description: description},
+				)
+			} else {
+				if len(content.MediaThumbnails) > 0 {
+					links = append(links, MediaLink{
+						URL:  content.MediaThumbnails[0].URL,
+						Type: "image",
+					})
+				}
+			}
+		}
+		for _, thumbnail := range content.MediaThumbnails {
+			links = append(links, MediaLink{
+				URL:  thumbnail.URL,
+				Type: "image",
+			})
+		}
+	}
+	if len(links) == 0 {
+		return nil
+	}
+	return links
+}

src/parser/models.go

@@ -14,7 +14,12 @@ type Item struct {
 	URL   string
 	Title string
 
-	Content  string
-	ImageURL string
-	AudioURL string
+	Content    string
+	MediaLinks []MediaLink
+}
+
+type MediaLink struct {
+	URL         string
+	Type        string
+	Description string
 }

src/parser/rdf_test.go

@@ -42,8 +42,16 @@ func TestRDFFeed(t *testing.T) {
 		Title:   "Mozilla Dot Org",
 		SiteURL: "http://www.mozilla.org",
 		Items: []Item{
-			{GUID: "http://www.mozilla.org/status/", URL: "http://www.mozilla.org/status/", Title: "New Status Updates"},
-			{GUID: "http://www.mozilla.org/bugs/", URL: "http://www.mozilla.org/bugs/", Title: "Bugzilla Reorganized"},
+			{
+				GUID:  "http://www.mozilla.org/status/",
+				URL:   "http://www.mozilla.org/status/",
+				Title: "New Status Updates",
+			},
+			{
+				GUID:  "http://www.mozilla.org/bugs/",
+				URL:   "http://www.mozilla.org/bugs/",
+				Title: "Bugzilla Reorganized",
+			},
 		},
 	}
 

src/parser/rss.go

@@ -20,12 +20,12 @@ type rssFeed struct {
 }
 
 type rssItem struct {
-	GUID        string         `xml:"guid"`
-	Title       string         `xml:"title"`
+	GUID        rssGuid        `xml:"rss guid"`
+	Title       string         `xml:"rss title"`
 	Link        string         `xml:"rss link"`
 	Description string         `xml:"rss description"`
-	PubDate     string         `xml:"pubDate"`
-	Enclosures  []rssEnclosure `xml:"enclosure"`
+	PubDate     string         `xml:"rss pubDate"`
+	Enclosures  []rssEnclosure `xml:"rss enclosure"`
 
 	DublinCoreDate string `xml:"http://purl.org/dc/elements/1.1/ date"`
 	ContentEncoded string `xml:"http://purl.org/rss/1.0/modules/content/ encoded"`
@@ -36,6 +36,11 @@ type rssItem struct {
 	media
 }
 
+type rssGuid struct {
+	GUID        string `xml:",chardata"`
+	IsPermaLink string `xml:"isPermaLink,attr"`
+}
+
 type rssLink struct {
 	XMLName xml.Name
 	Data    string `xml:",chardata"`
@@ -69,26 +74,40 @@ func ParseRSS(r io.Reader) (*Feed, error) {
 		SiteURL: srcfeed.Link,
 	}
 	for _, srcitem := range srcfeed.Items {
-		podcastURL := ""
+		mediaLinks := srcitem.mediaLinks()
 		for _, e := range srcitem.Enclosures {
 			if strings.HasPrefix(e.Type, "audio/") {
-				podcastURL = e.URL
-
-				if srcitem.OrigEnclosureLink != "" && strings.Contains(podcastURL, path.Base(srcitem.OrigEnclosureLink)) {
+				podcastURL := e.URL
+				if srcitem.OrigEnclosureLink != "" &&
+					strings.Contains(podcastURL, path.Base(srcitem.OrigEnclosureLink)) {
 					podcastURL = srcitem.OrigEnclosureLink
 				}
+				mediaLinks = append(mediaLinks, MediaLink{URL: podcastURL, Type: "audio"})
 				break
 			}
 		}
+		for _, e := range srcitem.Enclosures {
+			if strings.HasPrefix(e.Type, "image/") {
+				mediaLinks = append(mediaLinks, MediaLink{URL: e.URL, Type: "image"})
+			}
+		}
+
+		permalink := ""
+		if srcitem.GUID.IsPermaLink == "true" {
+			permalink = srcitem.GUID.GUID
+		}
 
 		dstfeed.Items = append(dstfeed.Items, Item{
-			GUID:     firstNonEmpty(srcitem.GUID, srcitem.Link),
-			Date:     dateParse(firstNonEmpty(srcitem.DublinCoreDate, srcitem.PubDate)),
-			URL:      firstNonEmpty(srcitem.OrigLink, srcitem.Link),
-			Title:    srcitem.Title,
-			Content:  firstNonEmpty(srcitem.ContentEncoded, srcitem.Description),
-			AudioURL: podcastURL,
-			ImageURL: srcitem.firstMediaThumbnail(),
+			GUID:  firstNonEmpty(srcitem.GUID.GUID, srcitem.Link),
+			Date:  dateParse(firstNonEmpty(srcitem.DublinCoreDate, srcitem.PubDate)),
+			URL:   firstNonEmpty(srcitem.OrigLink, srcitem.Link, permalink),
+			Title: srcitem.Title,
+			Content: firstNonEmpty(
+				srcitem.ContentEncoded,
+				srcitem.Description,
+				srcitem.firstMediaDescription(),
+			),
+			MediaLinks: mediaLinks,
 		})
 	}
 	return dstfeed, nil

src/parser/rss_test.go

@@ -75,9 +75,15 @@ func TestRSSMediaContentThumbnail(t *testing.T) {
 			</channel>
 		</rss>
 	`))
-	have := feed.Items[0].ImageURL
-	want := "https://i.vimeocdn.com/video/1092705247_960.jpg"
-	if have != want {
+	if len(feed.Items[0].MediaLinks) != 1 {
+		t.Fatalf("Expected 1 media link, got %#v", feed.Items[0].MediaLinks)
+	}
+	have := feed.Items[0].MediaLinks[0]
+	want := MediaLink{
+		URL:  "https://i.vimeocdn.com/video/1092705247_960.jpg",
+		Type: "image",
+	}
+	if !reflect.DeepEqual(want, have) {
 		t.Logf("want: %#v", want)
 		t.Logf("have: %#v", have)
 		t.FailNow()
@@ -127,9 +133,15 @@ func TestRSSPodcast(t *testing.T) {
 			</channel>
 		</rss>
 	`))
-	have := feed.Items[0].AudioURL
-	want := "http://example.com/audio.ext"
-	if want != have {
+	if len(feed.Items[0].MediaLinks) != 1 {
+		t.Fatal("Invalid media links")
+	}
+	have := feed.Items[0].MediaLinks[0]
+	want := MediaLink{
+		URL:  "http://example.com/audio.ext",
+		Type: "audio",
+	}
+	if !reflect.DeepEqual(want, have) {
 		t.Logf("want: %#v", want)
 		t.Logf("have: %#v", have)
 		t.FailNow()
@@ -147,9 +159,15 @@ func TestRSSOpusPodcast(t *testing.T) {
 			</channel>
 		</rss>
 	`))
-	have := feed.Items[0].AudioURL
-	want := "http://example.com/audio.ext"
-	if want != have {
+	if len(feed.Items[0].MediaLinks) != 1 {
+		t.Fatal("Invalid media links")
+	}
+	have := feed.Items[0].MediaLinks[0]
+	want := MediaLink{
+		URL:  "http://example.com/audio.ext",
+		Type: "audio",
+	}
+	if !reflect.DeepEqual(want, have) {
 		t.Logf("want: %#v", want)
 		t.Logf("have: %#v", have)
 		t.FailNow()
@@ -176,8 +194,9 @@ func TestRSSPodcastDuplicated(t *testing.T) {
 	if want != have {
 		t.Fatalf("content doesn't match\nwant: %#v\nhave: %#v\n", want, have)
 	}
-	if feed.Items[0].AudioURL != "" {
-		t.Fatal("item.audio_url must be unset if present in the content")
+
+	if len(feed.Items[0].MediaLinks) != 0 {
+		t.Fatal("item media must be excluded if present in the content")
 	}
 }
 
@@ -197,9 +216,114 @@ func TestRSSTitleHTMLTags(t *testing.T) {
 	`))
 	have := []string{feed.Items[0].Title, feed.Items[1].Title}
 	want := []string{"title in p", "very strong title"}
-	for i := 0; i < len(want); i++ {
+	for i := range want {
 		if want[i] != have[i] {
 			t.Errorf("title doesn't match\nwant: %#v\nhave: %#v\n", want[i], have[i])
 		}
 	}
 }
+
+func TestRSSIsPermalink(t *testing.T) {
+	feed, _ := Parse(strings.NewReader(`
+		<?xml version="1.0" encoding="UTF-8"?>
+		<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/">
+			<channel>
+				<item>
+                    <guid isPermaLink="true">http://example.com/posts/1</guid>
+				</item>
+			</channel>
+		</rss>
+	`))
+	have := feed.Items
+	want := []Item{
+		{
+			GUID: "http://example.com/posts/1",
+			URL:  "http://example.com/posts/1",
+		},
+	}
+	for i := range want {
+		if !reflect.DeepEqual(want, have) {
+			t.Errorf("Failed to handle isPermalink\nwant: %#v\nhave: %#v\n", want[i], have[i])
+		}
+	}
+}
+
+// https://github.com/nkanaev/yarr/issues/284
+func TestRSSEnclosureImage(t *testing.T) {
+	feed, _ := Parse(strings.NewReader(`
+		<?xml version="1.0" encoding="UTF-8"?>
+		<rss version="2.0">
+			<channel>
+				<item>
+					<title>Post with image</title>
+					<link>http://example.com/post/1</link>
+					<enclosure url="http://example.com/photo.jpg" type="image/jpeg" length="123456"/>
+				</item>
+			</channel>
+		</rss>
+	`))
+	if len(feed.Items[0].MediaLinks) != 1 {
+		t.Fatalf("Expected 1 media link, got %d: %#v", len(feed.Items[0].MediaLinks), feed.Items[0].MediaLinks)
+	}
+	have := feed.Items[0].MediaLinks[0]
+	want := MediaLink{
+		URL:  "http://example.com/photo.jpg",
+		Type: "image",
+	}
+	if !reflect.DeepEqual(want, have) {
+		t.Logf("want: %#v", want)
+		t.Logf("have: %#v", have)
+		t.FailNow()
+	}
+}
+
+func TestRSSMultipleMedia(t *testing.T) {
+	feed, _ := Parse(strings.NewReader(`
+		<?xml version="1.0" encoding="UTF-8"?>
+		<rss version="2.0" xmlns:media="http://search.yahoo.com/mrss/">
+			<channel>
+				<item>
+                    <guid isPermaLink="true">http://example.com/posts/1</guid>
+					<media:content url="https://example.com/path/to/image1.png" type="image/png" fileSize="1000" medium="image">
+						<media:description type="plain">description 1</media:description>
+					</media:content>
+					<media:content url="https://example.com/path/to/image2.png" type="image/png" fileSize="2000" medium="image">
+						<media:description type="plain">description 2</media:description>
+					</media:content>
+					<media:content url="https://example.com/path/to/video1.mp4" type="video/mp4" fileSize="2000" medium="image">
+						<media:description type="plain">video description</media:description>
+					</media:content>
+				</item>
+			</channel>
+		</rss>
+	`))
+	have := feed.Items
+	want := []Item{
+		{
+			GUID: "http://example.com/posts/1",
+			URL:  "http://example.com/posts/1",
+			MediaLinks: []MediaLink{
+				{
+					URL:         "https://example.com/path/to/image1.png",
+					Type:        "image",
+					Description: "description 1",
+				},
+				{
+					URL:         "https://example.com/path/to/image2.png",
+					Type:        "image",
+					Description: "description 2",
+				},
+				{
+					URL:         "https://example.com/path/to/video1.mp4",
+					Type:        "video",
+					Description: "video description",
+				},
+			},
+		},
+	}
+	if !reflect.DeepEqual(want, have) {
+		t.Logf("want: %#v", want)
+		t.Logf("have: %#v", have)
+		t.Fatal("invalid rss")
+	}
+}

src/parser/util_test.go

@@ -46,7 +46,7 @@ func TestSafeXMLReaderPartial1(t *testing.T) {
 	f = NewSafeXMLReader(f)
 
 	buf := make([]byte, 1)
-	for i := 0; i < len(want); i++ {
+	for i := range want {
 		n, err := f.Read(buf)
 		if err != nil {
 			t.Fatal(err)

src/platform/fixconsole_default.go

@@ -1,4 +1,4 @@
-// +build !windows
+//go:build !windows
 
 package platform
 

src/platform/fixconsole_windows.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package platform
 
 import (
@@ -58,17 +60,20 @@ var oldStdin, oldStdout, oldStderr *os.File
 //
 // Net result is as follows.
 // Before:
-//    SHELL            NON-REDIRECTED     REDIRECTED
-//    explorer.exe     no console         n/a
-//    cmd.exe          broken             works
-//    powershell       broken             broken
-//    WSL bash         broken             works
+//
+//	SHELL            NON-REDIRECTED     REDIRECTED
+//	explorer.exe     no console         n/a
+//	cmd.exe          broken             works
+//	powershell       broken             broken
+//	WSL bash         broken             works
+//
 // After
-//    SHELL            NON-REDIRECTED     REDIRECTED
-//    explorer.exe     no console         n/a
-//    cmd.exe          works              works
-//    powershell       works              broken
-//    WSL bash         works              works
+//
+//	SHELL            NON-REDIRECTED     REDIRECTED
+//	explorer.exe     no console         n/a
+//	cmd.exe          works              works
+//	powershell       works              broken
+//	WSL bash         works              works
 //
 // We don't seem to make anything worse, at least.
 func FixConsoleIfNeeded() error {

src/platform/gui.go

@@ -1,15 +1,16 @@
-// +build macos windows
+//go:build (darwin || windows) && gui
 
 package platform
 
 import (
+	"fyne.io/systray"
 	"github.com/nkanaev/yarr/src/server"
-	"github.com/nkanaev/yarr/src/systray"
 )
 
 func Start(s *server.Server) {
 	systrayOnReady := func() {
-		systray.SetIcon(Icon)
+		systray.SetTemplateIcon(Icon, Icon)
+		systray.SetTooltip("yarr")
 
 		menuOpen := systray.AddMenuItem("Open", "")
 		systray.AddSeparator()

src/platform/guiless.go

@@ -1,4 +1,4 @@
-// +build !windows,!macos
+//go:build !gui
 
 package platform
 

src/platform/icon.svg

@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   fill="none"
-   stroke="currentColor"
-   stroke-width="2"
-   stroke-linecap="round"
-   stroke-linejoin="round"
-   class="feather feather-anchor"
-   version="1.1"
-   id="svg905"
-   sodipodi:docname="icon.svg"
-   inkscape:version="1.0.1 (c497b03c, 2020-09-10)"
-   inkscape:export-filename="/Users/nkanaev/Desktop/icon.png"
-   inkscape:export-xdpi="2048"
-   inkscape:export-ydpi="2048">
-  <metadata
-     id="metadata911">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs909">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective842" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1440"
-     inkscape:window-height="900"
-     id="namedview907"
-     showgrid="false"
-     inkscape:zoom="4.9128436"
-     inkscape:cx="30.960444"
-     inkscape:cy="52.71331"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg905"
-     inkscape:document-rotation="0" />
-  <rect
-     style="fill:#212529;stroke:none;stroke-width:3;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
-     id="rect913"
-     width="48"
-     height="48"
-     x="0"
-     y="0"
-     ry="24"
-     rx="0" />
-  <g
-     id="g940"
-     transform="matrix(1.4545455,0,0,1.4545455,6.545454,6.545454)"
-     style="fill:none;stroke:#ffffff;stroke-opacity:1">
-    <circle
-       cx="12"
-       cy="5"
-       id="circle899"
-       r="3"
-       style="fill:none;stroke:#ffffff;stroke-opacity:1" />
-    <line
-       x1="12"
-       y1="22"
-       x2="12"
-       y2="8"
-       id="line901"
-       style="fill:none;stroke:#ffffff;stroke-opacity:1" />
-    <path
-       d="M 5,12 H 2 a 10,10 0 0 0 20,0 h -3"
-       id="path903"
-       style="fill:none;stroke:#ffffff;stroke-opacity:1" />
-  </g>
-</svg>

src/platform/icon_mac.go

@@ -1,8 +1,8 @@
-// +build macos
+//go:build darwin && gui
 
 package platform
 
 import _ "embed"
 
-//go:embed icon.png
+//go:embed icon_mac.png
 var Icon []byte

src/platform/icon_mac.svg

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   fill="none"
+   stroke="currentColor"
+   stroke-width="2"
+   stroke-linecap="round"
+   stroke-linejoin="round"
+   class="feather feather-anchor"
+   version="1.1"
+   id="svg905"
+   sodipodi:docname="icon_mac.svg"
+   inkscape:version="1.4 (e7c3feb1, 2024-10-09)"
+   inkscape:export-filename="icon_mac.png"
+   inkscape:export-xdpi="2048"
+   inkscape:export-ydpi="2048"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <metadata
+     id="metadata911">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs909">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective842" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1440"
+     inkscape:window-height="895"
+     id="namedview907"
+     showgrid="false"
+     inkscape:zoom="4.9128436"
+     inkscape:cx="31.14286"
+     inkscape:cy="52.718959"
+     inkscape:window-x="0"
+     inkscape:window-y="33"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg905"
+     inkscape:document-rotation="0"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1" />
+  <rect
+     style="display:none;fill:#800000;stroke-width:4;stroke-linecap:round;stroke-dasharray:none"
+     id="rect3"
+     width="89.561165"
+     height="70.427643"
+     x="-21.576099"
+     y="-7.734828"
+     ry="24"
+     inkscape:label="background-test" />
+  <rect
+     style="display:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect913"
+     width="48"
+     height="48"
+     x="0"
+     y="0"
+     ry="24"
+     rx="0"
+     inkscape:label="circle" />
+  <path
+     id="rect2"
+     style="fill:#000000;stroke:none;stroke-width:3"
+     inkscape:label="circle-hollow"
+     d="M 24 0 C 10.704 0 0 10.704 0 24 C 0 37.296 10.704 48 24 48 C 37.296 48 48 37.296 48 24 C 48 10.704 37.296 0 24 0 z M 24 7.4550781 C 27.49085 7.4550781 30.363281 10.327509 30.363281 13.818359 C 30.363281 16.611253 28.523046 19.006548 26 19.853516 L 26 36.380859 C 31.271218 35.519062 35.266025 31.300336 36.144531 26 L 34.181641 26 A 2.0000001 2.0000001 0 0 1 32.181641 24 A 2.0000001 2.0000001 0 0 1 34.181641 22 L 38.544922 22 A 2.0002001 2.0002001 0 0 1 40.544922 24 C 40.544922 33.114118 33.114111 40.544922 24 40.544922 C 14.885889 40.544922 7.4550781 33.114118 7.4550781 24 A 2.0002001 2.0002001 0 0 1 9.4550781 22 L 13.818359 22 A 2.0000001 2.0000001 0 0 1 15.818359 24 A 2.0000001 2.0000001 0 0 1 13.818359 26 L 11.855469 26 C 12.733975 31.300336 16.728783 35.519062 22 36.380859 L 22 19.853516 C 19.476954 19.006548 17.636719 16.611253 17.636719 13.818359 C 17.636719 10.327509 20.50915 7.4550781 24 7.4550781 z M 24 11.455078 C 22.670911 11.455078 21.636719 12.48927 21.636719 13.818359 C 21.636719 15.147449 22.670911 16.181641 24 16.181641 C 25.329089 16.181641 26.363281 15.147449 26.363281 13.818359 C 26.363281 12.48927 25.329089 11.455078 24 11.455078 z " />
+  <g
+     id="g1"
+     transform="matrix(1.4545455,0,0,1.4545455,6.545454,6.545454)"
+     style="display:none;fill:none;stroke:#ffffff;stroke-width:2.75;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:label="anchor_backup">
+    <circle
+       cx="12"
+       cy="5"
+       id="circle1"
+       r="3"
+       style="fill:none;stroke:#ffffff;stroke-width:2.75;stroke-dasharray:none;stroke-opacity:1" />
+    <line
+       x1="12"
+       y1="22"
+       x2="12"
+       y2="8"
+       id="line1"
+       style="fill:none;stroke:#ffffff;stroke-width:2.75;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 5,12 H 2 a 10,10 0 0 0 20,0 h -3"
+       id="path1"
+       style="fill:none;stroke:#ffffff;stroke-width:2.75;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>

src/platform/icon_win.go

@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows && gui
 
 package platform
 

src/platform/open_etc.go

@@ -1,4 +1,4 @@
-// +build !windows,!darwin
+//go:build linux || freebsd || openbsd
 
 package platform
 

src/platform/open_mac.go

@@ -1,4 +1,4 @@
-// +build darwin
+//go:build darwin
 
 package platform
 

src/platform/open_win.go

@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 package platform
 

src/server/auth/auth.go

@@ -7,7 +7,6 @@ import (
 	"encoding/hex"
 	"net/http"
 	"strings"
-	"time"
 )
 
 func IsAuthenticated(req *http.Request, username, password string) bool {
@@ -24,10 +23,12 @@ func IsAuthenticated(req *http.Request, username, password string) bool {
 
 func Authenticate(rw http.ResponseWriter, username, password, basepath string) {
 	http.SetCookie(rw, &http.Cookie{
-		Name:    "auth",
-		Value:   username + ":" + secret(username, password),
-		Expires: time.Now().Add(time.Hour * 24 * 7), // 1 week,
-		Path:    basepath,
+		Name:     "auth",
+		Value:    username + ":" + secret(username, password),
+		MaxAge:   604800, // 1 week
+		Path:     basepath,
+		Secure:   true,
+		SameSite: http.SameSiteLaxMode,
 	})
 }
 

src/server/auth/middleware.go

@@ -6,23 +6,23 @@ import (
 
 	"github.com/nkanaev/yarr/src/assets"
 	"github.com/nkanaev/yarr/src/server/router"
+	"github.com/nkanaev/yarr/src/storage"
 )
 
 type Middleware struct {
 	Username string
 	Password string
 	BasePath string
-	Public   string
-}
-
-func unsafeMethod(method string) bool {
-	return method == "POST" || method == "PUT" || method == "DELETE"
+	Public   []string
+	DB       *storage.Storage
 }
 
 func (m *Middleware) Handler(c *router.Context) {
-	if strings.HasPrefix(c.Req.URL.Path, m.BasePath+m.Public) {
-		c.Next()
-		return
+	for _, path := range m.Public {
+		if strings.HasPrefix(c.Req.URL.Path, m.BasePath+path) {
+			c.Next()
+			return
+		}
 	}
 	if IsAuthenticated(c.Req, m.Username, m.Password) {
 		c.Next()
@@ -44,12 +44,15 @@ func (m *Middleware) Handler(c *router.Context) {
 			c.Redirect(rootUrl)
 			return
 		} else {
-			c.HTML(http.StatusOK, assets.Template("login.html"), map[string]string{
+			c.HTML(http.StatusOK, assets.Template("login.html"), map[string]any{
 				"username": username,
 				"error":    "Invalid username/password",
+				"settings": m.DB.GetSettings(),
 			})
 			return
 		}
 	}
-	c.HTML(http.StatusOK, assets.Template("login.html"), nil)
+	c.HTML(http.StatusOK, assets.Template("login.html"), map[string]any{
+		"settings": m.DB.GetSettings(),
+	})
 }

src/server/fever.go

@@ -0,0 +1,396 @@
+package server
+
+import (
+	"crypto/md5"
+	"encoding/base64"
+	"fmt"
+	"log"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/nkanaev/yarr/src/server/auth"
+	"github.com/nkanaev/yarr/src/server/router"
+	"github.com/nkanaev/yarr/src/storage"
+)
+
+type FeverGroup struct {
+	ID    int64  `json:"id"`
+	Title string `json:"title"`
+}
+
+type FeverFeedsGroup struct {
+	GroupID int64  `json:"group_id"`
+	FeedIDs string `json:"feed_ids"`
+}
+
+type FeverFeed struct {
+	ID          int64  `json:"id"`
+	FaviconID   int64  `json:"favicon_id"`
+	Title       string `json:"title"`
+	Url         string `json:"url"`
+	SiteUrl     string `json:"site_url"`
+	IsSpark     int    `json:"is_spark"`
+	LastUpdated int64  `json:"last_updated_on_time"`
+}
+
+type FeverItem struct {
+	ID        int64  `json:"id"`
+	FeedID    int64  `json:"feed_id"`
+	Title     string `json:"title"`
+	Author    string `json:"author"`
+	HTML      string `json:"html"`
+	Url       string `json:"url"`
+	IsSaved   int    `json:"is_saved"`
+	IsRead    int    `json:"is_read"`
+	CreatedAt int64  `json:"created_on_time"`
+}
+
+type FeverFavicon struct {
+	ID   int64  `json:"id"`
+	Data string `json:"data"`
+}
+
+func writeFeverJSON(c *router.Context, data map[string]any, lastRefreshed int64) {
+	data["api_version"] = 3
+	data["auth"] = 1
+	data["last_refreshed_on_time"] = lastRefreshed
+	c.JSON(http.StatusOK, data)
+}
+
+func getLastRefreshedOnTime(httpStates map[int64]storage.HTTPState) int64 {
+	if len(httpStates) == 0 {
+		return 0
+	}
+
+	var lastRefreshed int64
+	for _, state := range httpStates {
+		if state.LastRefreshed.Unix() > lastRefreshed {
+			lastRefreshed = state.LastRefreshed.Unix()
+		}
+	}
+	return lastRefreshed
+}
+
+func (s *Server) feverAuth(c *router.Context) bool {
+	if s.Username != "" && s.Password != "" {
+		apiKey := c.Req.FormValue("api_key")
+		apiKey = strings.ToLower(apiKey)
+		md5HashValue := md5.Sum(fmt.Appendf(nil, "%s:%s", s.Username, s.Password))
+		hexMD5HashValue := fmt.Sprintf("%x", md5HashValue[:])
+		if !auth.StringsEqual(apiKey, hexMD5HashValue) {
+			return false
+		}
+	}
+	return true
+}
+
+func formHasValue(values url.Values, value string) bool {
+	if _, ok := values[value]; ok {
+		return true
+	}
+	return false
+}
+
+func (s *Server) handleFever(c *router.Context) {
+	c.Req.ParseForm()
+	if !s.feverAuth(c) {
+		c.JSON(http.StatusOK, map[string]any{
+			"api_version":            3,
+			"auth":                   0,
+			"last_refreshed_on_time": 0,
+		})
+		return
+	}
+
+	switch {
+	case formHasValue(c.Req.Form, "groups"):
+		s.feverGroupsHandler(c)
+	case formHasValue(c.Req.Form, "feeds"):
+		s.feverFeedsHandler(c)
+	case formHasValue(c.Req.Form, "unread_item_ids"):
+		s.feverUnreadItemIDsHandler(c)
+	case formHasValue(c.Req.Form, "saved_item_ids"):
+		s.feverSavedItemIDsHandler(c)
+	case formHasValue(c.Req.Form, "favicons"):
+		s.feverFaviconsHandler(c)
+	case formHasValue(c.Req.Form, "items"):
+		s.feverItemsHandler(c)
+	case formHasValue(c.Req.Form, "links"):
+		s.feverLinksHandler(c)
+	case formHasValue(c.Req.Form, "mark"):
+		s.feverMarkHandler(c)
+	default:
+		c.JSON(http.StatusOK, map[string]any{
+			"api_version":            3,
+			"auth":                   1,
+			"last_refreshed_on_time": getLastRefreshedOnTime(s.db.ListHTTPStates()),
+		})
+	}
+}
+
+func joinInts(values []int64) string {
+	var result strings.Builder
+	for i, val := range values {
+		fmt.Fprintf(&result, "%d", val)
+		if i != len(values)-1 {
+			result.WriteString(",")
+		}
+	}
+	return result.String()
+}
+
+func feedGroups(db *storage.Storage) []*FeverFeedsGroup {
+	feeds := db.ListFeeds()
+
+	groupFeeds := make(map[int64][]int64)
+	for _, feed := range feeds {
+		if feed.FolderId == nil {
+			continue
+		}
+		groupFeeds[*feed.FolderId] = append(groupFeeds[*feed.FolderId], feed.Id)
+	}
+	result := make([]*FeverFeedsGroup, 0)
+	for groupId, feedIds := range groupFeeds {
+		result = append(result, &FeverFeedsGroup{
+			GroupID: groupId,
+			FeedIDs: joinInts(feedIds),
+		})
+	}
+	return result
+}
+
+func (s *Server) feverGroupsHandler(c *router.Context) {
+	folders := s.db.ListFolders()
+	groups := make([]*FeverGroup, len(folders))
+	for i, folder := range folders {
+		groups[i] = &FeverGroup{ID: folder.Id, Title: folder.Title}
+	}
+	writeFeverJSON(c, map[string]any{
+		"groups":       groups,
+		"feeds_groups": feedGroups(s.db),
+	}, getLastRefreshedOnTime(s.db.ListHTTPStates()))
+}
+
+func (s *Server) feverFeedsHandler(c *router.Context) {
+	feeds := s.db.ListFeeds()
+	httpStates := s.db.ListHTTPStates()
+
+	feverFeeds := make([]*FeverFeed, len(feeds))
+	for i, feed := range feeds {
+		var lastUpdated int64
+		if state, ok := httpStates[feed.Id]; ok {
+			lastUpdated = state.LastRefreshed.Unix()
+		}
+		feverFeeds[i] = &FeverFeed{
+			ID:          feed.Id,
+			FaviconID:   feed.Id,
+			Title:       feed.Title,
+			Url:         feed.FeedLink,
+			SiteUrl:     feed.Link,
+			IsSpark:     0,
+			LastUpdated: lastUpdated,
+		}
+	}
+	writeFeverJSON(c, map[string]any{
+		"feeds":        feverFeeds,
+		"feeds_groups": feedGroups(s.db),
+	}, getLastRefreshedOnTime(httpStates))
+}
+
+func (s *Server) feverFaviconsHandler(c *router.Context) {
+	feeds := s.db.ListFeeds()
+	favicons := make([]*FeverFavicon, len(feeds))
+	for i, feed := range feeds {
+		data := "data:image/gif;base64,R0lGODlhAQABAAAAACw="
+		if feed.HasIcon {
+			icon := s.db.GetFeed(feed.Id).Icon
+			data = fmt.Sprintf(
+				"data:%s;base64,%s",
+				http.DetectContentType(*icon),
+				base64.StdEncoding.EncodeToString(*icon),
+			)
+		}
+		favicons[i] = &FeverFavicon{ID: feed.Id, Data: data}
+	}
+
+	writeFeverJSON(c, map[string]any{
+		"favicons": favicons,
+	}, getLastRefreshedOnTime(s.db.ListHTTPStates()))
+}
+
+// for memory pressure reasons, we only return a limited number of items
+// documented at https://github.com/DigitalDJ/tinytinyrss-fever-plugin/blob/master/fever-api.md#items
+const listLimit = 50
+
+func (s *Server) feverItemsHandler(c *router.Context) {
+	filter := storage.ItemFilter{}
+	query := c.Req.URL.Query()
+
+	switch {
+	case query.Get("with_ids") != "":
+		ids := make([]int64, 0)
+		for _, idstr := range strings.Split(query.Get("with_ids"), ",") {
+			if idnum, err := strconv.ParseInt(idstr, 10, 64); err == nil {
+				ids = append(ids, idnum)
+			}
+		}
+		filter.IDs = &ids
+	case query.Get("since_id") != "":
+		idstr := query.Get("since_id")
+		if idnum, err := strconv.ParseInt(idstr, 10, 64); err == nil {
+			filter.SinceID = &idnum
+		}
+	case query.Get("max_id") != "":
+		idstr := query.Get("max_id")
+		if idnum, err := strconv.ParseInt(idstr, 10, 64); err == nil {
+			filter.MaxID = &idnum
+		}
+	}
+
+	items := s.db.ListItems(filter, listLimit, true, true)
+
+	feverItems := make([]FeverItem, len(items))
+	for i, item := range items {
+		date := item.Date
+		time := date.Unix()
+
+		isSaved := 0
+		if item.Status == storage.STARRED {
+			isSaved = 1
+		}
+		isRead := 0
+		if item.Status == storage.READ {
+			isRead = 1
+		}
+		feverItems[i] = FeverItem{
+			ID:        item.Id,
+			FeedID:    item.FeedId,
+			Title:     item.Title,
+			Author:    "",
+			HTML:      item.Content,
+			Url:       item.Link,
+			IsSaved:   isSaved,
+			IsRead:    isRead,
+			CreatedAt: time,
+		}
+	}
+
+	totalItems := s.db.CountItems(storage.ItemFilter{})
+
+	writeFeverJSON(c, map[string]any{
+		"items":       feverItems,
+		"total_items": totalItems,
+	}, getLastRefreshedOnTime(s.db.ListHTTPStates()))
+}
+
+func (s *Server) feverLinksHandler(c *router.Context) {
+	writeFeverJSON(c, map[string]any{
+		"links": make([]any, 0),
+	}, getLastRefreshedOnTime(s.db.ListHTTPStates()))
+}
+
+func (s *Server) feverUnreadItemIDsHandler(c *router.Context) {
+	status := storage.UNREAD
+	itemIds := make([]int64, 0)
+
+	itemFilter := storage.ItemFilter{
+		Status: &status,
+	}
+	for {
+		items := s.db.ListItems(itemFilter, listLimit, true, false)
+		if len(items) == 0 {
+			break
+		}
+		for _, item := range items {
+			itemIds = append(itemIds, item.Id)
+		}
+		itemFilter.After = &items[len(items)-1].Id
+	}
+	writeFeverJSON(c, map[string]any{
+		"unread_item_ids": joinInts(itemIds),
+	}, getLastRefreshedOnTime(s.db.ListHTTPStates()))
+}
+
+func (s *Server) feverSavedItemIDsHandler(c *router.Context) {
+	status := storage.STARRED
+	itemIds := make([]int64, 0)
+
+	itemFilter := storage.ItemFilter{
+		Status: &status,
+	}
+	for {
+		items := s.db.ListItems(itemFilter, listLimit, true, false)
+		if len(items) == 0 {
+			break
+		}
+		for _, item := range items {
+			itemIds = append(itemIds, item.Id)
+		}
+		itemFilter.After = &items[len(items)-1].Id
+	}
+	writeFeverJSON(c, map[string]any{
+		"saved_item_ids": joinInts(itemIds),
+	}, getLastRefreshedOnTime(s.db.ListHTTPStates()))
+}
+
+func (s *Server) feverMarkHandler(c *router.Context) {
+	id, err := strconv.ParseInt(c.Req.Form.Get("id"), 10, 64)
+	if err != nil {
+		log.Print("invalid id:", err)
+		return
+	}
+
+	switch c.Req.Form.Get("mark") {
+	case "item":
+		var status storage.ItemStatus
+		switch c.Req.Form.Get("as") {
+		case "read":
+			status = storage.READ
+		case "unread":
+			status = storage.UNREAD
+		case "saved":
+			status = storage.STARRED
+		case "unsaved":
+			status = storage.READ
+		default:
+			c.Out.WriteHeader(http.StatusBadRequest)
+			return
+		}
+		s.db.UpdateItemStatus(id, status)
+	case "feed":
+		if c.Req.Form.Get("as") != "read" {
+			c.Out.WriteHeader(http.StatusBadRequest)
+		}
+		markFilter := storage.MarkFilter{FeedID: &id}
+		x, _ := strconv.ParseInt(c.Req.Form.Get("before"), 10, 64)
+		if x > 0 {
+			before := time.Unix(x, 0).UTC()
+			markFilter.Before = &before
+		}
+		s.db.MarkItemsRead(markFilter)
+	case "group":
+		if c.Req.Form.Get("as") != "read" {
+			c.Out.WriteHeader(http.StatusBadRequest)
+		}
+		markFilter := storage.MarkFilter{}
+		if id > 0 {
+			markFilter.FolderID = &id
+		} 
+		x, _ := strconv.ParseInt(c.Req.Form.Get("before"), 10, 64)
+		if x > 0 {
+			before := time.Unix(x, 0).UTC()
+			markFilter.Before = &before
+		}
+		s.db.MarkItemsRead(markFilter)
+	default:
+		c.Out.WriteHeader(http.StatusBadRequest)
+		return
+	}
+	c.JSON(http.StatusOK, map[string]any{
+		"api_version": 3,
+		"auth":        1,
+	})
+}

src/server/opml/read_test.go

@@ -78,7 +78,11 @@ func TestParseFallback(t *testing.T) {
 		Folders: []Folder{{
 			Title: "foldertitle",
 			Feeds: []Feed{
-				{Title: "feedtext", FeedUrl: "https://example.com/feed.xml", SiteUrl: "https://example.com"},
+				{
+					Title:   "feedtext",
+					FeedUrl: "https://example.com/feed.xml",
+					SiteUrl: "https://example.com",
+				},
 			},
 		}},
 	}

src/server/router/context.go

@@ -24,7 +24,7 @@ func (c *Context) Next() {
 	c.chain[c.index](c)
 }
 
-func (c *Context) JSON(status int, data interface{}) {
+func (c *Context) JSON(status int, data any) {
 	body, err := json.Marshal(data)
 	if err != nil {
 		log.Fatal(err)
@@ -35,7 +35,7 @@ func (c *Context) JSON(status int, data interface{}) {
 	c.Out.Write([]byte("\n"))
 }
 
-func (c *Context) HTML(status int, tmpl *template.Template, data interface{}) {
+func (c *Context) HTML(status int, tmpl *template.Template, data any) {
 	c.Out.Header().Set("Content-Type", "text/html")
 	c.Out.WriteHeader(status)
 	tmpl.Execute(c.Out, data)

src/server/router/router.go

@@ -32,10 +32,13 @@ func (r *Router) Use(h Handler) {
 }
 
 func (r *Router) For(path string, handler Handler) {
+	chain := make([]Handler, 0)
+	chain = append(chain, r.middle...)
+	chain = append(chain, handler)
+
 	x := Route{}
 	x.regex = routeRegexp(path)
-	x.chain = append(r.middle, handler)
-
+	x.chain = chain
 	r.routes = append(r.routes, x)
 }
 

src/server/routes.go

@@ -12,6 +12,7 @@ import (
 	"strings"
 
 	"github.com/nkanaev/yarr/src/assets"
+	"github.com/nkanaev/yarr/src/content/htmlutil"
 	"github.com/nkanaev/yarr/src/content/readability"
 	"github.com/nkanaev/yarr/src/content/sanitizer"
 	"github.com/nkanaev/yarr/src/content/silo"
@@ -33,12 +34,14 @@ func (s *Server) handler() http.Handler {
 			BasePath: s.BasePath,
 			Username: s.Username,
 			Password: s.Password,
-			Public:   "/static",
+			Public:   []string{"/static", "/fever", "/manifest.json"},
+			DB:       s.db,
 		}
 		r.Use(a.Handler)
 	}
 
 	r.For("/", s.handleIndex)
+	r.For("/manifest.json", s.handleManifest)
 	r.For("/static/*path", s.handleStatic)
 	r.For("/api/status", s.handleStatus)
 	r.For("/api/folders", s.handleFolderList)
@@ -55,12 +58,13 @@ func (s *Server) handler() http.Handler {
 	r.For("/opml/export", s.handleOPMLExport)
 	r.For("/page", s.handlePageCrawl)
 	r.For("/logout", s.handleLogout)
+	r.For("/fever/", s.handleFever)
 
 	return r
 }
 
 func (s *Server) handleIndex(c *router.Context) {
-	c.HTML(http.StatusOK, assets.Template("index.html"), map[string]interface{}{
+	c.HTML(http.StatusOK, assets.Template("index.html"), map[string]any{
 		"settings":      s.db.GetSettings(),
 		"authenticated": s.Username != "" && s.Password != "",
 	})
@@ -73,11 +77,30 @@ func (s *Server) handleStatic(c *router.Context) {
 		c.Out.WriteHeader(http.StatusNotFound)
 		return
 	}
-	http.StripPrefix(s.BasePath+"/static/", http.FileServer(http.FS(assets.FS))).ServeHTTP(c.Out, c.Req)
+	http.StripPrefix(s.BasePath+"/static/", http.FileServer(http.FS(assets.FS))).
+		ServeHTTP(c.Out, c.Req)
+}
+
+func (s *Server) handleManifest(c *router.Context) {
+	c.JSON(http.StatusOK, map[string]any{
+		"$schema":     "https://json.schemastore.org/web-manifest-combined.json",
+		"name":        "yarr!",
+		"short_name":  "yarr",
+		"description": "yet another rss reader",
+		"display":     "standalone",
+		"start_url":   "/" + strings.TrimPrefix(s.BasePath, "/"),
+		"icons": []map[string]any{
+			{
+				"src":   s.BasePath + "/static/graphicarts/favicon.png",
+				"sizes": "64x64",
+				"type":  "image/png",
+			},
+		},
+	})
 }
 
 func (s *Server) handleStatus(c *router.Context) {
-	c.JSON(http.StatusOK, map[string]interface{}{
+	c.JSON(http.StatusOK, map[string]any{
 		"running": s.worker.FeedsPending(),
 		"stats":   s.db.FeedStats(),
 	})
@@ -159,7 +182,9 @@ func (s *Server) handleFeedIcon(c *router.Context) {
 	}
 
 	cachekey := "icon:" + strconv.FormatInt(id, 10)
+	s.cache_mutex.Lock()
 	cachedat := s.cache[cachekey]
+	s.cache_mutex.Unlock()
 	if cachedat == nil {
 		feed := s.db.GetFeed(id)
 		if feed == nil || feed.Icon == nil {
@@ -177,7 +202,9 @@ func (s *Server) handleFeedIcon(c *router.Context) {
 			bytes: *(*feed).Icon,
 			etag:  etag,
 		}
+		s.cache_mutex.Lock()
 		s.cache[cachekey] = cachedat
+		s.cache_mutex.Unlock()
 	}
 
 	icon := cachedat.(feedicon)
@@ -210,7 +237,10 @@ func (s *Server) handleFeedList(c *router.Context) {
 			log.Printf("Faild to discover feed for %s: %s", form.Url, err)
 			c.JSON(http.StatusOK, map[string]string{"status": "notfound"})
 		case len(result.Sources) > 0:
-			c.JSON(http.StatusOK, map[string]interface{}{"status": "multiple", "choice": result.Sources})
+			c.JSON(
+				http.StatusOK,
+				map[string]any{"status": "multiple", "choice": result.Sources},
+			)
 		case result.Feed != nil:
 			feed := s.db.CreateFeed(
 				result.Feed.Title,
@@ -222,11 +252,11 @@ func (s *Server) handleFeedList(c *router.Context) {
 			items := worker.ConvertItems(result.Feed.Items, *feed)
 			if len(items) > 0 {
 				s.db.CreateItems(items)
-				s.db.SetFeedSize(feed.Id, len(items))
+				s.db.SyncSearch()
 			}
 			s.worker.FindFeedFavicon(*feed)
 
-			c.JSON(http.StatusOK, map[string]interface{}{
+			c.JSON(http.StatusOK, map[string]any{
 				"status": "success",
 				"feed":   feed,
 			})
@@ -248,7 +278,7 @@ func (s *Server) handleFeed(c *router.Context) {
 			c.Out.WriteHeader(http.StatusBadRequest)
 			return
 		}
-		body := make(map[string]interface{})
+		body := make(map[string]any)
 		if err := json.NewDecoder(c.Req.Body).Decode(&body); err != nil {
 			log.Print(err)
 			c.Out.WriteHeader(http.StatusBadRequest)
@@ -267,6 +297,11 @@ func (s *Server) handleFeed(c *router.Context) {
 				s.db.UpdateFeedFolder(id, &folderId)
 			}
 		}
+		if link, ok := body["feed_link"]; ok {
+			if reflect.TypeOf(link).Kind() == reflect.String {
+				s.db.UpdateFeedLink(id, link.(string))
+			}
+		}
 		c.Out.WriteHeader(http.StatusOK)
 	} else if c.Req.Method == "DELETE" {
 		s.db.DeleteFeed(id)
@@ -288,7 +323,18 @@ func (s *Server) handleItem(c *router.Context) {
 			c.Out.WriteHeader(http.StatusBadRequest)
 			return
 		}
+
+		// runtime fix for relative links
+		if !htmlutil.IsAPossibleLink(item.Link) {
+			if feed := s.db.GetFeed(item.FeedId); feed != nil {
+				item.Link = htmlutil.AbsoluteUrl(item.Link, feed.Link)
+			}
+		}
+
 		item.Content = sanitizer.Sanitize(item.Link, item.Content)
+		for i, link := range item.MediaLinks {
+			item.MediaLinks[i].Description = sanitizer.Sanitize(item.Link, link.Description)
+		}
 
 		c.JSON(http.StatusOK, item)
 	} else if c.Req.Method == "PUT" {
@@ -331,14 +377,21 @@ func (s *Server) handleItemList(c *router.Context) {
 		}
 		newestFirst := query.Get("oldest_first") != "true"
 
-		items := s.db.ListItems(filter, perPage+1, newestFirst)
+		items := s.db.ListItems(filter, perPage+1, newestFirst, true)
 		hasMore := false
 		if len(items) == perPage+1 {
 			hasMore = true
 			items = items[:perPage]
 		}
-		c.JSON(http.StatusOK, map[string]interface{}{
-			"list": items,
+
+		for i, item := range items {
+			if item.Title == "" {
+				text := htmlutil.ExtractText(item.Content)
+				items[i].Title = htmlutil.TruncateText(text, 140)
+			}
+		}
+		c.JSON(http.StatusOK, map[string]any{
+			"list":     items,
 			"has_more": hasMore,
 		})
 	} else if c.Req.Method == "PUT" {
@@ -361,7 +414,7 @@ func (s *Server) handleSettings(c *router.Context) {
 	if c.Req.Method == "GET" {
 		c.JSON(http.StatusOK, s.db.GetSettings())
 	} else if c.Req.Method == "PUT" {
-		settings := make(map[string]interface{})
+		settings := make(map[string]any)
 		if err := json.NewDecoder(c.Req.Body).Decode(&settings); err != nil {
 			c.Out.WriteHeader(http.StatusBadRequest)
 			return
@@ -418,7 +471,6 @@ func (s *Server) handleOPMLExport(c *router.Context) {
 
 		feedsByFolderID := make(map[int64][]*storage.Feed)
 		for _, feed := range s.db.ListFeeds() {
-			feed := feed
 			if feed.FolderId == nil {
 				doc.Feeds = append(doc.Feeds, opml.Feed{
 					Title:   feed.Title,
@@ -454,12 +506,19 @@ func (s *Server) handleOPMLExport(c *router.Context) {
 func (s *Server) handlePageCrawl(c *router.Context) {
 	url := c.Req.URL.Query().Get("url")
 
+	if newUrl := silo.RedirectURL(url); newUrl != "" {
+		url = newUrl
+	}
 	if content := silo.VideoIFrame(url); content != "" {
 		c.JSON(http.StatusOK, map[string]string{
 			"content": sanitizer.Sanitize(url, content),
 		})
 		return
 	}
+	if isInternalFromURL(url) {
+		log.Printf("attempt to access internal IP %s from %s", url, c.Req.RemoteAddr)
+		return
+	}
 
 	body, err := worker.GetBody(url)
 	if err != nil {
@@ -469,8 +528,9 @@ func (s *Server) handlePageCrawl(c *router.Context) {
 	}
 	content, err := readability.ExtractContent(strings.NewReader(body))
 	if err != nil {
-		log.Print(err)
-		c.Out.WriteHeader(http.StatusNoContent)
+		c.JSON(http.StatusOK, map[string]string{
+			"content": "error: " + err.Error(),
+		})
 		return
 	}
 	content = sanitizer.Sanitize(url, content)

src/server/server.go

@@ -2,17 +2,22 @@ package server
 
 import (
 	"log"
+	"net"
 	"net/http"
+	"os"
+	"strings"
+	"sync"
 
 	"github.com/nkanaev/yarr/src/storage"
 	"github.com/nkanaev/yarr/src/worker"
 )
 
 type Server struct {
-	Addr   string
-	db     *storage.Storage
-	worker *worker.Worker
-	cache  map[string]interface{}
+	Addr        string
+	db          *storage.Storage
+	worker      *worker.Worker
+	cache       map[string]any
+	cache_mutex *sync.Mutex
 
 	BasePath string
 
@@ -26,10 +31,11 @@ type Server struct {
 
 func NewServer(db *storage.Storage, addr string) *Server {
 	return &Server{
-		db:     db,
-		Addr:   addr,
-		worker: worker.NewWorker(db),
-		cache:  make(map[string]interface{}),
+		db:          db,
+		Addr:        addr,
+		worker:      worker.NewWorker(db),
+		cache:       make(map[string]any),
+		cache_mutex: &sync.Mutex{},
 	}
 }
 
@@ -50,14 +56,31 @@ func (s *Server) Start() {
 		s.worker.RefreshFeeds()
 	}
 
-	httpserver := &http.Server{Addr: s.Addr, Handler: s.handler()}
-
+	var ln net.Listener
 	var err error
-	if s.CertFile != "" && s.KeyFile != "" {
-		err = httpserver.ListenAndServeTLS(s.CertFile, s.KeyFile)
+
+	if path, isUnix := strings.CutPrefix(s.Addr, "unix:"); isUnix {
+		err = os.Remove(path)
+		if err != nil {
+			log.Print(err)
+		}
+		ln, err = net.Listen("unix", path)
 	} else {
-		err = httpserver.ListenAndServe()
+		ln, err = net.Listen("tcp", s.Addr)
 	}
+
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	httpserver := &http.Server{Handler: s.handler()}
+	if s.CertFile != "" && s.KeyFile != "" {
+		err = httpserver.ServeTLS(ln, s.CertFile, s.KeyFile)
+		ln.Close()
+	} else {
+		err = httpserver.Serve(ln)
+	}
+
 	if err != http.ErrServerClosed {
 		log.Fatal(err)
 	}

src/server/util.go

@@ -0,0 +1,35 @@
+package server
+
+import (
+	"net"
+	"net/url"
+	"strings"
+)
+
+func isInternalFromURL(urlStr string) bool {
+	parsedURL, err := url.Parse(urlStr)
+	if err != nil {
+		return false
+	}
+
+	host := parsedURL.Host
+
+	// Handle "host:port" format
+	if strings.Contains(host, ":") {
+		host, _, err = net.SplitHostPort(host)
+		if err != nil {
+			return false
+		}
+	}
+
+	if host == "localhost" {
+		return true
+	}
+
+	ip := net.ParseIP(host)
+	if ip == nil {
+		return false
+	}
+
+	return ip.IsPrivate() || ip.IsLoopback() || ip.IsLinkLocalUnicast()
+}

src/server/util_test.go

@@ -0,0 +1,31 @@
+package server
+
+import "testing"
+
+func TestIsInternalFromURL(t *testing.T) {
+	tests := []struct {
+		url      string
+		expected bool
+	}{
+		{"http://192.168.1.1:8080", true},
+		{"http://10.0.0.5", true},
+		{"http://172.16.0.1", true},
+		{"http://172.31.255.255", true},
+		{"http://172.32.0.1", false}, // outside private range
+		{"http://127.0.0.1", true},
+		{"http://127.0.0.1:7000", true},
+		{"http://127.0.0.1:7000/secret", true},
+		{"http://169.254.0.5", true},
+		{"http://localhost", true}, // resolves to 127.0.0.1
+		{"http://8.8.8.8", false},
+		{"http://google.com", false}, // resolves to public IPs
+		{"invalid-url", false},       // invalid format
+		{"", false},                  // empty string
+	}
+	for _, test := range tests {
+		result := isInternalFromURL(test.url)
+		if result != test.expected {
+			t.Errorf("isInternalFromURL(%q) = %v; want %v", test.url, result, test.expected)
+		}
+	}
+}

src/storage/feed.go

@@ -20,18 +20,22 @@ func (s *Storage) CreateFeed(title, description, link, feedLink string, folderId
 	if title == "" {
 		title = feedLink
 	}
-	result, err := s.db.Exec(`
+	row := s.db.QueryRow(`
 		insert into feeds (title, description, link, feed_link, folder_id) 
-		values (?, ?, ?, ?, ?)
-		on conflict (feed_link) do update set folder_id=?`,
-		title, description, link, feedLink, folderId,
-		folderId,
+		values (:title, :description, :link, :feed_link, :folder_id)
+		on conflict (feed_link) do update set folder_id = :folder_id
+        returning id`,
+		sql.Named("title", title),
+		sql.Named("description", description),
+		sql.Named("link", link),
+		sql.Named("feed_link", feedLink),
+		sql.Named("folder_id", folderId),
 	)
+
+	var id int64
+	err := row.Scan(&id)
 	if err != nil {
-		return nil
-	}
-	id, idErr := result.LastInsertId()
-	if idErr != nil {
+		log.Print(err)
 		return nil
 	}
 	return &Feed{
@@ -45,7 +49,7 @@ func (s *Storage) CreateFeed(title, description, link, feedLink string, folderId
 }
 
 func (s *Storage) DeleteFeed(feedId int64) bool {
-	result, err := s.db.Exec(`delete from feeds where id = ?`, feedId)
+	result, err := s.db.Exec(`delete from feeds where id = :id`, sql.Named("id", feedId))
 	if err != nil {
 		log.Print(err)
 		return false
@@ -61,17 +65,34 @@ func (s *Storage) DeleteFeed(feedId int64) bool {
 }
 
 func (s *Storage) RenameFeed(feedId int64, newTitle string) bool {
-	_, err := s.db.Exec(`update feeds set title = ? where id = ?`, newTitle, feedId)
+	_, err := s.db.Exec(`update feeds set title = :title where id = :id`,
+		sql.Named("title", newTitle),
+		sql.Named("id", feedId),
+	)
 	return err == nil
 }
 
 func (s *Storage) UpdateFeedFolder(feedId int64, newFolderId *int64) bool {
-	_, err := s.db.Exec(`update feeds set folder_id = ? where id = ?`, newFolderId, feedId)
+	_, err := s.db.Exec(`update feeds set folder_id = :folder_id where id = :id`,
+		sql.Named("folder_id", newFolderId),
+		sql.Named("id", feedId),
+	)
+	return err == nil
+}
+
+func (s *Storage) UpdateFeedLink(feedId int64, newLink string) bool {
+	_, err := s.db.Exec(`update feeds set feed_link = :feed_link where id = :id`,
+		sql.Named("feed_link", newLink),
+		sql.Named("id", feedId),
+	)
 	return err == nil
 }
 
 func (s *Storage) UpdateFeedIcon(feedId int64, icon *[]byte) bool {
-	_, err := s.db.Exec(`update feeds set icon = ? where id = ?`, icon, feedId)
+	_, err := s.db.Exec(`update feeds set icon = :icon where id = :id`,
+		sql.Named("icon", icon),
+		sql.Named("id", feedId),
+	)
 	return err == nil
 }
 
@@ -143,8 +164,8 @@ func (s *Storage) GetFeed(id int64) *Feed {
 		select
 			id, folder_id, title, link, feed_link,
 			icon, ifnull(icon, '') != '' as has_icon
-		from feeds where id = ?
-	`, id).Scan(
+		from feeds where id = :id
+	`, sql.Named("id", id)).Scan(
 		&f.Id, &f.FolderId, &f.Title, &f.Link, &f.FeedLink,
 		&f.Icon, &f.HasIcon,
 	)
@@ -166,9 +187,10 @@ func (s *Storage) ResetFeedErrors() {
 func (s *Storage) SetFeedError(feedID int64, lastError error) {
 	_, err := s.db.Exec(`
 		insert into feed_errors (feed_id, error)
-		values (?, ?)
+		values (:feed_id, :error)
 		on conflict (feed_id) do update set error = excluded.error`,
-		feedID, lastError.Error(),
+		sql.Named("feed_id", feedID),
+		sql.Named("error", lastError.Error()),
 	)
 	if err != nil {
 		log.Print(err)
@@ -194,15 +216,3 @@ func (s *Storage) GetFeedErrors() map[int64]string {
 	}
 	return errors
 }
-
-func (s *Storage) SetFeedSize(feedId int64, size int) {
-	_, err := s.db.Exec(`
-		insert into feed_sizes (feed_id, size)
-		values (?, ?)
-		on conflict (feed_id) do update set size = excluded.size`,
-		feedId, size,
-	)
-	if err != nil {
-		log.Print(err)
-	}
-}

src/storage/feed_test.go

@@ -17,6 +17,23 @@ func TestCreateFeed(t *testing.T) {
 	}
 }
 
+func TestCreateFeedSameLink(t *testing.T) {
+	db := testDB()
+	feed1 := db.CreateFeed("title", "", "", "http://example1.com/feed.xml", nil)
+	if feed1 == nil || feed1.Id == 0 {
+		t.Fatal("expected feed")
+	}
+
+	for range 10 {
+		db.CreateFeed("title", "", "", "http://example2.com/feed.xml", nil)
+	}
+
+	feed2 := db.CreateFeed("title", "", "http://example.com", "http://example1.com/feed.xml", nil)
+	if feed1.Id != feed2.Id {
+		t.Fatalf("expected the same feed.\nwant: %#v\nhave: %#v", feed1, feed2)
+	}
+}
+
 func TestReadFeed(t *testing.T) {
 	db := testDB()
 	if db.GetFeed(100500) != nil {

src/storage/folder.go

@@ -1,7 +1,7 @@
 package storage
 
 import (
-	"fmt"
+	"database/sql"
 	"log"
 )
 
@@ -13,40 +13,25 @@ type Folder struct {
 
 func (s *Storage) CreateFolder(title string) *Folder {
 	expanded := true
-	result, err := s.db.Exec(`
-		insert into folders (title, is_expanded) values (?, ?)
-		on conflict (title) do nothing`,
-		title, expanded,
+	row := s.db.QueryRow(`
+		insert into folders (title, is_expanded) values (:title, :is_expanded)
+		on conflict (title) do update set title = :title
+        returning id`,
+		sql.Named("title", title),
+		sql.Named("is_expanded", expanded),
 	)
-	if err != nil {
-		fmt.Println(err)
-		return nil
-	}
-
 	var id int64
-	numrows, err := result.RowsAffected()
+	err := row.Scan(&id)
+
 	if err != nil {
 		log.Print(err)
 		return nil
 	}
-	if numrows == 1 {
-		id, err = result.LastInsertId()
-		if err != nil {
-			log.Print(err)
-			return nil
-		}
-	} else {
-		err = s.db.QueryRow(`select id, is_expanded from folders where title=?`, title).Scan(&id, &expanded)
-		if err != nil {
-			log.Print(err)
-			return nil
-		}
-	}
 	return &Folder{Id: id, Title: title, IsExpanded: expanded}
 }
 
 func (s *Storage) DeleteFolder(folderId int64) bool {
-	_, err := s.db.Exec(`delete from folders where id = ?`, folderId)
+	_, err := s.db.Exec(`delete from folders where id = :id`, sql.Named("id", folderId))
 	if err != nil {
 		log.Print(err)
 	}
@@ -54,17 +39,23 @@ func (s *Storage) DeleteFolder(folderId int64) bool {
 }
 
 func (s *Storage) RenameFolder(folderId int64, newTitle string) bool {
-	_, err := s.db.Exec(`update folders set title = ? where id = ?`, newTitle, folderId)
+	_, err := s.db.Exec(`update folders set title = :title where id = :id`,
+		sql.Named("title", newTitle),
+		sql.Named("id", folderId),
+	)
 	return err == nil
 }
 
 func (s *Storage) ToggleFolderExpanded(folderId int64, isExpanded bool) bool {
-	_, err := s.db.Exec(`update folders set is_expanded = ? where id = ?`, isExpanded, folderId)
+	_, err := s.db.Exec(`update folders set is_expanded = :is_expanded where id = :id`,
+		sql.Named("is_expanded", isExpanded),
+		sql.Named("id", folderId),
+	)
 	return err == nil
 }
 
 func (s *Storage) ListFolders() []Folder {
-	result := make([]Folder, 0, 0)
+	result := make([]Folder, 0)
 	rows, err := s.db.Query(`
 		select id, title, is_expanded
 		from folders

src/storage/http.go

@@ -1,6 +1,7 @@
 package storage
 
 import (
+	"database/sql"
 	"log"
 	"time"
 )
@@ -40,8 +41,8 @@ func (s *Storage) ListHTTPStates() map[int64]HTTPState {
 func (s *Storage) GetHTTPState(feedID int64) *HTTPState {
 	row := s.db.QueryRow(`
 		select feed_id, last_refreshed, last_modified, etag
-		from http_states where feed_id = ?
-	`, feedID)
+		from http_states where feed_id = :feed_id
+	`, sql.Named("feed_id", feedID))
 
 	if row == nil {
 		return nil
@@ -60,12 +61,11 @@ func (s *Storage) GetHTTPState(feedID int64) *HTTPState {
 func (s *Storage) SetHTTPState(feedID int64, lastModified, etag string) {
 	_, err := s.db.Exec(`
 		insert into http_states (feed_id, last_modified, etag, last_refreshed)
-		values (?, ?, ?, datetime())
-		on conflict (feed_id) do update set last_modified = ?, etag = ?, last_refreshed = datetime()`,
-		// insert
-		feedID, lastModified, etag,
-		// upsert
-		lastModified, etag,
+		values (:feed_id, :last_modified, :etag, datetime())
+		on conflict (feed_id) do update set last_modified = :last_modified, etag = :etag, last_refreshed = datetime()`,
+		sql.Named("feed_id", feedID),
+		sql.Named("last_modified", lastModified),
+		sql.Named("etag", etag),
 	)
 	if err != nil {
 		log.Print(err)

src/storage/item.go

@@ -1,9 +1,12 @@
 package storage
 
 import (
+	"database/sql"
+	"database/sql/driver"
 	"encoding/json"
 	"fmt"
 	"log"
+	"sort"
 	"strings"
 	"time"
 
@@ -43,17 +46,39 @@ func (s *ItemStatus) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
+type MediaLink struct {
+	URL         string `json:"url"`
+	Type        string `json:"type"`
+	Description string `json:"description,omitempty"`
+}
+
+type MediaLinks []MediaLink
+
+func (m *MediaLinks) Scan(src any) error {
+	switch data := src.(type) {
+	case []byte:
+		return json.Unmarshal(data, m)
+	case string:
+		return json.Unmarshal([]byte(data), m)
+	default:
+		return nil
+	}
+}
+
+func (m MediaLinks) Value() (driver.Value, error) {
+	return json.Marshal(m)
+}
+
 type Item struct {
-	Id       int64      `json:"id"`
-	GUID     string     `json:"guid"`
-	FeedId   int64      `json:"feed_id"`
-	Title    string     `json:"title"`
-	Link     string     `json:"link"`
-	Content  string     `json:"content,omitempty"`
-	Date     time.Time  `json:"date"`
-	Status   ItemStatus `json:"status"`
-	ImageURL *string    `json:"image"`
-	AudioURL *string    `json:"podcast_url"`
+	Id         int64      `json:"id"`
+	GUID       string     `json:"guid"`
+	FeedId     int64      `json:"feed_id"`
+	Title      string     `json:"title"`
+	Link       string     `json:"link"`
+	Content    string     `json:"content,omitempty"`
+	Date       time.Time  `json:"date"`
+	Status     ItemStatus `json:"status"`
+	MediaLinks MediaLinks `json:"media_links"`
 }
 
 type ItemFilter struct {
@@ -62,11 +87,35 @@ type ItemFilter struct {
 	Status   *ItemStatus
 	Search   *string
 	After    *int64
+	IDs      *[]int64
+	SinceID  *int64
+	MaxID    *int64
+	Before   *time.Time
 }
 
 type MarkFilter struct {
 	FolderID *int64
 	FeedID   *int64
+
+	Before *time.Time
+}
+
+type ItemList []Item
+
+func (list ItemList) Len() int {
+	return len(list)
+}
+
+func (list ItemList) SortKey(i int) string {
+	return list[i].Date.Format(time.RFC3339) + "::" + list[i].GUID
+}
+
+func (list ItemList) Less(i, j int) bool {
+	return list.SortKey(i) < list.SortKey(j)
+}
+
+func (list ItemList) Swap(i, j int) {
+	list[i], list[j] = list[j], list[i]
 }
 
 func (s *Storage) CreateItems(items []Item) bool {
@@ -76,20 +125,35 @@ func (s *Storage) CreateItems(items []Item) bool {
 		return false
 	}
 
-	now := time.Now()
+	now := time.Now().UTC()
 
-	for _, item := range items {
+	itemsSorted := ItemList(items)
+	sort.Sort(itemsSorted)
+
+	for _, item := range itemsSorted {
 		_, err = tx.Exec(`
 			insert into items (
 				guid, feed_id, title, link, date,
-				content, image, podcast_url,
-				date_arrived, status
+				content, media_links,
+				date_arrived, last_arrived, status
 			)
-			values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-			on conflict (feed_id, guid) do nothing`,
-			item.GUID, item.FeedId, item.Title, item.Link, item.Date,
-			item.Content, item.ImageURL, item.AudioURL,
-			now, UNREAD,
+			values (
+				:guid, :feed_id, :title, :link, strftime('%Y-%m-%d %H:%M:%f', :date),
+				:content, :media_links,
+				:date_arrived, :last_arrived, :status
+			)
+			on conflict (feed_id, guid) do update set
+				last_arrived = :last_arrived`,
+			sql.Named("guid", item.GUID),
+			sql.Named("feed_id", item.FeedId),
+			sql.Named("title", item.Title),
+			sql.Named("link", item.Link),
+			sql.Named("date", item.Date),
+			sql.Named("content", item.Content),
+			sql.Named("media_links", item.MediaLinks),
+			sql.Named("date_arrived", now),
+			sql.Named("last_arrived", now),
+			sql.Named("status", UNREAD),
 		)
 		if err != nil {
 			log.Print(err)
@@ -107,20 +171,20 @@ func (s *Storage) CreateItems(items []Item) bool {
 	return true
 }
 
-func listQueryPredicate(filter ItemFilter, newestFirst bool) (string, []interface{}) {
+func listQueryPredicate(filter ItemFilter, newestFirst bool) (string, []any) {
 	cond := make([]string, 0)
-	args := make([]interface{}, 0)
+	args := make([]any, 0)
 	if filter.FolderID != nil {
-		cond = append(cond, "i.feed_id in (select id from feeds where folder_id = ?)")
-		args = append(args, *filter.FolderID)
+		cond = append(cond, "i.feed_id in (select id from feeds where folder_id = :folder_id)")
+		args = append(args, sql.Named("folder_id", *filter.FolderID))
 	}
 	if filter.FeedID != nil {
-		cond = append(cond, "i.feed_id = ?")
-		args = append(args, *filter.FeedID)
+		cond = append(cond, "i.feed_id = :feed_id")
+		args = append(args, sql.Named("feed_id", *filter.FeedID))
 	}
 	if filter.Status != nil {
-		cond = append(cond, "i.status = ?")
-		args = append(args, *filter.Status)
+		cond = append(cond, "i.status = :status")
+		args = append(args, sql.Named("status", *filter.Status))
 	}
 	if filter.Search != nil {
 		words := strings.Fields(*filter.Search)
@@ -129,16 +193,46 @@ func listQueryPredicate(filter ItemFilter, newestFirst bool) (string, []interfac
 			terms[idx] = word + "*"
 		}
 
-		cond = append(cond, "i.search_rowid in (select rowid from search where search match ?)")
-		args = append(args, strings.Join(terms, " "))
+		cond = append(
+			cond,
+			"i.search_rowid in (select rowid from search where search match :search)",
+		)
+		args = append(args, sql.Named("search", strings.Join(terms, " ")))
 	}
 	if filter.After != nil {
 		compare := ">"
 		if newestFirst {
 			compare = "<"
 		}
-		cond = append(cond, fmt.Sprintf("(i.date, i.id) %s (select date, id from items where id = ?)", compare))
-		args = append(args, *filter.After)
+		cond = append(
+			cond,
+			fmt.Sprintf(
+				"(i.date, i.id) %s (select date, id from items where id = :after_id)",
+				compare,
+			),
+		)
+		args = append(args, sql.Named("after_id", *filter.After))
+	}
+	if filter.IDs != nil && len(*filter.IDs) > 0 {
+		qmarks := make([]string, len(*filter.IDs))
+		for i, id := range *filter.IDs {
+			name := fmt.Sprintf("id%d", i)
+			qmarks[i] = ":" + name
+			args = append(args, sql.Named(name, id))
+		}
+		cond = append(cond, "i.id in ("+strings.Join(qmarks, ",")+")")
+	}
+	if filter.SinceID != nil {
+		cond = append(cond, "i.id > :since_id")
+		args = append(args, sql.Named("since_id", filter.SinceID))
+	}
+	if filter.MaxID != nil {
+		cond = append(cond, "i.id < :max_id")
+		args = append(args, sql.Named("max_id", filter.MaxID))
+	}
+	if filter.Before != nil {
+		cond = append(cond, "i.date < :before")
+		args = append(args, sql.Named("before", filter.Before))
 	}
 
 	predicate := "1"
@@ -149,25 +243,56 @@ func listQueryPredicate(filter ItemFilter, newestFirst bool) (string, []interfac
 	return predicate, args
 }
 
-func (s *Storage) ListItems(filter ItemFilter, limit int, newestFirst bool) []Item {
+func (s *Storage) CountItems(filter ItemFilter) int {
+	predicate, args := listQueryPredicate(filter, false)
+
+	var count int
+	query := fmt.Sprintf(`
+		select count(*)
+		from items i
+		where %s
+		`, predicate)
+	err := s.db.QueryRow(query, args...).Scan(&count)
+	if err != nil {
+		log.Print(err)
+		return 0
+	}
+	return count
+}
+
+func (s *Storage) ListItems(
+	filter ItemFilter,
+	limit int,
+	newestFirst bool,
+	withContent bool,
+) []Item {
 	predicate, args := listQueryPredicate(filter, newestFirst)
-	result := make([]Item, 0, 0)
+	result := make([]Item, 0)
 
 	order := "date desc, id desc"
 	if !newestFirst {
 		order = "date asc, id asc"
 	}
+	if filter.IDs != nil || filter.SinceID != nil {
+		order = "i.id asc"
+	}
+	if filter.MaxID != nil {
+		order = "i.id desc"
+	}
 
+	selectCols := "i.id, i.guid, i.feed_id, i.title, i.link, i.date, i.status, i.media_links"
+	if withContent {
+		selectCols += ", i.content"
+	} else {
+		selectCols += ", '' as content"
+	}
 	query := fmt.Sprintf(`
-		select
-			i.id, i.guid, i.feed_id,
-			i.title, i.link, i.date,
-			i.status, i.image, i.podcast_url
+		select %s
 		from items i
 		where %s
 		order by %s
 		limit %d
-		`, predicate, order, limit)
+		`, selectCols, predicate, order, limit)
 	rows, err := s.db.Query(query, args...)
 	if err != nil {
 		log.Print(err)
@@ -178,7 +303,7 @@ func (s *Storage) ListItems(filter ItemFilter, limit int, newestFirst bool) []It
 		err = rows.Scan(
 			&x.Id, &x.GUID, &x.FeedId,
 			&x.Title, &x.Link, &x.Date,
-			&x.Status, &x.ImageURL, &x.AudioURL,
+			&x.Status, &x.MediaLinks, &x.Content,
 		)
 		if err != nil {
 			log.Print(err)
@@ -194,12 +319,12 @@ func (s *Storage) GetItem(id int64) *Item {
 	err := s.db.QueryRow(`
 		select
 			i.id, i.guid, i.feed_id, i.title, i.link, i.content,
-			i.date, i.status, i.image, i.podcast_url
+			i.date, i.status, i.media_links
 		from items i
-		where i.id = ?
-	`, id).Scan(
+		where i.id = :id
+	`, sql.Named("id", id)).Scan(
 		&i.Id, &i.GUID, &i.FeedId, &i.Title, &i.Link, &i.Content,
-		&i.Date, &i.Status, &i.ImageURL, &i.AudioURL,
+		&i.Date, &i.Status, &i.MediaLinks,
 	)
 	if err != nil {
 		log.Print(err)
@@ -209,12 +334,19 @@ func (s *Storage) GetItem(id int64) *Item {
 }
 
 func (s *Storage) UpdateItemStatus(item_id int64, status ItemStatus) bool {
-	_, err := s.db.Exec(`update items set status = ? where id = ?`, status, item_id)
+	_, err := s.db.Exec(`update items set status = :status where id = :id`,
+		sql.Named("status", status),
+		sql.Named("id", item_id),
+	)
 	return err == nil
 }
 
 func (s *Storage) MarkItemsRead(filter MarkFilter) bool {
-	predicate, args := listQueryPredicate(ItemFilter{FolderID: filter.FolderID, FeedID: filter.FeedID}, false)
+	predicate, args := listQueryPredicate(ItemFilter{
+		FolderID: filter.FolderID,
+		FeedID:   filter.FeedID,
+		Before:   filter.Before,
+	}, false)
 	query := fmt.Sprintf(`
 		update items as i set status = %d
 		where %s and i.status != %d
@@ -274,8 +406,9 @@ func (s *Storage) SyncSearch() {
 
 	for _, item := range items {
 		result, err := s.db.Exec(`
-			insert into search (title, description, content) values (?, "", ?)`,
-			item.Title, htmlutil.ExtractText(item.Content),
+			insert into search (title, description, content) values (:title, "", :content)`,
+			sql.Named("title", item.Title),
+			sql.Named("content", htmlutil.ExtractText(item.Content)),
 		)
 		if err != nil {
 			log.Print(err)
@@ -284,8 +417,9 @@ func (s *Storage) SyncSearch() {
 		if numrows, err := result.RowsAffected(); err == nil && numrows == 1 {
 			if rowId, err := result.LastInsertId(); err == nil {
 				s.db.Exec(
-					`update items set search_rowid = ? where id = ?`,
-					rowId, item.Id,
+					`update items set search_rowid = :search_rowid where id = :id`,
+					sql.Named("search_rowid", rowId),
+					sql.Named("id", item.Id),
 				)
 			}
 		}
@@ -300,62 +434,36 @@ var (
 // Delete old articles from the database to cleanup space.
 //
 // The rules:
-// * Never delete starred entries.
-// * Keep at least the same amount of articles the feed provides (default: 50).
-//   This prevents from deleting items for rarely updated and/or ever-growing
-//   feeds which might eventually reappear as unread.
-// * Keep entries for a certain period (default: 90 days).
+//   - Never delete starred entries.
+//   - Keep at least 50 latest items for each feed.
+//   - Delete entries older than 90 days relative to the latest arrived item in the same feed.
 func (s *Storage) DeleteOldItems() {
-	rows, err := s.db.Query(`
-		select
-			i.feed_id,
-			max(coalesce(s.size, 0), ?) as max_items,
-			count(*) as num_items
-		from items i
-		left outer join feed_sizes s on s.feed_id = i.feed_id
-		where status != ?
-		group by i.feed_id
-	`, itemsKeepSize, STARRED)
-
+	result, err := s.db.Exec(`
+		delete from items
+		where id in (
+			select id
+			from (
+				select
+					id,
+					row_number() over (partition by feed_id order by date desc) as rn,
+					last_arrived,
+					max(last_arrived) over (partition by feed_id) as max_la
+				from items
+				where status != :starred_status
+			)
+			where rn > :keep_size
+			  and last_arrived < datetime(max_la, :keep_days_limit)
+		)`,
+		sql.Named("starred_status", STARRED),
+		sql.Named("keep_size", itemsKeepSize),
+		sql.Named("keep_days_limit", fmt.Sprintf("-%d days", itemsKeepDays)),
+	)
 	if err != nil {
 		log.Print(err)
 		return
 	}
-
-	feedLimits := make(map[int64]int64, 0)
-	for rows.Next() {
-		var feedId, limit int64
-		rows.Scan(&feedId, &limit, nil)
-		feedLimits[feedId] = limit
-	}
-
-	for feedId, limit := range feedLimits {
-		result, err := s.db.Exec(`
-			delete from items
-			where id in (
-				select i.id
-				from items i
-				where i.feed_id = ? and status != ?
-				order by date desc
-				limit -1 offset ?
-			) and date_arrived < ?
-			`,
-			feedId,
-			STARRED,
-			limit,
-			time.Now().Add(-time.Hour*time.Duration(24*itemsKeepDays)),
-		)
-		if err != nil {
-			log.Print(err)
-			return
-		}
-		numDeleted, err := result.RowsAffected()
-		if err != nil {
-			log.Print(err)
-			return
-		}
-		if numDeleted > 0 {
-			log.Printf("Deleted %d old items (feed: %d)", numDeleted, feedId)
-		}
+	numDeleted, err := result.RowsAffected()
+	if err == nil && numDeleted > 0 {
+		log.Printf("Deleted %d old items", numDeleted)
 	}
 }

src/storage/item_test.go

@@ -1,10 +1,12 @@
 package storage
 
 import (
+	"database/sql"
 	"log"
 	"reflect"
 	"strconv"
 	"testing"
+	"testing/synctest"
 	"time"
 )
 
@@ -46,21 +48,62 @@ func testItemsSetup(db *Storage) testItemScope {
 	db.CreateItems([]Item{
 		// feed11
 		{GUID: "item111", FeedId: feed11.Id, Title: "title111", Date: now.Add(time.Hour * 24 * 1)},
-		{GUID: "item112", FeedId: feed11.Id, Title: "title112", Date: now.Add(time.Hour * 24 * 2)}, // read
-		{GUID: "item113", FeedId: feed11.Id, Title: "title113", Date: now.Add(time.Hour * 24 * 3)}, // starred
+		{
+			GUID:   "item112",
+			FeedId: feed11.Id,
+			Title:  "title112",
+			Date:   now.Add(time.Hour * 24 * 2),
+		}, // read
+		{
+			GUID:   "item113",
+			FeedId: feed11.Id,
+			Title:  "title113",
+			Date:   now.Add(time.Hour * 24 * 3),
+		}, // starred
 		// feed12
 		{GUID: "item121", FeedId: feed12.Id, Title: "title121", Date: now.Add(time.Hour * 24 * 4)},
-		{GUID: "item122", FeedId: feed12.Id, Title: "title122", Date: now.Add(time.Hour * 24 * 5)}, // read
+		{
+			GUID:   "item122",
+			FeedId: feed12.Id,
+			Title:  "title122",
+			Date:   now.Add(time.Hour * 24 * 5),
+		}, // read
 		// feed21
-		{GUID: "item211", FeedId: feed21.Id, Title: "title211", Date: now.Add(time.Hour * 24 * 6)}, // read
-		{GUID: "item212", FeedId: feed21.Id, Title: "title212", Date: now.Add(time.Hour * 24 * 7)}, // starred
+		{
+			GUID:   "item211",
+			FeedId: feed21.Id,
+			Title:  "title211",
+			Date:   now.Add(time.Hour * 24 * 6),
+		}, // read
+		{
+			GUID:   "item212",
+			FeedId: feed21.Id,
+			Title:  "title212",
+			Date:   now.Add(time.Hour * 24 * 7),
+		}, // starred
 		// feed01
 		{GUID: "item011", FeedId: feed01.Id, Title: "title011", Date: now.Add(time.Hour * 24 * 8)},
-		{GUID: "item012", FeedId: feed01.Id, Title: "title012", Date: now.Add(time.Hour * 24 * 9)},  // read
-		{GUID: "item013", FeedId: feed01.Id, Title: "title013", Date: now.Add(time.Hour * 24 * 10)}, // starred
+		{
+			GUID:   "item012",
+			FeedId: feed01.Id,
+			Title:  "title012",
+			Date:   now.Add(time.Hour * 24 * 9),
+		}, // read
+		{
+			GUID:   "item013",
+			FeedId: feed01.Id,
+			Title:  "title013",
+			Date:   now.Add(time.Hour * 24 * 10),
+		}, // starred
 	})
-	db.db.Exec(`update items set status = ? where guid in ("item112", "item122", "item211", "item012")`, READ)
-	db.db.Exec(`update items set status = ? where guid in ("item113", "item212", "item013")`, STARRED)
+	db.db.Exec(
+		`update items set status = :status where guid in ("item112", "item122", "item211", "item012")`,
+		sql.Named("status", READ),
+	)
+	db.db.Exec(
+		`update items set status = :status where guid in ("item113", "item212", "item013")`,
+		sql.Named("status", STARRED),
+	)
 
 	return testItemScope{
 		feed11:  feed11,
@@ -77,12 +120,12 @@ func getItem(db *Storage, guid string) *Item {
 	err := db.db.QueryRow(`
 		select
 			i.id, i.guid, i.feed_id, i.title, i.link, i.content,
-			i.date, i.status, i.image, i.podcast_url
+			i.date, i.status, i.media_links
 		from items i
-		where i.guid = ?
-	`, guid).Scan(
+		where i.guid = :guid
+	`, sql.Named("guid", guid)).Scan(
 		&i.Id, &i.GUID, &i.FeedId, &i.Title, &i.Link, &i.Content,
-		&i.Date, &i.Status, &i.ImageURL, &i.AudioURL,
+		&i.Date, &i.Status, &i.MediaLinks,
 	)
 	if err != nil {
 		log.Fatal(err)
@@ -104,7 +147,7 @@ func TestListItems(t *testing.T) {
 
 	// filter by folder_id
 
-	have := getItemGuids(db.ListItems(ItemFilter{FolderID: &scope.folder1.Id}, 10, false))
+	have := getItemGuids(db.ListItems(ItemFilter{FolderID: &scope.folder1.Id}, 10, false, false))
 	want := []string{"item111", "item112", "item113", "item121", "item122"}
 	if !reflect.DeepEqual(have, want) {
 		t.Logf("want: %#v", want)
@@ -112,7 +155,7 @@ func TestListItems(t *testing.T) {
 		t.Fail()
 	}
 
-	have = getItemGuids(db.ListItems(ItemFilter{FolderID: &scope.folder2.Id}, 10, false))
+	have = getItemGuids(db.ListItems(ItemFilter{FolderID: &scope.folder2.Id}, 10, false, false))
 	want = []string{"item211", "item212"}
 	if !reflect.DeepEqual(have, want) {
 		t.Logf("want: %#v", want)
@@ -122,7 +165,7 @@ func TestListItems(t *testing.T) {
 
 	// filter by feed_id
 
-	have = getItemGuids(db.ListItems(ItemFilter{FeedID: &scope.feed11.Id}, 10, false))
+	have = getItemGuids(db.ListItems(ItemFilter{FeedID: &scope.feed11.Id}, 10, false, false))
 	want = []string{"item111", "item112", "item113"}
 	if !reflect.DeepEqual(have, want) {
 		t.Logf("want: %#v", want)
@@ -130,7 +173,7 @@ func TestListItems(t *testing.T) {
 		t.Fail()
 	}
 
-	have = getItemGuids(db.ListItems(ItemFilter{FeedID: &scope.feed01.Id}, 10, false))
+	have = getItemGuids(db.ListItems(ItemFilter{FeedID: &scope.feed01.Id}, 10, false, false))
 	want = []string{"item011", "item012", "item013"}
 	if !reflect.DeepEqual(have, want) {
 		t.Logf("want: %#v", want)
@@ -141,7 +184,7 @@ func TestListItems(t *testing.T) {
 	// filter by status
 
 	var starred ItemStatus = STARRED
-	have = getItemGuids(db.ListItems(ItemFilter{Status: &starred}, 10, false))
+	have = getItemGuids(db.ListItems(ItemFilter{Status: &starred}, 10, false, false))
 	want = []string{"item113", "item212", "item013"}
 	if !reflect.DeepEqual(have, want) {
 		t.Logf("want: %#v", want)
@@ -150,7 +193,7 @@ func TestListItems(t *testing.T) {
 	}
 
 	var unread ItemStatus = UNREAD
-	have = getItemGuids(db.ListItems(ItemFilter{Status: &unread}, 10, false))
+	have = getItemGuids(db.ListItems(ItemFilter{Status: &unread}, 10, false, false))
 	want = []string{"item111", "item121", "item011"}
 	if !reflect.DeepEqual(have, want) {
 		t.Logf("want: %#v", want)
@@ -160,7 +203,7 @@ func TestListItems(t *testing.T) {
 
 	// limit
 
-	have = getItemGuids(db.ListItems(ItemFilter{}, 2, false))
+	have = getItemGuids(db.ListItems(ItemFilter{}, 2, false, false))
 	want = []string{"item111", "item112"}
 	if !reflect.DeepEqual(have, want) {
 		t.Logf("want: %#v", want)
@@ -171,7 +214,7 @@ func TestListItems(t *testing.T) {
 	// filter by search
 	db.SyncSearch()
 	search1 := "title111"
-	have = getItemGuids(db.ListItems(ItemFilter{Search: &search1}, 4, true))
+	have = getItemGuids(db.ListItems(ItemFilter{Search: &search1}, 4, true, false))
 	want = []string{"item111"}
 	if !reflect.DeepEqual(have, want) {
 		t.Logf("want: %#v", want)
@@ -180,7 +223,7 @@ func TestListItems(t *testing.T) {
 	}
 
 	// sort by date
-	have = getItemGuids(db.ListItems(ItemFilter{}, 4, true))
+	have = getItemGuids(db.ListItems(ItemFilter{}, 4, true, false))
 	want = []string{"item013", "item012", "item011", "item212"}
 	if !reflect.DeepEqual(have, want) {
 		t.Logf("want: %#v", want)
@@ -197,7 +240,7 @@ func TestListItemsPaginated(t *testing.T) {
 	item121 := getItem(db, "item121")
 
 	// all, newest first
-	have := getItemGuids(db.ListItems(ItemFilter{After: &item012.Id}, 3, true))
+	have := getItemGuids(db.ListItems(ItemFilter{After: &item012.Id}, 3, true, false))
 	want := []string{"item011", "item212", "item211"}
 	if !reflect.DeepEqual(have, want) {
 		t.Logf("want: %#v", want)
@@ -207,7 +250,9 @@ func TestListItemsPaginated(t *testing.T) {
 
 	// unread, newest first
 	unread := UNREAD
-	have = getItemGuids(db.ListItems(ItemFilter{After: &item012.Id, Status: &unread}, 3, true))
+	have = getItemGuids(
+		db.ListItems(ItemFilter{After: &item012.Id, Status: &unread}, 3, true, false),
+	)
 	want = []string{"item011", "item121", "item111"}
 	if !reflect.DeepEqual(have, want) {
 		t.Logf("want: %#v", want)
@@ -217,7 +262,9 @@ func TestListItemsPaginated(t *testing.T) {
 
 	// starred, oldest first
 	starred := STARRED
-	have = getItemGuids(db.ListItems(ItemFilter{After: &item121.Id, Status: &starred}, 3, false))
+	have = getItemGuids(
+		db.ListItems(ItemFilter{After: &item121.Id, Status: &starred}, 3, false, false),
+	)
 	want = []string{"item212", "item013"}
 	if !reflect.DeepEqual(have, want) {
 		t.Logf("want: %#v", want)
@@ -233,7 +280,7 @@ func TestMarkItemsRead(t *testing.T) {
 	db1 := testDB()
 	testItemsSetup(db1)
 	db1.MarkItemsRead(MarkFilter{})
-	have := getItemGuids(db1.ListItems(ItemFilter{Status: &read}, 10, false))
+	have := getItemGuids(db1.ListItems(ItemFilter{Status: &read}, 10, false, false))
 	want := []string{
 		"item111", "item112", "item121", "item122",
 		"item211", "item011", "item012",
@@ -247,7 +294,7 @@ func TestMarkItemsRead(t *testing.T) {
 	db2 := testDB()
 	scope2 := testItemsSetup(db2)
 	db2.MarkItemsRead(MarkFilter{FolderID: &scope2.folder1.Id})
-	have = getItemGuids(db2.ListItems(ItemFilter{Status: &read}, 10, false))
+	have = getItemGuids(db2.ListItems(ItemFilter{Status: &read}, 10, false, false))
 	want = []string{
 		"item111", "item112", "item121", "item122",
 		"item211", "item012",
@@ -261,7 +308,7 @@ func TestMarkItemsRead(t *testing.T) {
 	db3 := testDB()
 	scope3 := testItemsSetup(db3)
 	db3.MarkItemsRead(MarkFilter{FeedID: &scope3.feed11.Id})
-	have = getItemGuids(db3.ListItems(ItemFilter{Status: &read}, 10, false))
+	have = getItemGuids(db3.ListItems(ItemFilter{Status: &read}, 10, false, false))
 	want = []string{
 		"item111", "item112", "item122",
 		"item211", "item012",
@@ -274,57 +321,111 @@ func TestMarkItemsRead(t *testing.T) {
 }
 
 func TestDeleteOldItems(t *testing.T) {
-	extraItems := 10
+	now := time.Now().UTC()
+	starred := STARRED
 
-	now := time.Now()
-	db := testDB()
-	feed := db.CreateFeed("feed", "", "", "http://test.com/feed11.xml", nil)
+	t.Run("keeps at least 50 items", func(t *testing.T) {
+		db := testDB()
+		feed := db.CreateFeed("f", "", "", "http://f.xml", nil)
+		items := make([]Item, 100)
+		for i := range 100 {
+			items[i] = Item{GUID: strconv.Itoa(i), FeedId: feed.Id, Date: now.Add(time.Duration(i) * time.Hour * 24)}
+		}
+		db.CreateItems(items)
 
-	items := make([]Item, 0)
-	for i := 0; i < itemsKeepSize+extraItems; i++ {
-		istr := strconv.Itoa(i)
-		items = append(items, Item{
-			GUID:   istr,
-			FeedId: feed.Id,
-			Title:  istr,
-			Date:   now.Add(time.Hour * time.Duration(i)),
-		})
-	}
-	db.CreateItems(items)
-	
-	db.SetFeedSize(feed.Id, itemsKeepSize)
-	var feedSize int
-	err := db.db.QueryRow(
-		`select size from feed_sizes where feed_id = ?`, feed.Id,
-	).Scan(&feedSize)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if feedSize != itemsKeepSize {
-		t.Fatalf(
-			"expected feed size to get updated\nwant: %d\nhave: %d", 
-			itemsKeepSize+extraItems,
-			feedSize,
-		)
-	}
+		// // Set 1 recent (latest), 100 old (100 days ago)
+		db.db.Exec(`update items set last_arrived = :la where guid = "99"`, sql.Named("la", now))
+		db.db.Exec(`update items set last_arrived = :la where guid != "99"`, sql.Named("la", now.Add(-time.Hour*24*100)))
 
-	// expire only the first 3 articles
-	_, err = db.db.Exec(
-		`update items set date_arrived = ?
-		where id in (select id from items limit 3)`,
-		now.Add(-time.Hour*time.Duration(itemsKeepDays*24)),
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
+		db.DeleteOldItems()
+		have := db.CountItems(ItemFilter{FeedID: &feed.Id})
+		if have != 50 {
+			t.Errorf("expected 50 items, have %d", have)
+		}
+	})
 
-	db.DeleteOldItems()
-	feedItems := db.ListItems(ItemFilter{FeedID: &feed.Id}, 1000, false)
-	if len(feedItems) != len(items)-3 {
-		t.Fatalf(
-			"invalid number of old items kept\nwant: %d\nhave: %d",
-			len(items)-3,
-			len(feedItems),
-		)
-	}
+	t.Run("keeps all less than 90 days old", func(t *testing.T) {
+		db := testDB()
+		feed := db.CreateFeed("f", "", "", "http://f.xml", nil)
+		items := make([]Item, 100)
+		for i := 0; i < 100; i++ {
+			items[i] = Item{GUID: strconv.Itoa(i), FeedId: feed.Id, Date: now.Add(time.Duration(i) * time.Second)}
+		}
+		db.CreateItems(items)
+
+		// Latest item at "now"
+		// All others at 80 days ago (keep)
+		db.db.Exec(`update items set last_arrived = :la where guid = "99"`, sql.Named("la", now))
+		db.db.Exec(`update items set last_arrived = :la where guid != "99"`, sql.Named("la", now.Add(-time.Hour*24*80)))
+
+		db.DeleteOldItems()
+		have := db.CountItems(ItemFilter{FeedID: &feed.Id})
+		if have != 100 {
+			t.Errorf("expected 100 items, have %d", have)
+		}
+	})
+
+	t.Run("keeps starred", func(t *testing.T) {
+		db := testDB()
+		feed := db.CreateFeed("f", "", "", "http://f.xml", nil)
+		items := make([]Item, 100)
+		for i := 0; i < 100; i++ {
+			items[i] = Item{GUID: strconv.Itoa(i), FeedId: feed.Id, Date: now.Add(time.Duration(i) * time.Second)}
+		}
+		db.CreateItems(items)
+
+		// Set all to 100 days ago, except one recent
+		db.db.Exec(`update items set last_arrived = :la`, sql.Named("la", now.Add(-time.Hour*24*100)))
+		db.db.Exec(`update items set last_arrived = :la where guid = "99"`, sql.Named("la", now))
+		// Star 10 old items that would otherwise be deleted (rn > 50 and old)
+		db.db.Exec(`update items set status = :s where cast(guid as integer) < 10`, sql.Named("s", starred))
+
+		db.DeleteOldItems()
+		have := db.CountItems(ItemFilter{FeedID: &feed.Id})
+		// 50 (limit) + 10 (starred) = 60 items should remain.
+		if have != 60 {
+			t.Errorf("expected 60 items, have %d", have)
+		}
+	})
+}
+
+
+
+func TestCreateItemsLastArrived(t *testing.T) {
+	synctest.Test(t, func(t *testing.T) {
+		db := testDB()
+		defer db.db.Close()
+		feed := db.CreateFeed("test feed", "", "", "http://example.com/feed", nil)
+
+		item := Item{
+			GUID:   "item1",
+			FeedId: feed.Id,
+			Title:  "Title 1",
+			Date:   time.Now(),
+		}
+
+		// 1. Initial creation
+		db.CreateItems([]Item{item})
+
+		var lastArrived1 time.Time
+		err := db.db.QueryRow("select last_arrived from items where guid = ?", item.GUID).Scan(&lastArrived1)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		time.Sleep(time.Second * 10)
+
+		// 2. Update on conflict
+		db.CreateItems([]Item{item})
+
+		var lastArrived2 time.Time
+		err = db.db.QueryRow("select last_arrived from items where guid = ?", item.GUID).Scan(&lastArrived2)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if !lastArrived2.After(lastArrived1) {
+			t.Errorf("expected last_arrived to be updated. old: %v, new: %v", lastArrived1, lastArrived2)
+		}
+	})
 }

src/storage/migration.go

@@ -4,6 +4,7 @@ import (
 	"database/sql"
 	"fmt"
 	"log"
+	"time"
 )
 
 var migrations = []func(*sql.Tx) error{
@@ -14,13 +15,20 @@ var migrations = []func(*sql.Tx) error{
 	m05_move_description_to_content,
 	m06_fill_missing_dates,
 	m07_add_feed_size,
+	m08_normalize_datetime,
+	m09_change_item_index,
+	m10_add_item_medialinks,
+	m11_add_item_last_arrived,
+	m12_remove_feed_sizes,
 }
 
 var maxVersion = int64(len(migrations))
 
 func migrate(db *sql.DB) error {
 	var version int64
-	db.QueryRow("pragma user_version").Scan(&version)
+	if err := db.QueryRow("pragma user_version").Scan(&version); err != nil {
+		return err
+	}
 
 	if version >= maxVersion {
 		return nil
@@ -271,3 +279,69 @@ func m07_add_feed_size(tx *sql.Tx) error {
 	_, err := tx.Exec(sql)
 	return err
 }
+
+func m08_normalize_datetime(tx *sql.Tx) error {
+	rows, err := tx.Query(`select id, date_arrived from items;`)
+	if err != nil {
+		return err
+	}
+	for rows.Next() {
+		var id int64
+		var dateArrived time.Time
+		err = rows.Scan(&id, &dateArrived)
+		if err != nil {
+			return err
+		}
+		_, err = tx.Exec(`update items set date_arrived = :date_arrived where id = :id;`,
+			sql.Named("date_arrived", dateArrived.UTC()),
+			sql.Named("id", id),
+		)
+		if err != nil {
+			return err
+		}
+	}
+	_, err = tx.Exec(`update items set date = strftime('%Y-%m-%d %H:%M:%f', date);`)
+	return err
+}
+
+func m09_change_item_index(tx *sql.Tx) error {
+	sql := `
+        drop index if exists idx_item_status;
+		create index if not exists idx_item__date_id_status on items(date,id,status);
+	`
+	_, err := tx.Exec(sql)
+	return err
+}
+
+func m10_add_item_medialinks(tx *sql.Tx) error {
+	sql := `
+		alter table items add column media_links json;
+		update items set media_links = case
+			when coalesce(image, '') != '' and coalesce(podcast_url, '') != ''
+			then json_array(json_object('type', 'image', 'url', image), json_object('type', 'audio', 'url', podcast_url))
+
+			when coalesce(image, '') != ''
+			then json_array(json_object('type', 'image', 'url', image))
+
+			when coalesce(podcast_url, '') != ''
+			then json_array(json_object('type', 'audio', 'url', podcast_url))
+
+			else null
+		end;
+		alter table items drop column image;
+		alter table items drop column podcast_url;
+	`
+	_, err := tx.Exec(sql)
+	return err
+}
+
+func m11_add_item_last_arrived(tx *sql.Tx) error {
+	sql := `alter table items add column last_arrived datetime`
+	_, err := tx.Exec(sql)
+	return err
+}
+
+func m12_remove_feed_sizes(tx *sql.Tx) error {
+	_, err := tx.Exec(`drop table if exists feed_sizes`)
+	return err
+}

src/storage/settings.go

@@ -1,12 +1,13 @@
 package storage
 
 import (
+	"database/sql"
 	"encoding/json"
 	"log"
 )
 
-func settingsDefaults() map[string]interface{} {
-	return map[string]interface{}{
+func settingsDefaults() map[string]any {
+	return map[string]any{
 		"filter":            "",
 		"feed":              "",
 		"feed_list_width":   300,
@@ -19,8 +20,8 @@ func settingsDefaults() map[string]interface{} {
 	}
 }
 
-func (s *Storage) GetSettingsValue(key string) interface{} {
-	row := s.db.QueryRow(`select val from settings where key=?`, key)
+func (s *Storage) GetSettingsValue(key string) any {
+	row := s.db.QueryRow(`select val from settings where key=:key`, sql.Named("key", key))
 	if row == nil {
 		return settingsDefaults()[key]
 	}
@@ -29,7 +30,7 @@ func (s *Storage) GetSettingsValue(key string) interface{} {
 	if len(val) == 0 {
 		return nil
 	}
-	var valDecoded interface{}
+	var valDecoded any
 	if err := json.Unmarshal([]byte(val), &valDecoded); err != nil {
 		log.Print(err)
 		return nil
@@ -47,7 +48,7 @@ func (s *Storage) GetSettingsValueInt64(key string) int64 {
 	return 0
 }
 
-func (s *Storage) GetSettings() map[string]interface{} {
+func (s *Storage) GetSettings() map[string]any {
 	result := settingsDefaults()
 	rows, err := s.db.Query(`select key, val from settings;`)
 	if err != nil {
@@ -57,7 +58,7 @@ func (s *Storage) GetSettings() map[string]interface{} {
 	for rows.Next() {
 		var key string
 		var val []byte
-		var valDecoded interface{}
+		var valDecoded any
 
 		rows.Scan(&key, &val)
 		if err = json.Unmarshal([]byte(val), &valDecoded); err != nil {
@@ -69,7 +70,7 @@ func (s *Storage) GetSettings() map[string]interface{} {
 	return result
 }
 
-func (s *Storage) UpdateSettings(kv map[string]interface{}) bool {
+func (s *Storage) UpdateSettings(kv map[string]any) bool {
 	defaults := settingsDefaults()
 	for key, val := range kv {
 		if defaults[key] == nil {
@@ -81,9 +82,10 @@ func (s *Storage) UpdateSettings(kv map[string]interface{}) bool {
 			return false
 		}
 		_, err = s.db.Exec(`
-			insert into settings (key, val) values (?, ?)
-			on conflict (key) do update set val=?`,
-			key, valEncoded, valEncoded,
+			insert into settings (key, val) values (:key, :val)
+			on conflict (key) do update set val=:val`,
+			sql.Named("key", key),
+			sql.Named("val", valEncoded),
 		)
 		if err != nil {
 			log.Print(err)

src/storage/storage.go

@@ -2,6 +2,9 @@ package storage
 
 import (
 	"database/sql"
+	"log"
+	"strings"
+
 	_ "github.com/mattn/go-sqlite3"
 )
 
@@ -10,14 +13,17 @@ type Storage struct {
 }
 
 func New(path string) (*Storage, error) {
+	if pos := strings.IndexRune(path, '?'); pos == -1 {
+		params := "_journal=WAL&_sync=NORMAL&_busy_timeout=5000&cache=shared"
+		log.Printf("opening db with params: %s", params)
+		path = path + "?" + params
+	}
+
 	db, err := sql.Open("sqlite3", path)
 	if err != nil {
 		return nil, err
 	}
 
-	// TODO: https://foxcpp.dev/articles/the-right-way-to-use-go-sqlite3
-	db.SetMaxOpenConns(1)
-
 	if err = migrate(db); err != nil {
 		return nil, err
 	}

src/systray/NOTES.txt

@@ -1,12 +0,0 @@
-taken from:
-
-repo:
-https://github.com/getlantern/systray
-
-hash:
-2c0986dda9aea361e925f90e848d9036be7b5367
-
-changes:
-
--removed `getlantern/golog` dependency
--prevent from compiling in linux

src/systray/README.md

@@ -1,120 +0,0 @@
-systray is a cross-platform Go library to place an icon and menu in the notification area.
-
-## Features
-
-* Supported on Windows, macOS, and Linux
-* Menu items can be checked and/or disabled
-* Methods may be called from any Goroutine
-
-## API
-
-```go
-func main() {
-	systray.Run(onReady, onExit)
-}
-
-func onReady() {
-	systray.SetIcon(icon.Data)
-	systray.SetTitle("Awesome App")
-	systray.SetTooltip("Pretty awesome超级棒")
-	mQuit := systray.AddMenuItem("Quit", "Quit the whole app")
-
-	// Sets the icon of a menu item. Only available on Mac and Windows.
-	mQuit.SetIcon(icon.Data)
-}
-
-func onExit() {
-	// clean up here
-}
-```
-
-See [full API](https://pkg.go.dev/github.com/getlantern/systray?tab=doc) as well as [CHANGELOG](https://github.com/getlantern/systray/tree/master/CHANGELOG.md).
-
-## Try the example app!
-
-Have go v1.12+ or higher installed? Here's an example to get started on macOS:
-
-```sh
-git clone https://github.com/getlantern/systray
-cd example
-env GO111MODULE=on go build
-./example
-```
-
-On Windows, you should build like this:
-
-```
-env GO111MODULE=on go build -ldflags "-H=windowsgui"
-```
-
-The following text will then appear on the console:
-
-
-```sh
-go: finding github.com/skratchdot/open-golang latest
-go: finding github.com/getlantern/systray latest
-go: finding github.com/getlantern/golog latest
-```
-
-Now look for *Awesome App* in your menu bar!
-
-![Awesome App screenshot](example/screenshot.png)
-
-## The Webview example
-
-The code under `webview_example` is to demostrate how it can co-exist with other UI elements. Note that the example doesn't work on macOS versions older than 10.15 Catalina.
-
-## Platform notes
-
-### Linux
-
-* Building apps requires gcc as well as the `gtk3` and `libappindicator3` development headers to be installed. For Debian or Ubuntu, you may install these using:
-
-```sh
-sudo apt-get install gcc libgtk-3-dev libappindicator3-dev
-```
-
-On Linux Mint, `libxapp-dev` is also required .
-
-To build `webview_example`, you also need to install `libwebkit2gtk-4.0-dev` and remove `webview_example/rsrc.syso` which is required on Windows.
-
-### Windows
-
-* To avoid opening a console at application startup, use these compile flags:
-
-```sh
-go build -ldflags -H=windowsgui
-```
-
-### macOS
-
-On macOS, you will need to create an application bundle to wrap the binary; simply folders with the following minimal structure and assets:
-
-```
-SystrayApp.app/
-  Contents/
-    Info.plist
-    MacOS/
-      go-executable
-    Resources/
-      SystrayApp.icns
-```
-
-When running as an app bundle, you may want to add one or both of the following to your Info.plist:
-
-```xml
-<!-- avoid having a blurry icon and text -->
-	<key>NSHighResolutionCapable</key>
-	<string>True</string>
-
-	<!-- avoid showing the app on the Dock -->
-	<key>LSUIElement</key>
-	<string>1</string>
-```
-
-Consult the [Official Apple Documentation here](https://developer.apple.com/library/archive/documentation/CoreFoundation/Conceptual/CFBundles/BundleTypes/BundleTypes.html#//apple_ref/doc/uid/10000123i-CH101-SW1).
-
-## Credits
-
-- https://github.com/xilp/systray
-- https://github.com/cratonica/trayhost

src/systray/_systray_linux.c

@@ -1,268 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.h>
-#include <libappindicator/app-indicator.h>
-#include "systray.h"
-
-static AppIndicator *global_app_indicator;
-static GtkWidget *global_tray_menu = NULL;
-static GList *global_menu_items = NULL;
-static char temp_file_name[PATH_MAX] = "";
-
-typedef struct {
-	GtkWidget *menu_item;
-	int menu_id;
-	long signalHandlerId;
-} MenuItemNode;
-
-typedef struct {
-	int menu_id;
-	int parent_menu_id;
-	char* title;
-	char* tooltip;
-	short disabled;
-	short checked;
-	short isCheckable;
-} MenuItemInfo;
-
-void registerSystray(void) {
-	gtk_init(0, NULL);
-	global_app_indicator = app_indicator_new("systray", "", APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
-	app_indicator_set_status(global_app_indicator, APP_INDICATOR_STATUS_ACTIVE);
-	global_tray_menu = gtk_menu_new();
-	app_indicator_set_menu(global_app_indicator, GTK_MENU(global_tray_menu));
-	systray_ready();
-}
-
-int nativeLoop(void) {
-	gtk_main();
-	systray_on_exit();
-	return 0;
-}
-
-void _unlink_temp_file() {
-	if (strlen(temp_file_name) != 0) {
-		int ret = unlink(temp_file_name);
-		if (ret == -1) {
-			printf("failed to remove temp icon file %s: %s\n", temp_file_name, strerror(errno));
-		}
-		temp_file_name[0] = '\0';
-	}
-}
-
-// runs in main thread, should always return FALSE to prevent gtk to execute it again
-gboolean do_set_icon(gpointer data) {
-	_unlink_temp_file();
-	char *tmpdir = getenv("TMPDIR");
-	if (NULL == tmpdir) {
-		tmpdir = "/tmp";
-	}
-	strncpy(temp_file_name, tmpdir, PATH_MAX-1);
-	strncat(temp_file_name, "/systray_XXXXXX", PATH_MAX-1);
-	temp_file_name[PATH_MAX-1] = '\0';
-
-	GBytes* bytes = (GBytes*)data;
-	int fd = mkstemp(temp_file_name);
-	if (fd == -1) {
-		printf("failed to create temp icon file %s: %s\n", temp_file_name, strerror(errno));
-		return FALSE;
-	}
-	gsize size = 0;
-	gconstpointer icon_data = g_bytes_get_data(bytes, &size);
-	ssize_t written = write(fd, icon_data, size);
-	close(fd);
-	if(written != size) {
-		printf("failed to write temp icon file %s: %s\n", temp_file_name, strerror(errno));
-		return FALSE;
-	}
-	app_indicator_set_icon_full(global_app_indicator, temp_file_name, "");
-	app_indicator_set_attention_icon_full(global_app_indicator, temp_file_name, "");
-	g_bytes_unref(bytes);
-	return FALSE;
-}
-
-void _systray_menu_item_selected(int *id) {
-	systray_menu_item_selected(*id);
-}
-
-GtkMenuItem* find_menu_by_id(int id) {
-	GList* it;
-	for(it = global_menu_items; it != NULL; it = it->next) {
-		MenuItemNode* item = (MenuItemNode*)(it->data);
-		if(item->menu_id == id) {
-			return GTK_MENU_ITEM(item->menu_item);
-		}
-	}
-	return NULL;
-}
-
-// runs in main thread, should always return FALSE to prevent gtk to execute it again
-gboolean do_add_or_update_menu_item(gpointer data) {
-	MenuItemInfo *mii = (MenuItemInfo*)data;
-	GList* it;
-	for(it = global_menu_items; it != NULL; it = it->next) {
-		MenuItemNode* item = (MenuItemNode*)(it->data);
-		if(item->menu_id == mii->menu_id) {
-			gtk_menu_item_set_label(GTK_MENU_ITEM(item->menu_item), mii->title);
-
-			if (mii->isCheckable) {
-				// We need to block the "activate" event, to emulate the same behaviour as in the windows version
-				// A Check/Uncheck does change the checkbox, but does not trigger the checkbox menuItem channel
-				g_signal_handler_block(GTK_CHECK_MENU_ITEM(item->menu_item), item->signalHandlerId);
-				gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item->menu_item), mii->checked == 1);
-				g_signal_handler_unblock(GTK_CHECK_MENU_ITEM(item->menu_item), item->signalHandlerId);
-			}
-			break;
-		}
-	}
-
-	// menu id doesn't exist, add new item
-	if(it == NULL) {
-		GtkWidget *menu_item;
-		if (mii->isCheckable) {
-			menu_item = gtk_check_menu_item_new_with_label(mii->title);
-			gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_item), mii->checked == 1);
-		} else {
-			menu_item = gtk_menu_item_new_with_label(mii->title);
-		}
-		int *id = malloc(sizeof(int));
-		*id = mii->menu_id;
-		long signalHandlerId = g_signal_connect_swapped(
-			G_OBJECT(menu_item),
-			"activate",
-			G_CALLBACK(_systray_menu_item_selected),
-			id
-		);
-
-		if (mii->parent_menu_id == 0) {
-			gtk_menu_shell_append(GTK_MENU_SHELL(global_tray_menu), menu_item);
-		} else {
-			GtkMenuItem* parentMenuItem = find_menu_by_id(mii->parent_menu_id);
-			GtkWidget* parentMenu = gtk_menu_item_get_submenu(parentMenuItem);
-
-			if(parentMenu == NULL) {
-				parentMenu = gtk_menu_new();
-				gtk_menu_item_set_submenu(parentMenuItem, parentMenu);
-			}
-
-			gtk_menu_shell_append(GTK_MENU_SHELL(parentMenu), menu_item);
-		}
-
-		MenuItemNode* new_item = malloc(sizeof(MenuItemNode));
-		new_item->menu_id = mii->menu_id;
-		new_item->signalHandlerId = signalHandlerId;
-		new_item->menu_item = menu_item;
-		GList* new_node = malloc(sizeof(GList));
-		new_node->data = new_item;
-		new_node->next = global_menu_items;
-		if(global_menu_items != NULL) {
-			global_menu_items->prev = new_node;
-		}
-		global_menu_items = new_node;
-		it = new_node;
-	}
-	GtkWidget* menu_item = GTK_WIDGET(((MenuItemNode*)(it->data))->menu_item);
-	gtk_widget_set_sensitive(menu_item, mii->disabled != 1);
-	gtk_widget_show(menu_item);
-
-	free(mii->title);
-	free(mii->tooltip);
-	free(mii);
-	return FALSE;
-}
-
-gboolean do_add_separator(gpointer data) {
-	GtkWidget *separator = gtk_separator_menu_item_new();
-	gtk_menu_shell_append(GTK_MENU_SHELL(global_tray_menu), separator);
-	gtk_widget_show(separator);
-	return FALSE;
-}
-
-// runs in main thread, should always return FALSE to prevent gtk to execute it again
-gboolean do_hide_menu_item(gpointer data) {
-	MenuItemInfo *mii = (MenuItemInfo*)data;
-	GList* it;
-	for(it = global_menu_items; it != NULL; it = it->next) {
-		MenuItemNode* item = (MenuItemNode*)(it->data);
-		if(item->menu_id == mii->menu_id){
-			gtk_widget_hide(GTK_WIDGET(item->menu_item));
-			break;
-		}
-	}
-	return FALSE;
-}
-
-// runs in main thread, should always return FALSE to prevent gtk to execute it again
-gboolean do_show_menu_item(gpointer data) {
-	MenuItemInfo *mii = (MenuItemInfo*)data;
-	GList* it;
-	for(it = global_menu_items; it != NULL; it = it->next) {
-		MenuItemNode* item = (MenuItemNode*)(it->data);
-		if(item->menu_id == mii->menu_id){
-			gtk_widget_show(GTK_WIDGET(item->menu_item));
-			break;
-		}
-	}
-	return FALSE;
-}
-
-// runs in main thread, should always return FALSE to prevent gtk to execute it again
-gboolean do_quit(gpointer data) {
-	_unlink_temp_file();
-	// app indicator doesn't provide a way to remove it, hide it as a workaround
-	app_indicator_set_status(global_app_indicator, APP_INDICATOR_STATUS_PASSIVE);
-	gtk_main_quit();
-	return FALSE;
-}
-
-void setIcon(const char* iconBytes, int length, bool template) {
-	GBytes* bytes = g_bytes_new_static(iconBytes, length);
-	g_idle_add(do_set_icon, bytes);
-}
-
-void setTitle(char* ctitle) {
-	app_indicator_set_label(global_app_indicator, ctitle, "");
-	free(ctitle);
-}
-
-void setTooltip(char* ctooltip) {
-	free(ctooltip);
-}
-
-void setMenuItemIcon(const char* iconBytes, int length, int menuId, bool template) {
-}
-
-void add_or_update_menu_item(int menu_id, int parent_menu_id, char* title, char* tooltip, short disabled, short checked, short isCheckable) {
-	MenuItemInfo *mii = malloc(sizeof(MenuItemInfo));
-	mii->menu_id = menu_id;
-	mii->parent_menu_id = parent_menu_id;
-	mii->title = title;
-	mii->tooltip = tooltip;
-	mii->disabled = disabled;
-	mii->checked = checked;
-	mii->isCheckable = isCheckable;
-	g_idle_add(do_add_or_update_menu_item, mii);
-}
-
-void add_separator(int menu_id) {
-	MenuItemInfo *mii = malloc(sizeof(MenuItemInfo));
-	mii->menu_id = menu_id;
-	g_idle_add(do_add_separator, mii);
-}
-
-void hide_menu_item(int menu_id) {
-	MenuItemInfo *mii = malloc(sizeof(MenuItemInfo));
-	mii->menu_id = menu_id;
-	g_idle_add(do_hide_menu_item, mii);
-}
-
-void show_menu_item(int menu_id) {
-	MenuItemInfo *mii = malloc(sizeof(MenuItemInfo));
-	mii->menu_id = menu_id;
-	g_idle_add(do_show_menu_item, mii);
-}
-
-void quit() {
-	g_idle_add(do_quit, NULL);
-}

src/systray/systray_darwin.go

@@ -1,38 +0,0 @@
-package systray
-
-/*
-#cgo darwin CFLAGS: -DDARWIN -x objective-c -fobjc-arc
-#cgo darwin LDFLAGS: -framework Cocoa -framework WebKit
-
-#include "systray.h"
-*/
-import "C"
-
-import (
-	"unsafe"
-)
-
-// SetTemplateIcon sets the systray icon as a template icon (on Mac), falling back
-// to a regular icon on other platforms.
-// templateIconBytes and regularIconBytes should be the content of .ico for windows and
-// .ico/.jpg/.png for other platforms.
-func SetTemplateIcon(templateIconBytes []byte, regularIconBytes []byte) {
-	cstr := (*C.char)(unsafe.Pointer(&templateIconBytes[0]))
-	C.setIcon(cstr, (C.int)(len(templateIconBytes)), true)
-}
-
-// SetIcon sets the icon of a menu item. Only works on macOS and Windows.
-// iconBytes should be the content of .ico/.jpg/.png
-func (item *MenuItem) SetIcon(iconBytes []byte) {
-	cstr := (*C.char)(unsafe.Pointer(&iconBytes[0]))
-	C.setMenuItemIcon(cstr, (C.int)(len(iconBytes)), C.int(item.id), false)
-}
-
-// SetTemplateIcon sets the icon of a menu item as a template icon (on macOS). On Windows, it
-// falls back to the regular icon bytes and on Linux it does nothing.
-// templateIconBytes and regularIconBytes should be the content of .ico for windows and
-// .ico/.jpg/.png for other platforms.
-func (item *MenuItem) SetTemplateIcon(templateIconBytes []byte, regularIconBytes []byte) {
-	cstr := (*C.char)(unsafe.Pointer(&templateIconBytes[0]))
-	C.setMenuItemIcon(cstr, (C.int)(len(templateIconBytes)), C.int(item.id), true)
-}

src/systray/systray_linux.go

@@ -1,31 +0,0 @@
-// +build never
-
-package systray
-
-/*
-#cgo darwin CFLAGS: -DDARWIN -x objective-c -fobjc-arc
-#cgo darwin LDFLAGS: -framework Cocoa -framework WebKit
-
-#include "systray.h"
-*/
-import "C"
-
-// SetTemplateIcon sets the systray icon as a template icon (on macOS), falling back
-// to a regular icon on other platforms.
-// templateIconBytes and iconBytes should be the content of .ico for windows and
-// .ico/.jpg/.png for other platforms.
-func SetTemplateIcon(templateIconBytes []byte, regularIconBytes []byte) {
-	SetIcon(regularIconBytes)
-}
-
-// SetIcon sets the icon of a menu item. Only works on macOS and Windows.
-// iconBytes should be the content of .ico/.jpg/.png
-func (item *MenuItem) SetIcon(iconBytes []byte) {
-}
-
-// SetTemplateIcon sets the icon of a menu item as a template icon (on macOS). On Windows, it
-// falls back to the regular icon bytes and on Linux it does nothing.
-// templateIconBytes and regularIconBytes should be the content of .ico for windows and
-// .ico/.jpg/.png for other platforms.
-func (item *MenuItem) SetTemplateIcon(templateIconBytes []byte, regularIconBytes []byte) {
-}