From 9770d54237bea828cab7e50aec7dff452c203138 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Wed, 9 Aug 2023 19:14:33 +0200
Subject: [feature] List replies policy, refactor async workers (#2087)

* Add/update some DB functions.

* move async workers into subprocessor

* rename FromFederator -> FromFediAPI

* update home timeline check to include check for current status first before moving to parent status

* change streamMap to pointer to mollify linter

* update followtoas func signature

* fix merge

* remove errant debug log

* don't use separate errs.Combine() check to wrap errs

* wrap parts of workers functionality in sub-structs

* populate report using new db funcs

* embed federator (tiny bit tidier)

* flesh out error msg, add continue(!)

* fix other error messages to be more specific

* better, nicer

* give parseURI util function a bit more util

* missing headers

* use pointers for subprocessors
---
 internal/processing/user/email.go | 54 ---------------------------------------
 1 file changed, 54 deletions(-)

(limited to 'internal/processing/user/email.go')

diff --git a/internal/processing/user/email.go b/internal/processing/user/email.go
index 32c8e760a..dd2a96ae3 100644
--- a/internal/processing/user/email.go
+++ b/internal/processing/user/email.go
@@ -23,67 +23,13 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/google/uuid"
-	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
-	"github.com/superseriousbusiness/gotosocial/internal/email"
 	"github.com/superseriousbusiness/gotosocial/internal/gtserror"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
-	"github.com/superseriousbusiness/gotosocial/internal/uris"
 )
 
 var oneWeek = 168 * time.Hour
 
-// EmailSendConfirmation sends an email address confirmation request email to the given user.
-func (p *Processor) EmailSendConfirmation(ctx context.Context, user *gtsmodel.User, username string) error {
-	if user.UnconfirmedEmail == "" || user.UnconfirmedEmail == user.Email {
-		// user has already confirmed this email address, so there's nothing to do
-		return nil
-	}
-
-	// We need a token and a link for the user to click on.
-	// We'll use a uuid as our token since it's basically impossible to guess.
-	// From the uuid package we use (which uses crypto/rand under the hood):
-	//      Randomly generated UUIDs have 122 random bits.  One's annual risk of being
-	//      hit by a meteorite is estimated to be one chance in 17 billion, that
-	//      means the probability is about 0.00000000006 (6 × 10−11),
-	//      equivalent to the odds of creating a few tens of trillions of UUIDs in a
-	//      year and having one duplicate.
-	confirmationToken := uuid.NewString()
-	confirmationLink := uris.GenerateURIForEmailConfirm(confirmationToken)
-
-	// pull our instance entry from the database so we can greet the user nicely in the email
-	instance := &gtsmodel.Instance{}
-	host := config.GetHost()
-	if err := p.state.DB.GetWhere(ctx, []db.Where{{Key: "domain", Value: host}}, instance); err != nil {
-		return fmt.Errorf("SendConfirmEmail: error getting instance: %s", err)
-	}
-
-	// assemble the email contents and send the email
-	confirmData := email.ConfirmData{
-		Username:     username,
-		InstanceURL:  instance.URI,
-		InstanceName: instance.Title,
-		ConfirmLink:  confirmationLink,
-	}
-	if err := p.emailSender.SendConfirmEmail(user.UnconfirmedEmail, confirmData); err != nil {
-		return fmt.Errorf("SendConfirmEmail: error sending to email address %s belonging to user %s: %s", user.UnconfirmedEmail, username, err)
-	}
-
-	// email sent, now we need to update the user entry with the token we just sent them
-	updatingColumns := []string{"confirmation_sent_at", "confirmation_token", "last_emailed_at", "updated_at"}
-	user.ConfirmationSentAt = time.Now()
-	user.ConfirmationToken = confirmationToken
-	user.LastEmailedAt = time.Now()
-	user.UpdatedAt = time.Now()
-
-	if err := p.state.DB.UpdateByID(ctx, user, user.ID, updatingColumns...); err != nil {
-		return fmt.Errorf("SendConfirmEmail: error updating user entry after email sent: %s", err)
-	}
-
-	return nil
-}
-
 // EmailConfirm processes an email confirmation request, usually initiated as a result of clicking on a link
 // in a 'confirm your email address' type email.
 func (p *Processor) EmailConfirm(ctx context.Context, token string) (*gtsmodel.User, gtserror.WithCode) {
-- 
cgit v1.2.3