This commit is contained in:
Nazar Kanaev 2020-10-20 20:54:05 +01:00
parent b766cb4ac5
commit 6a63d49823
7 changed files with 21 additions and 21 deletions

View File

@ -270,7 +270,7 @@ func listItems(f storage.Feed, db *storage.Storage) ([]storage.Item, error) {
} }
defer res.Body.Close() defer res.Body.Close()
if res.StatusCode / 100 == 4 || res.StatusCode / 100 == 5 { if res.StatusCode/100 == 4 || res.StatusCode/100 == 5 {
errmsg := fmt.Sprintf("Failed to list feed items for %s (status: %d)", f.FeedLink, res.StatusCode) errmsg := fmt.Sprintf("Failed to list feed items for %s (status: %d)", f.FeedLink, res.StatusCode)
return nil, errors.New(errmsg) return nil, errors.New(errmsg)
} }
@ -299,7 +299,7 @@ func init() {
DialContext: (&net.Dialer{ DialContext: (&net.Dialer{
Timeout: 10 * time.Second, Timeout: 10 * time.Second,
}).DialContext, }).DialContext,
DisableKeepAlives: true, DisableKeepAlives: true,
TLSHandshakeTimeout: time.Second * 10, TLSHandshakeTimeout: time.Second * 10,
} }
httpClient := &http.Client{ httpClient := &http.Client{

View File

@ -13,10 +13,10 @@ var feverHandlers = map[string]func(rw http.ResponseWriter, req *http.Request){
"unread_item_ids": FeverFilteredItemIDsHandler, "unread_item_ids": FeverFilteredItemIDsHandler,
"saved_item_ids": FeverFilteredItemIDsHandler, "saved_item_ids": FeverFilteredItemIDsHandler,
"favicons": FeverFaviconsHandler, "favicons": FeverFaviconsHandler,
"items": FeverItemsHandler, "items": FeverItemsHandler,
"links": FeverLinksHandler, "links": FeverLinksHandler,
"mark": FeverMarkHandler, "mark": FeverMarkHandler,
} }
type FeverGroup struct { type FeverGroup struct {

View File

@ -2,9 +2,9 @@ package server
import ( import (
"bytes" "bytes"
"encoding/json"
"encoding/base64"
"compress/gzip" "compress/gzip"
"encoding/base64"
"encoding/json"
"fmt" "fmt"
"github.com/nkanaev/yarr/storage" "github.com/nkanaev/yarr/storage"
"html" "html"
@ -43,7 +43,7 @@ var routes []Route = []Route{
type asset struct { type asset struct {
etag string etag string
body string // base64(gzip(content)) body string // base64(gzip(content))
gzipped *[]byte gzipped *[]byte
decoded *string decoded *string
} }

View File

@ -2,8 +2,8 @@ package server
import ( import (
"encoding/json" "encoding/json"
"net/http"
"log" "log"
"net/http"
) )
func writeJSON(rw http.ResponseWriter, data interface{}) { func writeJSON(rw http.ResponseWriter, data interface{}) {

View File

@ -8,8 +8,8 @@ type HTTPState struct {
FeedID int64 FeedID int64
LastRefreshed time.Time LastRefreshed time.Time
LastModified string LastModified string
Etag string Etag string
} }
func (s *Storage) GetHTTPState(feedID int64) *HTTPState { func (s *Storage) GetHTTPState(feedID int64) *HTTPState {

View File

@ -356,7 +356,7 @@ func (s *Storage) DeleteOldItems() {
delete from items where feed_id = ? and status != ? and date_arrived < ?`, delete from items where feed_id = ? and status != ? and date_arrived < ?`,
feedId, feedId,
STARRED, STARRED,
time.Now().Add(-time.Hour*24*90), // 90 days time.Now().Add(-time.Hour*24*90), // 90 days
) )
if err != nil { if err != nil {
s.log.Print(err) s.log.Print(err)

View File

@ -4,15 +4,15 @@ import "encoding/json"
func settingsDefaults() map[string]interface{} { func settingsDefaults() map[string]interface{} {
return map[string]interface{}{ return map[string]interface{}{
"filter": "", "filter": "",
"feed": "", "feed": "",
"feed_list_width": 300, "feed_list_width": 300,
"item_list_width": 300, "item_list_width": 300,
"sort_newest_first": true, "sort_newest_first": true,
"theme_name": "light", "theme_name": "light",
"theme_font": "", "theme_font": "",
"theme_size": 1, "theme_size": 1,
"refresh_rate": 0, "refresh_rate": 0,
} }
} }