mirror of
https://gitgud.io/yats/libkiwi.git
synced 2026-06-15 15:55:28 -04:00
Even more refactoring n shit
This commit is contained in:
@@ -126,11 +126,6 @@ func (kf *KF) GetPost(ctx context.Context, postID uint32) (Post, error) {
|
||||
return Post{}, errors.New("Failed to parse post message body.")
|
||||
}
|
||||
|
||||
bh, err := body.Html()
|
||||
if err != nil {
|
||||
return Post{}, err
|
||||
}
|
||||
|
||||
author, err := parsePostAuthor(article)
|
||||
if err != nil {
|
||||
return Post{}, err
|
||||
@@ -138,8 +133,6 @@ func (kf *KF) GetPost(ctx context.Context, postID uint32) (Post, error) {
|
||||
|
||||
post := Post{
|
||||
Author: author,
|
||||
Text: bytes.TrimSpace([]byte(body.Text())),
|
||||
HTML: bytes.TrimSpace([]byte(bh)),
|
||||
|
||||
article: article,
|
||||
body: body,
|
||||
|
||||
+7
-6
@@ -88,19 +88,20 @@ func parsePostAuthor(article *gq.Selection) (User, error) {
|
||||
|
||||
type Post struct {
|
||||
Author User
|
||||
Text []byte
|
||||
|
||||
HTML []byte
|
||||
|
||||
article *gq.Selection
|
||||
body *gq.Selection
|
||||
}
|
||||
|
||||
func (post *Post) TextContent() (io.Reader, error) {
|
||||
postHTML, err := post.body.Html()
|
||||
func (post *Post) TextContent() io.Reader {
|
||||
return strings.NewReader(strings.TrimSpace(post.body.Text()))
|
||||
}
|
||||
|
||||
func (post *Post) HTML() (io.Reader, error) {
|
||||
postHTML, err := post.article.Html()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return strings.NewReader(postHTML), nil
|
||||
return strings.NewReader(strings.TrimSpace(postHTML)), nil
|
||||
}
|
||||
|
||||
@@ -55,6 +55,7 @@ func TestGetPost(t *testing.T) {
|
||||
}
|
||||
|
||||
t.Logf("Post author: %+v\n", post.Author)
|
||||
t.Logf("Post text: %s\n", post.TextContent())
|
||||
}
|
||||
|
||||
func newTestKF() (*KF, error) {
|
||||
|
||||
Reference in New Issue
Block a user