Refactor over18 skipping logics.

context.go

@@ -2,20 +2,14 @@ package main
 
 import (
 	"net/http"
-
-	"github.com/gorilla/mux"
 )
 
-var routesSkipOver18 = map[string]bool{
-	"atomfeed": true,
-}
-
 type Context struct {
 	R *http.Request
 
-	isOver18CheckSkipped bool
-	hasOver18Cookie      bool
-	isCrawler            bool
+	skipOver18      bool
+	hasOver18Cookie bool
+	isCrawler       bool
 }
 
 func (c *Context) Request() *http.Request {
@@ -24,18 +18,17 @@ func (c *Context) Request() *http.Request {
 
 func (c *Context) MergeFromRequest(r *http.Request) error {
 	c.R = r
-	_, c.isOver18CheckSkipped = routesSkipOver18[mux.CurrentRoute(r).GetName()]
 	c.hasOver18Cookie = checkOver18Cookie(r)
 	c.isCrawler = isCrawlerUserAgent(r)
 	return nil
 }
 
-func (c *Context) IsOver18CheckSkipped() bool {
-	return c.isOver18CheckSkipped
+func (c *Context) SetSkipOver18() {
+	c.skipOver18 = true
 }
 
 func (c *Context) IsOver18() bool {
-	return c.hasOver18Cookie
+	return c.hasOver18Cookie || c.skipOver18
 }
 
 func (c *Context) IsCrawler() bool {

pttweb.go

@@ -594,6 +594,7 @@ func handleBoardAtomFeed(c *Context, w http.ResponseWriter) error {
 
 	timeout := BbsIndexLastPageCacheTimeout
 
+	c.SetSkipOver18()
 	brd, err := getBoardByName(c, brdname)
 	if err != nil {
 		return err
@@ -809,15 +810,13 @@ func hasPermViewBoard(c *Context, brd *pttbbs.Board) error {
 		return NewNotFoundError(fmt.Errorf("no permission: %s", brd.BrdName))
 	}
 	if brd.Over18 {
-		if config.EnableOver18Cookie {
-			if c.IsCrawler() || c.IsOver18CheckSkipped() {
-				// Crawlers or machine-to-machine requests.
-			} else if !c.IsOver18() {
-				return shouldAskOver18Error(c)
-			}
-		} else {
+		if !config.EnableOver18Cookie {
 			return NewNotFoundError(ErrOver18CookieNotEnabled)
 		}
+		if !c.IsCrawler() && !c.IsOver18() {
+			return shouldAskOver18Error(c)
+		}
+		// Ok
 	}
 	return nil
 }