autonomic-cooperative/gotosocial
0
0
Fork 0
Code Releases Activity

add emoji + tags

Browse Source
This commit is contained in:
tsmethurst
2021-04-04 16:08:26 +02:00
parent 23e2c4a567
commit bf93305931
6 changed files with 129 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/apimodule/status/status.go
View File

@ -26,6 +26,7 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/db/model"
"github.com/superseriousbusiness/gotosocial/internal/distributor"
"github.com/superseriousbusiness/gotosocial/internal/media"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
"github.com/superseriousbusiness/gotosocial/internal/router"
@ -54,15 +55,17 @@ type statusModule struct {
db db.DB
oauthServer oauth.Server
mediaHandler media.MediaHandler
distributor distributor.Distributor
log *logrus.Logger
}
// New returns a new account module
func New(config *config.Config, db db.DB, oauthServer oauth.Server, mediaHandler media.MediaHandler, log *logrus.Logger) apimodule.ClientAPIModule {
func New(config *config.Config, db db.DB, oauthServer oauth.Server, mediaHandler media.MediaHandler, distributor distributor.Distributor, log *logrus.Logger) apimodule.ClientAPIModule {
return &statusModule{
config: config,
db: db,
mediaHandler: mediaHandler,
distributor: distributor,
log: log,
}
}

15
internal/apimodule/status/statuscreate.go
View File

@ -23,13 +23,13 @@ import (
"fmt"
"net"
"net/http"
"strings"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/db/model"
"github.com/superseriousbusiness/gotosocial/internal/distributor"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
"github.com/superseriousbusiness/gotosocial/internal/util"
"github.com/superseriousbusiness/gotosocial/pkg/mastotypes"
@ -101,7 +101,6 @@ func (m *statusModule) statusCreatePOSTHandler(c *gin.Context) {
thisStatusID := uuid.NewString()
thisStatusURI := fmt.Sprintf("%s/%s", uris.StatusesURI, thisStatusID)
thisStatusURL := fmt.Sprintf("%s/%s", uris.StatusesURL, thisStatusID)
newStatus := &model.Status{
ID: thisStatusID,
URI: thisStatusURI,
@ -116,7 +115,6 @@ func (m *statusModule) statusCreatePOSTHandler(c *gin.Context) {
ActivityStreamsType: model.ActivityStreamsNote,
}
// take care of side effects -- mentions, updating metadata, etc, etc
menchies, err := m.db.AccountStringsToMentions(util.DeriveMentions(form.Status), authed.Account.ID, thisStatusID)
if err != nil {
l.Debugf("error generating mentions from status: %s", err)
@ -124,6 +122,17 @@ func (m *statusModule) statusCreatePOSTHandler(c *gin.Context) {
return
}
newStatus.Mentions = menchies
// take care of side effects -- federation, mentions, updating metadata, etc, etc
m.distributor.FromClientAPI() <- distributor.FromClientAPI{
APObjectType: model.ActivityStreamsNote,
APActivityType: model.ActivityStreamsCreate,
Activity: newStatus,
}
}
func validateCreateStatus(form *advancedStatusCreateForm, config *config.StatusesConfig, accountID string, db db.DB) error {