docs/configuration/general.md

@@ -80,18 +80,10 @@ host: "localhost"
 # Default: ""
 account-domain: ""
 
-# String. Protocol over which the server is reachable from the outside world.
+# String. Protocol to use for the server. Only change to http for local testing!
-#
+# This should be the protocol part of the URI that your server is actually reachable on. So even if you're
-# ONLY CHANGE THIS TO HTTP FOR LOCAL TESTING! IN 99.99% OF CASES YOU SHOULD NOT CHANGE THIS!
+# running GoToSocial behind a reverse proxy that handles SSL certificates for you, instead of using built-in
-#
+# letsencrypt, it should still be https.
-# This should be the protocol part of the URI that your server is actually reachable on.
-# So even if you're running GoToSocial behind a reverse proxy that handles SSL certificates
-# for you, instead of using built-in letsencrypt, it should still be https, not http.
-#
-# Again, ONLY CHANGE THIS TO HTTP FOR LOCAL TESTING! If you set this to `http`, start your instance,
-# and then later change it to `https`, you will have already broken URI generation for any created
-# users on the instance. You should only touch this setting if you 100% know what you're doing.
-#
 # Options: ["http","https"]
 # Default: "https"
 protocol: "https"

example/config.yaml

@@ -88,18 +88,10 @@ host: "localhost"
 # Default: ""
 account-domain: ""
 
-# String. Protocol over which the server is reachable from the outside world.
+# String. Protocol to use for the server. Only change to http for local testing!
-#
+# This should be the protocol part of the URI that your server is actually reachable on. So even if you're
-# ONLY CHANGE THIS TO HTTP FOR LOCAL TESTING! IN 99.99% OF CASES YOU SHOULD NOT CHANGE THIS!
+# running GoToSocial behind a reverse proxy that handles SSL certificates for you, instead of using built-in
-#
+# letsencrypt, it should still be https.
-# This should be the protocol part of the URI that your server is actually reachable on.
-# So even if you're running GoToSocial behind a reverse proxy that handles SSL certificates
-# for you, instead of using built-in letsencrypt, it should still be https, not http.
-#
-# Again, ONLY CHANGE THIS TO HTTP FOR LOCAL TESTING! If you set this to `http`, start your instance,
-# and then later change it to `https`, you will have already broken URI generation for any created
-# users on the instance. You should only touch this setting if you 100% know what you're doing.
-#
 # Options: ["http","https"]
 # Default: "https"
 protocol: "https"

internal/db/bundb/interaction.go

@@ -302,9 +302,9 @@ func (i *interactionDB) GetInteractionsRequestsForAcct(
 			bun.Ident("interaction_request"),
 		).
 		// Select only interaction requests that
-		// are neither accepted or rejected yet.
+		// are neither accepted or rejected yet,
-		Where("? IS NULL", bun.Ident("accepted_at")).
+		// ie., without an Accept or Reject URI.
-		Where("? IS NULL", bun.Ident("rejected_at"))
+		Where("? IS NULL", bun.Ident("uri"))
 
 	// Select interactions targeting status.
 	if statusID != "" {

internal/db/bundb/migrations/20241005100438_interaction_requests_pending_tweak.go

@@ -1,57 +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 migrations
-
-import (
-	"context"
-
-	"github.com/uptrace/bun"
-)
-
-func init() {
-	up := func(ctx context.Context, db *bun.DB) error {
-		return db.RunInTx(ctx, nil, func(ctx context.Context, tx bun.Tx) error {
-			for idx, col := range map[string]string{
-				"interaction_requests_accepted_at_idx": "accepted_at",
-				"interaction_requests_rejected_at_idx": "rejected_at",
-			} {
-				if _, err := tx.
-					NewCreateIndex().
-					Table("interaction_requests").
-					Index(idx).
-					Column(col).
-					IfNotExists().
-					Exec(ctx); err != nil {
-					return err
-				}
-			}
-
-			return nil
-		})
-	}
-
-	down := func(ctx context.Context, db *bun.DB) error {
-		return db.RunInTx(ctx, nil, func(ctx context.Context, tx bun.Tx) error {
-			return nil
-		})
-	}
-
-	if err := Migrations.Register(up, down); err != nil {
-		panic(err)
-	}
-}

internal/typeutils/internaltofrontend.go

@@ -2711,7 +2711,7 @@ func (c *Converter) InteractionReqToAPIInteractionReq(
 	}
 
 	var reply *apimodel.Status
-	if req.InteractionType == gtsmodel.InteractionReply && req.Reply != nil {
+	if req.InteractionType == gtsmodel.InteractionReply {
 		reply, err = c.statusToAPIStatus(
 			ctx,
 			req.Reply,