Merge branch 'main' into evan/platform-ux-improvements-1

apps/app-frontend/src/App.vue

@@ -62,12 +62,12 @@ const themeStore = useTheming()
 
 const news = ref([
   {
-    title: 'Modrinth App 0.9.0',
-    summary: 'An all-new UI, Modrinth Servers, and support for collections.',
+    title: 'Introducing Modrinth Servers',
+    summary: 'Host your next Minecraft server with Modrinth.',
     thumbnail:
-      'https://media.beehiiv.com/cdn-cgi/image/format=auto,width=800,height=421,fit=scale-down,onerror=redirect/uploads/publication/thumbnail/a49f8e1b-3835-4ea1-a85b-118c6425ebc3/landscape_1667087426098458.png',
-    date: '2024-10-11T00:00:00Z',
-    link: 'https://blog.modrinth.com/p/creator-revenue-update',
+      'https://media.beehiiv.com/cdn-cgi/image/format=auto,width=800,height=421,fit=scale-down,onerror=redirect/uploads/asset/file/eefddc59-b4c4-4e7d-92e8-c26bdef42984/Modrinth-Servers-Thumb.png',
+    date: '2024-11-02T00:00:00Z',
+    link: 'https://blog.modrinth.com/p/modrinth-servers-beta',
   },
   {
     title: 'Becoming Sustainable',

apps/app-frontend/src/components/ui/friends/FriendsList.vue

@@ -157,20 +157,19 @@ const unlisten = await friend_listener(() => loadFriends())
 onUnmounted(() => {
   unlisten()
 })
-// TODO: Remove friends menu
 </script>
 
 <template>
   <NewModal ref="manageFriendsModal" header="Manage friends">
     <p v-if="acceptedFriends.length === 0">You have no friends :C</p>
-    <div v-else class="flex flex-col gap-4">
-      <input type="text" placeholder="Search friends..." class="w-full" />
+    <div v-else class="flex flex-col gap-4 min-w-[20rem]">
+      <input v-model="search" type="text" placeholder="Search friends..." class="w-full" />
       <div
-        v-for="friend in acceptedFriends.filter((x) =>
-          x.username.toLowerCase().includes(search.value),
+        v-for="friend in acceptedFriends.filter(
+          (x) => !search || x.username.toLowerCase().includes(search),
         )"
         :key="friend.username"
-        class="flex gap-2 items-center min-w-[20rem]"
+        class="flex gap-2 items-center"
       >
         <div class="relative">
           <Avatar :src="friend.avatar" class="w-12 h-12 rounded-full" size="2.25rem" circle />

packages/app-lib/src/state/friends.rs

@@ -206,6 +206,13 @@ impl FriendsSocket {
         tokio::task::spawn(async move {
             let res = async {
                 let state = crate::State::get().await?;
+
+                {
+                    if state.friends_socket.write.lock().await.is_some() {
+                        return Ok(());
+                    }
+                }
+
                 state
                     .friends_socket
                     .connect(