commit 054a6a04b2df2fe448756c03f27c1485cc91ec01 · nel.pet/core

+18 -13

appview/db/notifications.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     

       5
       5
        
       	"database/sql"

     

       6
       6
       +
       	"errors"

     

       6
       7
        
       	"fmt"

     

       8
       8
       +
       	"strings"

     

       7
       9
        
       	"time"

     

       8
       10
        
       

     

       9
       11
        
       	"tangled.org/core/appview/models"

     
···

       248
       250
        
       	return GetNotificationsPaginated(e, pagination.FirstPage(), filters...)

     

       249
       251
        
       }

     

       250
       252
        
       

     

       251
       251
       -
       func (d *DB) GetUnreadNotificationCount(ctx context.Context, userDID string) (int, error) {

     

       252
       252
       -
       	recipientFilter := FilterEq("recipient_did", userDID)

     

       253
       253
       -
       	readFilter := FilterEq("read", 0)

     

       253
       253
       +
       func CountNotifications(e Execer, filters ...filter) (int64, error) {

     

       254
       254
       +
       	var conditions []string

     

       255
       255
       +
       	var args []any

     

       256
       256
       +
       	for _, filter := range filters {

     

       257
       257
       +
       		conditions = append(conditions, filter.Condition())

     

       258
       258
       +
       		args = append(args, filter.Arg()...)

     

       259
       259
       +
       	}

     

       254
       260
        
       

     

       255
       255
       -
       	query := fmt.Sprintf(`

     

       256
       256
       -
       		SELECT COUNT(*)

     

       257
       257
       -
       		FROM notifications

     

       258
       258
       -
       		WHERE %s AND %s

     

       259
       259
       -
       	`, recipientFilter.Condition(), readFilter.Condition())

     

       261
       261
       +
       	whereClause := ""

     

       262
       262
       +
       	if conditions != nil {

     

       263
       263
       +
       		whereClause = " where " + strings.Join(conditions, " and ")

     

       264
       264
       +
       	}

     

       260
       265
        
       

     

       261
       261
       -
       	args := append(recipientFilter.Arg(), readFilter.Arg()...)

     

       266
       266
       +
       	query := fmt.Sprintf(`select count(1) from notifications %s`, whereClause)

     

       267
       267
       +
       	var count int64

     

       268
       268
       +
       	err := e.QueryRow(query, args...).Scan(&count)

     

       262
       269
        
       

     

       263
       263
       -
       	var count int

     

       264
       264
       -
       	err := d.DB.QueryRowContext(ctx, query, args...).Scan(&count)

     

       265
       265
       -
       	if err != nil {

     

       266
       266
       -
       		return 0, fmt.Errorf("failed to get unread count: %w", err)

     

       270
       270
       +
       	if !errors.Is(err, sql.ErrNoRows) && err != nil {

     

       271
       271
       +
       		return 0, err

     

       267
       272
        
       	}

     

       268
       273
        
       

     

       269
       274
        
       	return count, nil

+29 -36

appview/notifications/notifications.go

···

       1
       1
        
       package notifications

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"fmt"

     

       4
       5
        
       	"log"

     

       5
       6
        
       	"net/http"

     

       6
       7
        
       	"strconv"

     
···

       32
       33
        
       

     

       33
       34
        
       	r.Use(middleware.AuthMiddleware(n.oauth))

     

       34
       35
        
       

     

       35
       35
       -
       	r.Get("/", n.notificationsPage)

     

       36
       36
       +
       	r.With(middleware.Paginate).Get("/", n.notificationsPage)

     

       36
       37
        
       

     

       37
       38
        
       	r.Get("/count", n.getUnreadCount)

     

       38
       39
        
       	r.Post("/{id}/read", n.markRead)

     
···

       45
       46
        
       func (n *Notifications) notificationsPage(w http.ResponseWriter, r *http.Request) {

     

       46
       47
        
       	userDid := n.oauth.GetDid(r)

     

       47
       48
        
       

     

       48
       48
       -
       	limitStr := r.URL.Query().Get("limit")

     

       49
       49
       -
       	offsetStr := r.URL.Query().Get("offset")

     

       50
       50
       -
       

     

       51
       51
       -
       	limit := 20 // default

     

       52
       52
       -
       	if limitStr != "" {

     

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

     

       54
       54
       -
       			limit = l

     

       55
       55
       -
       		}

     

       49
       49
       +
       	page, ok := r.Context().Value("page").(pagination.Page)

     

       50
       50
       +
       	if !ok {

     

       51
       51
       +
       		log.Println("failed to get page")

     

       52
       52
       +
       		page = pagination.FirstPage()

     

       56
       53
        
       	}

     

       57
       54
        
       

     

       58
       58
       -
       	offset := 0 // default

     

       59
       59
       -
       	if offsetStr != "" {

     

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

     

       61
       61
       -
       			offset = o

     

       62
       62
       -
       		}

     

       55
       55
       +
       	total, err := db.CountNotifications(

     

       56
       56
       +
       		n.db,

     

       57
       57
       +
       		db.FilterEq("recipient_did", userDid),

     

       58
       58
       +
       	)

     

       59
       59
       +
       	if err != nil {

     

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

     

       61
       61
       +
       		n.pages.Error500(w)

     

       62
       62
       +
       		return

     

       63
       63
        
       	}

     

       64
       64
        
       

     

       65
       65
       -
       	page := pagination.Page{Limit: limit + 1, Offset: offset}

     

       66
       66
       -
       	notifications, err := db.GetNotificationsWithEntities(n.db, page, db.FilterEq("recipient_did", userDid))

     

       65
       65
       +
       	notifications, err := db.GetNotificationsWithEntities(

     

       66
       66
       +
       		n.db,

     

       67
       67
       +
       		page,

     

       68
       68
       +
       		db.FilterEq("recipient_did", userDid),

     

       69
       69
       +
       	)

     

       67
       70
        
       	if err != nil {

     

       68
       71
        
       		log.Println("failed to get notifications:", err)

     

       69
       72
        
       		n.pages.Error500(w)

     

       70
       73
        
       		return

     

       71
       71
       -
       	}

     

       72
       72
       -
       

     

       73
       73
       -
       	hasMore := len(notifications) > limit

     

       74
       74
       -
       	if hasMore {

     

       75
       75
       -
       		notifications = notifications[:limit]

     

       76
       74
        
       	}

     

       77
       75
        
       

     

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

     
···

       88
       86
        
       		return

     

       89
       87
        
       	}

     

       90
       88
        
       

     

       91
       91
       -
       	params := pages.NotificationsParams{

     

       89
       89
       +
       	fmt.Println(n.pages.Notifications(w, pages.NotificationsParams{

     

       92
       90
        
       		LoggedInUser:  user,

     

       93
       91
        
       		Notifications: notifications,

     

       94
       92
        
       		UnreadCount:   unreadCount,

     

       95
       95
       -
       		HasMore:       hasMore,

     

       96
       96
       -
       		NextOffset:    offset + limit,

     

       97
       97
       -
       		Limit:         limit,

     

       98
       98
       -
       	}

     

       99
       99
       -
       

     

       100
       100
       -
       	err = n.pages.Notifications(w, params)

     

       101
       101
       -
       	if err != nil {

     

       102
       102
       -
       		log.Println("failed to load notifs:", err)

     

       103
       103
       -
       		n.pages.Error500(w)

     

       104
       104
       -
       		return

     

       105
       105
       -
       	}

     

       93
       93
       +
       		Page:          page,

     

       94
       94
       +
       		Total:         total,

     

       95
       95
       +
       	}))

     

       106
       96
        
       }

     

       107
       97
        
       

     

       108
       98
        
       func (n *Notifications) getUnreadCount(w http.ResponseWriter, r *http.Request) {

     

       109
       109
       -
       	userDid := n.oauth.GetDid(r)

     

       110
       110
       -
       

     

       111
       111
       -
       	count, err := n.db.GetUnreadNotificationCount(r.Context(), userDid)

     

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

     

       100
       100
       +
       	count, err := db.CountNotifications(

     

       101
       101
       +
       		n.db,

     

       102
       102
       +
       		db.FilterEq("recipient_did", user.Did),

     

       103
       103
       +
       		db.FilterEq("read", 0),

     

       104
       104
       +
       	)

     

       112
       105
        
       	if err != nil {

     

       113
       106
        
       		http.Error(w, "Failed to get unread count", http.StatusInternalServerError)

     

       114
       107
        
       		return

+3 -4

appview/pages/pages.go

···

       326
       326
        
       	LoggedInUser  *oauth.User

     

       327
       327
        
       	Notifications []*models.NotificationWithEntity

     

       328
       328
        
       	UnreadCount   int

     

       329
       329
       -
       	HasMore       bool

     

       330
       330
       -
       	NextOffset    int

     

       331
       331
       -
       	Limit         int

     

       329
       329
       +
       	Page          pagination.Page

     

       330
       330
       +
       	Total         int64

     

       332
       331
        
       }

     

       333
       332
        
       

     

       334
       333
        
       func (p *Pages) Notifications(w io.Writer, params NotificationsParams) error {

     
···

       344
       343
        
       }

     

       345
       344
        
       

     

       346
       345
        
       type NotificationCountParams struct {

     

       347
       347
       -
       	Count int

     

       346
       346
       +
       	Count int64

     

       348
       347
        
       }

     

       349
       348
        
       

     

       350
       349
        
       func (p *Pages) NotificationCount(w io.Writer, params NotificationCountParams) error {

+48 -15

appview/pages/templates/notifications/list.html

···

       11
       11
        
           </div>

     

       12
       12
        
         </div>

     

       13
       13
        
       

     

       14
       14
       -
           {{if .Notifications}}

     

       15
       15
       -
             <div class="flex flex-col gap-2" id="notifications-list">

     

       16
       16
       -
               {{range .Notifications}}

     

       17
       17
       -
                 {{template "notifications/fragments/item" .}}

     

       18
       18
       -
               {{end}}

     

       19
       19
       -
             </div>

     

       14
       14
       +
         {{if .Notifications}}

     

       15
       15
       +
           <div class="flex flex-col gap-2" id="notifications-list">

     

       16
       16
       +
             {{range .Notifications}}

     

       17
       17
       +
               {{template "notifications/fragments/item" .}}

     

       18
       18
       +
             {{end}}

     

       19
       19
       +
           </div>

     

       20
       20
        
       

     

       21
       21
       -
           {{else}}

     

       22
       22
       -
             <div class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white">

     

       23
       23
       -
               <div class="text-center py-12">

     

       24
       24
       -
                 <div class="w-16 h-16 mx-auto mb-4 text-gray-300 dark:text-gray-600">

     

       25
       25
       -
                   {{ i "bell-off" "w-16 h-16" }}

     

       26
       26
       -
                 </div>

     

       27
       27
       -
                 <h3 class="text-lg font-medium text-gray-900 dark:text-white mb-2">No notifications</h3>

     

       28
       28
       -
                 <p class="text-gray-600 dark:text-gray-400">When you receive notifications, they'll appear here.</p>

     

       21
       21
       +
         {{else}}

     

       22
       22
       +
           <div class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white">

     

       23
       23
       +
             <div class="text-center py-12">

     

       24
       24
       +
               <div class="w-16 h-16 mx-auto mb-4 text-gray-300 dark:text-gray-600">

     

       25
       25
       +
                 {{ i "bell-off" "w-16 h-16" }}

     

       29
       26
        
               </div>

     

       27
       27
       +
               <h3 class="text-lg font-medium text-gray-900 dark:text-white mb-2">No notifications</h3>

     

       28
       28
       +
               <p class="text-gray-600 dark:text-gray-400">When you receive notifications, they'll appear here.</p>

     

       30
       29
        
             </div>

     

       31
       31
       -
           {{end}}

     

       30
       30
       +
           </div>

     

       31
       31
       +
         {{end}}

     

       32
       32
       +
       

     

       33
       33
       +
         {{ template "pagination" . }}

     

       34
       34
       +
       {{ end }}

     

       35
       35
       +
       

     

       36
       36
       +
       {{ define "pagination" }}

     

       37
       37
       +
         <div class="flex justify-end mt-4 gap-2">

     

       38
       38
       +
             {{ if gt .Page.Offset 0 }}

     

       39
       39
       +
                {{ $prev := .Page.Previous }}

     

       40
       40
       +
                 <a

     

       41
       41
       +
                     class="btn flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:hover:bg-gray-700"

     

       42
       42
       +
                     hx-boost="true"

     

       43
       43
       +
                     href = "/notifications?offset={{ $prev.Offset }}&limit={{ $prev.Limit }}"

     

       44
       44
       +
                 >

     

       45
       45
       +
                     {{ i "chevron-left" "w-4 h-4" }}

     

       46
       46
       +
                     previous

     

       47
       47
       +
                 </a>

     

       48
       48
       +
             {{ else }}

     

       49
       49
       +
                 <div></div>

     

       50
       50
       +
             {{ end }}

     

       51
       51
       +
       

     

       52
       52
       +
             {{ $next := .Page.Next }}

     

       53
       53
       +
             {{ if lt $next.Offset .Total }}

     

       54
       54
       +
                {{ $next := .Page.Next }}

     

       55
       55
       +
                 <a

     

       56
       56
       +
                     class="btn flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:hover:bg-gray-700"

     

       57
       57
       +
                     hx-boost="true"

     

       58
       58
       +
                     href = "/notifications?offset={{ $next.Offset }}&limit={{ $next.Limit }}"

     

       59
       59
       +
                 >

     

       60
       60
       +
                     next

     

       61
       61
       +
                     {{ i "chevron-right" "w-4 h-4" }}

     

       62
       62
       +
                 </a>

     

       63
       63
       +
             {{ end }}

     

       64
       64
       +
         </div>

     

       32
       65
        
       {{ end }}

+1 -1

appview/pagination/page.go

···

       8
       8
        
       func FirstPage() Page {

     

       9
       9
        
       	return Page{

     

       10
       10
        
       		Offset: 0,

     

       11
       11
       -
       		Limit:  10,

     

       11
       11
       +
       		Limit:  30,

     

       12
       12
        
       	}

     

       13
       13
        
       }

     

       14
       14