Merge pull request #158 from neo451/dev

fix(ui): resolve links earlier for images

lua/feed/db/local.lua

@@ -90,16 +90,20 @@ end
 ---@param k any
 ---@return function | feed.entry
 function M:__index(k)
+   if not k then
+      return
+   end
    local ms = rawget(M, k)
    if ms then
       return ms
+   else
+      local r = mem[k]
+      if not r then
+         r = Path.load(self.dir / "object" / k)
+         mem[k] = r
+      end
+      return r
    end
-   local r = mem[k]
-   if not r then
-      r = Path.load(self.dir / "object" / k)
-      mem[k] = r
-   end
-   return r
 end
 
 ---@param id string

lua/feed/fetch.lua

@@ -57,8 +57,8 @@ function M.update_feed_co(url, opts)
       entry.content = nil
       local id = vim.fn.sha256(entry.link)
       local fp = tostring(db.dir / "data" / id)
-      ut.save_file(fp, content)
       db[id] = entry
+      ut.save_file(fp, content)
    end
 
    feeds[url] = feeds[url] or {}

lua/feed/server/init.lua

@@ -173,11 +173,13 @@ return {
       local state = require("feed.ui.state")
       local Config = require("feed.config")
 
-      local entries = db:filter(state.query)
+      if not state.entries then
+         state.entries = db:filter(Config.search.default_query)
+      end
 
       router:get("/", function(req, res)
          local acc = {}
-         for _, id in ipairs(entries) do
+         for _, id in ipairs(state.entries) do
             acc[#acc + 1] = router:render("entry", {
                id = id,
                title = db[id].title,

lua/feed/ui.lua

@@ -82,6 +82,7 @@ local function image_attach(buf)
 end
 
 local body_transforms = {
+   require("feed.utils").resolve_urls,
    require("feed.utils").remove_urls,
    -- TODO: get rid of html headers and stuff
    -- TODO: allow user
@@ -169,7 +170,7 @@ M.show_index = function()
          wo = Config.options.index.wo,
          bo = Config.options.index.bo,
          keys = Config.keys.index,
-         zindex = 8,
+         zindex = 3,
       })
    end
 
@@ -245,7 +246,7 @@ local function show_entry(ctx)
       keys = Config.keys.entry,
       ft = "markdown",
       zen = Config.zen.enabled,
-      zindex = 10,
+      zindex = 5,
    })
 
    if ctx.link then

lua/feed/utils/url.lua

@@ -92,6 +92,25 @@ M.remove_urls = function(body, id)
    return body
 end
 
+---@param body string
+---@param id string
+---@return string
+M.resolve_urls = function(body, id)
+   local base = require("feed.db")[id].link
+   local text_n_links = M.get_urls(body)
+   for _, v in ipairs(text_n_links) do
+      local link = v[2]
+      local resolved = link
+      if not M.looks_like_url(link) then
+         resolved = M.url_resolve(base, link)
+      end
+      if resolved and M.looks_like_url(resolved) and resolved ~= base then
+         body = string.gsub(body, escape_pattern(link), "(" .. resolved .. ")")
+      end
+   end
+   return body
+end
+
 ---@param url string
 ---@param base string
 M.resolve_and_open = function(url, base)