Skip to content

Commit

Permalink
Notifications (#34)
Browse files Browse the repository at this point in the history
Notifications working for:

* Mentions
* Faves
* New follow requests
* New followers
  • Loading branch information
tsmethurst committed May 27, 2021
1 parent e670c32 commit 40add68
Show file tree
Hide file tree
Showing 42 changed files with 2,096 additions and 1,194 deletions.
66 changes: 66 additions & 0 deletions internal/api/client/notification/notification.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/*
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 notification

import (
"net/http"

"github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/api"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/message"
"github.com/superseriousbusiness/gotosocial/internal/router"
)

const (
// IDKey is for notification UUIDs
IDKey = "id"
// BasePath is the base path for serving the notification API
BasePath = "/api/v1/notifications"
// BasePathWithID is just the base path with the ID key in it.
// Use this anywhere you need to know the ID of the notification being queried.
BasePathWithID = BasePath + "/:" + IDKey

// MaxIDKey is the url query for setting a max notification ID to return
MaxIDKey = "max_id"
// Limit key is for specifying maximum number of notifications to return.
LimitKey = "limit"
)

// Module implements the ClientAPIModule interface for every related to posting/deleting/interacting with notifications
type Module struct {
config *config.Config
processor message.Processor
log *logrus.Logger
}

// New returns a new notification module
func New(config *config.Config, processor message.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.NotificationsGETHandler)
return nil
}
72 changes: 72 additions & 0 deletions internal/api/client/notification/notificationsget.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
/*
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 notification

import (
"net/http"
"strconv"

"github.com/gin-gonic/gin"
"github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
)

func (m *Module) NotificationsGETHandler(c *gin.Context) {
l := m.log.WithFields(logrus.Fields{
"func": "NotificationsGETHandler",
"request_uri": c.Request.RequestURI,
"user_agent": c.Request.UserAgent(),
"origin_ip": c.ClientIP(),
})
l.Debugf("entering function")

authed, err := oauth.Authed(c, true, true, true, true) // we don't really need an app here but we want everything else
if err != nil {
l.Errorf("error authing status faved by request: %s", err)
c.JSON(http.StatusBadRequest, gin.H{"error": "not authed"})
return
}

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)
}

maxID := ""
maxIDString := c.Query(MaxIDKey)
if maxIDString != "" {
maxID = maxIDString
}

notifs, errWithCode := m.processor.NotificationsGet(authed, limit, maxID)
if errWithCode != nil {
l.Debugf("error processing notifications get: %s", errWithCode.Error())
c.JSON(errWithCode.Code(), gin.H{"error": errWithCode.Safe()})
return
}

c.JSON(http.StatusOK, notifs)
}
2 changes: 1 addition & 1 deletion internal/api/model/notification.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ type Notification struct {
// OPTIONAL

// Status that was the object of the notification, e.g. in mentions, reblogs, favourites, or polls.
Status *Status `json:"status"`
Status *Status `json:"status,omitempty"`
}
2 changes: 1 addition & 1 deletion internal/api/model/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ type Status struct {
// Is this status marked as sensitive content?
Sensitive bool `json:"sensitive"`
// Subject or summary line, below which status content is collapsed until expanded.
SpoilerText string `json:"spoiler_text,omitempty"`
SpoilerText string `json:"spoiler_text"`
// Visibility of this status.
Visibility Visibility `json:"visibility"`
// Primary language of this status. (ISO 639 Part 1 two-letter language code)
Expand Down
2 changes: 2 additions & 0 deletions internal/db/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,8 @@ type DB interface {
// It will use the given filters and try to return as many statuses up to the limit as possible.
GetHomeTimelineForAccount(accountID string, maxID string, sinceID string, minID string, limit int, local bool) ([]*gtsmodel.Status, error)

GetNotificationsForAccount(accountID string, limit int, maxID string) ([]*gtsmodel.Notification, error)

/*
USEFUL CONVERSION FUNCTIONS
*/
Expand Down
29 changes: 29 additions & 0 deletions internal/db/pg/pg.go
Original file line number Diff line number Diff line change
Expand Up @@ -1138,6 +1138,35 @@ func (ps *postgresService) GetHomeTimelineForAccount(accountID string, maxID str
return statuses, nil
}

func (ps *postgresService) GetNotificationsForAccount(accountID string, limit int, maxID string) ([]*gtsmodel.Notification, error) {
notifications := []*gtsmodel.Notification{}

q := ps.conn.Model(&notifications).Where("target_account_id = ?", accountID)


if maxID != "" {
n := &gtsmodel.Notification{}
if err := ps.conn.Model(n).Where("id = ?", maxID).Select(); err != nil {
return nil, err
}
q = q.Where("created_at < ?", n.CreatedAt)
}

if limit != 0 {
q = q.Limit(limit)
}

q = q.Order("created_at DESC")

if err := q.Select(); err != nil {
if err != pg.ErrNoRows {
return nil, err
}

}
return notifications, nil
}

/*
CONVERSION FUNCTIONS
*/
Expand Down
Loading

0 comments on commit 40add68

Please sign in to comment.