diff options
Diffstat (limited to 'internal/api/activitypub')
| -rw-r--r-- | internal/api/activitypub/emoji/emojiget.go | 8 | ||||
| -rw-r--r-- | internal/api/activitypub/users/followers.go | 8 | ||||
| -rw-r--r-- | internal/api/activitypub/users/following.go | 8 | ||||
| -rw-r--r-- | internal/api/activitypub/users/inboxpost.go | 8 | ||||
| -rw-r--r-- | internal/api/activitypub/users/outboxget.go | 10 | ||||
| -rw-r--r-- | internal/api/activitypub/users/publickeyget.go | 8 | ||||
| -rw-r--r-- | internal/api/activitypub/users/repliesget.go | 14 | ||||
| -rw-r--r-- | internal/api/activitypub/users/statusget.go | 10 | ||||
| -rw-r--r-- | internal/api/activitypub/users/userget.go | 8 | 
9 files changed, 41 insertions, 41 deletions
diff --git a/internal/api/activitypub/emoji/emojiget.go b/internal/api/activitypub/emoji/emojiget.go index d5b2c4e2e..e9e9eff11 100644 --- a/internal/api/activitypub/emoji/emojiget.go +++ b/internal/api/activitypub/emoji/emojiget.go @@ -33,25 +33,25 @@ func (m *Module) EmojiGetHandler(c *gin.Context) {  	requestedEmojiID := strings.ToUpper(c.Param(EmojiIDKey))  	if requestedEmojiID == "" {  		err := errors.New("no emoji id specified in request") -		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1)  		return  	}  	format, err := apiutil.NegotiateAccept(c, apiutil.ActivityPubAcceptHeaders...)  	if err != nil { -		apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGetV1)  		return  	}  	resp, errWithCode := m.processor.GetFediEmoji(apiutil.TransferSignatureContext(c), requestedEmojiID, c.Request.URL)  	if errWithCode != nil { -		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGet) +		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1)  		return  	}  	b, err := json.Marshal(resp)  	if err != nil { -		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1)  		return  	} diff --git a/internal/api/activitypub/users/followers.go b/internal/api/activitypub/users/followers.go index df6453507..040e1cff7 100644 --- a/internal/api/activitypub/users/followers.go +++ b/internal/api/activitypub/users/followers.go @@ -35,13 +35,13 @@ func (m *Module) FollowersGETHandler(c *gin.Context) {  	requestedUsername := strings.ToLower(c.Param(UsernameKey))  	if requestedUsername == "" {  		err := errors.New("no username specified in request") -		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1)  		return  	}  	format, err := apiutil.NegotiateAccept(c, apiutil.HTMLOrActivityPubHeaders...)  	if err != nil { -		apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGetV1)  		return  	} @@ -53,13 +53,13 @@ func (m *Module) FollowersGETHandler(c *gin.Context) {  	resp, errWithCode := m.processor.GetFediFollowers(apiutil.TransferSignatureContext(c), requestedUsername, c.Request.URL)  	if errWithCode != nil { -		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGet) +		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1)  		return  	}  	b, err := json.Marshal(resp)  	if err != nil { -		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1)  		return  	} diff --git a/internal/api/activitypub/users/following.go b/internal/api/activitypub/users/following.go index ffba9ab1b..629df2503 100644 --- a/internal/api/activitypub/users/following.go +++ b/internal/api/activitypub/users/following.go @@ -35,13 +35,13 @@ func (m *Module) FollowingGETHandler(c *gin.Context) {  	requestedUsername := strings.ToLower(c.Param(UsernameKey))  	if requestedUsername == "" {  		err := errors.New("no username specified in request") -		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1)  		return  	}  	format, err := apiutil.NegotiateAccept(c, apiutil.HTMLOrActivityPubHeaders...)  	if err != nil { -		apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGetV1)  		return  	} @@ -53,13 +53,13 @@ func (m *Module) FollowingGETHandler(c *gin.Context) {  	resp, errWithCode := m.processor.GetFediFollowing(apiutil.TransferSignatureContext(c), requestedUsername, c.Request.URL)  	if errWithCode != nil { -		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGet) +		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1)  		return  	}  	b, err := json.Marshal(resp)  	if err != nil { -		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1)  		return  	} diff --git a/internal/api/activitypub/users/inboxpost.go b/internal/api/activitypub/users/inboxpost.go index 30d2be78f..0815394b7 100644 --- a/internal/api/activitypub/users/inboxpost.go +++ b/internal/api/activitypub/users/inboxpost.go @@ -34,18 +34,18 @@ func (m *Module) InboxPOSTHandler(c *gin.Context) {  	requestedUsername := strings.ToLower(c.Param(UsernameKey))  	if requestedUsername == "" {  		err := errors.New("no username specified in request") -		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1)  		return  	}  	if posted, err := m.processor.InboxPost(apiutil.TransferSignatureContext(c), c.Writer, c.Request); err != nil {  		if withCode, ok := err.(gtserror.WithCode); ok { -			apiutil.ErrorHandler(c, withCode, m.processor.InstanceGet) +			apiutil.ErrorHandler(c, withCode, m.processor.InstanceGetV1)  		} else { -			apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) +			apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1)  		}  	} else if !posted {  		err := errors.New("unable to process request") -		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1)  	}  } diff --git a/internal/api/activitypub/users/outboxget.go b/internal/api/activitypub/users/outboxget.go index 49b0335d9..ad9a3829f 100644 --- a/internal/api/activitypub/users/outboxget.go +++ b/internal/api/activitypub/users/outboxget.go @@ -90,13 +90,13 @@ func (m *Module) OutboxGETHandler(c *gin.Context) {  	requestedUsername := strings.ToLower(c.Param(UsernameKey))  	if requestedUsername == "" {  		err := errors.New("no username specified in request") -		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1)  		return  	}  	format, err := apiutil.NegotiateAccept(c, apiutil.HTMLOrActivityPubHeaders...)  	if err != nil { -		apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGetV1)  		return  	} @@ -111,7 +111,7 @@ func (m *Module) OutboxGETHandler(c *gin.Context) {  		i, err := strconv.ParseBool(pageString)  		if err != nil {  			err := fmt.Errorf("error parsing %s: %s", PageKey, err) -			apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) +			apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1)  			return  		}  		page = i @@ -131,13 +131,13 @@ func (m *Module) OutboxGETHandler(c *gin.Context) {  	resp, errWithCode := m.processor.GetFediOutbox(apiutil.TransferSignatureContext(c), requestedUsername, page, maxID, minID, c.Request.URL)  	if errWithCode != nil { -		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGet) +		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1)  		return  	}  	b, err := json.Marshal(resp)  	if err != nil { -		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1)  		return  	} diff --git a/internal/api/activitypub/users/publickeyget.go b/internal/api/activitypub/users/publickeyget.go index 07486c24f..27457f107 100644 --- a/internal/api/activitypub/users/publickeyget.go +++ b/internal/api/activitypub/users/publickeyget.go @@ -39,13 +39,13 @@ func (m *Module) PublicKeyGETHandler(c *gin.Context) {  	requestedUsername := strings.ToLower(c.Param(UsernameKey))  	if requestedUsername == "" {  		err := errors.New("no username specified in request") -		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1)  		return  	}  	format, err := apiutil.NegotiateAccept(c, apiutil.HTMLOrActivityPubHeaders...)  	if err != nil { -		apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGetV1)  		return  	} @@ -57,13 +57,13 @@ func (m *Module) PublicKeyGETHandler(c *gin.Context) {  	resp, errWithCode := m.processor.GetFediUser(apiutil.TransferSignatureContext(c), requestedUsername, c.Request.URL)  	if errWithCode != nil { -		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGet) +		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1)  		return  	}  	b, err := json.Marshal(resp)  	if err != nil { -		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1)  		return  	} diff --git a/internal/api/activitypub/users/repliesget.go b/internal/api/activitypub/users/repliesget.go index 2f59221d4..7e3d459db 100644 --- a/internal/api/activitypub/users/repliesget.go +++ b/internal/api/activitypub/users/repliesget.go @@ -97,7 +97,7 @@ func (m *Module) StatusRepliesGETHandler(c *gin.Context) {  	requestedUsername := strings.ToLower(c.Param(UsernameKey))  	if requestedUsername == "" {  		err := errors.New("no username specified in request") -		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1)  		return  	} @@ -105,13 +105,13 @@ func (m *Module) StatusRepliesGETHandler(c *gin.Context) {  	requestedStatusID := strings.ToUpper(c.Param(StatusIDKey))  	if requestedStatusID == "" {  		err := errors.New("no status id specified in request") -		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1)  		return  	}  	format, err := apiutil.NegotiateAccept(c, apiutil.HTMLOrActivityPubHeaders...)  	if err != nil { -		apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGetV1)  		return  	} @@ -126,7 +126,7 @@ func (m *Module) StatusRepliesGETHandler(c *gin.Context) {  		i, err := strconv.ParseBool(pageString)  		if err != nil {  			err := fmt.Errorf("error parsing %s: %s", PageKey, err) -			apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) +			apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1)  			return  		}  		page = i @@ -138,7 +138,7 @@ func (m *Module) StatusRepliesGETHandler(c *gin.Context) {  		i, err := strconv.ParseBool(onlyOtherAccountsString)  		if err != nil {  			err := fmt.Errorf("error parsing %s: %s", OnlyOtherAccountsKey, err) -			apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) +			apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1)  			return  		}  		onlyOtherAccounts = i @@ -152,13 +152,13 @@ func (m *Module) StatusRepliesGETHandler(c *gin.Context) {  	resp, errWithCode := m.processor.GetFediStatusReplies(apiutil.TransferSignatureContext(c), requestedUsername, requestedStatusID, page, onlyOtherAccounts, minID, c.Request.URL)  	if errWithCode != nil { -		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGet) +		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1)  		return  	}  	b, err := json.Marshal(resp)  	if err != nil { -		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1)  		return  	} diff --git a/internal/api/activitypub/users/statusget.go b/internal/api/activitypub/users/statusget.go index 0b89c544c..766fee429 100644 --- a/internal/api/activitypub/users/statusget.go +++ b/internal/api/activitypub/users/statusget.go @@ -35,7 +35,7 @@ func (m *Module) StatusGETHandler(c *gin.Context) {  	requestedUsername := strings.ToLower(c.Param(UsernameKey))  	if requestedUsername == "" {  		err := errors.New("no username specified in request") -		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1)  		return  	} @@ -43,13 +43,13 @@ func (m *Module) StatusGETHandler(c *gin.Context) {  	requestedStatusID := strings.ToUpper(c.Param(StatusIDKey))  	if requestedStatusID == "" {  		err := errors.New("no status id specified in request") -		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1)  		return  	}  	format, err := apiutil.NegotiateAccept(c, apiutil.HTMLOrActivityPubHeaders...)  	if err != nil { -		apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGetV1)  		return  	} @@ -61,13 +61,13 @@ func (m *Module) StatusGETHandler(c *gin.Context) {  	resp, errWithCode := m.processor.GetFediStatus(apiutil.TransferSignatureContext(c), requestedUsername, requestedStatusID, c.Request.URL)  	if errWithCode != nil { -		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGet) +		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1)  		return  	}  	b, err := json.Marshal(resp)  	if err != nil { -		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1)  		return  	} diff --git a/internal/api/activitypub/users/userget.go b/internal/api/activitypub/users/userget.go index 1d65f5efe..97f101cfc 100644 --- a/internal/api/activitypub/users/userget.go +++ b/internal/api/activitypub/users/userget.go @@ -43,13 +43,13 @@ func (m *Module) UsersGETHandler(c *gin.Context) {  	requestedUsername := strings.ToLower(c.Param(UsernameKey))  	if requestedUsername == "" {  		err := errors.New("no username specified in request") -		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1)  		return  	}  	format, err := apiutil.NegotiateAccept(c, apiutil.HTMLOrActivityPubHeaders...)  	if err != nil { -		apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGetV1)  		return  	} @@ -61,13 +61,13 @@ func (m *Module) UsersGETHandler(c *gin.Context) {  	resp, errWithCode := m.processor.GetFediUser(apiutil.TransferSignatureContext(c), requestedUsername, c.Request.URL)  	if errWithCode != nil { -		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGet) +		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1)  		return  	}  	b, err := json.Marshal(resp)  	if err != nil { -		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGet) +		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1)  		return  	}  | 
