diff options
Diffstat (limited to 'internal/processing/status')
| -rw-r--r-- | internal/processing/status/create.go | 6 | ||||
| -rw-r--r-- | internal/processing/status/util.go | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/internal/processing/status/create.go b/internal/processing/status/create.go index 1e93af162..add8a5bc6 100644 --- a/internal/processing/status/create.go +++ b/internal/processing/status/create.go @@ -39,13 +39,11 @@ func (p *processor) Create(ctx context.Context, account *gtsmodel.Account, appli if err != nil { return nil, gtserror.NewErrorInternalError(err) } - thisStatusURI := fmt.Sprintf("%s/%s", accountURIs.StatusesURI, thisStatusID) - thisStatusURL := fmt.Sprintf("%s/%s", accountURIs.StatusesURL, thisStatusID) newStatus := >smodel.Status{ ID: thisStatusID, - URI: thisStatusURI, - URL: thisStatusURL, + URI: accountURIs.StatusesURI + "/" + thisStatusID, + URL: accountURIs.StatusesURL + "/" + thisStatusID, CreatedAt: time.Now(), UpdatedAt: time.Now(), Local: true, diff --git a/internal/processing/status/util.go b/internal/processing/status/util.go index 5de66af8a..190d88f1b 100644 --- a/internal/processing/status/util.go +++ b/internal/processing/status/util.go @@ -242,11 +242,11 @@ func (p *processor) ProcessTags(ctx context.Context, form *apimodel.AdvancedStat } func (p *processor) ProcessEmojis(ctx context.Context, form *apimodel.AdvancedStatusCreateForm, accountID string, status *gtsmodel.Status) error { - emojis := []string{} gtsEmojis, err := p.db.EmojiStringsToEmojis(ctx, util.DeriveEmojisFromText(form.Status)) if err != nil { return fmt.Errorf("error generating emojis from status: %s", err) } + emojis := make([]string, 0, len(gtsEmojis)) for _, e := range gtsEmojis { emojis = append(emojis, e.ID) } |