summaryrefslogtreecommitdiff
path: root/internal/processing/account
diff options
context:
space:
mode:
Diffstat (limited to 'internal/processing/account')
-rw-r--r--internal/processing/account/get.go2
-rw-r--r--internal/processing/account/interactionpolicies.go8
-rw-r--r--internal/processing/account/rss.go85
-rw-r--r--internal/processing/account/rss_test.go65
4 files changed, 60 insertions, 100 deletions
diff --git a/internal/processing/account/get.go b/internal/processing/account/get.go
index f7bf84961..7f401ed57 100644
--- a/internal/processing/account/get.go
+++ b/internal/processing/account/get.go
@@ -112,7 +112,7 @@ func (p *Processor) GetWeb(ctx context.Context, username string) (*apimodel.WebA
return nil, gtserror.NewErrorInternalError(err)
}
- webAccount, err := p.converter.AccountToWebAccount(ctx, targetAccount)
+ webAccount, err := p.converter.AccountToWebAccount(ctx, targetAccount, nil)
if err != nil {
err := gtserror.Newf("error converting account: %w", err)
return nil, gtserror.NewErrorInternalError(err)
diff --git a/internal/processing/account/interactionpolicies.go b/internal/processing/account/interactionpolicies.go
index 405c92230..d581112a6 100644
--- a/internal/processing/account/interactionpolicies.go
+++ b/internal/processing/account/interactionpolicies.go
@@ -89,10 +89,10 @@ func (p *Processor) DefaultInteractionPoliciesGet(
}
return &apimodel.DefaultPolicies{
- Direct: *directAPI,
- Private: *privateAPI,
- Unlisted: *unlistedAPI,
- Public: *publicAPI,
+ Direct: directAPI,
+ Private: privateAPI,
+ Unlisted: unlistedAPI,
+ Public: publicAPI,
}, nil
}
diff --git a/internal/processing/account/rss.go b/internal/processing/account/rss.go
index 205027528..d6f367566 100644
--- a/internal/processing/account/rss.go
+++ b/internal/processing/account/rss.go
@@ -76,16 +76,44 @@ func (p *Processor) GetRSSFeedForUsername(ctx context.Context, username string,
lastPostAt := account.Stats.LastStatusAt
return func() (*feeds.Feed, gtserror.WithCode) {
- // Assemble author namestring once only.
- author := "@" + account.Username + "@" + config.GetAccountDomain()
+ var image *feeds.Image
+
+ // Assemble author namestring.
+ author := "@" + account.Username +
+ "@" + config.GetAccountDomain()
+
+ // Check if account has an avatar media attachment.
+ if id := account.AvatarMediaAttachmentID; id != "" {
+ if account.AvatarMediaAttachment == nil {
+ var err error
+
+ // Populate the account's avatar media attachment from database by its ID.
+ account.AvatarMediaAttachment, err = p.state.DB.GetAttachmentByID(ctx, id)
+ if err != nil && !errors.Is(err, db.ErrNoEntries) {
+ err := gtserror.Newf("db error getting account avatar: %w", err)
+ return nil, gtserror.NewErrorInternalError(err)
+ }
+ }
- // Derive image/thumbnail for this account (may be nil if no media).
- image, errWithCode := p.rssImageForAccount(ctx, account, author)
- if errWithCode != nil {
- return nil, errWithCode
+ // If avatar is found, use as feed image.
+ if account.AvatarMediaAttachment != nil {
+ image = &feeds.Image{
+ Title: "Avatar for " + author,
+ Url: account.AvatarMediaAttachment.Thumbnail.URL,
+ Link: account.URL,
+ }
+ }
}
+ // Start creating feed.
feed := &feeds.Feed{
+ // we specifcally do not set the author, as a lot
+ // of feed readers rely on the RSS standard of the
+ // author being an email with optional name. but
+ // our @username@domain identifiers break this.
+ //
+ // attribution is handled in the title/description.
+
Title: "Posts from " + author,
Description: "Posts from " + author,
Link: &feeds.Link{Href: account.URL},
@@ -128,6 +156,17 @@ func (p *Processor) GetRSSFeedForUsername(ctx context.Context, username string,
return nil, gtserror.NewErrorInternalError(err)
}
+ // Check for no statuses.
+ if len(statuses) == 0 {
+ return feed, nil
+ }
+
+ // Get next / prev paging parameters.
+ lo := statuses[len(statuses)-1].ID
+ hi := statuses[0].ID
+ next := page.Next(lo, hi)
+ prev := page.Prev(lo, hi)
+
// Add each status to the rss feed.
for _, status := range statuses {
item, err := p.converter.StatusToRSSItem(ctx, status)
@@ -138,35 +177,11 @@ func (p *Processor) GetRSSFeedForUsername(ctx context.Context, username string,
feed.Add(item)
}
+ // TODO: when we have some manner of supporting
+ // atom:link in RSS (and Atom), set the paging
+ // parameters for next / prev feed pages here.
+ _, _ = next, prev
+
return feed, nil
}, lastPostAt, nil
}
-
-func (p *Processor) rssImageForAccount(ctx context.Context, account *gtsmodel.Account, author string) (*feeds.Image, gtserror.WithCode) {
- if account.AvatarMediaAttachmentID == "" {
- // No image, no problem!
- return nil, nil
- }
-
- // Ensure account avatar attachment populated.
- if account.AvatarMediaAttachment == nil {
- var err error
- account.AvatarMediaAttachment, err = p.state.DB.GetAttachmentByID(ctx, account.AvatarMediaAttachmentID)
- if err != nil {
- if errors.Is(err, db.ErrNoEntries) {
- // No attachment found with this ID (race condition?).
- return nil, nil
- }
-
- // Real db error.
- err = gtserror.Newf("db error fetching avatar media attachment: %w", err)
- return nil, gtserror.NewErrorInternalError(err)
- }
- }
-
- return &feeds.Image{
- Url: account.AvatarMediaAttachment.Thumbnail.URL,
- Title: "Avatar for " + author,
- Link: account.URL,
- }, nil
-}
diff --git a/internal/processing/account/rss_test.go b/internal/processing/account/rss_test.go
index b053a3795..75aa20891 100644
--- a/internal/processing/account/rss_test.go
+++ b/internal/processing/account/rss_test.go
@@ -44,7 +44,6 @@ func (suite *GetRSSTestSuite) TestGetAccountRSSAdmin() {
<link>http://localhost:8080/@admin/statuses/01F8MHAAY43M6RJ473VQFCVH37</link>
<description>@admin@localhost:8080 made a new post: &#34;🐕🐕🐕🐕🐕&#34;</description>
<content:encoded><![CDATA[<p>🐕🐕🐕🐕🐕</p>]]></content:encoded>
- <author>@admin@localhost:8080</author>
<guid isPermaLink="true">http://localhost:8080/@admin/statuses/01F8MHAAY43M6RJ473VQFCVH37</guid>
<pubDate>Wed, 20 Oct 2021 12:36:45 +0000</pubDate>
<source>http://localhost:8080/@admin/feed.rss</source>
@@ -54,7 +53,6 @@ func (suite *GetRSSTestSuite) TestGetAccountRSSAdmin() {
<link>http://localhost:8080/@admin/statuses/01F8MH75CBF9JFX4ZAD54N0W0R</link>
<description>@admin@localhost:8080 posted 1 attachment: &#34;hello world! #welcome ! first post on the instance :rainbow: !&#34;</description>
<content:encoded><![CDATA[<p>hello world! <a href="http://localhost:8080/tags/welcome" class="mention hashtag" rel="tag nofollow noreferrer noopener" target="_blank">#<span>welcome</span></a> ! first post on the instance <img src="http://localhost:8080/fileserver/01AY6P665V14JJR0AFVRT7311Y/emoji/original/01F8MH9H8E4VG3KDYJR9EGPXCQ.png" title=":rainbow:" alt=":rainbow:" width="25" height="25" /> !</p>]]></content:encoded>
- <author>@admin@localhost:8080</author>
<enclosure url="http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/attachment/original/01F8MH6NEM8D7527KZAECTCR76.jpg" length="62529" type="image/jpeg"></enclosure>
<guid isPermaLink="true">http://localhost:8080/@admin/statuses/01F8MH75CBF9JFX4ZAD54N0W0R</guid>
<pubDate>Wed, 20 Oct 2021 11:36:45 +0000</pubDate>
@@ -78,11 +76,7 @@ func (suite *GetRSSTestSuite) TestGetAccountAtomAdmin() {
<id>http://localhost:8080/@admin/statuses/01F8MHAAY43M6RJ473VQFCVH37</id>
<content type="html">&lt;p&gt;🐕🐕🐕🐕🐕&lt;/p&gt;</content>
<link href="http://localhost:8080/@admin/statuses/01F8MHAAY43M6RJ473VQFCVH37" rel="alternate"></link>
- <link href="" rel="enclosure"></link>
<summary type="html">@admin@localhost:8080 made a new post: &#34;🐕🐕🐕🐕🐕&#34;</summary>
- <author>
- <name>@admin@localhost:8080</name>
- </author>
</entry>
<entry>
<title>hello world! #welcome ! first post on the instance :rainbow: !</title>
@@ -92,9 +86,6 @@ func (suite *GetRSSTestSuite) TestGetAccountAtomAdmin() {
<link href="http://localhost:8080/@admin/statuses/01F8MH75CBF9JFX4ZAD54N0W0R" rel="alternate"></link>
<link href="http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/attachment/original/01F8MH6NEM8D7527KZAECTCR76.jpg" rel="enclosure" type="image/jpeg" length="62529"></link>
<summary type="html">@admin@localhost:8080 posted 1 attachment: &#34;hello world! #welcome ! first post on the instance :rainbow: !&#34;</summary>
- <author>
- <name>@admin@localhost:8080</name>
- </author>
</entry>
</feed>`)
}
@@ -114,15 +105,7 @@ func (suite *GetRSSTestSuite) TestGetAccountJSONAdmin() {
"title": "open to see some \u003cstrong\u003epuppies\u003c/strong\u003e",
"content_html": "\u003cp\u003e🐕🐕🐕🐕🐕\u003c/p\u003e",
"summary": "@admin@localhost:8080 made a new post: \"🐕🐕🐕🐕🐕\"",
- "date_published": "2021-10-20T12:36:45Z",
- "author": {
- "name": "@admin@localhost:8080"
- },
- "authors": [
- {
- "name": "@admin@localhost:8080"
- }
- ]
+ "date_published": "2021-10-20T12:36:45Z"
},
{
"id": "http://localhost:8080/@admin/statuses/01F8MH75CBF9JFX4ZAD54N0W0R",
@@ -132,15 +115,7 @@ func (suite *GetRSSTestSuite) TestGetAccountJSONAdmin() {
"content_html": "\u003cp\u003ehello world! \u003ca href=\"http://localhost:8080/tags/welcome\" class=\"mention hashtag\" rel=\"tag nofollow noreferrer noopener\" target=\"_blank\"\u003e#\u003cspan\u003ewelcome\u003c/span\u003e\u003c/a\u003e ! first post on the instance \u003cimg src=\"http://localhost:8080/fileserver/01AY6P665V14JJR0AFVRT7311Y/emoji/original/01F8MH9H8E4VG3KDYJR9EGPXCQ.png\" title=\":rainbow:\" alt=\":rainbow:\" width=\"25\" height=\"25\" /\u003e !\u003c/p\u003e",
"summary": "@admin@localhost:8080 posted 1 attachment: \"hello world! #welcome ! first post on the instance :rainbow: !\"",
"image": "http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/attachment/original/01F8MH6NEM8D7527KZAECTCR76.jpg",
- "date_published": "2021-10-20T11:36:45Z",
- "author": {
- "name": "@admin@localhost:8080"
- },
- "authors": [
- {
- "name": "@admin@localhost:8080"
- }
- ]
+ "date_published": "2021-10-20T11:36:45Z"
}
]
}`)
@@ -165,7 +140,6 @@ func (suite *GetRSSTestSuite) TestGetAccountRSSZork() {
<link>http://localhost:8080/@the_mighty_zork/statuses/01JDPZC707CKDN8N4QVWM4Z1NR</link>
<description>@the_mighty_zork@localhost:8080 made a new post: &#34;this is the latest revision of the status, with a content-warning&#34;</description>
<content:encoded><![CDATA[<p>this is the latest revision of the status, with a content-warning</p>]]></content:encoded>
- <author>@the_mighty_zork@localhost:8080</author>
<guid isPermaLink="true">http://localhost:8080/@the_mighty_zork/statuses/01JDPZC707CKDN8N4QVWM4Z1NR</guid>
<pubDate>Fri, 01 Nov 2024 09:00:00 +0000</pubDate>
<source>http://localhost:8080/@the_mighty_zork/feed.rss</source>
@@ -210,7 +184,6 @@ func (suite *GetRSSTestSuite) TestGetAccountRSSZork() {
&lt;/div&gt;
&lt;/section&gt;
</code></pre><p>There, hope you liked that!</p>]]></content:encoded>
- <author>@the_mighty_zork@localhost:8080</author>
<guid isPermaLink="true">http://localhost:8080/@the_mighty_zork/statuses/01HH9KYNQPA416TNJ53NSATP40</guid>
<pubDate>Sun, 10 Dec 2023 09:24:00 +0000</pubDate>
<source>http://localhost:8080/@the_mighty_zork/feed.rss</source>
@@ -220,7 +193,6 @@ func (suite *GetRSSTestSuite) TestGetAccountRSSZork() {
<link>http://localhost:8080/@the_mighty_zork/statuses/01F8MHAMCHF6Y650WCRSCP4WMY</link>
<description>@the_mighty_zork@localhost:8080 made a new post: &#34;hello everyone!&#34;</description>
<content:encoded><![CDATA[<p>hello everyone!</p>]]></content:encoded>
- <author>@the_mighty_zork@localhost:8080</author>
<guid isPermaLink="true">http://localhost:8080/@the_mighty_zork/statuses/01F8MHAMCHF6Y650WCRSCP4WMY</guid>
<pubDate>Wed, 20 Oct 2021 10:40:37 +0000</pubDate>
<source>http://localhost:8080/@the_mighty_zork/feed.rss</source>
@@ -248,7 +220,6 @@ func (suite *GetRSSTestSuite) TestGetAccountAtomZork() {
<link>http://localhost:8080/@the_mighty_zork/statuses/01JDPZC707CKDN8N4QVWM4Z1NR</link>
<description>@the_mighty_zork@localhost:8080 made a new post: &#34;this is the latest revision of the status, with a content-warning&#34;</description>
<content:encoded><![CDATA[<p>this is the latest revision of the status, with a content-warning</p>]]></content:encoded>
- <author>@the_mighty_zork@localhost:8080</author>
<guid isPermaLink="true">http://localhost:8080/@the_mighty_zork/statuses/01JDPZC707CKDN8N4QVWM4Z1NR</guid>
<pubDate>Fri, 01 Nov 2024 09:00:00 +0000</pubDate>
<source>http://localhost:8080/@the_mighty_zork/feed.rss</source>
@@ -293,7 +264,6 @@ func (suite *GetRSSTestSuite) TestGetAccountAtomZork() {
&lt;/div&gt;
&lt;/section&gt;
</code></pre><p>There, hope you liked that!</p>]]></content:encoded>
- <author>@the_mighty_zork@localhost:8080</author>
<guid isPermaLink="true">http://localhost:8080/@the_mighty_zork/statuses/01HH9KYNQPA416TNJ53NSATP40</guid>
<pubDate>Sun, 10 Dec 2023 09:24:00 +0000</pubDate>
<source>http://localhost:8080/@the_mighty_zork/feed.rss</source>
@@ -303,7 +273,6 @@ func (suite *GetRSSTestSuite) TestGetAccountAtomZork() {
<link>http://localhost:8080/@the_mighty_zork/statuses/01F8MHAMCHF6Y650WCRSCP4WMY</link>
<description>@the_mighty_zork@localhost:8080 made a new post: &#34;hello everyone!&#34;</description>
<content:encoded><![CDATA[<p>hello everyone!</p>]]></content:encoded>
- <author>@the_mighty_zork@localhost:8080</author>
<guid isPermaLink="true">http://localhost:8080/@the_mighty_zork/statuses/01F8MHAMCHF6Y650WCRSCP4WMY</guid>
<pubDate>Wed, 20 Oct 2021 10:40:37 +0000</pubDate>
<source>http://localhost:8080/@the_mighty_zork/feed.rss</source>
@@ -328,15 +297,7 @@ func (suite *GetRSSTestSuite) TestGetAccountJSONZork() {
"content_html": "\u003cp\u003ethis is the latest revision of the status, with a content-warning\u003c/p\u003e",
"summary": "@the_mighty_zork@localhost:8080 made a new post: \"this is the latest revision of the status, with a content-warning\"",
"date_published": "2024-11-01T09:00:00Z",
- "date_modified": "2024-11-01T09:02:00Z",
- "author": {
- "name": "@the_mighty_zork@localhost:8080"
- },
- "authors": [
- {
- "name": "@the_mighty_zork@localhost:8080"
- }
- ]
+ "date_modified": "2024-11-01T09:02:00Z"
},
{
"id": "http://localhost:8080/@the_mighty_zork/statuses/01HH9KYNQPA416TNJ53NSATP40",
@@ -345,15 +306,7 @@ func (suite *GetRSSTestSuite) TestGetAccountJSONZork() {
"title": "HTML in post",
"content_html": "\u003cp\u003eHere's a bunch of HTML, read it and weep, weep then!\u003c/p\u003e\u003cpre\u003e\u003ccode class=\"language-html\"\u003e\u0026lt;section class=\u0026#34;about-user\u0026#34;\u0026gt;\n \u0026lt;div class=\u0026#34;col-header\u0026#34;\u0026gt;\n \u0026lt;h2\u0026gt;About\u0026lt;/h2\u0026gt;\n \u0026lt;/div\u0026gt; \n \u0026lt;div class=\u0026#34;fields\u0026#34;\u0026gt;\n \u0026lt;h3 class=\u0026#34;sr-only\u0026#34;\u0026gt;Fields\u0026lt;/h3\u0026gt;\n \u0026lt;dl\u0026gt;\n \u0026lt;div class=\u0026#34;field\u0026#34;\u0026gt;\n \u0026lt;dt\u0026gt;should you follow me?\u0026lt;/dt\u0026gt;\n \u0026lt;dd\u0026gt;maybe!\u0026lt;/dd\u0026gt;\n \u0026lt;/div\u0026gt;\n \u0026lt;div class=\u0026#34;field\u0026#34;\u0026gt;\n \u0026lt;dt\u0026gt;age\u0026lt;/dt\u0026gt;\n \u0026lt;dd\u0026gt;120\u0026lt;/dd\u0026gt;\n \u0026lt;/div\u0026gt;\n \u0026lt;/dl\u0026gt;\n \u0026lt;/div\u0026gt;\n \u0026lt;div class=\u0026#34;bio\u0026#34;\u0026gt;\n \u0026lt;h3 class=\u0026#34;sr-only\u0026#34;\u0026gt;Bio\u0026lt;/h3\u0026gt;\n \u0026lt;p\u0026gt;i post about things that concern me\u0026lt;/p\u0026gt;\n \u0026lt;/div\u0026gt;\n \u0026lt;div class=\u0026#34;sr-only\u0026#34; role=\u0026#34;group\u0026#34;\u0026gt;\n \u0026lt;h3 class=\u0026#34;sr-only\u0026#34;\u0026gt;Stats\u0026lt;/h3\u0026gt;\n \u0026lt;span\u0026gt;Joined in Jun, 2022.\u0026lt;/span\u0026gt;\n \u0026lt;span\u0026gt;8 posts.\u0026lt;/span\u0026gt;\n \u0026lt;span\u0026gt;Followed by 1.\u0026lt;/span\u0026gt;\n \u0026lt;span\u0026gt;Following 1.\u0026lt;/span\u0026gt;\n \u0026lt;/div\u0026gt;\n \u0026lt;div class=\u0026#34;accountstats\u0026#34; aria-hidden=\u0026#34;true\u0026#34;\u0026gt;\n \u0026lt;b\u0026gt;Joined\u0026lt;/b\u0026gt;\u0026lt;time datetime=\u0026#34;2022-06-04T13:12:00.000Z\u0026#34;\u0026gt;Jun, 2022\u0026lt;/time\u0026gt;\n \u0026lt;b\u0026gt;Posts\u0026lt;/b\u0026gt;\u0026lt;span\u0026gt;8\u0026lt;/span\u0026gt;\n \u0026lt;b\u0026gt;Followed by\u0026lt;/b\u0026gt;\u0026lt;span\u0026gt;1\u0026lt;/span\u0026gt;\n \u0026lt;b\u0026gt;Following\u0026lt;/b\u0026gt;\u0026lt;span\u0026gt;1\u0026lt;/span\u0026gt;\n \u0026lt;/div\u0026gt;\n\u0026lt;/section\u0026gt;\n\u003c/code\u003e\u003c/pre\u003e\u003cp\u003eThere, hope you liked that!\u003c/p\u003e",
"summary": "@the_mighty_zork@localhost:8080 made a new post: \"Here's a bunch of HTML, read it and weep, weep then!\n\n`+"```"+`html\n\u003csection class=\"about-user\"\u003e\n \u003cdiv class=\"col-header\"\u003e\n \u003ch2\u003eAbout\u003c/h2\u003e\n \u003c/div\u003e \n \u003cdiv class=\"fields\"\u003e\n \u003ch3 class=\"sr-only\"\u003eFields\u003c/h3\u003e\n \u003cdl\u003e\n...",
- "date_published": "2023-12-10T09:24:00Z",
- "author": {
- "name": "@the_mighty_zork@localhost:8080"
- },
- "authors": [
- {
- "name": "@the_mighty_zork@localhost:8080"
- }
- ]
+ "date_published": "2023-12-10T09:24:00Z"
},
{
"id": "http://localhost:8080/@the_mighty_zork/statuses/01F8MHAMCHF6Y650WCRSCP4WMY",
@@ -362,15 +315,7 @@ func (suite *GetRSSTestSuite) TestGetAccountJSONZork() {
"title": "introduction post",
"content_html": "\u003cp\u003ehello everyone!\u003c/p\u003e",
"summary": "@the_mighty_zork@localhost:8080 made a new post: \"hello everyone!\"",
- "date_published": "2021-10-20T10:40:37Z",
- "author": {
- "name": "@the_mighty_zork@localhost:8080"
- },
- "authors": [
- {
- "name": "@the_mighty_zork@localhost:8080"
- }
- ]
+ "date_published": "2021-10-20T10:40:37Z"
}
]
}`)
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-02 09:11:21 +0000