v2.4

.github/workflows/build.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   build_macos:
     name: Build for MacOS
-    runs-on: macos-10.15
+    runs-on: macos-13
     steps:
     - name: "Checkout"
       uses: actions/checkout@v2
@@ -16,7 +16,7 @@ jobs:
     - name: "Setup Go"
       uses: actions/setup-go@v2
       with:
-        go-version: '^1.16'
+        go-version: '^1.17'
     - name: Cache Go Modules
       uses: actions/cache@v2
       with:
@@ -34,7 +34,7 @@ jobs:
 
   build_windows:
     name: Build for Windows
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
     - name: "Checkout"
       uses: actions/checkout@v2
@@ -43,7 +43,7 @@ jobs:
     - name: "Setup Go"
       uses: actions/setup-go@v2
       with:
-        go-version: '^1.16'
+        go-version: '^1.17'
     - name: Cache Go Modules
       uses: actions/cache@v2
       with:
@@ -61,7 +61,7 @@ jobs:
 
   build_linux:
     name: Build for Linux
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
     - name: "Checkout"
       uses: actions/checkout@v2
@@ -70,7 +70,7 @@ jobs:
     - name: "Setup Go"
       uses: actions/setup-go@v2
       with:
-        go-version: '^1.16'
+        go-version: '^1.17'
     - name: Cache Go Modules
       uses: actions/cache@v2
       with:

build.md

@@ -1,6 +1,6 @@
 ## Compilation
 
-Install `Go >= 1.16` and `GCC`. Get the source code:
+Install `Go >= 1.17` and `GCC`. Get the source code:
 
     git clone https://github.com/nkanaev/yarr.git
 

go.mod

@@ -1,9 +1,11 @@
 module github.com/nkanaev/yarr
 
-go 1.16
+go 1.17
 
 require (
 	github.com/mattn/go-sqlite3 v1.14.7
 	golang.org/x/net v0.8.0
 	golang.org/x/sys v0.6.0
 )
+
+require golang.org/x/text v0.8.0 // indirect

makefile

@@ -1,4 +1,4 @@
-VERSION=2.3
+VERSION=2.4
 GITHASH=$(shell git rev-parse --short=8 HEAD)
 
 CGO_ENABLED=1

src/assets/index.html

@@ -133,7 +133,7 @@
                            :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)}">
+                                              && (!itemSelectedDetails || (feedsById[itemSelectedDetails.feed_id] || {}).folder_id != 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"
@@ -274,7 +274,7 @@
                                 <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>
@@ -338,7 +338,7 @@
                 <div class="content-wrapper">
                     <h1><b>{{ itemSelectedDetails.title || 'untitled' }}</b></h1>
                     <div class="text-muted">
-                        <div>{{ feedsById[itemSelectedDetails.feed_id].title }}</div>
+                        <div>{{ (feedsById[itemSelectedDetails.feed_id] || {}).title }}</div>
                         <time>{{ formatDate(itemSelectedDetails.date) }}</time>
                     </div>
                     <hr>

src/assets/javascripts/app.js

@@ -410,6 +410,7 @@ var vm = new Vue({
     refreshItems: function(loadMore) {
       if (this.feedSelected === null) {
         vm.items = []
+        vm.itemsHasMore = false
         return
       }
 
@@ -516,10 +517,7 @@ 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.feedSelected = null
-            vm.items = []
-            vm.feedSelected = ''
-          }
           vm.refreshStats()
           vm.refreshFeeds()
         })
@@ -536,12 +534,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
+          vm.feedSelected = null
-          var isSelected = !vm.feedSelected
-            || (vm.feedSelected === 'feed:'+feed.id
-            || (feed.folder_id && vm.feedSelected === 'folder:'+feed.folder_id));
-          if (isSelected) vm.feedSelected = null
-
           vm.refreshStats()
           vm.refreshFeeds()
         })

src/assets/stylesheets/app.css

@@ -2,8 +2,11 @@
   display: none !important;
 }
 
-body {
+html {
   font-size: 15px !important;
+}
+
+body {
   overscroll-behavior: none;
 }
 

vendor/github.com/mattn/go-sqlite3/go.mod

@@ -1,3 +0,0 @@
-module github.com/mattn/go-sqlite3
-
-go 1.12

vendor/modules.txt

@@ -1,16 +1,17 @@
 # github.com/mattn/go-sqlite3 v1.14.7
-## explicit
+## explicit; go 1.12
 github.com/mattn/go-sqlite3
 # golang.org/x/net v0.8.0
-## explicit
+## explicit; go 1.17
 golang.org/x/net/html
 golang.org/x/net/html/atom
 golang.org/x/net/html/charset
 # golang.org/x/sys v0.6.0
-## explicit
+## explicit; go 1.17
 golang.org/x/sys/internal/unsafeheader
 golang.org/x/sys/windows
 # golang.org/x/text v0.8.0
+## explicit; go 1.17
 golang.org/x/text/encoding
 golang.org/x/text/encoding/charmap
 golang.org/x/text/encoding/htmlindex