diff options
Diffstat (limited to 'internal/processing')
| -rw-r--r-- | internal/processing/fromcommon.go | 6 | ||||
| -rw-r--r-- | internal/processing/fromfederator.go | 18 |
2 files changed, 4 insertions, 20 deletions
diff --git a/internal/processing/fromcommon.go b/internal/processing/fromcommon.go index 0adb576bc..03ebb1f1a 100644 --- a/internal/processing/fromcommon.go +++ b/internal/processing/fromcommon.go @@ -434,11 +434,7 @@ func (p *Processor) wipeStatus(ctx context.Context, statusToDelete *gtsmodel.Sta } // delete the status itself - if err := p.state.DB.DeleteStatusByID(ctx, statusToDelete.ID); err != nil { - return err - } - - return nil + return p.state.DB.DeleteStatusByID(ctx, statusToDelete.ID) } // deleteStatusFromTimelines completely removes the given status from all timelines. diff --git a/internal/processing/fromfederator.go b/internal/processing/fromfederator.go index f91f5ae8b..17d60c77f 100644 --- a/internal/processing/fromfederator.go +++ b/internal/processing/fromfederator.go @@ -167,11 +167,7 @@ func (p *Processor) processCreateStatusFromFederator(ctx context.Context, federa } } - if err := p.timelineAndNotifyStatus(ctx, status); err != nil { - return err - } - - return nil + return p.timelineAndNotifyStatus(ctx, status) } // processCreateFaveFromFederator handles Activity Create and Object Like @@ -208,11 +204,7 @@ func (p *Processor) processCreateFaveFromFederator(ctx context.Context, federato incomingFave.Account = a } - if err := p.notifyFave(ctx, incomingFave); err != nil { - return err - } - - return nil + return p.notifyFave(ctx, incomingFave) } // processCreateFollowRequestFromFederator handles Activity Create and Object Follow @@ -327,11 +319,7 @@ func (p *Processor) processCreateAnnounceFromFederator(ctx context.Context, fede return err } - if err := p.notifyAnnounce(ctx, incomingAnnounce); err != nil { - return err - } - - return nil + return p.notifyAnnounce(ctx, incomingAnnounce) } // processCreateBlockFromFederator handles Activity Create and Object Block |