From 5e2bf0bdcadb940285204e577b7379a6e808b6ca Mon Sep 17 00:00:00 2001 From: Daenney Date: Sun, 12 Mar 2023 16:00:57 +0100 Subject: [chore] Improve copyright header handling (#1608) * [chore] Remove years from all license headers Years or year ranges aren't required in license headers. Many projects have removed them in recent years and it avoids a bit of yearly toil. In many cases our copyright claim was also a bit dodgy since we added the 2021-2023 header to files created after 2021 but you can't claim copyright into the past that way. * [chore] Add license header check This ensures a license header is always added to any new file. This avoids maintainers/reviewers needing to remember to check for and ask for it in case a contribution doesn't include it. * [chore] Add missing license headers * [chore] Further updates to license header * Use the more common // indentend comment format * Remove the hack we had for the linter now that we use the // format * Add SPDX license identifier --- internal/typeutils/internaltoas_test.go | 53 ++++++++++++++++----------------- 1 file changed, 26 insertions(+), 27 deletions(-) (limited to 'internal/typeutils/internaltoas_test.go') diff --git a/internal/typeutils/internaltoas_test.go b/internal/typeutils/internaltoas_test.go index f3cee648c..9c858947e 100644 --- a/internal/typeutils/internaltoas_test.go +++ b/internal/typeutils/internaltoas_test.go @@ -1,20 +1,19 @@ -/* - GoToSocial - Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org - - 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 . -*/ +// 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 . package typeutils_test @@ -460,18 +459,18 @@ func (suite *InternalToASTestSuite) TestStatusToASDeletePublicReplyOriginalDelet testStatus := suite.testStatuses["admin_account_status_3"] ctx := context.Background() - // Delete the status this replies to. - if err := suite.db.DeleteStatusByID(ctx, testStatus.ID); err != nil { - suite.FailNow(err.Error()) - } + // Delete the status this replies to. + if err := suite.db.DeleteStatusByID(ctx, testStatus.ID); err != nil { + suite.FailNow(err.Error()) + } - // Delete the mention the reply created. - mention := suite.testMentions["admin_account_mention_zork"] - if err := suite.db.DeleteByID(ctx, mention.ID, mention); err != nil { - suite.FailNow(err.Error()) - } + // Delete the mention the reply created. + mention := suite.testMentions["admin_account_mention_zork"] + if err := suite.db.DeleteByID(ctx, mention.ID, mention); err != nil { + suite.FailNow(err.Error()) + } - // The delete should still be created OK. + // The delete should still be created OK. asDelete, err := suite.typeconverter.StatusToASDelete(ctx, testStatus) suite.NoError(err) -- cgit v1.2.3