openidec

commit bee7883b22fed8c4d29ec499676074a872cfdf12
parent fd4fb4049fa7a27497a672ae9bd6d66569aa1391
Author: Peter Kosyh <p.kosyh@gmail.com>
Date:   Tue,  8 Sep 2020 14:32:17 +0300

be simpler

Diffstat:
M
ii-node/web.go
 | 
8
+-------
M
ii/db.go
 | 
6
+++---

2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/ii-node/web.go b/ii-node/web.go
@@ -315,13 +315,7 @@ func makePager(ctx *WebContext, count int, page int) int {
 }
 
 func Select(ctx *WebContext, q ii.Query) []string {
-	if ii.IsPrivate(q.Echo) { /* private */
-		if ctx.User.Name == "" {
-			var l []string
-			return l
-		}
-		q.User = *ctx.User
-	}
+	q.User = *ctx.User
 	return ctx.www.db.SelectIDS(q)
 }
 
diff --git a/ii/db.go b/ii/db.go
@@ -385,9 +385,6 @@ func (db *DB) Match(info MsgInfo, r Query) bool {
 	if r.Blacklisted {
 		return info.Off < 0
 	}
-	if r.Match != nil {
-		return r.Match(info, r)
-	}
 	if r.Echo != "" && r.Echo != info.Echo {
 		return false
 	}
@@ -408,6 +405,9 @@ func (db *DB) Match(info MsgInfo, r Query) bool {
 			return false
 		}
 	}
+	if r.Match != nil {
+		return r.Match(info, r)
+	}
 	return true
 }