From 05469f68a808581a6d77620b847bae0d78d9f4fa Mon Sep 17 00:00:00 2001
From: Natty <natty.sh.git@gmail.com>
Date: Wed, 27 Dec 2023 04:40:13 +0100
Subject: [PATCH] User and note fetching fixes

---
 ext_calckey_model/src/note_model.rs           | 22 +++++++++----------
 .../frontend/client/src/pages/user/index.vue  | 10 ++++++---
 magnetar_common/src/util.rs                   |  2 +-
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/ext_calckey_model/src/note_model.rs b/ext_calckey_model/src/note_model.rs
index ba0dcee..ae8b40b 100644
--- a/ext_calckey_model/src/note_model.rs
+++ b/ext_calckey_model/src/note_model.rs
@@ -359,17 +359,17 @@ impl NoteResolver {
         let mut select = note::Entity::find().add_aliased_columns(Some(USER), user::Entity);
 
         if let Some(pins_user) = options.only_pins_from.clone() {
-            select = select.join_as(
-                JoinType::InnerJoin,
-                note::Relation::UserNotePining
-                    .def()
-                    .on_condition(move |left, _right| {
-                        Expr::col((left, note::Column::UserId))
-                            .eq(&pins_user)
-                            .into_condition()
-                    }),
-                ALIAS_PIN.clone(),
-            )
+            select = select
+                .join_as(
+                    JoinType::InnerJoin,
+                    note::Relation::UserNotePining.def(),
+                    ALIAS_PIN.clone(),
+                )
+                .filter(
+                    Expr::col((ALIAS_PIN.clone(), user_note_pining::Column::UserId))
+                        .eq(&pins_user)
+                        .into_condition(),
+                )
         }
 
         if let Some(user_id) = &options.with_interactions_from {
diff --git a/fe_calckey/frontend/client/src/pages/user/index.vue b/fe_calckey/frontend/client/src/pages/user/index.vue
index 647daeb..40e2fee 100644
--- a/fe_calckey/frontend/client/src/pages/user/index.vue
+++ b/fe_calckey/frontend/client/src/pages/user/index.vue
@@ -29,6 +29,7 @@
 </template>
 
 <script lang="ts" setup>
+import { host as localHost } from "@/config";
 import { computed, defineAsyncComponent, watch } from "vue";
 import * as os from "@/os";
 import { useRouter } from "@/router";
@@ -60,9 +61,10 @@ let tab = $ref(props.page);
 let user = $ref<null | packed.PackUserSelfMaybeAll>(null);
 let error = $ref<any>(null);
 
-function fetchUser(refetch: boolean = true): void {
+function fetchUser(refetch: boolean = true, clear: boolean = true): void {
     if (!props.acct) return;
-    user = null;
+
+    if (clear) user = null;
 
     os.magApi(
         endpoints.GetUserByAcct,
@@ -78,11 +80,13 @@ function fetchUser(refetch: boolean = true): void {
                     new Date().getTime() -
                         new Date(user.last_fetched_at).getTime() >
                         dayMs) &&
+                user.host !== null &&
+                user.host !== localHost &&
                 refetch
             ) {
                 os.api("users/show", Acct.parse(props.acct))
                     .then(() => {
-                        fetchUser(false);
+                        fetchUser(false, false);
                     })
                     .catch((e) => {
                         error = e;
diff --git a/magnetar_common/src/util.rs b/magnetar_common/src/util.rs
index 927ea2f..ca7b30b 100644
--- a/magnetar_common/src/util.rs
+++ b/magnetar_common/src/util.rs
@@ -68,7 +68,7 @@ fn split_tag_inner(tag: impl AsRef<str>) -> (String, Option<String>) {
 fn validate_tag_inner((name, host): (&str, Option<&str>)) -> Result<(), FediverseTagParseError> {
     if name
         .chars()
-        .any(|c| !c.is_alphanumeric() && c != '-' && c != '.')
+        .any(|c| !c.is_alphanumeric() && c != '-' && c != '_' && c != '.')
     {
         return Err(FediverseTagParseError::InvalidChar(name.to_owned()));
     }