diff options
Diffstat (limited to 'models/action.go')
| -rw-r--r-- | models/action.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/models/action.go b/models/action.go index b9d45ab3..b5f692c4 100644 --- a/models/action.go +++ b/models/action.go @@ -305,13 +305,11 @@ func TransferRepoAction(u, newUser *User, repo *Repository) (err error) { } // GetFeeds returns action list of given user in given context. -func GetFeeds(userid, offset int64, isProfile bool) ([]*Action, error) { +func GetFeeds(uid, offset int64, isProfile bool) ([]*Action, error) { actions := make([]*Action, 0, 20) - sess := x.Limit(20, int(offset)).Desc("id").Where("user_id=?", userid) + sess := x.Limit(20, int(offset)).Desc("id").Where("user_id=?", uid) if isProfile { - sess.Where("is_private=?", false).And("act_user_id=?", userid) - } else { - sess.And("act_user_id!=?", userid) + sess.Where("is_private=?", false).And("act_user_id=?", uid) } err := sess.Find(&actions) return actions, err |