🔖 version 0.5.0

RF-Tar-Railt · RF-Tar-Railt · commit 9f3a090af14a · 2025-07-22T22:28:30.000+08:00
diff --git a/nonechat/backend/__init__.py b/nonechat/backend/__init__.py
@@ -75,16 +75,16 @@ async def list_users(self) -> list[User]:
 
     async def list_channels(self, list_users: bool = False) -> list[Channel]:
         data = list(self.storage.channels.values())
-        data[0] = await self.create_dm(
-            self.current_user
-        )  # Ensure the first channel is the DM with current user
+        data.pop(0)
+        users = [await self.create_dm(self.current_user)]
         if list_users:
-            data = [
-                (await self.create_dm(user))
+            users += [
+                await self.create_dm(user)
                 for user in self.storage.users.values()
                 if user.id != self.current_user.id
-            ] + data
-        return data
+            ]
+        users.sort(key=lambda x: x._created_at.timestamp(), reverse=True)
+        return users + data
 
     async def create_dm(self, user: User):
         chl = Channel(f"private:{user.id}", user.nickname, "", user.avatar)
@@ -96,9 +96,7 @@ async def list_bots(self) -> list[User]:
 
     async def get_chat_history(self, channel: Union[Channel, None] = None) -> list[MessageEvent]:
         _target = (
-            Channel(
-                f"private:{self.current_user.id}", self.current_user.nickname, "", self.current_user.avatar
-            )
+            await self.create_dm(self.current_user)
             if (channel or self.current_channel).id == DIRECT.id
             else (channel or self.current_channel)
         )
@@ -157,9 +155,7 @@ async def write_chat(self, message: "MessageEvent", channel: Channel):
 
     async def clear_chat_history(self, channel: Union[Channel, None] = None):
         _target = (
-            Channel(
-                f"private:{self.current_user.id}", self.current_user.nickname, "", self.current_user.avatar
-            )
+            await self.create_dm(self.current_user)
             if (channel or self.current_channel).id == DIRECT.id
             else (channel or self.current_channel)
         )
diff --git a/nonechat/components/channel_selector.py b/nonechat/components/channel_selector.py
@@ -50,7 +50,7 @@ def __init__(self):
         self.channel_items: dict[str, tuple[ListItem, tuple[Channel, Optional[User]]]] = {}
         self.check_record: dict[str, float] = {}  # 用于记录频道的最后活动时间
         self.is_bot_mode = self.app.is_bot_mode
-        self._current_channel: Optional[Channel] = None
+        self.current_channel: Optional[Channel] = None
 
     @property
     def app(self) -> "Frontend":
@@ -87,7 +87,6 @@ async def update_channel_list(self):
         await channel_list.clear()
         self.channel_items.clear()
 
-        # 普通模式：显示频道列表
         channels_times = [
             (
                 channel,
@@ -106,14 +105,12 @@ async def update_channel_list(self):
                 if time != channel._created_at.timestamp():
                     color = (
                         "auto"
-                        if self._current_channel and channel.id == self._current_channel.id
+                        if self.current_channel and channel.id == self.current_channel.id
                         else "lime blink"
                     )
             elif time > self.check_record[channel.id]:
                 color = (
-                    "auto"
-                    if self._current_channel and channel.id == self._current_channel.id
-                    else "lime blink"
+                    "auto" if self.current_channel and channel.id == self.current_channel.id else "lime blink"
                 )
 
             if channel.id.startswith("private:"):
@@ -136,41 +133,36 @@ async def update_channel_list(self):
 
             self.channel_items[channel.id] = (item, (channel, orig_user))
             await channel_list.append(item)
-            if self._current_channel and channel.id == self._current_channel.id:
+            if self.current_channel and channel.id == self.current_channel.id:
                 item.highlighted = True
 
     async def on_list_view_selected(self, event: ListView.Selected):
         """处理列表项选择事件"""
         if event.item and event.item.id and event.item.id.startswith("channel-"):
             # 查找对应的频道
             for item, slots in self.channel_items.values():
+                channel, orig_user = slots
+                if channel.id == DIRECT.id:
+                    ev = ChannelSelectorPressed(
+                        await self.app.backend.create_dm(self.app.backend.current_user),
+                        self.app.backend.current_user,
+                    )
+                else:
+                    ev = ChannelSelectorPressed(channel, orig_user)
                 if item == event.item:
-                    channel, orig_user = slots
-                    self._current_channel = channel  # 更新当前频道
-                    self.check_record[channel.id] = datetime.now().timestamp()  # 更新最后活动时间
                     key = (
                         f"dm-{channel.id[8:]}"
                         if channel.id.startswith("private:")
-                        else (
-                            f"dm-{self.app.backend.current_user.id}"
-                            if channel.id == DIRECT.id
-                            else channel.id
-                        )
+                        else ("dm-direct" if channel.id == DIRECT.id else channel.id)
                     )
                     label = self.query_one(f"#label-{key}", Label)
                     label.update(label.renderable.replace("lime blink", "auto"))  # type: ignore
-                    if channel.id == DIRECT.id:
-                        self.post_message(
-                            ChannelSelectorPressed(
-                                await self.app.backend.create_dm(self.app.backend.current_user),
-                                self.app.backend.current_user,
-                            )
-                        )
-                    else:
-                        self.post_message(ChannelSelectorPressed(channel, orig_user))
+                    self.post_message(ev)
                     item.highlighted = True
+                    self.current_channel = ev.channel
                 else:
                     item.highlighted = False
+                self.check_record[ev.channel.id] = datetime.now().timestamp()  # 更新最后活动时间
 
     async def add_new_channel(self):
         """添加新频道的逻辑"""
diff --git a/nonechat/components/sidebar.py b/nonechat/components/sidebar.py
@@ -92,15 +92,6 @@ def on_unmount(self):
 
     def compose(self):
         with TabbedContent():
-            with TabPane("🤖 机器人列表" if self.is_bot_mode else "👥 用户列表", id="users"):
-                with Vertical(classes="selector-container"):
-                    yield self.user_selector
-                with Vertical(classes="button-container"):
-                    yield Button(
-                        "➕ 添加机器人" if self.is_bot_mode else "➕ 添加用户",
-                        id="add-user",
-                        classes="add-button",
-                    )
             with TabPane("📺 频道列表", id="channels"):
                 with Vertical(classes="selector-container"):
                     yield self.channel_selector
@@ -111,6 +102,15 @@ def compose(self):
                         classes="add-button",
                         disabled=self.is_bot_mode,
                     )
+            with TabPane("🤖 机器人列表" if self.is_bot_mode else "👥 用户列表", id="users"):
+                with Vertical(classes="selector-container"):
+                    yield self.user_selector
+                with Vertical(classes="button-container"):
+                    yield Button(
+                        "➕ 添加机器人" if self.is_bot_mode else "➕ 添加用户",
+                        id="add-user",
+                        classes="add-button",
+                    )
 
     async def on_bot_mode_changed(self, event: "BotModeChanged"):
         """处理模式切换"""
diff --git a/pdm.lock b/pdm.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -7,7 +7,7 @@ authors = [
 dependencies = [
     "textual<4.0.0,>=3.7.0",
 ]
-version = "0.4.3"
+version = "0.5.0"
 requires-python = ">=3.9, <4.0"
 readme = "README.md"
 license = {text = "MIT"}

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ authors = [`
`7`	`7`	`dependencies = [`
`8`	`8`	`"textual<4.0.0,>=3.7.0",`
`9`	`9`	`]`
`10`		`-version = "0.4.3"`
	`10`	`+version = "0.5.0"`
`11`	`11`	`requires-python = ">=3.9, <4.0"`
`12`	`12`	`readme = "README.md"`
`13`	`13`	`license = {text = "MIT"}`