Cargo.lock

@@ -1472,7 +1472,6 @@ dependencies = [
 name = "magnetar"
 version = "0.3.0-alpha"
 dependencies = [
- "async-stream",
  "axum",
  "axum-extra",
  "cached",
@@ -1503,7 +1502,6 @@ dependencies = [
  "strum",
  "thiserror",
  "tokio",
- "tokio-stream",
  "toml",
  "tower",
  "tower-http",

Cargo.toml

@@ -24,7 +24,6 @@ edition = "2021"
 
 [workspace.dependencies]
 async-trait = "0.1"
-async-stream = "0.3"
 axum = "0.7"
 axum-extra = "0.9"
 cached = "0.47"
@@ -61,7 +60,6 @@ tera = { version = "1", default-features = false }
 thiserror = "1"
 tokio = "1.24"
 tokio-util = "0.7"
-tokio-stream = "0.1"
 toml = "0.8"
 tower = "0.4"
 tower-http = "0.5"
@@ -88,11 +86,9 @@ dotenvy = { workspace = true }
 
 axum = { workspace = true, features = ["macros"] }
 axum-extra = { workspace = true, features = ["typed-header"]}
-async-stream = { workspace = true }
 headers = { workspace = true }
 hyper = { workspace = true, features = ["full"] }
 tokio = { workspace = true, features = ["full"] }
-tokio-stream = { workspace = true }
 tower = { workspace = true }
 tower-http = { workspace = true, features = ["cors", "trace", "fs"] }
 url = { workspace = true }

ext_calckey_model/entity_ck/src/entities/sea_orm_active_enums.rs

@@ -98,10 +98,14 @@ pub enum NotificationTypeEnum {
     Follow,
     #[sea_orm(string_value = "followRequestAccepted")]
     FollowRequestAccepted,
+    #[sea_orm(string_value = "groupInvited")]
+    GroupInvited,
     #[sea_orm(string_value = "mention")]
     Mention,
     #[sea_orm(string_value = "pollEnded")]
     PollEnded,
+    #[sea_orm(string_value = "pollVote")]
+    PollVote,
     #[sea_orm(string_value = "quote")]
     Quote,
     #[sea_orm(string_value = "reaction")]

ext_calckey_model/migration/src/lib.rs

@@ -9,7 +9,6 @@ mod m20240107_220523_generated_is_quote;
 mod m20240107_224446_generated_is_renote;
 mod m20240112_215106_remove_pages;
 mod m20240112_234759_remove_gallery;
-mod m20240115_212109_remove_poll_vote_notification;
 
 pub struct Migrator;
 
@@ -26,7 +25,6 @@ impl MigratorTrait for Migrator {
             Box::new(m20240107_224446_generated_is_renote::Migration),
             Box::new(m20240112_215106_remove_pages::Migration),
             Box::new(m20240112_234759_remove_gallery::Migration),
-            Box::new(m20240115_212109_remove_poll_vote_notification::Migration),
         ]
     }
 }

ext_calckey_model/migration/src/m20240115_212109_remove_poll_vote_notification.rs

@@ -1,45 +0,0 @@
-use sea_orm_migration::prelude::*;
-use sea_orm_migration::sea_orm::TransactionTrait;
-
-#[derive(DeriveMigrationName)]
-pub struct Migration;
-
-#[async_trait::async_trait]
-impl MigrationTrait for Migration {
-    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
-        let db = manager.get_connection();
-
-        db.execute_unprepared(
-            r#"
-            DELETE FROM "notification" WHERE "type" = 'pollVote' OR "type" = 'groupInvited';
-
-            ALTER TYPE "notification_type_enum" RENAME TO "notification_type_enum_old";
-            CREATE TYPE "notification_type_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'app');
-            ALTER TABLE "notification" ALTER COLUMN "type" TYPE "notification_type_enum" USING "type"::text::notification_type_enum;
-            DROP TYPE "notification_type_enum_old";
-            "#,
-        )
-        .await?;
-
-        Ok(())
-    }
-
-    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
-        let db = manager.get_connection();
-        let txn = db.begin().await?;
-
-        db.execute_unprepared(
-            r#"
-            ALTER TYPE "notification_type_enum" RENAME TO "notification_type_enum_old";
-            CREATE TYPE "notification_type_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app');
-            ALTER TABLE "notification" ALTER COLUMN "type" TYPE "notification_type_enum" USING "type"::text::notification_type_enum;
-            DROP TYPE "notification_type_enum_old";
-            "#,
-        )
-        .await?;
-
-        txn.commit().await?;
-
-        Ok(())
-    }
-}

ext_calckey_model/src/lib.rs

@@ -10,7 +10,6 @@ use ck::*;
 pub use sea_orm;
 use user_model::UserResolver;
 
-use crate::model_ext::IdShape;
 use crate::note_model::NoteResolver;
 use crate::notification_model::NotificationResolver;
 use chrono::Utc;
@@ -22,16 +21,14 @@ use sea_orm::{
     ColumnTrait, ConnectOptions, DatabaseConnection, DbErr, EntityTrait, QueryFilter,
     TransactionTrait,
 };
-use serde::de::Error;
+use serde::{Deserialize, Serialize};
-use serde::{Deserialize, Deserializer, Serialize};
-use serde_json::Value;
 use std::future::Future;
 use strum::IntoStaticStr;
 use thiserror::Error;
 use tokio::select;
 use tokio_util::sync::CancellationToken;
 use tracing::log::LevelFilter;
-use tracing::{error, info, trace, warn};
+use tracing::{error, info, trace};
 
 #[derive(Debug)]
 pub struct ConnectorConfig {
@@ -356,46 +353,12 @@ impl CalckeyCache {
 
 pub struct CalckeyCacheClient(redis::aio::Connection);
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Deserialize)]
+#[serde(tag = "channel", content = "message")]
 pub enum SubMessage {
     Internal(InternalStreamMessage),
-    MainStream(String, MainStreamMessage),
+    #[serde(other)]
-    Other(String, Value),
+    Other,
-}
-
-#[derive(Deserialize)]
-struct RawMessage<'a> {
-    channel: &'a str,
-    message: Value,
-}
-
-impl<'de> Deserialize<'de> for SubMessage {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        let raw = RawMessage::deserialize(deserializer)?;
-
-        Ok(match raw.channel {
-            "internal" => SubMessage::Internal(
-                InternalStreamMessage::deserialize(raw.message).map_err(Error::custom)?,
-            ),
-            c if c.starts_with("mainStream") => SubMessage::MainStream(
-                c.strip_prefix("mainStream:")
-                    .ok_or_else(|| Error::custom("Invalid mainStream prefix"))?
-                    .to_string(),
-                MainStreamMessage::deserialize(raw.message).map_err(Error::custom)?,
-            ),
-            _ => SubMessage::Other(raw.channel.to_string(), raw.message),
-        })
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(tag = "type", content = "body")]
-#[serde(rename_all = "camelCase")]
-pub enum MainStreamMessage {
-    Notification(IdShape),
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
@@ -463,7 +426,6 @@ impl CalckeySub {
         let prefix = prefix.to_string();
 
         tokio::spawn(async move {
-            trace!("Redis subscriber spawned");
             let mut on_message = pub_sub.on_message();
 
             while let Some(msg) = select! {
@@ -471,7 +433,7 @@ impl CalckeySub {
                 _ = token_rx.cancelled() => {
                     drop(on_message);
                     if let Err(e) = pub_sub.unsubscribe(prefix).await {
-                        warn!("Redis error: {:?}", e);
+                        info!("Redis error: {:?}", e);
                     }
                     return;
                 }
@@ -479,7 +441,7 @@ impl CalckeySub {
                 let data = &match msg.get_payload::<String>() {
                     Ok(val) => val,
                     Err(e) => {
-                        warn!("Redis error: {:?}", e);
+                        info!("Redis error: {:?}", e);
                         continue;
                     }
                 };
@@ -487,7 +449,7 @@ impl CalckeySub {
                 let parsed = match serde_json::from_str::<SubMessage>(data) {
                     Ok(val) => val,
                     Err(e) => {
-                        warn!("Message parse error: {:?}", e);
+                        info!("Message parse error: {:?}", e);
                         continue;
                     }
                 };
@@ -504,7 +466,6 @@ impl CalckeySub {
 
 impl Drop for CalckeySub {
     fn drop(&mut self) {
-        trace!("Redis subscriber dropped");
         self.0.cancel();
     }
 }

ext_calckey_model/src/model_ext.rs

@@ -5,10 +5,9 @@ use ext_calckey_model_migration::{
 use magnetar_sdk::types::SpanFilter;
 use sea_orm::{
     ColumnTrait, Condition, ConnectionTrait, Cursor, DbErr, DynIden, EntityTrait, FromQueryResult,
-    Iden, IntoIdentity, Iterable, JoinType, QueryTrait, RelationDef, RelationTrait, Select,
+    Iden, IntoIdentity, Iterable, JoinType, RelationDef, RelationTrait, Select, SelectModel,
-    SelectModel, SelectorTrait,
+    SelectorTrait,
 };
-use serde::{Deserialize, Serialize};
 use std::fmt::Write;
 
 #[derive(Clone)]
@@ -225,7 +224,6 @@ pub trait CursorPaginationExt<E> {
 
     fn cursor_by_columns_and_span<C>(
         self,
-        cursor_prefix_alias: Option<MagIden>,
         order_columns: C,
         pagination: &SpanFilter,
         limit: Option<u64>,
@@ -236,7 +234,6 @@ pub trait CursorPaginationExt<E> {
     async fn get_paginated_model<M, C, T>(
         self,
         db: &T,
-        cursor_prefix_alias: Option<MagIden>,
         columns: C,
         curr: &SpanFilter,
         prev: &mut Option<SpanFilter>,
@@ -258,7 +255,6 @@ where
 
     fn cursor_by_columns_and_span<C>(
         self,
-        cursor_prefix_alias: Option<MagIden>,
         order_columns: C,
         pagination: &SpanFilter,
         limit: Option<u64>,
@@ -266,11 +262,7 @@ where
     where
         C: IntoIdentity,
     {
-        let mut cursor = Cursor::new(
+        let mut cursor = self.cursor_by(order_columns);
-            self.into_query(),
-            cursor_prefix_alias.map_or_else(|| E::default().into_iden(), MagIden::into_iden),
-            order_columns,
-        );
 
         if let Some(start) = pagination.start() {
             cursor.after(start);
@@ -294,7 +286,6 @@ where
     async fn get_paginated_model<Q, C, T>(
         self,
         db: &T,
-        cursor_prefix_alias: Option<MagIden>,
         columns: C,
         curr: &SpanFilter,
         prev: &mut Option<SpanFilter>,
@@ -307,7 +298,7 @@ where
         T: ConnectionTrait,
     {
         let mut result = self
-            .cursor_by_columns_and_span(cursor_prefix_alias, columns, curr, Some(limit + 1))
+            .cursor_by_columns_and_span(columns, curr, Some(limit + 1))
             .into_model::<Q>()
             .all(db)
             .await?;
@@ -333,8 +324,3 @@ pub trait ModelPagination {
     fn id(&self) -> &str;
     fn time(&self) -> DateTime<Utc>;
 }
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct IdShape {
-    pub id: String,
-}

ext_calckey_model/src/note_model/mod.rs

@@ -3,8 +3,8 @@ pub mod data;
 use ext_calckey_model_migration::SelectStatement;
 use sea_orm::sea_query::{Asterisk, Expr, IntoIden, Query, SelectExpr, SimpleExpr};
 use sea_orm::{
-    Condition, EntityTrait, Iden, JoinType, QueryFilter, QueryOrder, QuerySelect, QueryTrait,
+    Condition, EntityTrait, Iden, IntoSimpleExpr, JoinType, QueryFilter, QueryOrder, QuerySelect,
-    Select,
+    QueryTrait, Select,
 };
 use std::sync::Arc;
 
@@ -177,7 +177,6 @@ impl NoteResolver {
             notes_select
                 .get_paginated_model::<NoteData, _, _>(
                     self.db.inner(),
-                    Some(note::Entity.base_prefix()),
                     (note::Column::CreatedAt, note::Column::Id),
                     pagination,
                     &mut None,

ext_calckey_model/src/notification_model.rs

@@ -7,13 +7,10 @@ use crate::note_model::{NoteResolveOptions, NoteResolver};
 use crate::user_model::{UserData, UserResolveOptions, UserResolver};
 use crate::{CalckeyDbError, CalckeyModel};
 use chrono::{DateTime, Utc};
-use ck::sea_orm_active_enums::NotificationTypeEnum;
 use ck::{access_token, notification, user};
 use ext_calckey_model_migration::{JoinType, SelectStatement};
 use magnetar_sdk::types::SpanFilter;
-use sea_orm::prelude::Expr;
+use sea_orm::Iden;
-use sea_orm::sea_query::{IntoCondition, Query};
-use sea_orm::{ActiveEnum, Iden, QueryTrait};
 use sea_orm::{DbErr, EntityTrait, FromQueryResult, QueryFilter, QueryResult, QuerySelect};
 use serde::{Deserialize, Serialize};
 
@@ -58,14 +55,12 @@ impl ModelPagination for NotificationData {
     }
 }
 
+const NOTIFICATION: &str = "notification.";
 const NOTIFIER: &str = "notifier.";
 const NOTIFICATION_NOTE: &str = "note.";
 const ACCESS_TOKEN: &str = "access_token.";
 
-pub struct NotificationResolveOptions {
+pub struct NotificationResolveOptions {}
-    pub note_options: NoteResolveOptions,
-    pub user_options: UserResolveOptions,
-}
 
 #[derive(Clone)]
 pub struct NotificationResolver {
@@ -91,12 +86,11 @@ impl NotificationResolver {
         &self,
         q: &mut SelectStatement,
         notification_tbl: &MagIden,
-        resolve_options: &NotificationResolveOptions,
+        note_options: &NoteResolveOptions,
+        user_options: &UserResolveOptions,
         note_resolver: &NoteResolver,
         user_resolver: &UserResolver,
     ) {
-        q.add_aliased_columns::<notification::Entity>(&notification_tbl);
-
         let notifier_tbl = notification_tbl.join_str(NOTIFIER);
         q.add_aliased_columns::<user::Entity>(&notifier_tbl);
         q.join_columns(
@@ -104,7 +98,7 @@ impl NotificationResolver {
             notification::Relation::User2.with_from_alias(notification_tbl),
             &notifier_tbl,
         );
-        user_resolver.resolve(q, &notifier_tbl, &resolve_options.user_options);
+        user_resolver.resolve(q, &notifier_tbl, &user_options);
 
         let token_tbl = notification_tbl.join_str(ACCESS_TOKEN);
         q.add_aliased_columns::<access_token::Entity>(&token_tbl);
@@ -120,56 +114,14 @@ impl NotificationResolver {
             notification::Relation::Note.with_from_alias(notification_tbl),
             &note_tbl,
         );
-        note_resolver.attach_note(
+        note_resolver.attach_note(q, &note_tbl, 1, 1, note_options, &self.user_resolver);
-            q,
-            &note_tbl,
-            1,
-            1,
-            &resolve_options.note_options,
-            &self.user_resolver,
-        );
-    }
-
-    pub async fn get_single(
-        &self,
-        resolve_options: &NotificationResolveOptions,
-        notification_id: &str,
-    ) -> Result<Option<NotificationData>, CalckeyDbError> {
-        let notification_tbl = notification::Entity.base_prefix();
-
-        let mut query = Query::select();
-        query.from_as(notification::Entity, notification_tbl.clone());
-
-        self.resolve(
-            &mut query,
-            &notification_tbl,
-            &resolve_options,
-            &self.note_resolver,
-            &self.user_resolver,
-        );
-
-        let mut select = notification::Entity::find();
-        *QuerySelect::query(&mut select) = query;
-
-        let notifications = select
-            .filter(
-                notification_tbl
-                    .col(notification::Column::Id)
-                    .eq(notification_id),
-            )
-            .into_model::<NotificationData>()
-            .one(self.db.inner())
-            .await?;
-
-        Ok(notifications)
     }
 
     pub async fn get(
         &self,
-        resolve_options: &NotificationResolveOptions,
+        note_options: &NoteResolveOptions,
+        user_options: &UserResolveOptions,
         user_id: &str,
-        notification_types: &[NotificationTypeEnum],
-        unread_only: bool,
         pagination: &SpanFilter,
         prev: &mut Option<SpanFilter>,
         next: &mut Option<SpanFilter>,
@@ -177,46 +129,26 @@ impl NotificationResolver {
     ) -> Result<Vec<NotificationData>, CalckeyDbError> {
         let notification_tbl = notification::Entity.base_prefix();
 
-        let mut query = Query::select();
+        let mut select = notification::Entity::find();
-        query.from_as(notification::Entity, notification_tbl.clone());
 
+        let query = QuerySelect::query(&mut select);
         self.resolve(
-            &mut query,
+            query,
             &notification_tbl,
-            &resolve_options,
+            note_options,
+            user_options,
             &self.note_resolver,
             &self.user_resolver,
         );
 
-        let mut select = notification::Entity::find();
-        *QuerySelect::query(&mut select) = query;
-
         let notifications = select
             .filter(
                 notification_tbl
                     .col(notification::Column::NotifieeId)
-                    .eq(user_id)
+                    .eq(user_id),
-                    .and(
-                        notification_tbl.col(notification::Column::Type).is_in(
-                            notification_types
-                                .iter()
-                                .copied()
-                                .map(Expr::val)
-                                .map(|e| e.cast_as(NotificationTypeEnum::name())),
-                        ),
-                    ),
             )
-            .apply_if(unread_only.then_some(()), |s, _| {
-                s.filter(
-                    notification_tbl
-                        .col(notification::Column::IsRead)
-                        .not()
-                        .into_condition(),
-                )
-            })
             .get_paginated_model::<NotificationData, _, _>(
                 &self.db.0,
-                Some(notification_tbl),
                 (notification::Column::CreatedAt, notification::Column::Id),
                 pagination,
                 prev,

ext_calckey_model/src/user_model.rs

@@ -200,7 +200,6 @@ impl UserResolver {
             .filter(follow_request::Column::FolloweeId.eq(followee))
             .get_paginated_model::<UserFollowRequestData, _, _>(
                 &self.db.0,
-                None,
                 (
                     follow_request::Column::CreatedAt,
                     follow_request::Column::Id,
@@ -242,7 +241,6 @@ impl UserResolver {
             .filter(following::Column::FollowerId.eq(follower))
             .get_paginated_model::<UserFollowData, _, _>(
                 &self.db.0,
-                None,
                 (following::Column::CreatedAt, following::Column::Id),
                 pagination,
                 prev,
@@ -281,7 +279,6 @@ impl UserResolver {
             .filter(following::Column::FolloweeId.eq(followee))
             .get_paginated_model::<UserFollowData, _, _>(
                 &self.db.0,
-                None,
                 (following::Column::CreatedAt, following::Column::Id),
                 pagination,
                 prev,

fe_calckey/frontend/client/src/components/MagNote.vue

@@ -286,7 +286,7 @@ const reactButton = ref<HTMLElement | null>(null);
 let appearNote = $computed(
     () => magEffectiveNote(note) as packed.PackNoteMaybeFull
 );
-const isMyRenote = $i && $i.id === appearNote.user.id;
+const isMyRenote = $i && $i.id === note.user.id;
 const showContent = ref(false);
 const isDeleted = ref(false);
 const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));

fe_calckey/frontend/client/src/components/MkNotification.vue

@@ -6,24 +6,13 @@
         :class="notification.type"
     >
         <div class="head">
-            <MagAvatar
+            <MagAvatarResolvingProxy
-                v-if="
+                v-if="notification.type === 'pollEnded'"
-                    notification.type === 'Renote' ||
-                    notification.type === 'Reply' ||
-                    notification.type === 'Mention' ||
-                    notification.type === 'Quote' ||
-                    notification.type === 'PollEnd'
-                "
                 class="icon"
                 :user="notification.note.user"
             />
-            <MagAvatar
+            <MagAvatarResolvingProxy
-                v-else-if="
+                v-else-if="notification.user"
-                    notification.type === 'Reaction' ||
-                    notification.type === 'FollowRequestAccepted' ||
-                    notification.type === 'Follow' ||
-                    notification.type === 'FollowRequestReceived'
-                "
                 class="icon"
                 :user="notification.user"
             />
@@ -35,51 +24,55 @@
             />
             <div class="sub-icon" :class="notification.type">
                 <i
-                    v-if="notification.type === 'Follow'"
+                    v-if="notification.type === 'follow'"
                     class="ph-hand-waving ph-bold"
                 ></i>
                 <i
-                    v-else-if="notification.type === 'FollowRequestReceived'"
+                    v-else-if="notification.type === 'receiveFollowRequest'"
                     class="ph-clock ph-bold"
                 ></i>
                 <i
-                    v-else-if="notification.type === 'FollowRequestAccepted'"
+                    v-else-if="notification.type === 'followRequestAccepted'"
                     class="ph-check ph-bold"
                 ></i>
                 <i
-                    v-else-if="notification.type === 'Renote'"
+                    v-else-if="notification.type === 'renote'"
                     class="ph-repeat ph-bold"
                 ></i>
                 <i
-                    v-else-if="notification.type === 'Reply'"
+                    v-else-if="notification.type === 'reply'"
                     class="ph-arrow-bend-up-left ph-bold"
                 ></i>
                 <i
-                    v-else-if="notification.type === 'Mention'"
+                    v-else-if="notification.type === 'mention'"
                     class="ph-at ph-bold"
                 ></i>
                 <i
-                    v-else-if="notification.type === 'Quote'"
+                    v-else-if="notification.type === 'quote'"
                     class="ph-quotes ph-bold"
                 ></i>
                 <i
-                    v-else-if="notification.type === 'PollEnd'"
+                    v-else-if="notification.type === 'pollVote'"
+                    class="ph-microphone-stage ph-bold"
+                ></i>
+                <i
+                    v-else-if="notification.type === 'pollEnded'"
                     class="ph-microphone-stage ph-bold"
                 ></i>
                 <!-- notification.reaction が null になることはまずないが、ここでoptional chaining使うと一部ブラウザで刺さるので念の為 -->
                 <MagEmoji
                     v-else-if="
-                        showEmojiReactions && notification.type === 'Reaction'
+                        showEmojiReactions && notification.type === 'reaction'
                     "
                     ref="reactionRef"
-                    :emoji="notification.reaction"
+                    :emoji="normalizeNotifReaction(notification)"
                     :is-reaction="true"
                     :normal="true"
                     :no-style="true"
                 />
                 <MagEmoji
                     v-else-if="
-                        !showEmojiReactions && notification.type === 'Reaction'
+                        !showEmojiReactions && notification.type === 'reaction'
                     "
                     :emoji="defaultReaction"
                     :is-reaction="true"
@@ -90,29 +83,11 @@
         </div>
         <div class="tail">
             <header>
-                <span v-if="notification.type === 'PollEnd'">{{
+                <span v-if="notification.type === 'pollEnded'">{{
                     i18n.ts._notification.pollEnded
                 }}</span>
                 <MkA
-                    v-if="
+                    v-else-if="notification.user"
-                        notification.type === 'Renote' ||
-                        notification.type === 'Reply' ||
-                        notification.type === 'Mention' ||
-                        notification.type === 'Quote' ||
-                        notification.type === 'PollEnd'
-                    "
-                    v-user-preview="notification.note.user.id"
-                    class="name"
-                    :to="userPage(notification.note.user)"
-                    ><MkUserName :user="notification.note.user"
-                /></MkA>
-                <MkA
-                    v-else-if="
-                        notification.type === 'Reaction' ||
-                        notification.type === 'FollowRequestAccepted' ||
-                        notification.type === 'Follow' ||
-                        notification.type === 'FollowRequestReceived'
-                    "
                     v-user-preview="notification.user.id"
                     class="name"
                     :to="userPage(notification.user)"
@@ -121,12 +96,12 @@
                 <span v-else>{{ notification.header }}</span>
                 <MkTime
                     v-if="withTime"
-                    :time="notification.created_at"
+                    :time="notification.createdAt"
                     class="time"
                 />
             </header>
             <MkA
-                v-if="notification.type === 'Reaction'"
+                v-if="notification.type === 'reaction'"
                 class="text"
                 :to="notePage(notification.note)"
                 :title="getNoteSummary(notification.note)"
@@ -142,23 +117,23 @@
                 <i class="ph-quotes ph-fill ph-lg"></i>
             </MkA>
             <MkA
-                v-if="notification.type === 'Renote'"
+                v-if="notification.type === 'renote'"
                 class="text"
-                :to="notePage(notification.note.renoted_note!)"
+                :to="notePage(notification.note)"
-                :title="getNoteSummary(notification.note.renoted_note!)"
+                :title="getNoteSummary(notification.note.renote!)"
             >
                 <span>{{ i18n.ts._notification.renoted }}</span>
                 <i class="ph-quotes ph-fill ph-lg"></i>
                 <Mfm
-                    :text="getNoteSummary(notification.note.renoted_note!)"
+                    :text="getNoteSummary(notification.note.renote!)"
                     :plain="true"
                     :nowrap="!full"
-                    :custom-emojis="notification.note.renoted_note!.emojis"
+                    :custom-emojis="notification.note.renote.emojis"
                 />
                 <i class="ph-quotes ph-fill ph-lg"></i>
             </MkA>
             <MkA
-                v-if="notification.type === 'Reply'"
+                v-if="notification.type === 'reply'"
                 class="text"
                 :to="notePage(notification.note)"
                 :title="getNoteSummary(notification.note)"
@@ -171,7 +146,7 @@
                 />
             </MkA>
             <MkA
-                v-if="notification.type === 'Mention'"
+                v-if="notification.type === 'mention'"
                 class="text"
                 :to="notePage(notification.note)"
                 :title="getNoteSummary(notification.note)"
@@ -184,7 +159,7 @@
                 />
             </MkA>
             <MkA
-                v-if="notification.type === 'Quote'"
+                v-if="notification.type === 'quote'"
                 class="text"
                 :to="notePage(notification.note)"
                 :title="getNoteSummary(notification.note)"
@@ -197,7 +172,23 @@
                 />
             </MkA>
             <MkA
-                v-if="notification.type === 'PollEnd'"
+                v-if="notification.type === 'pollVote'"
+                class="text"
+                :to="notePage(notification.note)"
+                :title="getNoteSummary(notification.note)"
+            >
+                <span>{{ i18n.ts._notification.voted }}</span>
+                <i class="ph-quotes ph-fill ph-lg"></i>
+                <Mfm
+                    :text="getNoteSummary(notification.note)"
+                    :plain="true"
+                    :nowrap="!full"
+                    :custom-emojis="notification.note?.emojis"
+                />
+                <i class="ph-quotes ph-fill ph-lg"></i>
+            </MkA>
+            <MkA
+                v-if="notification.type === 'pollEnded'"
                 class="text"
                 :to="notePage(notification.note)"
                 :title="getNoteSummary(notification.note)"
@@ -212,7 +203,7 @@
                 <i class="ph-quotes ph-fill ph-lg"></i>
             </MkA>
             <span
-                v-if="notification.type === 'Follow'"
+                v-if="notification.type === 'follow'"
                 class="text"
                 style="opacity: 0.7"
                 >{{ i18n.ts.youGotNewFollower }}
@@ -225,13 +216,13 @@
                 </div>
             </span>
             <span
-                v-if="notification.type === 'FollowRequestAccepted'"
+                v-if="notification.type === 'followRequestAccepted'"
                 class="text"
                 style="opacity: 0.7"
                 >{{ i18n.ts.followRequestAccepted }}</span
             >
             <span
-                v-if="notification.type === 'FollowRequestReceived'"
+                v-if="notification.type === 'receiveFollowRequest'"
                 class="text"
                 style="opacity: 0.7"
                 >{{ i18n.ts.receiveFollowRequest }}
@@ -242,7 +233,7 @@
                     />
                 </div>
             </span>
-            <span v-if="notification.type === 'App'" class="text">
+            <span v-if="notification.type === 'app'" class="text">
                 <Mfm :text="notification.body" :nowrap="!full" />
             </span>
         </div>
@@ -251,23 +242,25 @@
 
 <script lang="ts" setup>
 import { onMounted, onUnmounted, ref, watch } from "vue";
+import * as misskey from "calckey-js";
 import MkFollowButton from "@/components/MkFollowButton.vue";
 import XReactionTooltip from "@/components/MkReactionTooltip.vue";
 import { getNoteSummary } from "@/scripts/get-note-summary";
 import { notePage } from "@/filters/note";
 import { userPage } from "@/filters/user";
+import { i18n } from "@/i18n";
 import * as os from "@/os";
 import { stream } from "@/stream";
 import { useTooltip } from "@/scripts/use-tooltip";
 import { defaultStore } from "@/store";
 import { instance } from "@/instance";
 import MkFollowApproveButton from "@/components/MkFollowApproveButton.vue";
-import { packed } from "magnetar-common";
+import { magConvertReaction, magIsCustomEmoji } from "@/scripts-mag/mag-util";
-import { i18n } from "@/i18n";
+import { types } from "magnetar-common";
 
 const props = withDefaults(
     defineProps<{
-        notification: packed.PackNotification;
+        notification: misskey.entities.Notification;
         withTime?: boolean;
         full?: boolean;
     }>(),
@@ -288,11 +281,32 @@ const defaultReaction = ["⭐", "👍", "❤️"].includes(instance.defaultReact
     ? instance.defaultReaction
     : "⭐";
 
+function normalizeNotifReaction(
+    notification: misskey.entities.Notification & { type: "reaction" }
+): types.Reaction {
+    return notification.reaction
+        ? magConvertReaction(
+              notification.reaction,
+              (name, host) =>
+                  notification.note.emojis.find((e) => {
+                      const parsed = magConvertReaction(`:${e.name}:`, e.url);
+
+                      if (!magIsCustomEmoji(parsed)) return false;
+
+                      return (
+                          parsed.name === name &&
+                          (parsed.host ?? null) === (host ?? null)
+                      );
+                  })?.url!
+          )
+        : notification.reaction;
+}
+
 let readObserver: IntersectionObserver | undefined;
 let connection;
 
 onMounted(() => {
-    if (!props.notification.is_read) {
+    if (!props.notification.isRead) {
         readObserver = new IntersectionObserver((entries, observer) => {
             if (!entries.some((entry) => entry.isIntersecting)) return;
             stream.send("readNotification", {
@@ -304,14 +318,11 @@ onMounted(() => {
         readObserver.observe(elRef.value);
 
         connection = stream.useChannel("main");
-        connection.on("readAllNotifications", () => readObserver!.disconnect());
+        connection.on("readAllNotifications", () => readObserver.disconnect());
 
-        watch(
+        watch(props.notification.isRead, () => {
-            () => props.notification.is_read,
+            readObserver.disconnect();
-            () => {
+        });
-                readObserver!.disconnect();
-            }
-        );
     }
 });
 
@@ -323,13 +334,13 @@ onUnmounted(() => {
 const followRequestDone = ref(false);
 
 useTooltip(reactionRef, (showing) => {
-    if (props.notification.type !== "Reaction") return;
+    if (props.notification.type !== "reaction") return;
 
     os.popup(
         XReactionTooltip,
         {
             showing,
-            reaction: props.notification.reaction,
+            reaction: normalizeNotifReaction(props.notification),
             targetElement: reactionRef.value.$el,
         },
         {},
@@ -395,39 +406,46 @@ useTooltip(reactionRef, (showing) => {
                 height: 100%;
             }
 
-            &.Follow,
+            &.follow,
-            &.FollowRequestAccepted,
+            &.followRequestAccepted,
-            &.FollowRequestReceived {
+            &.receiveFollowRequest,
+            &.groupInvited {
                 padding: 3px;
                 background: #31748f;
                 pointer-events: none;
             }
 
-            &.Renote {
+            &.renote {
                 padding: 3px;
                 background: #31748f;
                 pointer-events: none;
             }
 
-            &.Quote {
+            &.quote {
                 padding: 3px;
                 background: #31748f;
                 pointer-events: none;
             }
 
-            &.Reply {
+            &.reply {
                 padding: 3px;
                 background: #c4a7e7;
                 pointer-events: none;
             }
 
-            &.Mention {
+            &.mention {
                 padding: 3px;
                 background: #908caa;
                 pointer-events: none;
             }
 
-            &.PollEnd {
+            &.pollVote {
+                padding: 3px;
+                background: #908caa;
+                pointer-events: none;
+            }
+
+            &.pollEnded {
                 padding: 3px;
                 background: #908caa;
                 pointer-events: none;

fe_calckey/frontend/client/src/components/MkNotifications.vue

@@ -1,5 +1,5 @@
 <template>
-    <MagPagination ref="pagingComponent" :pagination="pagination">
+    <MkPagination ref="pagingComponent" :pagination="pagination">
         <template #empty>
             <div class="_fullinfo">
                 <img
@@ -11,23 +11,26 @@
             </div>
         </template>
 
-        <template #items="{ items: notifications }">
+        <template #default="{ items: notifications }">
             <XList
                 v-slot="{ item: notification }"
                 class="elsfgstc"
                 :items="notifications"
                 :no-gap="true"
             >
-                <XNote
+                <XNoteResolvingProxy
                     v-if="
-                        notification.note &&
+                        ['reply', 'quote', 'mention'].includes(
-                        (notification.type === 'Quote' ||
+                            notification.type
-                            notification.type === 'Mention' ||
+                        )
-                            notification.type === 'Reply')
                     "
                     :key="notification.id"
-                    :note="notification.note"
+                    :note="notification.note.id"
-                    :collapsedReply="!!notification.note.parent_note"
+                    :collapsedReply="
+                        notification.type === 'reply' ||
+                        (notification.type === 'mention' &&
+                            notification.note.replyId != null)
+                    "
                 />
                 <XNotification
                     v-else
@@ -39,36 +42,37 @@
                 />
             </XList>
         </template>
-    </MagPagination>
+    </MkPagination>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, ref } from "vue";
+import { computed, onMounted, onUnmounted, ref } from "vue";
+import { notificationTypes } from "calckey-js";
+import MkPagination, { Paging } from "@/components/MkPagination.vue";
 import XNotification from "@/components/MkNotification.vue";
 import XList from "@/components/MkDateSeparatedList.vue";
-import XNote from "@/components/MagNote.vue";
+import XNoteResolvingProxy from "@/components/MagNoteResolvingProxy.vue";
 import { stream } from "@/stream";
 import { $i } from "@/account";
-import MagPagination, { Paging } from "@/components/MagPagination.vue";
-import { endpoints, types } from "magnetar-common";
 import { i18n } from "@/i18n";
 
 const props = defineProps<{
-    includeTypes?: types.NotificationType[];
+    includeTypes?: (typeof notificationTypes)[number][];
     unreadOnly?: boolean;
 }>();
 
-const pagingComponent = ref<InstanceType<typeof MagPagination>>();
+const pagingComponent = ref<InstanceType<typeof MkPagination>>();
 
 const pagination: Paging = {
-    endpoint: endpoints.GetNotifications,
+    endpoint: "i/notifications" as const,
-    params: {
+    limit: 10,
-        include_types: props.includeTypes ?? undefined,
+    params: computed(() => ({
-        exclude_types: props.includeTypes
+        includeTypes: props.includeTypes ?? undefined,
+        excludeTypes: props.includeTypes
             ? undefined
             : $i?.mutingNotificationTypes,
-        unread_only: props.unreadOnly,
+        unreadOnly: props.unreadOnly,
-    } as types.NotificationsReq,
+    })),
 };
 
 const onNotification = (notification) => {

fe_calckey/frontend/magnetar-common/src/be-api.ts

@@ -36,9 +36,10 @@ function nestedUrlSearchParams(data: any, topLevel: boolean = true): string {
                     .map(encodeURIComponent)
                     .join("&");
 
-            const inner = Object.entries(data)
+            const inner = Object.entries(data).map(([k, v]) => [
-                .filter(([_, v]) => typeof v !== "undefined")
+                k,
-                .map(([k, v]) => [k, nestedUrlSearchParams(v, false)]);
+                nestedUrlSearchParams(v, false),
+            ]);
 
             return new URLSearchParams(inner).toString();
 

fe_calckey/frontend/magnetar-common/src/endpoints.ts

@@ -9,4 +9,3 @@ export { GetFollowersSelf } from "./types/endpoints/GetFollowersSelf";
 export { GetFollowingById } from "./types/endpoints/GetFollowingById";
 export { GetFollowingSelf } from "./types/endpoints/GetFollowingSelf";
 export { GetFollowRequestsSelf } from "./types/endpoints/GetFollowRequestsSelf";
-export { GetNotifications } from "./types/endpoints/GetNotifications";

fe_calckey/frontend/magnetar-common/src/types.ts

@@ -54,4 +54,3 @@ export { NotificationAppExt } from "./types/NotificationAppExt";
 export { NotificationNoteExt } from "./types/NotificationNoteExt";
 export { NotificationReactionExt } from "./types/NotificationReactionExt";
 export { NotificationUserExt } from "./types/NotificationUserExt";
-export { NotificationsReq } from "./types/NotificationsReq";

fe_calckey/frontend/magnetar-common/src/types/NotificationsReq.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { NotificationType } from "./NotificationType";
-
-export interface NotificationsReq { include_types?: Array<NotificationType>, exclude_types?: Array<NotificationType>, unread_only?: boolean, }

fe_calckey/frontend/magnetar-common/src/types/endpoints/GetNotifications.ts

@@ -1,13 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { NotificationsReq } from "../NotificationsReq";
-import type { PackNotification } from "../PackNotification";
-
-export const GetNotifications = {
-    endpoint: "/users/@self/notifications",
-    pathParams: [] as [],
-    method: "GET" as "GET" | "POST" | "PUT" | "DELETE" | "PATCH",
-    request: undefined as unknown as NotificationsReq,
-    response: undefined as unknown as Array<PackNotification>,
-    paginated: true as true
-}
-                    

fe_calckey/frontend/magnetar-common/src/types/packed/PackNotificationApp.ts

@@ -1,6 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Id } from "../Id";
 import type { NotificationAppExt } from "../NotificationAppExt";
-import type { NotificationBase } from "../NotificationBase";
 
-export type PackNotificationApp = Id & NotificationBase & NotificationAppExt;
+export type PackNotificationApp = Id & NotificationAppExt;

fe_calckey/frontend/magnetar-common/src/types/packed/PackNotificationFollow.ts

@@ -1,6 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Id } from "../Id";
-import type { NotificationBase } from "../NotificationBase";
 import type { NotificationUserExt } from "../NotificationUserExt";
 
-export type PackNotificationFollow = Id & NotificationBase & NotificationUserExt;
+export type PackNotificationFollow = Id & NotificationUserExt;

fe_calckey/frontend/magnetar-common/src/types/packed/PackNotificationFollowRequestAccepted.ts

@@ -1,6 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Id } from "../Id";
-import type { NotificationBase } from "../NotificationBase";
 import type { NotificationUserExt } from "../NotificationUserExt";
 
-export type PackNotificationFollowRequestAccepted = Id & NotificationBase & NotificationUserExt;
+export type PackNotificationFollowRequestAccepted = Id & NotificationUserExt;

fe_calckey/frontend/magnetar-common/src/types/packed/PackNotificationFollowRequestReceived.ts

@@ -1,6 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Id } from "../Id";
-import type { NotificationBase } from "../NotificationBase";
 import type { NotificationUserExt } from "../NotificationUserExt";
 
-export type PackNotificationFollowRequestReceived = Id & NotificationBase & NotificationUserExt;
+export type PackNotificationFollowRequestReceived = Id & NotificationUserExt;

fe_calckey/frontend/magnetar-common/src/types/packed/PackNotificationMention.ts

@@ -1,6 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Id } from "../Id";
-import type { NotificationBase } from "../NotificationBase";
 import type { NotificationNoteExt } from "../NotificationNoteExt";
 
-export type PackNotificationMention = Id & NotificationBase & NotificationNoteExt;
+export type PackNotificationMention = Id & NotificationNoteExt;

fe_calckey/frontend/magnetar-common/src/types/packed/PackNotificationPollEnd.ts

@@ -1,6 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Id } from "../Id";
-import type { NotificationBase } from "../NotificationBase";
 import type { NotificationNoteExt } from "../NotificationNoteExt";
 
-export type PackNotificationPollEnd = Id & NotificationBase & NotificationNoteExt;
+export type PackNotificationPollEnd = Id & NotificationNoteExt;

fe_calckey/frontend/magnetar-common/src/types/packed/PackNotificationQuote.ts

@@ -1,6 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Id } from "../Id";
-import type { NotificationBase } from "../NotificationBase";
 import type { NotificationNoteExt } from "../NotificationNoteExt";
 
-export type PackNotificationQuote = Id & NotificationBase & NotificationNoteExt;
+export type PackNotificationQuote = Id & NotificationNoteExt;

fe_calckey/frontend/magnetar-common/src/types/packed/PackNotificationReaction.ts

@@ -1,8 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Id } from "../Id";
-import type { NotificationBase } from "../NotificationBase";
-import type { NotificationNoteExt } from "../NotificationNoteExt";
 import type { NotificationReactionExt } from "../NotificationReactionExt";
 import type { NotificationUserExt } from "../NotificationUserExt";
 
-export type PackNotificationReaction = Id & NotificationBase & NotificationNoteExt & NotificationReactionExt & NotificationUserExt;
+export type PackNotificationReaction = Id & NotificationReactionExt & NotificationUserExt;

fe_calckey/frontend/magnetar-common/src/types/packed/PackNotificationRenote.ts

@@ -1,6 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Id } from "../Id";
-import type { NotificationBase } from "../NotificationBase";
 import type { NotificationNoteExt } from "../NotificationNoteExt";
 
-export type PackNotificationRenote = Id & NotificationBase & NotificationNoteExt;
+export type PackNotificationRenote = Id & NotificationNoteExt;

fe_calckey/frontend/magnetar-common/src/types/packed/PackNotificationReply.ts

@@ -1,6 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Id } from "../Id";
-import type { NotificationBase } from "../NotificationBase";
 import type { NotificationNoteExt } from "../NotificationNoteExt";
 
-export type PackNotificationReply = Id & NotificationBase & NotificationNoteExt;
+export type PackNotificationReply = Id & NotificationNoteExt;

magnetar_sdk/src/endpoints/user.rs

@@ -1,6 +1,5 @@
 use crate::endpoints::{Empty, Endpoint};
-use crate::types::notification::{NotificationType, PackNotification};
+use crate::util_types::deserialize_array_urlenc;
-use crate::util_types::{deserialize_array_urlenc, deserialize_opt_array_urlenc};
 use http::Method;
 use magnetar_sdk_macros::Endpoint;
 use serde::{Deserialize, Serialize};
@@ -84,31 +83,6 @@ pub struct GetManyUsersById;
 )]
 pub struct GetUserByAcct;
 
-#[derive(Serialize, Deserialize, TS)]
-#[ts(export)]
-pub struct NotificationsReq {
-    #[ts(optional)]
-    #[serde(default)]
-    #[serde(deserialize_with = "deserialize_opt_array_urlenc")]
-    pub include_types: Option<Vec<NotificationType>>,
-    #[ts(optional)]
-    #[serde(default)]
-    #[serde(deserialize_with = "deserialize_opt_array_urlenc")]
-    pub exclude_types: Option<Vec<NotificationType>>,
-    #[ts(optional)]
-    pub unread_only: Option<bool>,
-}
-
-#[derive(Endpoint)]
-#[endpoint(
-    endpoint = "/users/@self/notifications",
-    method = Method::GET,
-    request = "NotificationsReq",
-    response = "Vec<PackNotification>",
-    paginated = true
-)]
-pub struct GetNotifications;
-
 #[derive(Endpoint)]
 #[endpoint(
     endpoint = "/users/:id/followers",

magnetar_sdk/src/types/mod.rs

@@ -3,7 +3,6 @@ pub mod emoji;
 pub mod instance;
 pub mod note;
 pub mod notification;
-pub mod streaming;
 pub mod timeline;
 pub mod user;
 
@@ -30,7 +29,7 @@ pub(crate) mod packed_time {
     where
         D: Deserializer<'de>,
     {
-        Ok(DateTime::<Utc>::from_naive_utc_and_offset(
+        Ok(DateTime::<Utc>::from_utc(
             NaiveDateTime::from_timestamp_millis(
                 String::deserialize(deserializer)?
                     .parse::<i64>()

magnetar_sdk/src/types/notification.rs

@@ -1,11 +1,13 @@
-use crate::types::note::{PackNoteMaybeFull, Reaction};
+use crate::types::note::{
+    PackNoteMaybeFull, Reaction, ReactionShortcode, ReactionUnicode, ReactionUnknown,
+};
 use crate::types::user::PackUserBase;
 use crate::types::Id;
 use crate::{Packed, Required};
 use chrono::{DateTime, Utc};
 use magnetar_sdk_macros::pack;
 use serde::{Deserialize, Serialize};
-use strum::{EnumDiscriminants, EnumIter};
+use strum::EnumDiscriminants;
 use ts_rs::TS;
 
 #[derive(Clone, Debug, Deserialize, Serialize, TS)]
@@ -42,21 +44,21 @@ pub struct NotificationAppExt {
     pub icon: String,
 }
 
-pack!(PackNotificationFollow, Required<Id> as id & Required<NotificationBase> as notification & Required<NotificationUserExt> as follower);
+pack!(PackNotificationFollow, Required<Id> as id & Required<NotificationUserExt> as follower);
-pack!(PackNotificationFollowRequestReceived, Required<Id> as id & Required<NotificationBase> as notification & Required<NotificationUserExt> as follower);
+pack!(PackNotificationFollowRequestReceived, Required<Id> as id & Required<NotificationUserExt> as follower);
-pack!(PackNotificationFollowRequestAccepted, Required<Id> as id & Required<NotificationBase> as notification & Required<NotificationUserExt> as follower);
+pack!(PackNotificationFollowRequestAccepted, Required<Id> as id & Required<NotificationUserExt> as follower);
-pack!(PackNotificationMention, Required<Id> as id & Required<NotificationBase> as notification & Required<NotificationNoteExt> as note);
+pack!(PackNotificationMention, Required<Id> as id & Required<NotificationNoteExt> as note);
-pack!(PackNotificationReply, Required<Id> as id & Required<NotificationBase> as notification & Required<NotificationNoteExt> as note);
+pack!(PackNotificationReply, Required<Id> as id & Required<NotificationNoteExt> as note);
-pack!(PackNotificationRenote, Required<Id> as id & Required<NotificationBase> as notification & Required<NotificationNoteExt> as note);
+pack!(PackNotificationRenote, Required<Id> as id & Required<NotificationNoteExt> as note);
-pack!(PackNotificationReaction, Required<Id> as id & Required<NotificationBase> as notification & Required<NotificationNoteExt> as note & Required<NotificationReactionExt> as reaction & Required<NotificationUserExt> as user);
+pack!(PackNotificationReaction, Required<Id> as id & Required<NotificationReactionExt> as reaction & Required<NotificationUserExt> as user);
-pack!(PackNotificationQuote, Required<Id> as id & Required<NotificationBase> as notification & Required<NotificationNoteExt> as note);
+pack!(PackNotificationQuote, Required<Id> as id & Required<NotificationNoteExt> as note);
-pack!(PackNotificationPollEnd, Required<Id> as id & Required<NotificationBase> as notification & Required<NotificationNoteExt> as note);
+pack!(PackNotificationPollEnd, Required<Id> as id & Required<NotificationNoteExt> as note);
-pack!(PackNotificationApp, Required<Id> as id & Required<NotificationBase> as notification & Required<NotificationAppExt> as custom);
+pack!(PackNotificationApp, Required<Id> as id & Required<NotificationAppExt> as custom);
 
 #[derive(Clone, Debug, Deserialize, Serialize, TS, EnumDiscriminants)]
 #[strum_discriminants(name(NotificationType))]
 #[strum_discriminants(ts(export))]
-#[strum_discriminants(derive(Deserialize, Serialize, Hash, TS, EnumIter))]
+#[strum_discriminants(derive(Deserialize, Serialize, TS))]
 #[ts(export)]
 #[serde(tag = "type")]
 pub enum PackNotification {

magnetar_sdk/src/types/streaming.rs

@@ -1,10 +0,0 @@
-use crate::types::notification::PackNotification;
-use serde::{Deserialize, Serialize};
-use ts_rs::TS;
-
-#[derive(Clone, Debug, Deserialize, Serialize, TS)]
-#[serde(tag = "type", content = "body")]
-#[ts(export)]
-pub enum ChannelEvent {
-    Notification(PackNotification),
-}

magnetar_sdk/src/util_types.rs

@@ -95,23 +95,3 @@ where
 
     Ok(parts)
 }
-
-pub(crate) fn deserialize_opt_array_urlenc<'de, D, T: Eq + Hash>(
-    deserializer: D,
-) -> Result<Option<Vec<T>>, D::Error>
-where
-    D: serde::Deserializer<'de>,
-    T: DeserializeOwned,
-{
-    let Some(str_raw) = Option::<String>::deserialize(deserializer)? else {
-        return Ok(None);
-    };
-
-    let parts = serde_urlencoded::from_str::<Vec<(T, String)>>(&str_raw)
-        .map_err(serde::de::Error::custom)?
-        .into_iter()
-        .map(|(k, _)| k)
-        .collect::<Vec<_>>();
-
-    Ok(Some(parts))
-}

src/api_v1/mod.rs

@@ -1,13 +1,11 @@
 mod note;
-mod streaming;
 mod user;
 
 use crate::api_v1::note::handle_note;
-use crate::api_v1::streaming::handle_streaming;
 use crate::api_v1::user::{
     handle_follow_requests_self, handle_followers, handle_followers_self, handle_following,
-    handle_following_self, handle_notifications, handle_user_by_id_many, handle_user_info,
+    handle_following_self, handle_user_by_id_many, handle_user_info, handle_user_info_by_acct,
-    handle_user_info_by_acct, handle_user_info_self,
+    handle_user_info_self,
 };
 use crate::service::MagnetarService;
 use crate::web::auth;
@@ -23,7 +21,6 @@ pub fn create_api_router(service: Arc<MagnetarService>) -> Router {
         .route("/users/by-acct/:id", get(handle_user_info_by_acct))
         .route("/users/lookup-many", get(handle_user_by_id_many))
         .route("/users/:id", get(handle_user_info))
-        .route("/users/@self/notifications", get(handle_notifications))
         .route(
             "/users/@self/follow-requests",
             get(handle_follow_requests_self),
@@ -33,7 +30,6 @@ pub fn create_api_router(service: Arc<MagnetarService>) -> Router {
         .route("/users/@self/followers", get(handle_followers_self))
         .route("/users/:id/followers", get(handle_followers))
         .route("/notes/:id", get(handle_note))
-        .route("/streaming", get(handle_streaming))
         .layer(from_fn_with_state(
             AuthState::new(service.clone()),
             auth::auth,

src/api_v1/streaming.rs

@@ -1,100 +0,0 @@
-use crate::model::processing::notification::NotificationModel;
-use crate::model::PackingContext;
-use crate::service::MagnetarService;
-use crate::web::auth::AuthenticatedUser;
-use crate::web::ApiError;
-use axum::extract::State;
-use axum::response::sse::{Event, KeepAlive};
-use axum::response::Sse;
-use futures::Stream;
-use futures_util::StreamExt as _;
-use magnetar_calckey_model::model_ext::IdShape;
-use magnetar_calckey_model::{CalckeySub, MainStreamMessage, SubMessage};
-use magnetar_sdk::types::streaming::ChannelEvent;
-use std::sync::Arc;
-use std::time::Duration;
-use tokio::sync::mpsc;
-use tokio_stream::wrappers::ReceiverStream;
-use tracing::{debug, error, trace, warn};
-
-pub fn drop_on_close(sub: CalckeySub, tx: mpsc::Sender<MainStreamMessage>) {
-    tokio::spawn(async move {
-        tx.closed().await;
-        drop(sub);
-        debug!("Dropped the listener.");
-    });
-}
-
-pub async fn handle_streaming(
-    State(service): State<Arc<MagnetarService>>,
-    AuthenticatedUser(self_user): AuthenticatedUser,
-) -> Result<Sse<impl Stream<Item = Result<Event, axum::Error>>>, ApiError> {
-    trace!("SSE connection from user `{}` start", self_user.username);
-
-    let (tx, rx) = mpsc::channel(1024);
-    let sub_tx = tx.clone();
-    let sub_user_id = self_user.id.clone();
-    let sub = service
-        .cache
-        .conn()
-        .await?
-        .subscribe(&service.config.networking.host, move |message| {
-            let user_id = sub_user_id.clone();
-            let tx = sub_tx.clone();
-            async move {
-                let SubMessage::MainStream(id, msg) = message else {
-                    return;
-                };
-
-                if id != user_id {
-                    return;
-                }
-
-                if let Err(e) = tx.send(msg).await {
-                    warn!("Failed to send stream channel message: {e}");
-                }
-            }
-        })
-        .await?;
-
-    drop_on_close(sub, tx);
-
-    let stream = ReceiverStream::new(rx).filter_map(move |m| {
-        let service = service.clone();
-        let self_user = self_user.clone();
-        async move {
-            match m {
-                MainStreamMessage::Notification(IdShape { id }) => {
-                    let ctx = PackingContext::new(service, Some(self_user.clone()))
-                        .await
-                        .map_err(|e| {
-                            error!("Failed to create notification packing context: {}", e);
-                            e
-                        })
-                        .ok()?;
-                    let notification_model = NotificationModel;
-
-                    Some(
-                        Event::default().json_data(ChannelEvent::Notification(
-                            notification_model
-                                .get_notification(&ctx, &id, &self_user.id)
-                                .await
-                                .map_err(|e| {
-                                    error!("Failed to fetch notification: {}", e);
-                                    e
-                                })
-                                .ok()
-                                .flatten()?,
-                        )),
-                    )
-                }
-            }
-        }
-    });
-
-    Ok(Sse::new(stream).keep_alive(
-        KeepAlive::new()
-            .interval(Duration::from_secs(2))
-            .text("mag-keep-alive"),
-    ))
-}

src/api_v1/user.rs

@@ -1,4 +1,3 @@
-use crate::model::processing::notification::NotificationModel;
 use crate::model::processing::user::{UserBorrowedData, UserModel, UserShapedData};
 use crate::model::PackingContext;
 use crate::service::MagnetarService;
@@ -11,14 +10,11 @@ use itertools::Itertools;
 use magnetar_common::util::lenient_parse_tag_decode;
 use magnetar_sdk::endpoints::user::{
     GetFollowRequestsSelf, GetFollowersById, GetFollowersSelf, GetFollowingById, GetFollowingSelf,
-    GetManyUsersById, GetNotifications, GetUserByAcct, GetUserById, GetUserSelf, ManyUsersByIdReq,
+    GetManyUsersById, GetUserByAcct, GetUserById, GetUserSelf, ManyUsersByIdReq,
-    NotificationsReq,
 };
 use magnetar_sdk::endpoints::{Req, Res};
-use magnetar_sdk::types::notification::NotificationType;
 use std::collections::HashMap;
 use std::sync::Arc;
-use strum::IntoEnumIterator;
 
 pub async fn handle_user_info_self(
     Query(req): Query<Req<GetUserSelf>>,
@@ -145,40 +141,6 @@ pub async fn handle_user_by_id_many(
     Ok(Json(users_ordered))
 }
 
-pub async fn handle_notifications(
-    Query(NotificationsReq {
-        ref exclude_types,
-        include_types,
-        unread_only,
-    }): Query<Req<GetNotifications>>,
-    State(service): State<Arc<MagnetarService>>,
-    AuthenticatedUser(user): AuthenticatedUser,
-    mut pagination: Pagination,
-) -> Result<(Pagination, Json<Res<GetNotifications>>), ApiError> {
-    let notification_types = include_types
-        .unwrap_or_else(|| NotificationType::iter().collect::<Vec<_>>())
-        .iter()
-        .filter(|t| {
-            exclude_types.is_none() || !exclude_types.as_ref().is_some_and(|tt| tt.contains(t))
-        })
-        .copied()
-        .collect::<Vec<_>>();
-
-    let ctx = PackingContext::new(service, Some(user.clone())).await?;
-    let notification_model = NotificationModel;
-    let notifications = notification_model
-        .get_notifications(
-            &ctx,
-            &user.id,
-            &notification_types,
-            unread_only.unwrap_or_default(),
-            &mut pagination,
-        )
-        .await?;
-
-    Ok((pagination, Json(notifications)))
-}
-
 pub async fn handle_following_self(
     Query(_): Query<Req<GetFollowingSelf>>,
     State(service): State<Arc<MagnetarService>>,

src/model/data/id.rs

@@ -17,7 +17,6 @@ macro_rules! impl_id {
 impl_id!(ck::emoji::Model);
 impl_id!(ck::user::Model);
 impl_id!(ck::note::Model);
-impl_id!(ck::notification::Model);
 
 impl BaseId for ck::poll::Model {
     fn get_id(&self) -> &str {

src/model/data/mod.rs

@@ -3,6 +3,5 @@ pub mod emoji;
 pub mod id;
 pub mod instance;
 pub mod note;
-pub mod notification;
 pub mod poll;
 pub mod user;

src/model/data/notification.rs

@@ -1,65 +0,0 @@
-use crate::model::{PackType, PackingContext};
-use magnetar_calckey_model::ck;
-use magnetar_sdk::types::note::{PackNoteMaybeFull, Reaction};
-use magnetar_sdk::types::notification::{
-    NotificationAppExt, NotificationBase, NotificationNoteExt, NotificationReactionExt,
-    NotificationUserExt,
-};
-use magnetar_sdk::types::user::PackUserBase;
-
-impl<'a> PackType<&'a ck::notification::Model> for NotificationBase {
-    fn extract(_: &PackingContext, data: &'a ck::notification::Model) -> Self {
-        NotificationBase {
-            id: data.id.clone(),
-            created_at: data.created_at.into(),
-            is_read: data.is_read,
-        }
-    }
-}
-
-impl<'a> PackType<&'a PackNoteMaybeFull> for NotificationNoteExt {
-    fn extract(_: &PackingContext, data: &'a PackNoteMaybeFull) -> Self {
-        NotificationNoteExt { note: data.clone() }
-    }
-}
-
-impl<'a> PackType<&'a PackUserBase> for NotificationUserExt {
-    fn extract(_: &PackingContext, data: &'a PackUserBase) -> Self {
-        NotificationUserExt { user: data.clone() }
-    }
-}
-
-impl<'a> PackType<&'a Reaction> for NotificationReactionExt {
-    fn extract(_: &PackingContext, data: &'a Reaction) -> Self {
-        NotificationReactionExt {
-            reaction: data.clone(),
-        }
-    }
-}
-
-impl<'a> PackType<(&'a ck::notification::Model, &'a ck::access_token::Model)>
-    for NotificationAppExt
-{
-    fn extract(
-        _: &PackingContext,
-        (notification, access_token): (&'a ck::notification::Model, &'a ck::access_token::Model),
-    ) -> Self {
-        NotificationAppExt {
-            body: notification.custom_body.clone().unwrap_or_default(),
-            header: notification
-                .custom_header
-                .as_ref()
-                .or(access_token.name.as_ref())
-                .map(String::to_string)
-                .clone()
-                .unwrap_or_default(),
-            icon: notification
-                .custom_icon
-                .as_ref()
-                .or(access_token.icon_url.as_ref())
-                .map(String::to_string)
-                .clone()
-                .unwrap_or_default(),
-        }
-    }
-}

src/model/processing/emoji.rs

@@ -1,57 +1,11 @@
-use crate::model::processing::{PackError, PackResult};
+use crate::model::processing::PackResult;
 use crate::model::{PackType, PackingContext};
-use either::Either;
-use futures_util::TryFutureExt;
 use itertools::Itertools;
 use magnetar_calckey_model::ck;
 use magnetar_calckey_model::emoji::EmojiTag;
-use magnetar_common::util::{parse_reaction, RawReaction};
 use magnetar_sdk::types::emoji::{EmojiBase, PackEmojiBase};
-use magnetar_sdk::types::note::{Reaction, ReactionShortcode, ReactionUnicode, ReactionUnknown};
 use magnetar_sdk::types::Id;
 use magnetar_sdk::{Packed, Required};
-use std::sync::Arc;
-
-pub fn parse_emoji_or_raw(tag: &str) -> Either<String, RawReaction> {
-    parse_reaction(tag).map_or_else(|| Either::Left(tag.to_string()), Either::Right)
-}
-
-pub fn shortcode_tag_or_none(value: &RawReaction) -> Option<EmojiTag<'_>> {
-    match value {
-        RawReaction::Shortcode { shortcode, host } => Some(EmojiTag {
-            name: shortcode.as_str(),
-            host: host.as_deref(),
-        }),
-        _ => None,
-    }
-}
-
-pub fn resolve_reaction<'a>(
-    value: RawReaction,
-    code_lookup: &impl Fn(&str, Option<&str>) -> Option<&'a ck::emoji::Model>,
-) -> Reaction {
-    match value {
-        RawReaction::Unicode(text) => Reaction::Unicode(ReactionUnicode(text)),
-        RawReaction::Shortcode { shortcode, host } => code_lookup(&shortcode, host.as_deref())
-            .map_or_else(
-                || {
-                    Reaction::Unknown(ReactionUnknown {
-                        raw: format!(
-                            ":{shortcode}{}:",
-                            host.as_deref().map(|h| format!("@{h}")).unwrap_or_default()
-                        ),
-                    })
-                },
-                |e| {
-                    Reaction::Shortcode(ReactionShortcode {
-                        name: shortcode.clone(),
-                        host: host.clone(),
-                        url: e.public_url.clone(),
-                    })
-                },
-            ),
-    }
-}
 
 pub struct EmojiModel;
 
@@ -94,78 +48,4 @@ impl EmojiModel {
             .take(ctx.limits.max_emojis)
             .collect::<Vec<_>>()
     }
-
-    pub async fn resolve_reaction(
-        &self,
-        ctx: &PackingContext,
-        reaction: &str,
-    ) -> PackResult<Reaction> {
-        let parsed = parse_emoji_or_raw(reaction);
-
-        Ok(match parsed {
-            Either::Left(raw) => Reaction::Unknown(ReactionUnknown { raw }),
-            Either::Right(raw) => {
-                let reaction_fetched = match shortcode_tag_or_none(&raw) {
-                    Some(tag) => {
-                        ctx.service
-                            .emoji_cache
-                            .get(tag.name, tag.host)
-                            .map_err(PackError::from)
-                            .await?
-                    }
-                    None => None,
-                };
-
-                let reaction_ref = reaction_fetched.as_ref().map(Arc::as_ref);
-                resolve_reaction(raw, &move |_, _| reaction_ref)
-            }
-        })
-    }
-
-    pub async fn resolve_reactions_many(
-        &self,
-        ctx: &PackingContext,
-        reactions_raw: &[String],
-    ) -> PackResult<Vec<Reaction>> {
-        let reactions_parsed = reactions_raw
-            .iter()
-            .map(String::as_ref)
-            .map(parse_emoji_or_raw)
-            .collect::<Vec<_>>();
-
-        // Pick out all successfully-parsed shortcode emojis
-        let reactions_to_resolve = reactions_parsed
-            .iter()
-            .map(Either::as_ref)
-            .filter_map(Either::right)
-            .filter_map(shortcode_tag_or_none)
-            .collect::<Vec<_>>();
-
-        let reactions_fetched = ctx
-            .service
-            .emoji_cache
-            .get_many_tagged(&reactions_to_resolve)
-            .map_err(PackError::from)
-            .await?;
-
-        // Left reactions and the Right ones that didn't resolve to any emoji are turned back into Unknown
-        let reactions_resolved = reactions_parsed
-            .into_iter()
-            .map(|val| {
-                val.either(
-                    |raw| Reaction::Unknown(ReactionUnknown { raw }),
-                    |raw| {
-                        resolve_reaction(raw, &|shortcode, host| {
-                            reactions_fetched
-                                .iter()
-                                .find(|e| e.host.as_deref() == host && e.name == shortcode)
-                                .map(Arc::as_ref)
-                        })
-                    },
-                )
-            })
-            .collect::<Vec<_>>();
-
-        Ok(reactions_resolved)
-    }
 }

src/model/processing/mod.rs

@@ -10,7 +10,6 @@ use thiserror::Error;
 pub mod drive;
 pub mod emoji;
 pub mod note;
-pub mod notification;
 pub mod user;
 
 #[derive(Debug, Error, strum::IntoStaticStr)]
@@ -19,7 +18,7 @@ pub enum PackError {
     DbError(#[from] DbErr),
     #[error("Calckey database wrapper error: {0}")]
     CalckeyDbError(#[from] CalckeyDbError),
-    #[error("Data error: {0}")]
+    #[error("Emoji cache error: {0}")]
     DataError(String),
     #[error("Emoji cache error: {0}")]
     EmojiCacheError(#[from] EmojiCacheError),

src/model/processing/note.rs

@@ -7,8 +7,9 @@ use crate::model::{PackType, PackingContext};
 use compact_str::CompactString;
 use either::Either;
 use futures_util::future::{try_join_all, BoxFuture};
-use futures_util::{FutureExt, StreamExt, TryStreamExt};
+use futures_util::{FutureExt, StreamExt, TryFutureExt, TryStreamExt};
 use magnetar_calckey_model::ck::sea_orm_active_enums::NoteVisibilityEnum;
+use magnetar_calckey_model::emoji::EmojiTag;
 use magnetar_calckey_model::model_ext::AliasColumnExt;
 use magnetar_calckey_model::note_model::data::{
     sub_interaction_reaction, sub_interaction_renote, NoteData,
@@ -19,12 +20,14 @@ use magnetar_calckey_model::sea_orm::sea_query::{PgFunc, Query, SimpleExpr};
 use magnetar_calckey_model::sea_orm::{ActiveEnum, ColumnTrait, Iden, IntoSimpleExpr};
 use magnetar_calckey_model::user_model::UserResolveOptions;
 use magnetar_calckey_model::{ck, CalckeyDbError};
+use magnetar_common::util::{parse_reaction, RawReaction};
 use magnetar_sdk::mmm::Token;
 use magnetar_sdk::types::drive::PackDriveFileBase;
 use magnetar_sdk::types::emoji::EmojiContext;
 use magnetar_sdk::types::note::{
     NoteAttachmentExt, NoteBase, NoteDetailExt, NoteSelfContextExt, PackNoteBase,
-    PackNoteMaybeAttachments, PackNoteMaybeFull, PackPollBase, PollBase, ReactionPair,
+    PackNoteMaybeAttachments, PackNoteMaybeFull, PackPollBase, PollBase, Reaction, ReactionPair,
+    ReactionShortcode, ReactionUnicode, ReactionUnknown,
 };
 use magnetar_sdk::types::user::UserRelationship;
 use magnetar_sdk::types::{Id, MmXml};
@@ -296,38 +299,95 @@ impl NoteModel {
         let shortcodes = emoji_model.deduplicate_emoji(ctx, emoji_extracted);
         // Parse the JSON into an ordered map and turn it into a Vec of pairs, parsing the reaction codes
         // Failed reaction parses -> Left, Successful ones -> Right
-        let (reactions_raw, reactions_counts): (Vec<_>, Vec<_>) =
+        let reactions_raw =
             serde_json::Map::<String, serde_json::Value>::deserialize(&note.reactions)?
                 .into_iter()
-                .filter_map(|(k, v)| Some((k, usize::deserialize(v).ok()?)))
+                .map(|(ref code, count)| {
-                .filter(|(_, count)| *count > 0)
+                    let reaction = parse_reaction(code)
-                .unzip();
+                        .map_or_else(|| Either::Left(code.to_string()), Either::Right);
-        let self_reaction_name = note_data
+
+                    (
+                        reaction,
+                        count,
+                        note_data
                             .interaction_user_reaction()
                             .as_ref()
-            .and_then(|r| r.reaction_name.as_deref());
+                            .and_then(|r| r.reaction_name.as_deref())
-        let reactions_has_self_reacted = reactions_raw
+                            .map(|r| r == code),
+                    )
+                })
+                .map(|(code, count, self_reacted)| {
+                    Ok((code, usize::deserialize(count)?, self_reacted))
+                })
+                .filter(|v| !v.as_ref().is_ok_and(|(_, count, _)| *count == 0))
+                .collect::<Result<Vec<_>, serde_json::Error>>()?;
+        // Pick out all successfully-parsed shortcode emojis
+        let reactions_to_resolve = reactions_raw
             .iter()
-            .map(|r| self_reaction_name.map(|srn| srn == r))
+            .map(|(code, _, _)| code)
+            .map(Either::as_ref)
+            .filter_map(Either::right)
+            .filter_map(|c| match c {
+                RawReaction::Shortcode { shortcode, host } => Some(EmojiTag {
+                    name: shortcode,
+                    host: host.as_deref(),
+                }),
+                _ => None,
+            })
             .collect::<Vec<_>>();
 
+        let reaction_fetch = ctx
+            .service
+            .emoji_cache
+            .get_many_tagged(&reactions_to_resolve)
+            .map_err(PackError::from);
         let emoji_fetch = emoji_model.fetch_many_emojis(
             ctx,
             &shortcodes,
             note_data.user().user().host.as_deref(),
         );
 
-        let reaction_fetch = emoji_model.resolve_reactions_many(ctx, &reactions_raw);
-
         let (reactions_fetched, emojis) = try_join!(reaction_fetch, emoji_fetch)?;
 
-        let reactions = reactions_fetched
+        // Left reactions and the Right ones that didn't resolve to any emoji are turned back into Unknown
+        let reactions = &reactions_raw
             .into_iter()
-            .zip(reactions_counts.into_iter())
+            .map(|(raw, count, self_reaction)| {
-            .zip(reactions_has_self_reacted.into_iter())
+                let reaction = raw.either(
-            .map(|((reaction, count), self_reaction)| match self_reaction {
+                    |raw| Reaction::Unknown(ReactionUnknown { raw }),
-                Some(self_reaction) => ReactionPair::WithContext(reaction, count, self_reaction),
+                    |raw| match raw {
+                        RawReaction::Unicode(text) => Reaction::Unicode(ReactionUnicode(text)),
+                        RawReaction::Shortcode { shortcode, host } => reactions_fetched
+                            .iter()
+                            .find(|e| e.host == host && e.name == shortcode)
+                            .map_or_else(
+                                || {
+                                    Reaction::Unknown(ReactionUnknown {
+                                        raw: format!(
+                                            ":{shortcode}{}:",
+                                            host.as_deref()
+                                                .map(|h| format!("@{h}"))
+                                                .unwrap_or_default()
+                                        ),
+                                    })
+                                },
+                                |e| {
+                                    Reaction::Shortcode(ReactionShortcode {
+                                        name: shortcode.clone(),
+                                        host: host.clone(),
+                                        url: e.public_url.clone(),
+                                    })
+                                },
+                            ),
+                    },
+                );
+
+                match self_reaction {
+                    Some(self_reaction) => {
+                        ReactionPair::WithContext(reaction, count, self_reaction)
+                    }
                     None => ReactionPair::WithoutContext(reaction, count),
+                }
             })
             .collect::<Vec<_>>();
 
@@ -349,7 +409,7 @@ impl NoteModel {
                     .and_then(Result::ok)
                     .map(MmXml)
                     .as_ref(),
-                reactions: &reactions,
+                reactions,
                 user,
                 emoji_context,
             },
@@ -446,7 +506,7 @@ impl NoteModel {
         )))
     }
 
-    pub fn pack_full_single<'b, 'a: 'b>(
+    fn pack_full_single<'b, 'a: 'b>(
         &'a self,
         ctx: &'a PackingContext,
         note: &'b (dyn NoteShapedData<'a> + 'b),

src/model/processing/notification.rs

@@ -1,344 +0,0 @@
-use crate::model::data::id::BaseId;
-use crate::model::processing::emoji::EmojiModel;
-use crate::model::processing::note::{NoteModel, NoteVisibilityFilterModel};
-use crate::model::processing::user::UserModel;
-use crate::model::processing::{PackError, PackResult};
-use crate::model::{PackType, PackingContext};
-use crate::web::pagination::Pagination;
-use futures_util::{StreamExt, TryStreamExt};
-use magnetar_calckey_model::ck;
-use magnetar_calckey_model::ck::sea_orm_active_enums::NotificationTypeEnum;
-use magnetar_calckey_model::note_model::NoteResolveOptions;
-use magnetar_calckey_model::notification_model::{NotificationData, NotificationResolveOptions};
-use magnetar_calckey_model::user_model::UserResolveOptions;
-use magnetar_sdk::types::notification::{
-    NotificationAppExt, NotificationBase, NotificationNoteExt, NotificationReactionExt,
-    NotificationType, NotificationUserExt, PackNotification, PackNotificationApp,
-    PackNotificationFollow, PackNotificationFollowRequestAccepted,
-    PackNotificationFollowRequestReceived, PackNotificationMention, PackNotificationPollEnd,
-    PackNotificationQuote, PackNotificationReaction, PackNotificationRenote, PackNotificationReply,
-};
-use magnetar_sdk::types::Id;
-use magnetar_sdk::{Packed, Required};
-use std::sync::Arc;
-
-impl PackType<&NotificationType> for NotificationTypeEnum {
-    fn extract(_: &PackingContext, value: &NotificationType) -> Self {
-        use NotificationType as NT;
-        use NotificationTypeEnum as NTE;
-        match value {
-            NT::Follow => NTE::Follow,
-            NT::FollowRequestReceived => NTE::ReceiveFollowRequest,
-            NT::FollowRequestAccepted => NTE::FollowRequestAccepted,
-            NT::Mention => NTE::Mention,
-            NT::Reply => NTE::Reply,
-            NT::Renote => NTE::Renote,
-            NT::Reaction => NTE::Reaction,
-            NT::Quote => NTE::Quote,
-            NT::PollEnd => NTE::PollEnded,
-            NT::App => NTE::App,
-        }
-    }
-}
-
-impl PackType<&NotificationTypeEnum> for NotificationType {
-    fn extract(_: &PackingContext, value: &NotificationTypeEnum) -> Self {
-        use NotificationType as NT;
-        use NotificationTypeEnum as NTE;
-        match value {
-            NTE::Follow => NT::Follow,
-            NTE::ReceiveFollowRequest => NT::FollowRequestReceived,
-            NTE::FollowRequestAccepted => NT::FollowRequestAccepted,
-            NTE::Mention => NT::Mention,
-            NTE::Reply => NT::Reply,
-            NTE::Renote => NT::Renote,
-            NTE::Reaction => NT::Reaction,
-            NTE::Quote => NT::Quote,
-            NTE::PollEnded => NT::PollEnd,
-            NTE::App => NT::App,
-        }
-    }
-}
-
-pub struct NotificationModel;
-
-impl NotificationModel {
-    async fn pack_notification_single(
-        &self,
-        ctx: &PackingContext,
-        notification_data: &NotificationData,
-        note_model: &NoteModel,
-        user_model: &UserModel,
-        emoji_model: &EmojiModel,
-    ) -> PackResult<PackNotification> {
-        let notification_type =
-            NotificationType::extract(ctx, &notification_data.notification.r#type);
-        let id = Required(Id::from(&notification_data.notification.id));
-        let base = Required(NotificationBase::extract(
-            ctx,
-            &notification_data.notification,
-        ));
-
-        let notifier = notification_data
-            .notifier
-            .as_ref()
-            .ok_or_else(|| PackError::DataError("Missing notification user".to_string()));
-        let note = notification_data
-            .notification_note
-            .as_ref()
-            .ok_or_else(|| PackError::DataError("Missing notification note".to_string()));
-        let access_token = notification_data
-            .access_token
-            .as_ref()
-            .ok_or_else(|| PackError::DataError("Missing notification access token".to_string()));
-
-        Ok(match notification_type {
-            NotificationType::Follow => {
-                PackNotification::Follow(PackNotificationFollow::pack_from((
-                    id,
-                    base,
-                    Required(NotificationUserExt::extract(
-                        ctx,
-                        &user_model.base_from_existing(ctx, &notifier?).await?,
-                    )),
-                )))
-            }
-            NotificationType::FollowRequestReceived => PackNotification::FollowRequestReceived(
-                PackNotificationFollowRequestReceived::pack_from((
-                    id,
-                    base,
-                    Required(NotificationUserExt::extract(
-                        ctx,
-                        &user_model.base_from_existing(ctx, &notifier?).await?,
-                    )),
-                )),
-            ),
-            NotificationType::FollowRequestAccepted => PackNotification::FollowRequestAccepted(
-                PackNotificationFollowRequestAccepted::pack_from((
-                    id,
-                    base,
-                    Required(NotificationUserExt::extract(
-                        ctx,
-                        &user_model.base_from_existing(ctx, &notifier?).await?,
-                    )),
-                )),
-            ),
-            NotificationType::Mention => {
-                PackNotification::Mention(PackNotificationMention::pack_from((
-                    id,
-                    base,
-                    Required(NotificationNoteExt::extract(
-                        ctx,
-                        &note_model.pack_full_single(ctx, &note?).await?,
-                    )),
-                )))
-            }
-            NotificationType::Reply => PackNotification::Reply(PackNotificationReply::pack_from((
-                id,
-                base,
-                Required(NotificationNoteExt::extract(
-                    ctx,
-                    &note_model.pack_full_single(ctx, &note?).await?,
-                )),
-            ))),
-            NotificationType::Renote => {
-                PackNotification::Renote(PackNotificationRenote::pack_from((
-                    id,
-                    base,
-                    Required(NotificationNoteExt::extract(
-                        ctx,
-                        &note_model.pack_full_single(ctx, &note?).await?,
-                    )),
-                )))
-            }
-            NotificationType::Reaction => {
-                PackNotification::Reaction(PackNotificationReaction::pack_from((
-                    id,
-                    base,
-                    Required(NotificationNoteExt::extract(
-                        ctx,
-                        &note_model.pack_full_single(ctx, &note?).await?,
-                    )),
-                    Required(NotificationReactionExt::extract(
-                        ctx,
-                        &emoji_model
-                            .resolve_reaction(
-                                ctx,
-                                notification_data
-                                    .notification
-                                    .reaction
-                                    .as_deref()
-                                    .ok_or_else(|| {
-                                        PackError::DataError(
-                                            "Missing notification reaction".to_string(),
-                                        )
-                                    })?,
-                            )
-                            .await?,
-                    )),
-                    Required(NotificationUserExt::extract(
-                        ctx,
-                        &user_model.base_from_existing(ctx, &notifier?).await?,
-                    )),
-                )))
-            }
-            NotificationType::Quote => PackNotification::Quote(PackNotificationQuote::pack_from((
-                id,
-                base,
-                Required(NotificationNoteExt::extract(
-                    ctx,
-                    &note_model.pack_full_single(ctx, &note?).await?,
-                )),
-            ))),
-            NotificationType::PollEnd => {
-                PackNotification::PollEnd(PackNotificationPollEnd::pack_from((
-                    id,
-                    base,
-                    Required(NotificationNoteExt::extract(
-                        ctx,
-                        &note_model.pack_full_single(ctx, &note?).await?,
-                    )),
-                )))
-            }
-            NotificationType::App => PackNotification::App(PackNotificationApp::pack_from((
-                id,
-                base,
-                Required(NotificationAppExt::extract(
-                    ctx,
-                    (&notification_data.notification, access_token?),
-                )),
-            ))),
-        })
-    }
-
-    pub async fn get_notification(
-        &self,
-        ctx: &PackingContext,
-        notification_id: &str,
-        user_id: &str,
-    ) -> PackResult<Option<PackNotification>> {
-        let user_resolve_options = UserResolveOptions {
-            with_avatar: true,
-            with_banner: false,
-            with_profile: false,
-        };
-
-        let self_id = ctx.self_user.as_deref().map(ck::user::Model::get_id);
-        let Some(notification_raw) = ctx
-            .service
-            .db
-            .get_notification_resolver()
-            .get_single(
-                &NotificationResolveOptions {
-                    note_options: NoteResolveOptions {
-                        ids: None,
-                        visibility_filter: Arc::new(
-                            NoteVisibilityFilterModel.new_note_visibility_filter(Some(user_id)),
-                        ),
-                        time_range: None,
-                        limit: None,
-                        with_reply_target: true,
-                        with_renote_target: true,
-                        with_interactions_from: self_id.map(str::to_string),
-                        only_pins_from: None,
-                        user_options: user_resolve_options.clone(),
-                    },
-                    user_options: user_resolve_options,
-                },
-                notification_id,
-            )
-            .await?
-        else {
-            return Ok(None);
-        };
-
-        let note_model = NoteModel {
-            with_context: true,
-            attachments: false,
-        };
-        let user_model = UserModel;
-        let emoji_model = EmojiModel;
-
-        let notification = self
-            .pack_notification_single(
-                ctx,
-                &notification_raw,
-                &note_model,
-                &user_model,
-                &emoji_model,
-            )
-            .await?;
-
-        Ok(Some(notification))
-    }
-
-    pub async fn get_notifications(
-        &self,
-        ctx: &PackingContext,
-        id: &str,
-        notification_types: &[NotificationType],
-        unread_only: bool,
-        pagination: &mut Pagination,
-    ) -> PackResult<Vec<PackNotification>> {
-        let user_resolve_options = UserResolveOptions {
-            with_avatar: true,
-            with_banner: false,
-            with_profile: false,
-        };
-
-        let self_id = ctx.self_user.as_deref().map(ck::user::Model::get_id);
-        let notifications_raw = ctx
-            .service
-            .db
-            .get_notification_resolver()
-            .get(
-                &NotificationResolveOptions {
-                    note_options: NoteResolveOptions {
-                        ids: None,
-                        visibility_filter: Arc::new(
-                            NoteVisibilityFilterModel.new_note_visibility_filter(Some(id)),
-                        ),
-                        time_range: None,
-                        limit: None,
-                        with_reply_target: true,
-                        with_renote_target: true,
-                        with_interactions_from: self_id.map(str::to_string),
-                        only_pins_from: None,
-                        user_options: user_resolve_options.clone(),
-                    },
-                    user_options: user_resolve_options,
-                },
-                id,
-                &notification_types
-                    .iter()
-                    .map(|v| NotificationTypeEnum::extract(ctx, v))
-                    .collect::<Vec<_>>(),
-                unread_only,
-                &pagination.current,
-                &mut pagination.prev,
-                &mut pagination.next,
-                pagination.limit.into(),
-            )
-            .await?;
-
-        let note_model = NoteModel {
-            with_context: true,
-            attachments: false,
-        };
-        let user_model = UserModel;
-        let emoji_model = EmojiModel;
-
-        let fut_iter = notifications_raw
-            .iter()
-            .map(|n| self.pack_notification_single(ctx, n, &note_model, &user_model, &emoji_model))
-            .collect::<Vec<_>>();
-
-        let processed = futures::stream::iter(fut_iter)
-            .buffered(10)
-            .err_into::<PackError>()
-            .try_collect::<Vec<_>>()
-            .await?;
-
-        Ok(processed)
-    }
-}

src/service/emoji_cache.rs

@@ -98,16 +98,13 @@ impl EmojiCacheService {
         }
         drop(read);
 
-        let emoji = if to_resolve.is_empty() {
+        let emoji = self
-            Vec::new()
+            .db
-        } else {
-            self.db
             .fetch_many_emojis(&to_resolve, host)
             .await?
             .into_iter()
             .map(Arc::new)
-                .collect::<Vec<_>>()
+            .collect::<Vec<_>>();
-        };
         resolved.extend(emoji.iter().cloned());
 
         let mut write = self.cache.lock().await;
@@ -151,16 +148,13 @@ impl EmojiCacheService {
         }
         drop(read);
 
-        let emoji = if to_resolve.is_empty() {
+        let emoji = self
-            Vec::new()
+            .db
-        } else {
-            self.db
             .fetch_many_tagged_emojis(&to_resolve)
             .await?
             .into_iter()
             .map(Arc::new)
-                .collect::<Vec<_>>()
+            .collect::<Vec<_>>();
-        };
         resolved.extend(emoji.iter().cloned());
 
         let mut write = self.cache.lock().await;

src/service/instance_cache.rs

@@ -1,7 +1,6 @@
 use crate::web::ApiError;
 use lru::LruCache;
 use magnetar_calckey_model::{ck, CalckeyDbError, CalckeyModel};
-use magnetar_common::config::MagnetarConfig;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 use strum::EnumVariantNames;
@@ -45,16 +44,10 @@ pub struct RemoteInstanceCacheService {
     cache: Mutex<LruCache<String, CacheEntry>>,
     lifetime_max: Duration,
     db: CalckeyModel,
-    config: &'static MagnetarConfig,
 }
 
 impl RemoteInstanceCacheService {
-    pub(super) fn new(
+    pub(super) fn new(db: CalckeyModel, cache_size: usize, entry_lifetime: Duration) -> Self {
-        db: CalckeyModel,
-        config: &'static MagnetarConfig,
-        cache_size: usize,
-        entry_lifetime: Duration,
-    ) -> Self {
         const CACHE_SIZE: usize = 256;
 
         Self {
@@ -65,7 +58,6 @@ impl RemoteInstanceCacheService {
             )),
             lifetime_max: entry_lifetime,
             db,
-            config,
         }
     }
 
@@ -73,10 +65,6 @@ impl RemoteInstanceCacheService {
         &self,
         host: &str,
     ) -> Result<Option<Arc<ck::instance::Model>>, RemoteInstanceCacheError> {
-        if host == self.config.networking.host {
-            return Ok(None);
-        }
-
         let mut read = self.cache.lock().await;
         if let Some(item) = read.peek(host) {
             if item.created + self.lifetime_max >= Instant::now() {

src/service/mod.rs

@@ -51,7 +51,6 @@ impl MagnetarService {
         let emoji_cache = emoji_cache::EmojiCacheService::new(db.clone());
         let remote_instance_cache = instance_cache::RemoteInstanceCacheService::new(
             db.clone(),
-            config,
             256,
             Duration::from_secs(100),
         );

src/web/mod.rs

@@ -6,8 +6,6 @@ use magnetar_calckey_model::{CalckeyCacheError, CalckeyDbError};
 use magnetar_common::util::FediverseTagParseError;
 use serde::Serialize;
 use serde_json::json;
-use std::fmt::{Display, Formatter};
-use thiserror::Error;
 
 pub mod auth;
 pub mod pagination;
@@ -38,23 +36,13 @@ impl ErrorCode {
     }
 }
 
-#[derive(Debug, Error)]
+#[derive(Debug)]
 pub struct ApiError {
     pub status: StatusCode,
     pub code: ErrorCode,
     pub message: String,
 }
 
-impl Display for ApiError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "ApiError[status = \"{}\", code = \"{:?}\"]: \"{}\"",
-            self.status, self.code, self.message
-        )
-    }
-}
-
 #[derive(Debug)]
 pub struct AccessForbidden(pub String);