Fix filtering Hit model by ip to include the HitCount model instance

.github/workflows/test.yml

@@ -64,23 +64,23 @@ jobs:
 
  tests:
     name: Python ${{ matrix.python-version }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false
       max-parallel: 5
       matrix:
         python-version:
-          - 3.7
-          - 3.8
-          - 3.9
+          - '3.7'
+          - '3.8'
+          - '3.9'
           - '3.10'
-          - '3.11-dev'
+          - '3.11'
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 

hitcount/managers/hits.py

@@ -43,12 +43,12 @@ def filter_active(self, *args, **kwargs):
         period = timezone.now() - timedelta(**grace)
         return self.filter(created__gte=period).filter(*args, **kwargs)
 
-    def has_limit_reached_by_ip(self, ip=None):
+    def has_limit_reached_by_ip(self, ip, hitcount):
         hits_per_ip_limit = settings.HITCOUNT_HITS_PER_IP_LIMIT
         if not ip or not hits_per_ip_limit:
             return False
 
-        return self.filter_active(ip=ip).count() >= hits_per_ip_limit
+        return self.filter_active(ip=ip, hitcount=hitcount).count() >= hits_per_ip_limit
 
     def has_limit_reached_by_session(self, session, hitcount):
         hits_per_session_limit = settings.HITCOUNT_HITS_PER_SESSION_LIMIT

hitcount/mixins.py

@@ -85,7 +85,7 @@ def hit_count(request, hitcount):
         # active hits to see if we should count another one
 
         # check limit on hits from a unique ip address (HITCOUNT_HITS_PER_IP_LIMIT)
-        if Hit.objects.has_limit_reached_by_ip(ip):
+        if Hit.objects.has_limit_reached_by_ip(ip, hitcount):
             return UpdateHitCountResponse(
                 False, 'Not counted: hits per IP address limit reached')