diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2022-09-25 12:09:41 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-09-25 13:09:41 +0200 |
| commit | 7a1aa04bbbc9f95442c8850ef61d1d58bb12df74 (patch) | |
| tree | 7b05a52914deb1f838539a3196edca287942fd95 /internal/federation/dereferencing/status.go | |
| parent | [bugfix] Wrap media reader in length reader to determine length if no `conten... (diff) | |
| download | gotosocial-7a1aa04bbbc9f95442c8850ef61d1d58bb12df74.tar.xz | |
[bugfix] update thread iterators to not use recursion (#851)
* update thread iterators to not use recursion, rewrote both
Signed-off-by: kim <grufwub@gmail.com>
* fix endless descendant deref, don't error if fetching existing status
Signed-off-by: kim <grufwub@gmail.com>
* don't refetch remote ancestor statuses, improve descendant iter commenting
Signed-off-by: kim <grufwub@gmail.com>
* move collection page next logic so we capture first page of entities
Signed-off-by: kim <grufwub@gmail.com>
* improve log format argument quoting
Signed-off-by: kim <grufwub@gmail.com>
* improve code commenting of collection paging
Signed-off-by: kim <grufwub@gmail.com>
* only dereference announce's originating status if _not_ local. update DereferenceThread() signature. cleanup searchStatusByURI()
Signed-off-by: kim <grufwub@gmail.com>
Signed-off-by: kim <grufwub@gmail.com>
Diffstat (limited to 'internal/federation/dereferencing/status.go')
| -rw-r--r-- | internal/federation/dereferencing/status.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/internal/federation/dereferencing/status.go b/internal/federation/dereferencing/status.go index f3b7ee96e..645910d19 100644 --- a/internal/federation/dereferencing/status.go +++ b/internal/federation/dereferencing/status.go @@ -105,7 +105,7 @@ func (d *deref) GetRemoteStatus(ctx context.Context, username string, remoteStat return nil, nil, fmt.Errorf("GetRemoteStatus: error populating status fields: %s", err) } - if err := d.db.PutStatus(ctx, gtsStatus); err != nil { + if err := d.db.PutStatus(ctx, gtsStatus); err != nil && !errors.Is(err, db.ErrAlreadyExists) { return nil, nil, fmt.Errorf("GetRemoteStatus: error putting new status: %s", err) } @@ -441,7 +441,6 @@ func (d *deref) populateStatusEmojis(ctx context.Context, status *gtsmodel.Statu Disabled: e.Disabled, VisibleInPicker: e.VisibleInPicker, }) - if err != nil { log.Errorf("populateStatusEmojis: couldn't get remote emoji %s: %s", e.URI, err) continue |