See #212: record user last activity date
This commit is contained in:
parent
307959dfa6
commit
2e4f862387
7 changed files with 93 additions and 0 deletions
9
api/funkwhale_api/users/middleware.py
Normal file
9
api/funkwhale_api/users/middleware.py
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
class RecordActivityMiddleware:
|
||||
def __init__(self, get_response):
|
||||
self.get_response = get_response
|
||||
|
||||
def __call__(self, request):
|
||||
response = self.get_response(request)
|
||||
if hasattr(request, "user") and request.user.is_authenticated:
|
||||
request.user.record_activity()
|
||||
return response
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
# Generated by Django 2.0.6 on 2018-06-17 15:31
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('users', '0007_auto_20180524_2009'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='user',
|
||||
name='last_activity',
|
||||
field=models.DateTimeField(blank=True, default=None, null=True),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='user',
|
||||
name='permission_library',
|
||||
field=models.BooleanField(default=False, help_text='Manage library, delete files, tracks, artists, albums...', verbose_name='Manage library'),
|
||||
),
|
||||
]
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
from __future__ import absolute_import, unicode_literals
|
||||
|
||||
import binascii
|
||||
import datetime
|
||||
import os
|
||||
import uuid
|
||||
|
||||
|
|
@ -9,6 +10,7 @@ from django.conf import settings
|
|||
from django.contrib.auth.models import AbstractUser
|
||||
from django.db import models
|
||||
from django.urls import reverse
|
||||
from django.utils import timezone
|
||||
from django.utils.encoding import python_2_unicode_compatible
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
|
|
@ -75,6 +77,8 @@ class User(AbstractUser):
|
|||
default=False,
|
||||
)
|
||||
|
||||
last_activity = models.DateTimeField(default=None, null=True, blank=True)
|
||||
|
||||
def __str__(self):
|
||||
return self.username
|
||||
|
||||
|
|
@ -117,3 +121,16 @@ class User(AbstractUser):
|
|||
|
||||
def get_activity_url(self):
|
||||
return settings.FUNKWHALE_URL + "/@{}".format(self.username)
|
||||
|
||||
def record_activity(self):
|
||||
"""
|
||||
Simply update the last_activity field if current value is too old
|
||||
than a threshold. This is useful to keep a track of inactive accounts.
|
||||
"""
|
||||
current = self.last_activity
|
||||
delay = 60 * 15 # fifteen minutes
|
||||
now = timezone.now()
|
||||
|
||||
if current is None or current < now - datetime.timedelta(seconds=delay):
|
||||
self.last_activity = now
|
||||
self.save(update_fields=["last_activity"])
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue