diff --git a/misago/privatethreads/members.py b/misago/privatethreads/members.py index 0abc85a389..5537cb06e8 100644 --- a/misago/privatethreads/members.py +++ b/misago/privatethreads/members.py @@ -4,7 +4,7 @@ from django.http import HttpRequest from ..threadevents.create import ( - create_left_thread_event, + create_member_left_thread_event, create_removed_member_thread_event, ) from ..threadevents.models import ThreadEvent @@ -152,7 +152,7 @@ def _remove_private_thread_member_action( return None if actor == member: - return create_left_thread_event(thread, actor, request=request) + return create_member_left_thread_event(thread, actor, request=request) return create_removed_member_thread_event(thread, member, actor, request=request) diff --git a/misago/privatethreads/tests/test_members.py b/misago/privatethreads/tests/test_members.py index 0997482c48..4e30655f98 100644 --- a/misago/privatethreads/tests/test_members.py +++ b/misago/privatethreads/tests/test_members.py @@ -169,7 +169,7 @@ def test_remove_private_thread_member_actor_leaves_thread( _, members = get_private_thread_members(user_private_thread) assert members == [other_user, moderator] - assert thread_update.event_type == ThreadEventTypeName.LEFT + assert thread_update.event_type == ThreadEventTypeName.MEMBER_LEFT def test_remove_private_thread_member_removes_other_member( diff --git a/misago/privatethreads/tests/test_private_thread_leave_view.py b/misago/privatethreads/tests/test_private_thread_leave_view.py index 5c48a2ba10..1746533038 100644 --- a/misago/privatethreads/tests/test_private_thread_leave_view.py +++ b/misago/privatethreads/tests/test_private_thread_leave_view.py @@ -76,7 +76,7 @@ def test_private_thread_leave_view_removes_thread_owner( ThreadEvent.objects.get( actor=user, thread=user_private_thread, - event_type=ThreadEventTypeName.LEFT, + event_type=ThreadEventTypeName.MEMBER_LEFT, ) user_private_thread.refresh_from_db() @@ -105,7 +105,7 @@ def test_private_thread_leave_view_removes_thread_member( ThreadEvent.objects.get( actor=other_user, thread=user_private_thread, - event_type=ThreadEventTypeName.LEFT, + event_type=ThreadEventTypeName.MEMBER_LEFT, ) user_private_thread.refresh_from_db() @@ -134,7 +134,7 @@ def test_private_thread_leave_view_removes_thread_moderator( ThreadEvent.objects.get( actor=moderator, thread=user_private_thread, - event_type=ThreadEventTypeName.LEFT, + event_type=ThreadEventTypeName.MEMBER_LEFT, ) user_private_thread.refresh_from_db() diff --git a/misago/test/threadevents.py b/misago/test/threadevents.py index a603331796..3780eded62 100644 --- a/misago/test/threadevents.py +++ b/misago/test/threadevents.py @@ -63,7 +63,7 @@ def thread_event_user_context(user, thread, other_user): thread=thread, actor=user, actor_name=user.username, - event_type=ThreadEventTypeName.LEFT, + event_type=ThreadEventTypeName.MEMBER_LEFT, context=other_user.username, context_type="misago_users.user", context_id=other_user.id, @@ -92,7 +92,7 @@ def private_thread_event(user, private_thread): thread=private_thread, actor=user, actor_name=user.username, - event_type=ThreadEventTypeName.JOINED, + event_type=ThreadEventTypeName.MEMBER_JOINED, ) @@ -103,7 +103,7 @@ def user_private_thread_event(user, user_private_thread): thread=user_private_thread, actor=user, actor_name=user.username, - event_type=ThreadEventTypeName.JOINED, + event_type=ThreadEventTypeName.MEMBER_JOINED, ) @@ -114,7 +114,7 @@ def hidden_private_thread_event(user, moderator, private_thread): thread=private_thread, actor=user, actor_name=user.username, - event_type=ThreadEventTypeName.JOINED, + event_type=ThreadEventTypeName.MEMBER_JOINED, is_hidden=True, hidden_by=moderator, hidden_by_name=moderator.username, @@ -129,7 +129,7 @@ def hidden_user_private_thread_event(user, moderator, user_private_thread): thread=user_private_thread, actor=user, actor_name=user.username, - event_type=ThreadEventTypeName.JOINED, + event_type=ThreadEventTypeName.MEMBER_JOINED, is_hidden=True, hidden_by=moderator, hidden_by_name=moderator.username, diff --git a/misago/threadevents/create.py b/misago/threadevents/create.py index f139fb69ff..6b62ded6b3 100644 --- a/misago/threadevents/create.py +++ b/misago/threadevents/create.py @@ -492,7 +492,7 @@ def create_took_ownership_thread_event( ) -def create_joined_thread_event( +def create_member_joined_thread_event( thread: Thread, actor: Union["User", str, None] = None, commit: bool = True, @@ -500,7 +500,7 @@ def create_joined_thread_event( ) -> ThreadEvent: return create_thread_event( thread, - ThreadEventTypeName.JOINED, + ThreadEventTypeName.MEMBER_JOINED, actor, commit=commit, request=request, @@ -525,7 +525,7 @@ def create_added_member_thread_event( ) -def create_left_thread_event( +def create_member_left_thread_event( thread: Thread, actor: Union["User", str, None] = None, commit: bool = True, @@ -533,7 +533,7 @@ def create_left_thread_event( ) -> ThreadEvent: return create_thread_event( thread, - ThreadEventTypeName.LEFT, + ThreadEventTypeName.MEMBER_LEFT, actor, commit=commit, request=request, diff --git a/misago/threadevents/enums.py b/misago/threadevents/enums.py index 5284dd1f04..a5835211c5 100644 --- a/misago/threadevents/enums.py +++ b/misago/threadevents/enums.py @@ -40,8 +40,8 @@ class ThreadEventTypeName(StrEnum): TOOK_OWNERSHIP = "took_ownership" CHANGED_OWNER = "changed_owner" - JOINED = "joined" - LEFT = "left" + MEMBER_JOINED = "member_joined" + MEMBER_LEFT = "member_left" ADDED_MEMBER = "added_member" REMOVED_MEMBER = "removed_member" diff --git a/misago/threadevents/migrations/0002_move_data.py b/misago/threadevents/migrations/0002_move_data.py index d4860fc4f9..954a69352d 100644 --- a/misago/threadevents/migrations/0002_move_data.py +++ b/misago/threadevents/migrations/0002_move_data.py @@ -13,12 +13,12 @@ "hid": "hidden", "unhid": "unhidden", "split": "split_posts_from", - "entered_thread": "joined", + "entered_thread": "member_joined", "tookover": "took_ownership", "removed_owner": "removed_member", "added_participant": "added_member", - "owner_left": "left", - "participant_left": "left", + "owner_left": "member_left", + "participant_left": "member_left", } diff --git a/misago/threadevents/tests/test_thread_event_actions.py b/misago/threadevents/tests/test_thread_event_actions.py index 483e6012e0..bfe6f119c1 100644 --- a/misago/threadevents/tests/test_thread_event_actions.py +++ b/misago/threadevents/tests/test_thread_event_actions.py @@ -10,9 +10,9 @@ create_deleted_poll_thread_event, create_deleted_posts_thread_event, create_hidden_thread_event, - create_joined_thread_event, - create_left_thread_event, create_locked_thread_event, + create_member_joined_thread_event, + create_member_left_thread_event, create_merged_thread_event, create_moved_posts_from_thread_event, create_moved_posts_to_thread_event, @@ -531,8 +531,8 @@ def test_create_took_ownership_thread_event(client, thread, user): assert_contains(response, "Took ownership") -def test_create_joined_thread_event(client, thread, user): - create_joined_thread_event(thread, user) +def test_create_member_joined_thread_event(client, thread, user): + create_member_joined_thread_event(thread, user) thread.has_events = True thread.save() @@ -543,8 +543,8 @@ def test_create_joined_thread_event(client, thread, user): assert_contains(response, "Joined") -def test_create_left_thread_event(client, thread, user): - create_left_thread_event(thread, user) +def test_create_member_left_thread_event(client, thread, user): + create_member_left_thread_event(thread, user) thread.has_events = True thread.save() diff --git a/misago/threadevents/types.py b/misago/threadevents/types.py index c4ee1bcf7a..f60384a02f 100644 --- a/misago/threadevents/types.py +++ b/misago/threadevents/types.py @@ -405,15 +405,15 @@ class ChangedOwnerThreadEventType(UserContextThreadEventType): @thread_events_renderer.register_thread_event_type -class JoinedThreadEventType(ThreadEventType): - event_type = ThreadEventTypeName.JOINED +class MemberJoinedThreadEventType(ThreadEventType): + event_type = ThreadEventTypeName.MEMBER_JOINED icon = "tabler/user.svg" description = pgettext_lazy("thread event type description", "Joined") @thread_events_renderer.register_thread_event_type -class LeftThreadEventType(ThreadEventType): - event_type = ThreadEventTypeName.LEFT +class MemberLeftThreadEventType(ThreadEventType): + event_type = ThreadEventTypeName.MEMBER_LEFT icon = "tabler/user-off.svg" description = pgettext_lazy("thread event type description", "Left")