patch of appview/notifications: handlers for notifs · round #0 · pull #594 · tangled.org/core

+173

appview/notifications/notifications.go

···

       1
       1
       +
       package notifications

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"log"

     

       5
       5
       +
       	"net/http"

     

       6
       6
       +
       	"strconv"

     

       7
       7
       +
       

     

       8
       8
       +
       	"github.com/go-chi/chi/v5"

     

       9
       9
       +
       	"tangled.org/core/appview/db"

     

       10
       10
       +
       	"tangled.org/core/appview/middleware"

     

       11
       11
       +
       	"tangled.org/core/appview/oauth"

     

       12
       12
       +
       	"tangled.org/core/appview/pages"

     

       13
       13
       +
       )

     

       14
       14
       +
       

     

       15
       15
       +
       type Notifications struct {

     

       16
       16
       +
       	db    *db.DB

     

       17
       17
       +
       	oauth *oauth.OAuth

     

       18
       18
       +
       	pages *pages.Pages

     

       19
       19
       +
       }

     

       20
       20
       +
       

     

       21
       21
       +
       func New(database *db.DB, oauthHandler *oauth.OAuth, pagesHandler *pages.Pages) *Notifications {

     

       22
       22
       +
       	return &Notifications{

     

       23
       23
       +
       		db:    database,

     

       24
       24
       +
       		oauth: oauthHandler,

     

       25
       25
       +
       		pages: pagesHandler,

     

       26
       26
       +
       	}

     

       27
       27
       +
       }

     

       28
       28
       +
       

     

       29
       29
       +
       func (n *Notifications) Router(mw *middleware.Middleware) http.Handler {

     

       30
       30
       +
       	r := chi.NewRouter()

     

       31
       31
       +
       

     

       32
       32
       +
       	r.Use(middleware.AuthMiddleware(n.oauth))

     

       33
       33
       +
       

     

       34
       34
       +
       	r.Get("/", n.notificationsPage)

     

       35
       35
       +
       

     

       36
       36
       +
       	r.Get("/count", n.getUnreadCount)

     

       37
       37
       +
       	r.Post("/{id}/read", n.markRead)

     

       38
       38
       +
       	r.Post("/read-all", n.markAllRead)

     

       39
       39
       +
       	r.Delete("/{id}", n.deleteNotification)

     

       40
       40
       +
       

     

       41
       41
       +
       	return r

     

       42
       42
       +
       }

     

       43
       43
       +
       

     

       44
       44
       +
       func (n *Notifications) notificationsPage(w http.ResponseWriter, r *http.Request) {

     

       45
       45
       +
       	userDid := n.oauth.GetDid(r)

     

       46
       46
       +
       

     

       47
       47
       +
       	limitStr := r.URL.Query().Get("limit")

     

       48
       48
       +
       	offsetStr := r.URL.Query().Get("offset")

     

       49
       49
       +
       

     

       50
       50
       +
       	limit := 20 // default

     

       51
       51
       +
       	if limitStr != "" {

     

       52
       52
       +
       		if l, err := strconv.Atoi(limitStr); err == nil && l > 0 && l <= 100 {

     

       53
       53
       +
       			limit = l

     

       54
       54
       +
       		}

     

       55
       55
       +
       	}

     

       56
       56
       +
       

     

       57
       57
       +
       	offset := 0 // default

     

       58
       58
       +
       	if offsetStr != "" {

     

       59
       59
       +
       		if o, err := strconv.Atoi(offsetStr); err == nil && o >= 0 {

     

       60
       60
       +
       			offset = o

     

       61
       61
       +
       		}

     

       62
       62
       +
       	}

     

       63
       63
       +
       

     

       64
       64
       +
       	notifications, err := n.db.GetNotificationsWithEntities(r.Context(), userDid, limit+1, offset)

     

       65
       65
       +
       	if err != nil {

     

       66
       66
       +
       		log.Println("failed to get notifications:", err)

     

       67
       67
       +
       		n.pages.Error500(w)

     

       68
       68
       +
       		return

     

       69
       69
       +
       	}

     

       70
       70
       +
       

     

       71
       71
       +
       	hasMore := len(notifications) > limit

     

       72
       72
       +
       	if hasMore {

     

       73
       73
       +
       		notifications = notifications[:limit]

     

       74
       74
       +
       	}

     

       75
       75
       +
       

     

       76
       76
       +
       	err = n.db.MarkAllNotificationsRead(r.Context(), userDid)

     

       77
       77
       +
       	if err != nil {

     

       78
       78
       +
       		log.Println("failed to mark notifications as read:", err)

     

       79
       79
       +
       	}

     

       80
       80
       +
       

     

       81
       81
       +
       	unreadCount := 0

     

       82
       82
       +
       

     

       83
       83
       +
       	user := n.oauth.GetUser(r)

     

       84
       84
       +
       	if user == nil {

     

       85
       85
       +
       		http.Error(w, "Failed to get user", http.StatusInternalServerError)

     

       86
       86
       +
       		return

     

       87
       87
       +
       	}

     

       88
       88
       +
       

     

       89
       89
       +
       	params := pages.NotificationsParams{

     

       90
       90
       +
       		LoggedInUser:  user,

     

       91
       91
       +
       		Notifications: notifications,

     

       92
       92
       +
       		UnreadCount:   unreadCount,

     

       93
       93
       +
       		HasMore:       hasMore,

     

       94
       94
       +
       		NextOffset:    offset + limit,

     

       95
       95
       +
       		Limit:         limit,

     

       96
       96
       +
       	}

     

       97
       97
       +
       

     

       98
       98
       +
       	err = n.pages.Notifications(w, params)

     

       99
       99
       +
       	if err != nil {

     

       100
       100
       +
       		log.Println("failed to load notifs:", err)

     

       101
       101
       +
       		n.pages.Error500(w)

     

       102
       102
       +
       		return

     

       103
       103
       +
       	}

     

       104
       104
       +
       }

     

       105
       105
       +
       

     

       106
       106
       +
       func (n *Notifications) getUnreadCount(w http.ResponseWriter, r *http.Request) {

     

       107
       107
       +
       	userDid := n.oauth.GetDid(r)

     

       108
       108
       +
       

     

       109
       109
       +
       	count, err := n.db.GetUnreadNotificationCount(r.Context(), userDid)

     

       110
       110
       +
       	if err != nil {

     

       111
       111
       +
       		http.Error(w, "Failed to get unread count", http.StatusInternalServerError)

     

       112
       112
       +
       		return

     

       113
       113
       +
       	}

     

       114
       114
       +
       

     

       115
       115
       +
       	params := pages.NotificationCountParams{

     

       116
       116
       +
       		Count: count,

     

       117
       117
       +
       	}

     

       118
       118
       +
       	err = n.pages.NotificationCount(w, params)

     

       119
       119
       +
       	if err != nil {

     

       120
       120
       +
       		http.Error(w, "Failed to render count", http.StatusInternalServerError)

     

       121
       121
       +
       		return

     

       122
       122
       +
       	}

     

       123
       123
       +
       }

     

       124
       124
       +
       

     

       125
       125
       +
       func (n *Notifications) markRead(w http.ResponseWriter, r *http.Request) {

     

       126
       126
       +
       	userDid := n.oauth.GetDid(r)

     

       127
       127
       +
       

     

       128
       128
       +
       	idStr := chi.URLParam(r, "id")

     

       129
       129
       +
       	notificationID, err := strconv.ParseInt(idStr, 10, 64)

     

       130
       130
       +
       	if err != nil {

     

       131
       131
       +
       		http.Error(w, "Invalid notification ID", http.StatusBadRequest)

     

       132
       132
       +
       		return

     

       133
       133
       +
       	}

     

       134
       134
       +
       

     

       135
       135
       +
       	err = n.db.MarkNotificationRead(r.Context(), notificationID, userDid)

     

       136
       136
       +
       	if err != nil {

     

       137
       137
       +
       		http.Error(w, "Failed to mark notification as read", http.StatusInternalServerError)

     

       138
       138
       +
       		return

     

       139
       139
       +
       	}

     

       140
       140
       +
       

     

       141
       141
       +
       	w.WriteHeader(http.StatusNoContent)

     

       142
       142
       +
       }

     

       143
       143
       +
       

     

       144
       144
       +
       func (n *Notifications) markAllRead(w http.ResponseWriter, r *http.Request) {

     

       145
       145
       +
       	userDid := n.oauth.GetDid(r)

     

       146
       146
       +
       

     

       147
       147
       +
       	err := n.db.MarkAllNotificationsRead(r.Context(), userDid)

     

       148
       148
       +
       	if err != nil {

     

       149
       149
       +
       		http.Error(w, "Failed to mark all notifications as read", http.StatusInternalServerError)

     

       150
       150
       +
       		return

     

       151
       151
       +
       	}

     

       152
       152
       +
       

     

       153
       153
       +
       	http.Redirect(w, r, "/notifications", http.StatusSeeOther)

     

       154
       154
       +
       }

     

       155
       155
       +
       

     

       156
       156
       +
       func (n *Notifications) deleteNotification(w http.ResponseWriter, r *http.Request) {

     

       157
       157
       +
       	userDid := n.oauth.GetDid(r)

     

       158
       158
       +
       

     

       159
       159
       +
       	idStr := chi.URLParam(r, "id")

     

       160
       160
       +
       	notificationID, err := strconv.ParseInt(idStr, 10, 64)

     

       161
       161
       +
       	if err != nil {

     

       162
       162
       +
       		http.Error(w, "Invalid notification ID", http.StatusBadRequest)

     

       163
       163
       +
       		return

     

       164
       164
       +
       	}

     

       165
       165
       +
       

     

       166
       166
       +
       	err = n.db.DeleteNotification(r.Context(), notificationID, userDid)

     

       167
       167
       +
       	if err != nil {

     

       168
       168
       +
       		http.Error(w, "Failed to delete notification", http.StatusInternalServerError)

     

       169
       169
       +
       		return

     

       170
       170
       +
       	}

     

       171
       171
       +
       

     

       172
       172
       +
       	w.WriteHeader(http.StatusOK)

     

       173
       173
       +
       }

+51

appview/settings/settings.go

···

       41
       41
        
       		{"Name": "profile", "Icon": "user"},

     

       42
       42
        
       		{"Name": "keys", "Icon": "key"},

     

       43
       43
        
       		{"Name": "emails", "Icon": "mail"},

     

       44
       44
       +
       		{"Name": "notifications", "Icon": "bell"},

     

       44
       45
        
       	}

     

       45
       46
        
       )

     

       46
       47
        
       

     
···

       68
       69
        
       		r.Post("/primary", s.emailsPrimary)

     

       69
       70
        
       	})

     

       70
       71
        
       

     

       72
       72
       +
       	r.Route("/notifications", func(r chi.Router) {

     

       73
       73
       +
       		r.Get("/", s.notificationsSettings)

     

       74
       74
       +
       		r.Put("/", s.updateNotificationPreferences)

     

       75
       75
       +
       	})

     

       76
       76
       +
       

     

       71
       77
        
       	return r

     

       72
       78
        
       }

     

       73
       79
        
       

     
···

       81
       87
        
       	})

     

       82
       88
        
       }

     

       83
       89
        
       

     

       90
       90
       +
       func (s *Settings) notificationsSettings(w http.ResponseWriter, r *http.Request) {

     

       91
       91
       +
       	user := s.OAuth.GetUser(r)

     

       92
       92
       +
       	did := s.OAuth.GetDid(r)

     

       93
       93
       +
       

     

       94
       94
       +
       	prefs, err := s.Db.GetNotificationPreferences(r.Context(), did)

     

       95
       95
       +
       	if err != nil {

     

       96
       96
       +
       		log.Printf("failed to get notification preferences: %s", err)

     

       97
       97
       +
       		s.Pages.Notice(w, "settings-notifications-error", "Unable to load notification preferences.")

     

       98
       98
       +
       		return

     

       99
       99
       +
       	}

     

       100
       100
       +
       

     

       101
       101
       +
       	s.Pages.UserNotificationSettings(w, pages.UserNotificationSettingsParams{

     

       102
       102
       +
       		LoggedInUser: user,

     

       103
       103
       +
       		Preferences:  prefs,

     

       104
       104
       +
       		Tabs:         settingsTabs,

     

       105
       105
       +
       		Tab:          "notifications",

     

       106
       106
       +
       	})

     

       107
       107
       +
       }

     

       108
       108
       +
       

     

       109
       109
       +
       func (s *Settings) updateNotificationPreferences(w http.ResponseWriter, r *http.Request) {

     

       110
       110
       +
       	did := s.OAuth.GetDid(r)

     

       111
       111
       +
       

     

       112
       112
       +
       	prefs := &models.NotificationPreferences{

     

       113
       113
       +
       		UserDid:            did,

     

       114
       114
       +
       		RepoStarred:        r.FormValue("repo_starred") == "on",

     

       115
       115
       +
       		IssueCreated:       r.FormValue("issue_created") == "on",

     

       116
       116
       +
       		IssueCommented:     r.FormValue("issue_commented") == "on",

     

       117
       117
       +
       		IssueClosed:        r.FormValue("issue_closed") == "on",

     

       118
       118
       +
       		PullCreated:        r.FormValue("pull_created") == "on",

     

       119
       119
       +
       		PullCommented:      r.FormValue("pull_commented") == "on",

     

       120
       120
       +
       		PullMerged:         r.FormValue("pull_merged") == "on",

     

       121
       121
       +
       		Followed:           r.FormValue("followed") == "on",

     

       122
       122
       +
       		EmailNotifications: r.FormValue("email_notifications") == "on",

     

       123
       123
       +
       	}

     

       124
       124
       +
       

     

       125
       125
       +
       	err := s.Db.UpdateNotificationPreferences(r.Context(), prefs)

     

       126
       126
       +
       	if err != nil {

     

       127
       127
       +
       		log.Printf("failed to update notification preferences: %s", err)

     

       128
       128
       +
       		s.Pages.Notice(w, "settings-notifications-error", "Unable to save notification preferences.")

     

       129
       129
       +
       		return

     

       130
       130
       +
       	}

     

       131
       131
       +
       

     

       132
       132
       +
       	s.Pages.Notice(w, "settings-notifications-success", "Notification preferences saved successfully.")

     

       133
       133
       +
       }

     

       134
       134
       +
       

     

       84
       135
        
       func (s *Settings) keysSettings(w http.ResponseWriter, r *http.Request) {

     

       85
       136
        
       	user := s.OAuth.GetUser(r)

     

       86
       137
        
       	pubKeys, err := db.GetPublicKeysForDid(s.Db, user.Did)

appview/state/router.go

···

       10
       10
        
       	"tangled.org/core/appview/knots"

     

       11
       11
        
       	"tangled.org/core/appview/labels"

     

       12
       12
        
       	"tangled.org/core/appview/middleware"

     

       13
       13
       +
       	"tangled.org/core/appview/notifications"

     

       13
       14
        
       	oauthhandler "tangled.org/core/appview/oauth/handler"

     

       14
       15
        
       	"tangled.org/core/appview/pipelines"

     

       15
       16
        
       	"tangled.org/core/appview/pulls"

     
···

       276
       277
        
       	return ls.Router(mw)

     

       277
       278
        
       }

     

       278
       279
        
       

     

       280
       280
       +
       func (s *State) NotificationsRouter(mw *middleware.Middleware) http.Handler {

     

       281
       281
       +
       	notifs := notifications.New(s.db, s.oauth, s.pages)

     

       282
       282
       +
       	return notifs.Router(mw)

     

       283
       283
       +
       }

     

       284
       284
       +
       

     

       279
       285
        
       func (s *State) SignupRouter() http.Handler {

     

       280
       286
        
       	logger := log.New("signup")

     

       281
       287