- 
@@ -99,20 +106,18 @@ export default class extends AbstractView {
if (response.status === 200) {
removeFriendButton.innerHTML = 'Cancel Request';
removeFriendButton.classList.replace('btn-danger', 'btn-secondary');
- client.me.outgoingFriendRequests.push(this.profile);
this.profile.hasOutgoingRequest = true;
} else if (response.status === 201) {
removeFriendButton.innerHTML = 'Remove Friend';
removeFriendButton.classList.replace('btn-secondary', 'btn-danger');
- this.profile.friend = true;
+ this.profile.isFriend = true;
this.profile.hasIncomingRequest = false;
- client.me.incomingFriendRequests = client.me.incomingFriendRequests.filter(profile => profile.id !== this.profile.id);
- client.me.friendList.push(this.profile);
}
}
async removeFriend() {
- const addFriendButton = document.getElementById('addFriendButton');
+ const addFriendButton = document.getElementById('addFriendButton'),
+ statusIndicator = document.getElementById('statusIndicator');
const response = await client._delete(`/api/profiles/friends/${this.profile.id}`);
const body = await response.json();
@@ -121,14 +126,14 @@ export default class extends AbstractView {
if (response.ok) {
addFriendButton.innerHTML = 'Add Friend';
addFriendButton.classList.remove('d-none');
+ statusIndicator.classList.remove('bg-danger', 'bg-success');
document.getElementById('removeFriendButton').classList.add('d-none');
}
if (response.status === 200) {
this.profile.hasOutgoingRequest = false;
- client.me.outgoingFriendRequests = client.me.outgoingFriendRequests.filter(profile => profile.id !== this.profile.id);
} else if (response.status === 201) {
this.profile.isFriend = false;
- client.me.friendList = client.me.friendList.filter(friend => friend.id !== this.profile.id);
+ this.profile.online = null;
}
}
diff --git a/notice/consumers.py b/notice/consumers.py
index 81e78b4..83b9ee6 100644
--- a/notice/consumers.py
+++ b/notice/consumers.py
@@ -21,7 +21,14 @@ class NoticeManager:
consumer.send(notice.data)
notice.delete()
+ for friend in consumer.user.profilemodel.get_friends():
+ self.notify_user(friend.user, {'type': 'online',
+ 'user': ProfileSerializer(consumer.user.profilemodel).data})
+
def remove(self, consumer: NoticeConsumer):
+ for friend in consumer.user.profilemodel.get_friends():
+ self.notify_user(friend.user, {'type': 'offline',
+ 'user': ProfileSerializer(consumer.user.profilemodel).data})
self._list.remove(consumer)
def get_consumer_by_user(self, user: User):
@@ -44,7 +51,16 @@ class NoticeManager:
self.notify_user(user, {'type': 'friend_request_canceled', 'author': ProfileSerializer(friend).data})
def notify_new_friend(self, user: User, friend: ProfileModel):
- self.notify_user(user, {'type': 'new_friend', 'friend': ProfileSerializer(friend).data})
+ serialized_data = ProfileSerializer(friend).data
+ if self.get_consumer_by_user(user) is not None:
+ status = 'online'
+ else:
+ status = 'offline'
+ print(status)
+
+ self.notify_user(user, {'type': 'new_friend', 'friend': serialized_data})
+ self.notify_user(user, {'type': 'online', 'user': serialized_data})
+ self.notify_user(friend.user, {'type': status, 'user': ProfileSerializer(user.profilemodel).data})
def notify_friend_removed(self, user: User, friend: ProfileModel):
self.notify_user(user, {'type': 'friend_removed', 'friend': ProfileSerializer(friend).data})
diff --git a/profiles/serializers.py b/profiles/serializers.py
index 0f18a83..3ed1fd4 100644
--- a/profiles/serializers.py
+++ b/profiles/serializers.py
@@ -11,19 +11,19 @@ class ProfileSerializer(serializers.ModelSerializer):
username = serializers.ReadOnlyField(source='user.username')
avatar = serializers.ImageField(required=False)
online = serializers.SerializerMethodField()
+ is_friend = serializers.SerializerMethodField()
+ has_incoming_request = serializers.SerializerMethodField()
+ has_outgoing_request = serializers.SerializerMethodField()
class Meta:
model = ProfileModel
- fields = ["username", "avatar", "id", 'online']
+ fields = ["username", "avatar", "id", 'online', 'is_friend',
+ 'has_outgoing_request', 'has_incoming_request']
def get_online(self, obj: ProfileModel):
from notice.consumers import notice_manager
- user = None
- request = self.context.get("request")
- if request and hasattr(request, "user"):
- user = request.user
-
+ user = self.context.get('user')
if user is None or not user.is_authenticated:
return None
@@ -32,6 +32,27 @@ class ProfileSerializer(serializers.ModelSerializer):
return notice_manager.get_consumer_by_user(obj.user) is not None
+ def get_is_friend(self, obj: ProfileModel):
+ user = self.context.get('user')
+ if user is None or not user.is_authenticated or user.pk == obj.pk:
+ return False
+
+ return obj.is_friend(user.profilemodel)
+
+ def get_has_incoming_request(self, obj: ProfileModel):
+ user = self.context.get('user')
+ if user is None or not user.is_authenticated or user.pk == obj.pk:
+ return False
+
+ return obj.is_friend_requesting(user.profilemodel)
+
+ def get_has_outgoing_request(self, obj: ProfileModel):
+ user = self.context.get('user')
+ if user is None or not user.is_authenticated or user.pk == obj.pk:
+ return False
+
+ return obj.is_friend_requested_by(user.profilemodel)
+
def validate_avatar(self, value):
'''
Check that the image is not too large
diff --git a/profiles/viewsets/MyProfileViewSet.py b/profiles/viewsets/MyProfileViewSet.py
index 5ac6cdb..3afb81f 100644
--- a/profiles/viewsets/MyProfileViewSet.py
+++ b/profiles/viewsets/MyProfileViewSet.py
@@ -35,4 +35,4 @@ class MyProfileViewSet(viewsets.ModelViewSet):
return Response(ProfileSerializer(profile).data)
def retrieve(self, pk=None):
- return Response(self.serializer_class(self.get_object(), context={'request': self.request}).data)
+ return Response(self.serializer_class(self.get_object(), context={'user': self.request.user}).data)
diff --git a/profiles/viewsets/ProfileViewSet.py b/profiles/viewsets/ProfileViewSet.py
index c16a888..b02c952 100644
--- a/profiles/viewsets/ProfileViewSet.py
+++ b/profiles/viewsets/ProfileViewSet.py
@@ -16,12 +16,12 @@ class ProfileViewSet(viewsets.ModelViewSet):
def retrieve(self, request, username=None):
user = get_object_or_404(User, username=username)
- return Response(self.serializer_class(user.profilemodel, context={'request': request}).data)
+ return Response(self.serializer_class(user.profilemodel, context={'user': request.user}).data)
def retrieve_id(self, request, pk=None):
user = get_object_or_404(User, pk=pk)
- return Response(self.serializer_class(user.profilemodel, context={'request': request}).data)
+ return Response(self.serializer_class(user.profilemodel, context={'user': request.user}).data)
def list(self, request):
- serializer = ProfileSerializer(self.get_queryset(), many=True, context={'request': request})
+ serializer = ProfileSerializer(self.get_queryset(), many=True, context={'user': request.user})
return Response(serializer.data)