summaryrefslogtreecommitdiff
path: root/internal/db/bundb/relationship.go
diff options
context:
space:
mode:
authorLibravatar Vyr Cossont <VyrCossont@users.noreply.github.com>2023-07-27 01:30:39 -0700
committerLibravatar GitHub <noreply@github.com>2023-07-27 10:30:39 +0200
commit22ac4607a1c283a719eea95844e07513b8a67570 (patch)
tree61baf7949b62f84d2dff29c4d99614d946774f64 /internal/db/bundb/relationship.go
parent[performance] retry db queries on busy errors (#2025) (diff)
downloadgotosocial-22ac4607a1c283a719eea95844e07513b8a67570.tar.xz
[feature] Support setting private notes on accounts (#1982)
* Support setting private notes on accounts * Reformat comment whitespace * Add missing license headers * Use apiutil.ParseID * Rename Note model and cache to AccountNote * Update golden cache config in test/envparsing.sh * Rename gtsmodel/note.go to gtsmodel/accountnote.go * Update AccountNote uniqueness constraint name Now has same prefix as other indexes on this table. --------- Co-authored-by: tobi <31960611+tsmethurst@users.noreply.github.com>
Diffstat (limited to 'internal/db/bundb/relationship.go')
-rw-r--r--internal/db/bundb/relationship.go13
1 files changed, 13 insertions, 0 deletions
diff --git a/internal/db/bundb/relationship.go b/internal/db/bundb/relationship.go
index c865f8aad..eddd73b49 100644
--- a/internal/db/bundb/relationship.go
+++ b/internal/db/bundb/relationship.go
@@ -85,6 +85,19 @@ func (r *relationshipDB) GetRelationship(ctx context.Context, requestingAccount
return nil, fmt.Errorf("GetRelationship: error checking blockedBy: %w", err)
}
+ // retrieve a note by the requesting account on the target account, if there is one
+ note, err := r.GetNote(
+ gtscontext.SetBarebones(ctx),
+ requestingAccount,
+ targetAccount,
+ )
+ if err != nil && !errors.Is(err, db.ErrNoEntries) {
+ return nil, fmt.Errorf("GetRelationship: error fetching note: %w", err)
+ }
+ if note != nil {
+ rel.Note = note.Comment
+ }
+
return &rel, nil
}