interdiff of round #1 and #0 · pull #2 · yoten.app/yoten

REVERTED

internal/consumer/ingester.go

···

       607
       607
        
       			return fmt.Errorf("failed to start transaction: %w", err)

     

       608
       608
        
       		}

     

       609
       609
        
       

     

       610
       610
       +
       		// TODO: Parse reply

     

       610
       610
       -
       		var parentCommentUri *syntax.ATURI = nil

     

       611
       611
       -
       		reply := record.Reply

     

       612
       612
       -
       		if reply != nil {

     

       613
       613
       -
       			parentUri, err := syntax.ParseATURI(reply.Parent)

     

       614
       614
       -
       			if err != nil {

     

       615
       615
       -
       				return fmt.Errorf("failed to parse parent at-uri: %w", err)

     

       616
       616
       -
       			}

     

       617
       617
       -
       			parentCommentUri = &parentUri

     

       618
       618
       -
       		}

     

       619
       611
        
       

     

       620
       612
        
       		comment := db.Comment{

     

       613
       613
       +
       			Did:             did,

     

       614
       614
       +
       			Rkey:            e.Commit.RKey,

     

       615
       615
       +
       			StudySessionUri: subjectUri,

     

       616
       616
       +
       			Body:            body,

     

       617
       617
       +
       			CreatedAt:       createdAt,

     

       621
       621
       -
       			Did:              did,

     

       622
       622
       -
       			Rkey:             e.Commit.RKey,

     

       623
       623
       -
       			StudySessionUri:  subjectUri,

     

       624
       624
       -
       			ParentCommentUri: parentCommentUri,

     

       625
       625
       -
       			Body:             body,

     

       626
       626
       -
       			CreatedAt:        createdAt,

     

       627
       618
        
       		}

     

       628
       619
        
       

     

       629
       620
        
       		log.Println("upserting comment from pds request")

ERROR

internal/db/comment.go

Failed to calculate interdiff for this file.

ERROR

internal/server/handlers/comment.go

Failed to calculate interdiff for this file.

ERROR

internal/server/handlers/router.go

Failed to calculate interdiff for this file.

ERROR

internal/server/handlers/study-session.go

Failed to calculate interdiff for this file.

ERROR

internal/server/views/partials/comment.templ

Failed to calculate interdiff for this file.

ERROR

internal/server/views/partials/discussion.templ

Failed to calculate interdiff for this file.

ERROR

internal/server/views/partials/edit-comment.templ

Failed to calculate interdiff for this file.

ERROR

internal/server/views/partials/partials.go

Failed to calculate interdiff for this file.

ERROR

internal/server/views/partials/reply.templ

Failed to calculate interdiff for this file.

ERROR

internal/server/views/study-session.templ

Failed to calculate interdiff for this file.

REVERTED

migrations/update_notification_type.sql

···

       1
       1
       -
       -- This script should be used and updated whenever a new notification type

     

       2
       2
       -
       -- constraint needs to be added.

     

       3
       3
       -
       

     

       4
       4
       -
       BEGIN TRANSACTION;

     

       5
       5
       -
       

     

       6
       6
       -
       ALTER TABLE notifications RENAME TO notifications_old;

     

       7
       7
       -
       

     

       8
       8
       -
       CREATE TABLE notifications (

     

       9
       9
       -
           id INTEGER PRIMARY KEY AUTOINCREMENT,

     

       10
       10
       -
           recipient_did TEXT NOT NULL,

     

       11
       11
       -
           actor_did TEXT NOT NULL,

     

       12
       12
       -
           subject_uri TEXT NOT NULL,

     

       13
       13
       -
           state TEXT NOT NULL DEFAULT 'unread' CHECK(state IN ('unread', 'read')),

     

       14
       14
       -
           type TEXT NOT NULL CHECK(type IN ('follow', 'reaction', 'comment')),

     

       15
       15
       -
           created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),

     

       16
       16
       -
           FOREIGN KEY (recipient_did) REFERENCES profiles(did) ON DELETE CASCADE,

     

       17
       17
       -
           FOREIGN KEY (actor_did) REFERENCES profiles(did) ON DELETE CASCADE

     

       18
       18
       -
       );

     

       19
       19
       -
       

     

       20
       20
       -
       INSERT INTO notifications (id, recipient_did, actor_did, subject_uri, state, type, created_at)

     

       21
       21
       -
       SELECT id, recipient_did, actor_did, subject_uri, state, type, created_at

     

       22
       22
       -
       FROM notifications_old;

     

       23
       23
       -
       

     

       24
       24
       -
       DROP TABLE notifications_old;

     

       25
       25
       -
       

     

       26
       26
       -
       COMMIT;

NEW

internal/db/notification.go

···

       13
       13
        
       	NotificationTypeFollow   NotificationType = "follow"

     

       14
       14
        
       	NotificationTypeReaction NotificationType = "reaction"

     

       15
       15
        
       	NotificationTypeComment  NotificationType = "comment"

     

       16
       16
       +
       	NotificationTypeReply    NotificationType = "reply"

     

       16
       17
        
       )

     

       17
       18
        
       

     

       18
       19
        
       type NotificationState string