Merge branch 'master' into commands

.github/FUNDING.yml

@@ -1,2 +1,2 @@
-github: makeworld-the-better-one
+github: makew0rld
 ko_fi: makeworld

.github/workflows/golangci-lint.yml

@@ -14,16 +14,26 @@ on:
       - '**.desktop'
       - 'LICENSE'
 
+permissions:
+  # Required: allow read access to the content for analysis.
+  contents: read
+  # Optional: allow read access to pull request. Use with `only-new-issues` option.
+  pull-requests: read
+  # Optional: allow write access to checks to allow the action to annotate code in the PR.
+  checks: write
+
 jobs:
   golangci:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: stable
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v6
         with:
-          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.43
+          version: v1.60
           # Optional: show only new issues if it's a pull request. The default value is `false`.
           only-new-issues: true

.github/workflows/goreleaser.yml

@@ -16,11 +16,11 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.22
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
         with:
           version: 0.x
           args: release --rm-dist
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_REPOS }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/homebrew.yml

@@ -8,10 +8,9 @@ jobs:
     name: Bump Homebrew formula
     runs-on: ubuntu-latest
     steps:
-      - uses: mislav/bump-homebrew-formula-action@v1
+      - uses: mislav/bump-homebrew-formula-action@v3
         with:
           # A PR will be sent to github.com/Homebrew/homebrew-core to update this formula:
           formula-name: amfora
-          download-url: https://github.com/makeworld-the-better-one/amfora.git
         env:
           COMMITTER_TOKEN: ${{ secrets.HOMEBREW_TOKEN }}

.github/workflows/test.yml

@@ -19,25 +19,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: ['1.15', '1.16', '1.17']
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        go-version: ['1.22', '1.23']
+        os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
+    - uses: actions/checkout@v4
     - name: Install Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go-version }}
     - name: Install make on Windows
       if: matrix.os == 'windows-latest'
       run: choco install make
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - uses: actions/cache@v2
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: |
-          ${{ runner.os }}-go-
     - name: Test
       run: |
         go test -race ./...

CHANGELOG.md

@@ -6,23 +6,41 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added
+- Search in pages (#36, #240)
+
+### Changed
+- Use preformatted_text color for rendering plain text files (#351)
+
+
+## [1.10.0] - 2024-03-17
+### Added
 - Syntax highlighting for preformatted text blocks with alt text (#252, #263, [wiki page](https://github.com/makeworld-the-better-one/amfora/wiki/Source-Code-Highlighting))
 - [Client certificates](https://github.com/makeworld-the-better-one/amfora/wiki/Client-Certificates) can be restricted to certain paths of a host (#115)
 - `header` config option in `[subscriptions]` to allow disabling the header text on the subscriptions page (#191)
 - Selected link and scroll position stays for non-cached pages (#122)
 - Keybinding to open URL with URL handler instead of configured proxy (#143)
-- `include` theme key to import themes from an external file (#154)
+- `include` theme key to import themes from an external file (#154, #290)
 - Support SOCKS5 proxying by setting `AMFORA_SOCKS5` environment variable (#155)
+- When bookmarking a page, the first level one heading is suggested as the name (#267, #293)
+- Confirmation prompts for URL schemes in new `[url-prompts]` config section (#301, #302)
 
 ### Changed
 - Center text automatically, removing `left_margin` from the config (#233)
 - `max_width` defaults to 80 columns instead of 100 (#233)
 - Tabs have the domain of the current page instead of numbers (#202)
+- Closing Amfora with <kbd>q</kbd> was removed in favor of <kbd>Shift-q</kbd> (#243)
+- Paging up or down scrolls by 50% instead of 75%, to match `less` (#303)
+- Update deps, require Go 1.17 (#336)
+- Show local directory index file if available (#319)
+- Updated Project Gemini URLs (#342)
 
 ### Fixed
 - Modal can't be closed when opening non-gemini text URLs from the commandline (#283, #284)
 - External programs started by Amfora remain as zombie processes (#219)
 - Prevent link lines (and other types) from being wider than the `max_width` setting (#280)
+- `new:7` on new tab page fails to open link (#306)
+- Slashes aren't decoded in redirect URLs (#322, #324)
+- Typing `localhost` in the bottom bar actually loads localhost instead of searching (#326, #327)
 
 
 ## [1.9.2] - 2021-12-10

README.md

@@ -19,6 +19,10 @@ It also aims to be completely cross platform, with full Windows support. If you'
 
 It fully passes Sean Conman's client torture test, as well as the Egsam one.
 
+## Project Status
+
+Amfora is in maintenance mode. When possible, I’ll make/merge bug fixes, and maybe slowly merge feature PRs by others. See my [blog post](https://www.makeworld.space/2023/08/bye_gemini.html) for details.
+
 ## Installation
 
 ### Binary
@@ -114,40 +118,32 @@ brew upgrade --fetch-HEAD amfora
 </details>
 
 
-## Features / Roadmap
+## Features
 Features in *italics* are in the master branch, but not in the latest release.
 
-- [x] URL browsing with TOFU and error handling
-- [x] Tabbed browsing
-- [x] Support ANSI color codes on pages, even for Windows
-- [x] Styled page content (headings, links)
-- [x] Basic forward/backward history, for each tab
-- [x] Input (Status Code 10 & 11)
-- [x] Multiple charset support (over 55)
-- [x] Built-in search (uses geminispace.info by default)
-- [x] Bookmarks
-- [x] Download pages and arbitrary data
-- [x] Theming
+- URL browsing with TOFU and error handling
+- Tabbed browsing
+- Support ANSI color codes on pages, even for Windows
+- Styled page content (headings, links)
+- Basic forward/backward history, for each tab
+- Input (Status Code 10 & 11)
+- Multiple charset support (over 55)
+- Built-in search (uses geminispace.info by default)
+- Bookmarks
+- Download pages and arbitrary data
+- Theming
   - Check out the [user contributed themes](https://github.com/makeworld-the-better-one/amfora/tree/master/contrib/themes)!
-- [x] Proxying
+- Proxying
   - Schemes like Gopher or HTTP can be proxied through a Gemini server
-- [x] Client certificate support
-  - [ ] Full client certificate UX within the client
-    - Create transient and permanent certs within the client, per domain
-    - Manage and browse them
-    - Similar to [Kristall](https://github.com/MasterQ32/kristall)
-    - https://lists.orbitalfox.eu/archives/gemini/2020/001400.html
-- [x] Subscriptions
+- Client certificate support
+- Subscriptions
   - Subscribing to RSS, Atom, and [JSON Feeds](https://jsonfeed.org/) are all supported
   - So is subscribing to a page, to know when it changes
-- [x] Open non-text files in another application
-  - [x] Ability to stream content instead of downloading it first
-- [x] *Highlighting of preformatted code blocks that list a language in the alt text*
-- [x] *Run custom commands using the current or selected URL as an argument*
-- [ ] Stream support
-- [ ] Table of contents for pages
-- [ ] Search in pages with <kbd>Ctrl-F</kbd>
-- [ ] Persistent history
+- Open non-text files in another application
+  - Ability to stream content instead of downloading it first
+- Highlighting of preformatted code blocks that list a language in the alt text
+- *Search in pages with <kbd>Ctrl-F</kbd>*
+- *Run custom commands using the current or selected URL as an argument*
 
 
 ## Usage & Configuration

THANKS.md

@@ -26,3 +26,9 @@ Thank you to the following contributors, who have helped make Amfora great. FOSS
 * mooff (@awfulcooking)
 * Josias (@justjosias)
 * mntn (@mntn-xyz)
+* Maxime Bouillot (@Arkaeriit)
+* Emily (@emily-is-my-username)
+* Autumn! (@autumnull)
+* William Rehwinkel (@FiskFan1999)
+* Frank Seifferth (@seifferth)
+* Robin Schubert (@Schubisu)