mirror of
https://github.com/ChronosX88/yans.git
synced 2024-11-09 23:21:01 +00:00
Implement NEXT command
This commit is contained in:
parent
679c515ad1
commit
5c36bf1e71
@ -33,11 +33,11 @@
|
|||||||
- :x: `LIST OVERVIEW.FMT`
|
- :x: `LIST OVERVIEW.FMT`
|
||||||
- :x: `HDR`
|
- :x: `HDR`
|
||||||
- :x: `LIST HEADERS`
|
- :x: `LIST HEADERS`
|
||||||
- :construction: Group and Article Selection
|
- :heavy_check_mark: Group and Article Selection
|
||||||
- :heavy_check_mark: `GROUP`
|
- :heavy_check_mark: `GROUP`
|
||||||
- :heavy_check_mark: `LISTGROUP`
|
- :heavy_check_mark: `LISTGROUP`
|
||||||
- :heavy_check_mark: `LAST`
|
- :heavy_check_mark: `LAST`
|
||||||
- :x: `NEXT`
|
- :heavy_check_mark: `NEXT`
|
||||||
- :construction: The LIST Commands
|
- :construction: The LIST Commands
|
||||||
- :heavy_check_mark: `LIST ACTIVE`
|
- :heavy_check_mark: `LIST ACTIVE`
|
||||||
- :heavy_check_mark: `LIST NEWSGROUPS`
|
- :heavy_check_mark: `LIST NEWSGROUPS`
|
||||||
|
@ -184,6 +184,17 @@ func (sb *SQLiteBackend) GetLastArticleByNum(g *models.Group, a *models.Article)
|
|||||||
return lastArticle, json.Unmarshal([]byte(a.HeaderRaw), &a.Header)
|
return lastArticle, json.Unmarshal([]byte(a.HeaderRaw), &a.Header)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (sb *SQLiteBackend) GetNextArticleByNum(g *models.Group, a *models.Article) (models.Article, error) {
|
||||||
|
var lastArticle models.Article
|
||||||
|
if err := sb.db.Get(&lastArticle, "SELECT articles.* FROM articles INNER JOIN articles_to_groups atg on atg.article_id = articles.id WHERE atg.article_number > ? AND atg.group_id = ? LIMIT 1", a.ArticleNumber, g.ID); err != nil {
|
||||||
|
return lastArticle, err
|
||||||
|
}
|
||||||
|
if err := sb.db.Get(&a.ArticleNumber, "SELECT article_number FROM articles_to_groups WHERE article_id = ?", a.ID); err != nil {
|
||||||
|
return lastArticle, err
|
||||||
|
}
|
||||||
|
return lastArticle, json.Unmarshal([]byte(a.HeaderRaw), &a.Header)
|
||||||
|
}
|
||||||
|
|
||||||
func (sb *SQLiteBackend) GetNewArticlesSince(timestamp int64) ([]string, error) {
|
func (sb *SQLiteBackend) GetNewArticlesSince(timestamp int64) ([]string, error) {
|
||||||
var articleIds []string
|
var articleIds []string
|
||||||
return articleIds, sb.db.Select(&articleIds, "SELECT json_extract(articles.header, '$.Message-Id[0]') FROM articles WHERE created_at > datetime(?, 'unixepoch')", timestamp)
|
return articleIds, sb.db.Select(&articleIds, "SELECT json_extract(articles.header, '$.Message-Id[0]') FROM articles WHERE created_at > datetime(?, 'unixepoch')", timestamp)
|
||||||
|
@ -20,4 +20,5 @@ type StorageBackend interface {
|
|||||||
GetArticleNumbers(g *models.Group, low, high int64) ([]int64, error)
|
GetArticleNumbers(g *models.Group, low, high int64) ([]int64, error)
|
||||||
GetNewArticlesSince(timestamp int64) ([]string, error)
|
GetNewArticlesSince(timestamp int64) ([]string, error)
|
||||||
GetLastArticleByNum(g *models.Group, a *models.Article) (models.Article, error)
|
GetLastArticleByNum(g *models.Group, a *models.Article) (models.Article, error)
|
||||||
|
GetNextArticleByNum(g *models.Group, a *models.Article) (models.Article, error)
|
||||||
}
|
}
|
||||||
|
@ -63,6 +63,7 @@ const (
|
|||||||
CommandHelp = "HELP"
|
CommandHelp = "HELP"
|
||||||
CommandNewNews = "NEWNEWS"
|
CommandNewNews = "NEWNEWS"
|
||||||
CommandLast = "LAST"
|
CommandLast = "LAST"
|
||||||
|
CommandNext = "NEXT"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -43,6 +43,7 @@ func NewHandler(b backend.StorageBackend, serverDomain string) *Handler {
|
|||||||
protocol.CommandHelp: h.handleHelp,
|
protocol.CommandHelp: h.handleHelp,
|
||||||
protocol.CommandNewNews: h.handleNewNews,
|
protocol.CommandNewNews: h.handleNewNews,
|
||||||
protocol.CommandLast: h.handleLast,
|
protocol.CommandLast: h.handleLast,
|
||||||
|
protocol.CommandNext: h.handleNext,
|
||||||
}
|
}
|
||||||
h.serverDomain = serverDomain
|
h.serverDomain = serverDomain
|
||||||
return h
|
return h
|
||||||
@ -663,6 +664,42 @@ func (h *Handler) handleLast(s *Session, command string, arguments []string, id
|
|||||||
return s.tconn.PrintfLine(protocol.NNTPResponse{Code: 223, Message: fmt.Sprintf("%d %s retrieved", a.ArticleNumber, a.Header.Get("Message-ID"))}.String())
|
return s.tconn.PrintfLine(protocol.NNTPResponse{Code: 223, Message: fmt.Sprintf("%d %s retrieved", a.ArticleNumber, a.Header.Get("Message-ID"))}.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (h *Handler) handleNext(s *Session, command string, arguments []string, id uint) error {
|
||||||
|
s.tconn.StartResponse(id)
|
||||||
|
defer s.tconn.EndResponse(id)
|
||||||
|
|
||||||
|
if len(arguments) != 0 {
|
||||||
|
return s.tconn.PrintfLine(protocol.ErrSyntaxError.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
if s.currentGroup == nil {
|
||||||
|
return s.tconn.PrintfLine(protocol.NNTPResponse{Code: 412, Message: "no newsgroup selected"}.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
if s.currentArticle == nil {
|
||||||
|
return s.tconn.PrintfLine(protocol.NNTPResponse{Code: 420, Message: "No current article selected"}.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
high, err := h.backend.GetGroupHighWaterMark(s.currentGroup)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if s.currentArticle.ArticleNumber == high {
|
||||||
|
return s.tconn.PrintfLine(protocol.NNTPResponse{Code: 421, Message: "No next article to retrieve"}.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
a, err := h.backend.GetNextArticleByNum(s.currentGroup, s.currentArticle)
|
||||||
|
if err != nil {
|
||||||
|
if err == sql.ErrNoRows {
|
||||||
|
return s.tconn.PrintfLine(protocol.NNTPResponse{Code: 421, Message: "No next article to retrieve"}.String())
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return s.tconn.PrintfLine(protocol.NNTPResponse{Code: 223, Message: fmt.Sprintf("%d %s retrieved", a.ArticleNumber, a.Header.Get("Message-ID"))}.String())
|
||||||
|
}
|
||||||
|
|
||||||
func (h *Handler) Handle(s *Session, message string, id uint) error {
|
func (h *Handler) Handle(s *Session, message string, id uint) error {
|
||||||
splittedMessage := strings.Split(message, " ")
|
splittedMessage := strings.Split(message, " ")
|
||||||
for i, v := range splittedMessage {
|
for i, v := range splittedMessage {
|
||||||
|
Loading…
Reference in New Issue
Block a user