1
- From 72a35d23c4f740059241a7fab4b59b9aea5fdbef Mon Sep 17 00:00:00 2001
1
+ From 5d5485534189c87ee7c855b8bde630b0d4ffcc92 Mon Sep 17 00:00:00 2001
2
2
From: Oleg Komarov <oleg@blender.org>
3
3
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
5
5
6
6
Spam reporting is available for trusted users (org members and admins) via a
7
7
button on a spammer's profile page;
@@ -14,15 +14,15 @@ a new "pending spam reports" indicator in the header for admins.
14
14
routers/web/shared/user/header.go | 20 ++
15
15
routers/web/user/setting/spamreport.go | 43 ++++
16
16
routers/web/web.go | 12 +
17
- services/user/spamreport.go | 226 ++++++++++++++++++
17
+ services/user/spamreport.go | 230 ++++++++++++++++++
18
18
services/user/spamreport_test.go | 93 +++++++
19
19
templates/admin/navbar.tmpl | 5 +-
20
20
templates/admin/spamreports/list.tmpl | 88 +++++++
21
21
templates/base/head_navbar.tmpl | 7 +
22
22
templates/shared/user/profile_big_avatar.tmpl | 17 ++
23
23
.../shared/user/purgespammer_user_dialog.tmpl | 14 ++
24
24
.../shared/user/spamreport_user_dialog.tmpl | 14 ++
25
- 14 files changed, 838 insertions(+), 1 deletion(-)
25
+ 14 files changed, 842 insertions(+), 1 deletion(-)
26
26
create mode 100644 models/user/spamreport.go
27
27
create mode 100644 routers/web/admin/spamreports.go
28
28
create mode 100644 routers/web/user/setting/spamreport.go
@@ -502,10 +502,10 @@ index bd850baec0..385d15dc5e 100644
502
502
})
503
503
diff --git a/services/user/spamreport.go b/services/user/spamreport.go
504
504
new file mode 100644
505
- index 0000000000..d240546cc0
505
+ index 0000000000..1d9c2d3236
506
506
--- /dev/null
507
507
+++ b/services/user/spamreport.go
508
- @@ -0,0 +1,226 @@
508
+ @@ -0,0 +1,230 @@
509
509
+ // Copyright 2025 The Gitea Authors. All rights reserved.
510
510
+ // SPDX-License-Identifier: MIT
511
511
+
@@ -516,6 +516,7 @@ index 0000000000..d240546cc0
516
516
+ import (
517
517
+ "context"
518
518
+ "fmt"
519
+ + "strconv"
519
520
+
520
521
+ "code.gitea.io/gitea/models/db"
521
522
+ issues_model "code.gitea.io/gitea/models/issues"
@@ -675,7 +676,10 @@ index 0000000000..d240546cc0
675
676
+ }
676
677
+
677
678
+ 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
+ +
679
683
+ if err != nil {
680
684
+ return fmt.Errorf("failed to fetch IssueIDs: %w", err)
681
685
+ }
0 commit comments