Only prohibit commenting on blog discussions not forums and not prohi…

…bit admins changed in controllers.forumpost.create
Carbrex · Feb 23, 2024 · b53de7e · b53de7e
1 parent c4426d3
commit b53de7e
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 48 deletions.
diff --git a/app/controllers/ForumPost.scala b/app/controllers/ForumPost.scala
@@ -6,9 +6,6 @@ import lila.app.{ given, * }
 import lila.common.IpAddress
 import lila.msg.MsgPreset
 import lila.relation.{ Block }
-import lila.user.User
-import lila.common.paginator.Paginator
-import scala.concurrent.Future
 
 final class ForumPost(env: Env) extends LilaController(env) with ForumController:
 
@@ -36,55 +33,54 @@ final class ForumPost(env: Env) extends LilaController(env) with ForumController
           yield Ok(page)
 
   def create(categId: ForumCategId, slug: String, page: Int) = AuthBody { ctx ?=> me ?=>
-    def processRequest(
-        categ: lila.forum.ForumCateg,
-        topic: lila.forum.ForumTopic,
-        posts: lila.common.paginator.Paginator[lila.forum.ForumPost.WithFrag]
-    ) =
-      categ.team.so(env.team.api.isLeader(_, me)) flatMap { inOwnTeam =>
-        forms
-          .post(inOwnTeam)
-          .bindFromRequest()
-          .fold(
-            err =>
-              CategGrantWrite(categId, tryingToPostAsMod = true):
-                for
-                  captcha     <- forms.anyCaptcha
-                  unsub       <- env.timeline.status(s"forum:${topic.id}")
-                  canModCateg <- access.isGrantedMod(categ.slug)
-                  page <- renderPage:
-                    html.forum.topic
-                      .show(
-                        categ,
-                        topic,
-                        posts,
-                        Some(err -> captcha),
-                        unsub,
-                        canModCateg = canModCateg
-                      )
-                yield BadRequest(page)
-            ,
-            data =>
-              CategGrantWrite(categId, tryingToPostAsMod = ~data.modIcon):
-                CreateRateLimit(ctx.ip, rateLimited):
-                  postApi.makePost(categ, topic, data) map { post =>
-                    Redirect(routes.ForumPost.redirect(post.id))
-                  }
-          )
-      }
     NoBot:
       Found(topicApi.show(categId, slug, page)): (categ, topic, posts) =>
         if topic.closed then BadRequest("This topic is closed")
         else if topic.isOld then BadRequest("This topic is archived")
         else
-          topic.pp.userId match
-            case Some(userId) =>
-              env.relation.api.fetchRelation(userId: UserId, me.userId).flatMap {
-                case Some(relation) if relation == Block =>
-                  BadRequest("You are blocked by the forum author")
-                case _ => processRequest(categ, topic, posts)
-              }
-            case None => processRequest(categ, topic, posts)
+          for
+            canModCateg <- access.isGrantedMod(categ.slug)
+            topicUserId = topic.userId.getOrElse(UserId(""))
+            relation <- ctx.userId.so(
+              env.relation.api.fetchRelation(topicUserId: UserId, _)
+            )
+            isUblog      = topic.ublogId.isDefined
+            replyBlocked = relation.exists(_ == Block) && !canModCateg && isUblog
+            res <-
+              if replyBlocked then Future.successful(BadRequest("You are blocked by the blog author"))
+              else
+                categ.team.so(env.team.api.isLeader(_, me)) flatMap { inOwnTeam =>
+                  forms
+                    .post(inOwnTeam)
+                    .bindFromRequest()
+                    .fold(
+                      err =>
+                        CategGrantWrite(categId, tryingToPostAsMod = true):
+                          for
+                            captcha     <- forms.anyCaptcha
+                            unsub       <- env.timeline.status(s"forum:${topic.id}")
+                            canModCateg <- access.isGrantedMod(categ.slug)
+                            page <- renderPage:
+                              html.forum.topic
+                                .show(
+                                  categ,
+                                  topic,
+                                  posts,
+                                  Some(err -> captcha),
+                                  unsub,
+                                  canModCateg = canModCateg
+                                )
+                          yield BadRequest(page)
+                      ,
+                      data =>
+                        CategGrantWrite(categId, tryingToPostAsMod = ~data.modIcon):
+                          CreateRateLimit(ctx.ip, rateLimited):
+                            postApi.makePost(categ, topic, data) map { post =>
+                              Redirect(routes.ForumPost.redirect(post.id))
+                            }
+                    )
+                }
+          yield res
   }
 
   def edit(postId: ForumPostId) = AuthBody { ctx ?=> me ?=>

diff --git a/app/controllers/ForumTopic.scala b/app/controllers/ForumTopic.scala
@@ -6,7 +6,7 @@ import lila.app.{ given, * }
 import lila.common.IpAddress
 import lila.forum.ForumCateg.diagnosticId
 import lila.Lila.{ UserId }
-import lila.relation.{ Follow, Block }
+import lila.relation.{ Block }
 
 final class ForumTopic(env: Env) extends LilaController(env) with ForumController: