|
|
@@ -21,7 +21,8 @@ from utils.error.errno_utils import LensmanStatusCode, PhotoStatusCode
|
21
|
21
|
from utils.error.response_utils import response
|
22
|
22
|
from utils.ip_utils import ip_addr
|
23
|
23
|
from utils.redis.rgroup import get_group_info, get_group_users_info, set_group_info, set_group_users_info
|
24
|
|
-from utils.redis.rkeys import GROUP_LAST_PHOTO_PK, UUID_LIST
|
|
24
|
+from utils.redis.rkeys import (GROUP_LAST_PHOTO_PK, GROUP_USERS_DELETED_SET, GROUP_USERS_PASSED_SET,
|
|
25
|
+ GROUP_USERS_QUIT_SET, GROUP_USERS_REFUSED_SET, UUID_LIST)
|
25
|
26
|
from utils.redis.ruuid import generate_uuids, update_uuids
|
26
|
27
|
from utils.thumbnail_utils import make_thumbnail
|
27
|
28
|
from utils.watermark_utils import watermark_wrap
|
|
|
@@ -182,7 +183,13 @@ def session_join_api(request):
|
182
|
183
|
group_user.save()
|
183
|
184
|
|
184
|
185
|
# Redis 群组用户数据缓存
|
185
|
|
- group_users = set_group_users_info(group) if group_user_created else get_group_users_info(group_id, user_id)
|
|
186
|
+ group_users = set_group_users_info(group)
|
|
187
|
+
|
|
188
|
+ # Redis 群组通过集合缓存
|
|
189
|
+ r.srem(GROUP_USERS_REFUSED_SET % group_id, user_id)
|
|
190
|
+ r.srem(GROUP_USERS_DELETED_SET % group_id, user_id)
|
|
191
|
+ r.srem(GROUP_USERS_QUIT_SET % group_id, user_id)
|
|
192
|
+ r.sadd(GROUP_USERS_PASSED_SET % group_id, user_id)
|
186
|
193
|
|
187
|
194
|
# 获取 Session 照片
|
188
|
195
|
photos = PhotosInfo.objects.filter(session_id=session_id)
|