[feature] Add domain permission drafts and excludes

internal/db/bundb/domainpermissiondraft_test.go

@@ -1,120 +0,0 @@
-// GoToSocial
-// Copyright (C) GoToSocial Authors admin@gotosocial.org
-// SPDX-License-Identifier: AGPL-3.0-or-later
-//
-// 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 bundb_test
-
-import (
-	"context"
-	"errors"
-	"testing"
-
-	"github.com/stretchr/testify/suite"
-	"github.com/superseriousbusiness/gotosocial/internal/db"
-	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
-	"github.com/superseriousbusiness/gotosocial/internal/util"
-)
-
-type DomainPermissionDraftTestSuite struct {
-	BunDBStandardTestSuite
-}
-
-func (suite *DomainPermissionDraftTestSuite) TestPermDraftCreateGetDelete() {
-	var (
-		ctx   = context.Background()
-		draft = &gtsmodel.DomainPermissionDraft{
-			ID:                 "01JCZN614XG85GCGAMSV9ZZAEJ",
-			PermissionType:     gtsmodel.DomainPermissionBlock,
-			Domain:             "exämple.org",
-			CreatedByAccountID: suite.testAccounts["admin_account"].ID,
-			PrivateComment:     "this domain is poo",
-			PublicComment:      "this domain is poo, but phrased in a more outward-facing way",
-			Obfuscate:          util.Ptr(false),
-			SubscriptionID:     "01JCZN8PG55KKEVTDAY52D0T3P",
-		}
-	)
-
-	// Whack the draft in.
-	if err := suite.state.DB.PutDomainPermissionDraft(ctx, draft); err != nil {
-		suite.FailNow(err.Error())
-	}
-
-	// Get the draft again.
-	dbDraft, err := suite.state.DB.GetDomainPermissionDraftByID(ctx, draft.ID)
-	if err != nil {
-		suite.FailNow(err.Error())
-	}
-
-	// Domain should have been stored punycoded.
-	suite.Equal("xn--exmple-cua.org", dbDraft.Domain)
-
-	// Search for domain using both
-	// punycode and unicode variants.
-	search1, err := suite.state.DB.GetDomainPermissionDrafts(
-		ctx,
-		gtsmodel.DomainPermissionUnknown,
-		"",
-		"exämple.org",
-		nil,
-	)
-	if err != nil {
-		suite.FailNow(err.Error())
-	}
-	if len(search1) != 1 {
-		suite.FailNow("couldn't get domain perm draft exämple.org")
-	}
-
-	search2, err := suite.state.DB.GetDomainPermissionDrafts(
-		ctx,
-		gtsmodel.DomainPermissionUnknown,
-		"",
-		"xn--exmple-cua.org",
-		nil,
-	)
-	if err != nil {
-		suite.FailNow(err.Error())
-	}
-	if len(search2) != 1 {
-		suite.FailNow("couldn't get domain perm draft example.org")
-	}
-
-	// Change ID + try to put the same draft again.
-	draft.ID = "01JCZNVYSDT3JE385FABMJ7ADQ"
-	err = suite.state.DB.PutDomainPermissionDraft(ctx, draft)
-	if !errors.Is(err, db.ErrAlreadyExists) {
-		suite.FailNow("was able to insert same domain perm draft twice")
-	}
-
-	// Put same draft but change permission type, should work.
-	draft.PermissionType = gtsmodel.DomainPermissionAllow
-	if err := suite.state.DB.PutDomainPermissionDraft(ctx, draft); err != nil {
-		suite.FailNow(err.Error())
-	}
-
-	// Delete both drafts.
-	for _, id := range []string{
-		"01JCZN614XG85GCGAMSV9ZZAEJ",
-		"01JCZNVYSDT3JE385FABMJ7ADQ",
-	} {
-		if err := suite.state.DB.DeleteDomainPermissionDraft(ctx, id); err != nil {
-			suite.FailNow("error deleting domain permission draft")
-		}
-	}
-}
-
-func TestDomainPermissionDraftTestSuite(t *testing.T) {
-	suite.Run(t, new(DomainPermissionDraftTestSuite))
-}

internal/db/bundb/domainpermissionexclude_test.go

@@ -1,105 +0,0 @@
-// GoToSocial
-// Copyright (C) GoToSocial Authors admin@gotosocial.org
-// SPDX-License-Identifier: AGPL-3.0-or-later
-//
-// 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 bundb_test
-
-import (
-	"context"
-	"errors"
-	"testing"
-
-	"github.com/stretchr/testify/suite"
-	"github.com/superseriousbusiness/gotosocial/internal/db"
-	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
-)
-
-type DomainPermissionExcludeTestSuite struct {
-	BunDBStandardTestSuite
-}
-
-func (suite *DomainPermissionExcludeTestSuite) TestPermExcludeCreateGetDelete() {
-	var (
-		ctx     = context.Background()
-		exclude = &gtsmodel.DomainPermissionExclude{
-			ID:                 "01JCZN614XG85GCGAMSV9ZZAEJ",
-			Domain:             "exämple.org",
-			CreatedByAccountID: suite.testAccounts["admin_account"].ID,
-			PrivateComment:     "this domain is poo",
-		}
-	)
-
-	// Whack the exclude in.
-	if err := suite.state.DB.PutDomainPermissionExclude(ctx, exclude); err != nil {
-		suite.FailNow(err.Error())
-	}
-
-	// Get the exclude again.
-	dbExclude, err := suite.state.DB.GetDomainPermissionExcludeByID(ctx, exclude.ID)
-	if err != nil {
-		suite.FailNow(err.Error())
-	}
-
-	// Domain should have been stored punycoded.
-	suite.Equal("xn--exmple-cua.org", dbExclude.Domain)
-
-	// Search for domain using both
-	// punycode and unicode variants.
-	search1, err := suite.state.DB.GetDomainPermissionExcludes(
-		ctx,
-		"exämple.org",
-		nil,
-	)
-	if err != nil {
-		suite.FailNow(err.Error())
-	}
-	if len(search1) != 1 {
-		suite.FailNow("couldn't get domain perm exclude exämple.org")
-	}
-
-	search2, err := suite.state.DB.GetDomainPermissionExcludes(
-		ctx,
-		"xn--exmple-cua.org",
-		nil,
-	)
-	if err != nil {
-		suite.FailNow(err.Error())
-	}
-	if len(search2) != 1 {
-		suite.FailNow("couldn't get domain perm exclude example.org")
-	}
-
-	// Change ID + try to put the same exclude again.
-	exclude.ID = "01JCZNVYSDT3JE385FABMJ7ADQ"
-	err = suite.state.DB.PutDomainPermissionExclude(ctx, exclude)
-	if !errors.Is(err, db.ErrAlreadyExists) {
-		suite.FailNow("was able to insert same domain perm exclude twice")
-	}
-
-	// Delete both excludes.
-	for _, id := range []string{
-		"01JCZN614XG85GCGAMSV9ZZAEJ",
-		"01JCZNVYSDT3JE385FABMJ7ADQ",
-	} {
-		if err := suite.state.DB.DeleteDomainPermissionExclude(ctx, id); err != nil {
-			suite.FailNow("error deleting domain permission exclude")
-		}
-	}
-}
-
-func TestDomainPermissionExcludeTestSuite(t *testing.T) {
-	suite.Run(t, new(DomainPermissionExcludeTestSuite))
-}

internal/processing/admin/domainpermissiondraft.go

@@ -249,37 +249,38 @@ func (p *Processor) DomainPermissionDraftAccept(
 		deleteDraft()
 
 		return new, actionID, errWithCode
+	} else {
+		// Domain permission exists but we should overwrite
+		// it by just updating the existing domain permission.
+		// Domain can't change, so no need to re-run side effects.
+		existing.SetCreatedByAccountID(permDraft.CreatedByAccountID)
+		existing.SetCreatedByAccount(permDraft.CreatedByAccount)
+		existing.SetPrivateComment(permDraft.PrivateComment)
+		existing.SetPublicComment(permDraft.PublicComment)
+		existing.SetObfuscate(permDraft.Obfuscate)
+		existing.SetSubscriptionID(permDraft.SubscriptionID)
+
+		var err error
+		switch dp := existing.(type) {
+		case *gtsmodel.DomainBlock:
+			err = p.state.DB.UpdateDomainBlock(ctx, dp)
+
+		case *gtsmodel.DomainAllow:
+			err = p.state.DB.UpdateDomainAllow(ctx, dp)
+		}
+
+		if err != nil {
+			err := gtserror.Newf("db error updating existing domain permission: %w", err)
+			return nil, "", gtserror.NewErrorInternalError(err)
+		}
+
+		// Clean up the draft
+		// before returning.
+		deleteDraft()
+
+		apiPerm, errWithCode := p.apiDomainPerm(ctx, existing, false)
+		return apiPerm, "", errWithCode
 	}
-
-	// Domain permission exists but we should overwrite
-	// it by just updating the existing domain permission.
-	// Domain can't change, so no need to re-run side effects.
-	existing.SetCreatedByAccountID(permDraft.CreatedByAccountID)
-	existing.SetCreatedByAccount(permDraft.CreatedByAccount)
-	existing.SetPrivateComment(permDraft.PrivateComment)
-	existing.SetPublicComment(permDraft.PublicComment)
-	existing.SetObfuscate(permDraft.Obfuscate)
-	existing.SetSubscriptionID(permDraft.SubscriptionID)
-
-	switch dp := existing.(type) {
-	case *gtsmodel.DomainBlock:
-		err = p.state.DB.UpdateDomainBlock(ctx, dp)
-
-	case *gtsmodel.DomainAllow:
-		err = p.state.DB.UpdateDomainAllow(ctx, dp)
-	}
-
-	if err != nil {
-		err := gtserror.Newf("db error updating existing domain permission: %w", err)
-		return nil, "", gtserror.NewErrorInternalError(err)
-	}
-
-	// Clean up the draft
-	// before returning.
-	deleteDraft()
-
-	apiPerm, errWithCode := p.apiDomainPerm(ctx, existing, false)
-	return apiPerm, "", errWithCode
 }
 
 func (p *Processor) DomainPermissionDraftRemove(

test/envparsing.sh

@@ -34,7 +34,6 @@ EXPECT=$(cat << "EOF"
         "client-mem-ratio": 0.1,
         "conversation-last-status-ids-mem-ratio": 2,
         "conversation-mem-ratio": 1,
-        "domain-permission-draft-mem-ratio": 0.5,
         "emoji-category-mem-ratio": 0.1,
         "emoji-mem-ratio": 3,
         "filter-keyword-mem-ratio": 0.5,

web/source/settings/views/moderation/domain-permissions/excludes/detail.tsx

@@ -30,6 +30,8 @@ import MutationButton from "../../../../components/form/mutation-button";
 export default function DomainPermissionExcludeDetail() {
 	const baseUrl = useBaseUrl();
 	const backLocation: string = history.state?.backLocation ?? `~${baseUrl}`;
+	const [_location, setLocation] = useLocation();
+	const [ deleteExclude, deleteResult ] = useDeleteDomainPermissionExcludeMutation();
 
 	const params = useParams();
 	let id = params.excludeId as string | undefined;
@@ -84,36 +86,25 @@ export default function DomainPermissionExcludeDetail() {
 					<dd>{privateComment}</dd>
 				</div>
 			</dl>
-			<HandleExclude
-				id={id}
-				backLocation={backLocation}
+			<MutationButton
+				label={`Delete exclude`}
+				title={`Delete exclude`}
+				type="button"
+				className="button danger"
+				onClick={(e) => {
+					e.preventDefault();
+					e.stopPropagation();
+					deleteExclude(id).then(res => {
+						if ("data" in res) {
+							setLocation(backLocation);
+						}
+					});
+				}}
+				disabled={false}
+				showError={true}
+				result={deleteResult}
 			/>
 		</div>
 	);
 }
 
-function HandleExclude({ id, backLocation}: {id: string, backLocation: string}) {
-	const [_location, setLocation] = useLocation();
-	const [ deleteExclude, deleteResult ] = useDeleteDomainPermissionExcludeMutation();
-	
-	return (
-		<MutationButton
-			label={`Delete exclude`}
-			title={`Delete exclude`}
-			type="button"
-			className="button danger"
-			onClick={(e) => {
-				e.preventDefault();
-				e.stopPropagation();
-				deleteExclude(id).then(res => {
-					if ("data" in res) {
-						setLocation(backLocation);
-					}
-				});
-			}}
-			disabled={false}
-			showError={true}
-			result={deleteResult}
-		/>
-	);
-}