-
-
Notifications
You must be signed in to change notification settings - Fork 296
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* remote + local block logic, incl. federation * improve blocking stuff * fiddle with display of blocked profiles * go fmt
- Loading branch information
1 parent
c7da649
commit 846057f
Showing
45 changed files
with
1,405 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| GoToSocial | ||
| Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org | ||
| This program is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU Affero General Public License as published by | ||
| the Free Software Foundation, either version 3 of the License, or | ||
| (at your option) any later version. | ||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU Affero General Public License for more details. | ||
| You should have received a copy of the GNU Affero General Public License | ||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package account | ||
|
|
||
| import ( | ||
| "net/http" | ||
|
|
||
| "github.com/gin-gonic/gin" | ||
| "github.com/superseriousbusiness/gotosocial/internal/oauth" | ||
| ) | ||
|
|
||
| // AccountBlockPOSTHandler handles the creation of a block from the authed account targeting the given account ID. | ||
| func (m *Module) AccountBlockPOSTHandler(c *gin.Context) { | ||
| authed, err := oauth.Authed(c, true, true, true, true) | ||
| if err != nil { | ||
| c.JSON(http.StatusUnauthorized, gin.H{"error": "unauthorized"}) | ||
| return | ||
| } | ||
|
|
||
| targetAcctID := c.Param(IDKey) | ||
| if targetAcctID == "" { | ||
| c.JSON(http.StatusBadRequest, gin.H{"error": "no account id specified"}) | ||
| return | ||
| } | ||
|
|
||
| relationship, errWithCode := m.processor.AccountBlockCreate(authed, targetAcctID) | ||
| if errWithCode != nil { | ||
| c.JSON(errWithCode.Code(), gin.H{"error": errWithCode.Safe()}) | ||
| return | ||
| } | ||
|
|
||
| c.JSON(http.StatusOK, relationship) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| GoToSocial | ||
| Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org | ||
| This program is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU Affero General Public License as published by | ||
| the Free Software Foundation, either version 3 of the License, or | ||
| (at your option) any later version. | ||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU Affero General Public License for more details. | ||
| You should have received a copy of the GNU Affero General Public License | ||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package account | ||
|
|
||
| import ( | ||
| "net/http" | ||
|
|
||
| "github.com/gin-gonic/gin" | ||
| "github.com/superseriousbusiness/gotosocial/internal/oauth" | ||
| ) | ||
|
|
||
| // AccountUnblockPOSTHandler handles the removal of a block from the authed account targeting the given account ID. | ||
| func (m *Module) AccountUnblockPOSTHandler(c *gin.Context) { | ||
| authed, err := oauth.Authed(c, true, true, true, true) | ||
| if err != nil { | ||
| c.JSON(http.StatusUnauthorized, gin.H{"error": "unauthorized"}) | ||
| return | ||
| } | ||
|
|
||
| targetAcctID := c.Param(IDKey) | ||
| if targetAcctID == "" { | ||
| c.JSON(http.StatusBadRequest, gin.H{"error": "no account id specified"}) | ||
| return | ||
| } | ||
|
|
||
| relationship, errWithCode := m.processor.AccountBlockRemove(authed, targetAcctID) | ||
| if errWithCode != nil { | ||
| c.JSON(errWithCode.Code(), gin.H{"error": errWithCode.Safe()}) | ||
| return | ||
| } | ||
|
|
||
| c.JSON(http.StatusOK, relationship) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| /* | ||
| GoToSocial | ||
| Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org | ||
| This program is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU Affero General Public License as published by | ||
| the Free Software Foundation, either version 3 of the License, or | ||
| (at your option) any later version. | ||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU Affero General Public License for more details. | ||
| You should have received a copy of the GNU Affero General Public License | ||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package blocks | ||
|
|
||
| import ( | ||
| "net/http" | ||
|
|
||
| "github.com/sirupsen/logrus" | ||
| "github.com/superseriousbusiness/gotosocial/internal/api" | ||
| "github.com/superseriousbusiness/gotosocial/internal/config" | ||
| "github.com/superseriousbusiness/gotosocial/internal/processing" | ||
| "github.com/superseriousbusiness/gotosocial/internal/router" | ||
| ) | ||
|
|
||
| const ( | ||
| // BasePath is the base URI path for serving favourites | ||
| BasePath = "/api/v1/blocks" | ||
|
|
||
| // MaxIDKey is the url query for setting a max ID to return | ||
| MaxIDKey = "max_id" | ||
| // SinceIDKey is the url query for returning results newer than the given ID | ||
| SinceIDKey = "since_id" | ||
| // LimitKey is for specifying maximum number of results to return. | ||
| LimitKey = "limit" | ||
| ) | ||
|
|
||
| // Module implements the ClientAPIModule interface for everything relating to viewing blocks | ||
| type Module struct { | ||
| config *config.Config | ||
| processor processing.Processor | ||
| log *logrus.Logger | ||
| } | ||
|
|
||
| // New returns a new blocks module | ||
| func New(config *config.Config, processor processing.Processor, log *logrus.Logger) api.ClientModule { | ||
| return &Module{ | ||
| config: config, | ||
| processor: processor, | ||
| log: log, | ||
| } | ||
| } | ||
|
|
||
| // Route attaches all routes from this module to the given router | ||
| func (m *Module) Route(r router.Router) error { | ||
| r.AttachHandler(http.MethodGet, BasePath, m.BlocksGETHandler) | ||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| /* | ||
| GoToSocial | ||
| Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org | ||
| This program is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU Affero General Public License as published by | ||
| the Free Software Foundation, either version 3 of the License, or | ||
| (at your option) any later version. | ||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU Affero General Public License for more details. | ||
| You should have received a copy of the GNU Affero General Public License | ||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package blocks | ||
|
|
||
| import ( | ||
| "net/http" | ||
| "strconv" | ||
|
|
||
| "github.com/gin-gonic/gin" | ||
| "github.com/superseriousbusiness/gotosocial/internal/oauth" | ||
| ) | ||
|
|
||
| // BlocksGETHandler handles GETting blocks. | ||
| func (m *Module) BlocksGETHandler(c *gin.Context) { | ||
| l := m.log.WithField("func", "PublicTimelineGETHandler") | ||
|
|
||
| authed, err := oauth.Authed(c, true, true, true, true) | ||
| if err != nil { | ||
| l.Debugf("error authing: %s", err) | ||
| c.JSON(http.StatusUnauthorized, gin.H{"error": "unauthorized"}) | ||
| return | ||
| } | ||
|
|
||
| maxID := "" | ||
| maxIDString := c.Query(MaxIDKey) | ||
| if maxIDString != "" { | ||
| maxID = maxIDString | ||
| } | ||
|
|
||
| sinceID := "" | ||
| sinceIDString := c.Query(SinceIDKey) | ||
| if sinceIDString != "" { | ||
| sinceID = sinceIDString | ||
| } | ||
|
|
||
| limit := 20 | ||
| limitString := c.Query(LimitKey) | ||
| if limitString != "" { | ||
| i, err := strconv.ParseInt(limitString, 10, 64) | ||
| if err != nil { | ||
| l.Debugf("error parsing limit string: %s", err) | ||
| c.JSON(http.StatusBadRequest, gin.H{"error": "couldn't parse limit query param"}) | ||
| return | ||
| } | ||
| limit = int(i) | ||
| } | ||
|
|
||
| resp, errWithCode := m.processor.BlocksGet(authed, maxID, sinceID, limit) | ||
| if errWithCode != nil { | ||
| l.Debugf("error from processor BlocksGet: %s", errWithCode) | ||
| c.JSON(errWithCode.Code(), gin.H{"error": errWithCode.Safe()}) | ||
| return | ||
| } | ||
|
|
||
| if resp.LinkHeader != "" { | ||
| c.Header("Link", resp.LinkHeader) | ||
| } | ||
| c.JSON(http.StatusOK, resp.Accounts) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| /* | ||
| GoToSocial | ||
| Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org | ||
| This program is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU Affero General Public License as published by | ||
| the Free Software Foundation, either version 3 of the License, or | ||
| (at your option) any later version. | ||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU Affero General Public License for more details. | ||
| You should have received a copy of the GNU Affero General Public License | ||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package model | ||
|
|
||
| // BlocksResponse wraps a slice of accounts, ready to be serialized, along with the Link | ||
| // header for the previous and next queries, to be returned to the client. | ||
| type BlocksResponse struct { | ||
| Accounts []*Account | ||
| LinkHeader string | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.