Skip to content

Commit 4fd01f7

Browse files
committed
Fix issue in Spam Reporting patch
1 parent 2c0144e commit 4fd01f7

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

patches/0015-BLENDER-Add-Spam-Reporting.patch

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 72a35d23c4f740059241a7fab4b59b9aea5fdbef Mon Sep 17 00:00:00 2001
1+
From 5d5485534189c87ee7c855b8bde630b0d4ffcc92 Mon Sep 17 00:00:00 2001
22
From: Oleg Komarov <oleg@blender.org>
33
Date: Fri, 11 Apr 2025 16:57:54 +0200
4-
Subject: [PATCH 15/17] BLENDER: Add Spam Reporting
4+
Subject: [PATCH] BLENDER: Add Spam Reporting
55

66
Spam reporting is available for trusted users (org members and admins) via a
77
button on a spammer's profile page;
@@ -14,15 +14,15 @@ a new "pending spam reports" indicator in the header for admins.
1414
routers/web/shared/user/header.go | 20 ++
1515
routers/web/user/setting/spamreport.go | 43 ++++
1616
routers/web/web.go | 12 +
17-
services/user/spamreport.go | 226 ++++++++++++++++++
17+
services/user/spamreport.go | 230 ++++++++++++++++++
1818
services/user/spamreport_test.go | 93 +++++++
1919
templates/admin/navbar.tmpl | 5 +-
2020
templates/admin/spamreports/list.tmpl | 88 +++++++
2121
templates/base/head_navbar.tmpl | 7 +
2222
templates/shared/user/profile_big_avatar.tmpl | 17 ++
2323
.../shared/user/purgespammer_user_dialog.tmpl | 14 ++
2424
.../shared/user/spamreport_user_dialog.tmpl | 14 ++
25-
14 files changed, 838 insertions(+), 1 deletion(-)
25+
14 files changed, 842 insertions(+), 1 deletion(-)
2626
create mode 100644 models/user/spamreport.go
2727
create mode 100644 routers/web/admin/spamreports.go
2828
create mode 100644 routers/web/user/setting/spamreport.go
@@ -502,10 +502,10 @@ index bd850baec0..385d15dc5e 100644
502502
})
503503
diff --git a/services/user/spamreport.go b/services/user/spamreport.go
504504
new file mode 100644
505-
index 0000000000..d240546cc0
505+
index 0000000000..1d9c2d3236
506506
--- /dev/null
507507
+++ b/services/user/spamreport.go
508-
@@ -0,0 +1,226 @@
508+
@@ -0,0 +1,230 @@
509509
+// Copyright 2025 The Gitea Authors. All rights reserved.
510510
+// SPDX-License-Identifier: MIT
511511
+
@@ -516,6 +516,7 @@ index 0000000000..d240546cc0
516516
+import (
517517
+ "context"
518518
+ "fmt"
519+
+ "strconv"
519520
+
520521
+ "code.gitea.io/gitea/models/db"
521522
+ issues_model "code.gitea.io/gitea/models/issues"
@@ -675,7 +676,10 @@ index 0000000000..d240546cc0
675676
+ }
676677
+
677678
+ log.Info("Cleaning up issues and pulls by user %s", user.Name)
678-
+ issues, err := issues_model.Issues(ctx, &issues_model.IssuesOptions{PosterID: optional.Some(user.ID)})
679+
+ issues, err := issues_model.Issues(ctx, &issues_model.IssuesOptions{
680+
+ PosterID: strconv.FormatInt(user.ID, 10),
681+
+ })
682+
+
679683
+ if err != nil {
680684
+ return fmt.Errorf("failed to fetch IssueIDs: %w", err)
681685
+ }

0 commit comments

Comments
 (0)