From c2cfd7e007d2453f92eadb96d33bbc4ba719b3ae Mon Sep 17 00:00:00 2001 From: Natty Date: Sun, 7 Jan 2024 02:44:52 +0100 Subject: [PATCH] Removed user groups --- .../src/entities/abuse_user_report.rs | 2 +- .../entity_ck/src/entities/access_token.rs | 2 +- .../entity_ck/src/entities/ad.rs | 2 +- .../entity_ck/src/entities/announcement.rs | 2 +- .../src/entities/announcement_read.rs | 2 +- .../entity_ck/src/entities/antenna.rs | 18 +- .../entity_ck/src/entities/antenna_note.rs | 2 +- .../entity_ck/src/entities/app.rs | 2 +- .../src/entities/attestation_challenge.rs | 2 +- .../entity_ck/src/entities/auth_session.rs | 2 +- .../entity_ck/src/entities/blocking.rs | 2 +- .../entity_ck/src/entities/clip.rs | 2 +- .../entity_ck/src/entities/clip_note.rs | 2 +- .../entity_ck/src/entities/drive_file.rs | 2 +- .../entity_ck/src/entities/drive_folder.rs | 2 +- .../entity_ck/src/entities/emoji.rs | 2 +- .../entity_ck/src/entities/follow_request.rs | 2 +- .../entity_ck/src/entities/following.rs | 2 +- .../entity_ck/src/entities/gallery_like.rs | 2 +- .../entity_ck/src/entities/gallery_post.rs | 2 +- .../entity_ck/src/entities/hashtag.rs | 2 +- .../entity_ck/src/entities/instance.rs | 2 +- .../entity_ck/src/entities/meta.rs | 2 +- .../entity_ck/src/entities/mod.rs | 6 +- .../entity_ck/src/entities/moderation_log.rs | 2 +- .../entity_ck/src/entities/muted_note.rs | 2 +- .../entity_ck/src/entities/muting.rs | 2 +- .../entity_ck/src/entities/note.rs | 2 +- .../entity_ck/src/entities/note_edit.rs | 2 +- .../entity_ck/src/entities/note_favorite.rs | 2 +- .../entity_ck/src/entities/note_reaction.rs | 2 +- .../src/entities/note_thread_muting.rs | 2 +- .../entity_ck/src/entities/note_unread.rs | 2 +- .../entity_ck/src/entities/note_watching.rs | 2 +- .../entity_ck/src/entities/notification.rs | 18 +- .../entity_ck/src/entities/page.rs | 2 +- .../entity_ck/src/entities/page_like.rs | 2 +- .../src/entities/password_reset_request.rs | 2 +- .../entity_ck/src/entities/poll.rs | 2 +- .../entity_ck/src/entities/poll_vote.rs | 2 +- .../entity_ck/src/entities/prelude.rs | 6 +- .../entity_ck/src/entities/promo_note.rs | 2 +- .../entity_ck/src/entities/promo_read.rs | 2 +- .../src/entities/registration_ticket.rs | 2 +- .../entity_ck/src/entities/registry_item.rs | 2 +- .../entity_ck/src/entities/relay.rs | 2 +- .../entity_ck/src/entities/renote_muting.rs | 2 +- .../src/entities/sea_orm_active_enums.rs | 4 +- .../entity_ck/src/entities/signin.rs | 2 +- .../entity_ck/src/entities/sw_subscription.rs | 2 +- .../entity_ck/src/entities/used_username.rs | 2 +- .../entity_ck/src/entities/user.rs | 34 +- .../entity_ck/src/entities/user_group.rs | 62 -- .../src/entities/user_group_invitation.rs | 59 -- .../src/entities/user_group_invite.rs | 51 -- .../src/entities/user_group_joining.rs | 59 -- .../entity_ck/src/entities/user_ip.rs | 2 +- .../entity_ck/src/entities/user_keypair.rs | 2 +- .../entity_ck/src/entities/user_list.rs | 2 +- .../src/entities/user_list_joining.rs | 2 +- .../src/entities/user_note_pining.rs | 2 +- .../entity_ck/src/entities/user_pending.rs | 2 +- .../entity_ck/src/entities/user_profile.rs | 2 +- .../entity_ck/src/entities/user_publickey.rs | 2 +- .../src/entities/user_security_key.rs | 2 +- .../entity_ck/src/entities/webhook.rs | 2 +- ext_calckey_model/migration/src/lib.rs | 2 + .../m20240107_005747_remove_user_groups.rs | 181 ++++++ fe_calckey/frontend/calckey-js/CHANGELOG.md | 29 - .../frontend/calckey-js/src/api.types.ts | 48 -- fe_calckey/frontend/calckey-js/src/consts.ts | 3 - .../frontend/calckey-js/src/entities.ts | 28 +- .../calckey-js/src/streaming.types.ts | 26 +- .../client/src/components/MkNotification.vue | 41 -- fe_calckey/frontend/client/src/navbar.ts | 13 - .../client/src/pages/my-antennas/create.vue | 1 - .../client/src/pages/my-antennas/editor.vue | 25 - .../client/src/pages/my-groups/group.vue | 201 ------- .../client/src/pages/my-groups/index.vue | 136 ----- .../client/src/pages/settings/email.vue | 11 - .../src/pages/settings/notifications.vue | 8 - fe_calckey/frontend/client/src/router.ts | 10 - .../client/src/scripts/get-user-menu.ts | 31 - .../frontend/client/src/ui/universal.vue | 67 +-- .../sw/src/scripts/create-notification.ts | 568 +++++++++--------- fe_calckey/frontend/sw/src/sw.ts | 401 ++++++------- 86 files changed, 716 insertions(+), 1543 deletions(-) delete mode 100644 ext_calckey_model/entity_ck/src/entities/user_group.rs delete mode 100644 ext_calckey_model/entity_ck/src/entities/user_group_invitation.rs delete mode 100644 ext_calckey_model/entity_ck/src/entities/user_group_invite.rs delete mode 100644 ext_calckey_model/entity_ck/src/entities/user_group_joining.rs create mode 100644 ext_calckey_model/migration/src/m20240107_005747_remove_user_groups.rs delete mode 100644 fe_calckey/frontend/calckey-js/CHANGELOG.md delete mode 100644 fe_calckey/frontend/client/src/pages/my-groups/group.vue delete mode 100644 fe_calckey/frontend/client/src/pages/my-groups/index.vue diff --git a/ext_calckey_model/entity_ck/src/entities/abuse_user_report.rs b/ext_calckey_model/entity_ck/src/entities/abuse_user_report.rs index 161e890..3f45fa7 100644 --- a/ext_calckey_model/entity_ck/src/entities/abuse_user_report.rs +++ b/ext_calckey_model/entity_ck/src/entities/abuse_user_report.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/access_token.rs b/ext_calckey_model/entity_ck/src/entities/access_token.rs index 82df53b..f7d0ddd 100644 --- a/ext_calckey_model/entity_ck/src/entities/access_token.rs +++ b/ext_calckey_model/entity_ck/src/entities/access_token.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/ad.rs b/ext_calckey_model/entity_ck/src/entities/ad.rs index 623d5ff..ca3b8a8 100644 --- a/ext_calckey_model/entity_ck/src/entities/ad.rs +++ b/ext_calckey_model/entity_ck/src/entities/ad.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/announcement.rs b/ext_calckey_model/entity_ck/src/entities/announcement.rs index 429aed5..70208e9 100644 --- a/ext_calckey_model/entity_ck/src/entities/announcement.rs +++ b/ext_calckey_model/entity_ck/src/entities/announcement.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/announcement_read.rs b/ext_calckey_model/entity_ck/src/entities/announcement_read.rs index ae6366e..3fb7468 100644 --- a/ext_calckey_model/entity_ck/src/entities/announcement_read.rs +++ b/ext_calckey_model/entity_ck/src/entities/announcement_read.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/antenna.rs b/ext_calckey_model/entity_ck/src/entities/antenna.rs index adc277d..42c29b4 100644 --- a/ext_calckey_model/entity_ck/src/entities/antenna.rs +++ b/ext_calckey_model/entity_ck/src/entities/antenna.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use super::sea_orm_active_enums::AntennaSrcEnum; use sea_orm::entity::prelude::*; @@ -27,8 +27,6 @@ pub struct Model { pub case_sensitive: bool, #[sea_orm(column_name = "withReplies")] pub with_replies: bool, - #[sea_orm(column_name = "userGroupJoiningId")] - pub user_group_joining_id: Option, pub users: Vec, #[sea_orm(column_name = "excludeKeywords", column_type = "JsonBinary")] pub exclude_keywords: Json, @@ -48,14 +46,6 @@ pub enum Relation { on_delete = "Cascade" )] User, - #[sea_orm( - belongs_to = "super::user_group_joining::Entity", - from = "Column::UserGroupJoiningId", - to = "super::user_group_joining::Column::Id", - on_update = "NoAction", - on_delete = "Cascade" - )] - UserGroupJoining, #[sea_orm( belongs_to = "super::user_list::Entity", from = "Column::UserListId", @@ -78,12 +68,6 @@ impl Related for Entity { } } -impl Related for Entity { - fn to() -> RelationDef { - Relation::UserGroupJoining.def() - } -} - impl Related for Entity { fn to() -> RelationDef { Relation::UserList.def() diff --git a/ext_calckey_model/entity_ck/src/entities/antenna_note.rs b/ext_calckey_model/entity_ck/src/entities/antenna_note.rs index 2ad870f..cb72079 100644 --- a/ext_calckey_model/entity_ck/src/entities/antenna_note.rs +++ b/ext_calckey_model/entity_ck/src/entities/antenna_note.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/app.rs b/ext_calckey_model/entity_ck/src/entities/app.rs index ff4b41e..672ae2d 100644 --- a/ext_calckey_model/entity_ck/src/entities/app.rs +++ b/ext_calckey_model/entity_ck/src/entities/app.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/attestation_challenge.rs b/ext_calckey_model/entity_ck/src/entities/attestation_challenge.rs index 004ea17..7b4b613 100644 --- a/ext_calckey_model/entity_ck/src/entities/attestation_challenge.rs +++ b/ext_calckey_model/entity_ck/src/entities/attestation_challenge.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/auth_session.rs b/ext_calckey_model/entity_ck/src/entities/auth_session.rs index 63a432e..62a41b3 100644 --- a/ext_calckey_model/entity_ck/src/entities/auth_session.rs +++ b/ext_calckey_model/entity_ck/src/entities/auth_session.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/blocking.rs b/ext_calckey_model/entity_ck/src/entities/blocking.rs index 527ec57..2b6f70a 100644 --- a/ext_calckey_model/entity_ck/src/entities/blocking.rs +++ b/ext_calckey_model/entity_ck/src/entities/blocking.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/clip.rs b/ext_calckey_model/entity_ck/src/entities/clip.rs index 7763886..a971c5a 100644 --- a/ext_calckey_model/entity_ck/src/entities/clip.rs +++ b/ext_calckey_model/entity_ck/src/entities/clip.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/clip_note.rs b/ext_calckey_model/entity_ck/src/entities/clip_note.rs index ca915cd..e2fea9f 100644 --- a/ext_calckey_model/entity_ck/src/entities/clip_note.rs +++ b/ext_calckey_model/entity_ck/src/entities/clip_note.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/drive_file.rs b/ext_calckey_model/entity_ck/src/entities/drive_file.rs index 193fff4..2f2e2d6 100644 --- a/ext_calckey_model/entity_ck/src/entities/drive_file.rs +++ b/ext_calckey_model/entity_ck/src/entities/drive_file.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/drive_folder.rs b/ext_calckey_model/entity_ck/src/entities/drive_folder.rs index fb4418f..b611e9f 100644 --- a/ext_calckey_model/entity_ck/src/entities/drive_folder.rs +++ b/ext_calckey_model/entity_ck/src/entities/drive_folder.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/emoji.rs b/ext_calckey_model/entity_ck/src/entities/emoji.rs index ea75e8b..e869096 100644 --- a/ext_calckey_model/entity_ck/src/entities/emoji.rs +++ b/ext_calckey_model/entity_ck/src/entities/emoji.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/follow_request.rs b/ext_calckey_model/entity_ck/src/entities/follow_request.rs index 0677ee3..f6ea746 100644 --- a/ext_calckey_model/entity_ck/src/entities/follow_request.rs +++ b/ext_calckey_model/entity_ck/src/entities/follow_request.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/following.rs b/ext_calckey_model/entity_ck/src/entities/following.rs index 9f889a5..9f31202 100644 --- a/ext_calckey_model/entity_ck/src/entities/following.rs +++ b/ext_calckey_model/entity_ck/src/entities/following.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/gallery_like.rs b/ext_calckey_model/entity_ck/src/entities/gallery_like.rs index c8a05db..d9fda50 100644 --- a/ext_calckey_model/entity_ck/src/entities/gallery_like.rs +++ b/ext_calckey_model/entity_ck/src/entities/gallery_like.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/gallery_post.rs b/ext_calckey_model/entity_ck/src/entities/gallery_post.rs index 9491201..5b50610 100644 --- a/ext_calckey_model/entity_ck/src/entities/gallery_post.rs +++ b/ext_calckey_model/entity_ck/src/entities/gallery_post.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/hashtag.rs b/ext_calckey_model/entity_ck/src/entities/hashtag.rs index bcf18b6..e478842 100644 --- a/ext_calckey_model/entity_ck/src/entities/hashtag.rs +++ b/ext_calckey_model/entity_ck/src/entities/hashtag.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/instance.rs b/ext_calckey_model/entity_ck/src/entities/instance.rs index 70cf428..73ce9b2 100644 --- a/ext_calckey_model/entity_ck/src/entities/instance.rs +++ b/ext_calckey_model/entity_ck/src/entities/instance.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/meta.rs b/ext_calckey_model/entity_ck/src/entities/meta.rs index e399dad..a1bfa97 100644 --- a/ext_calckey_model/entity_ck/src/entities/meta.rs +++ b/ext_calckey_model/entity_ck/src/entities/meta.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use super::sea_orm_active_enums::MetaSensitivemediadetectionEnum; use super::sea_orm_active_enums::MetaSensitivemediadetectionsensitivityEnum; diff --git a/ext_calckey_model/entity_ck/src/entities/mod.rs b/ext_calckey_model/entity_ck/src/entities/mod.rs index 976b0d9..a040ce1 100644 --- a/ext_calckey_model/entity_ck/src/entities/mod.rs +++ b/ext_calckey_model/entity_ck/src/entities/mod.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 pub mod prelude; @@ -52,10 +52,6 @@ pub mod signin; pub mod sw_subscription; pub mod used_username; pub mod user; -pub mod user_group; -pub mod user_group_invitation; -pub mod user_group_invite; -pub mod user_group_joining; pub mod user_ip; pub mod user_keypair; pub mod user_list; diff --git a/ext_calckey_model/entity_ck/src/entities/moderation_log.rs b/ext_calckey_model/entity_ck/src/entities/moderation_log.rs index 141b8db..f4d1fd6 100644 --- a/ext_calckey_model/entity_ck/src/entities/moderation_log.rs +++ b/ext_calckey_model/entity_ck/src/entities/moderation_log.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/muted_note.rs b/ext_calckey_model/entity_ck/src/entities/muted_note.rs index 0b2753c..ec5000d 100644 --- a/ext_calckey_model/entity_ck/src/entities/muted_note.rs +++ b/ext_calckey_model/entity_ck/src/entities/muted_note.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use super::sea_orm_active_enums::MutedNoteReasonEnum; use sea_orm::entity::prelude::*; diff --git a/ext_calckey_model/entity_ck/src/entities/muting.rs b/ext_calckey_model/entity_ck/src/entities/muting.rs index da9b687..bc2ad27 100644 --- a/ext_calckey_model/entity_ck/src/entities/muting.rs +++ b/ext_calckey_model/entity_ck/src/entities/muting.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/note.rs b/ext_calckey_model/entity_ck/src/entities/note.rs index 485dbbe..8ec2b61 100644 --- a/ext_calckey_model/entity_ck/src/entities/note.rs +++ b/ext_calckey_model/entity_ck/src/entities/note.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use super::sea_orm_active_enums::NoteVisibilityEnum; use sea_orm::entity::prelude::*; diff --git a/ext_calckey_model/entity_ck/src/entities/note_edit.rs b/ext_calckey_model/entity_ck/src/entities/note_edit.rs index 13a3524..6db8a6d 100644 --- a/ext_calckey_model/entity_ck/src/entities/note_edit.rs +++ b/ext_calckey_model/entity_ck/src/entities/note_edit.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/note_favorite.rs b/ext_calckey_model/entity_ck/src/entities/note_favorite.rs index 16fdbe9..56b34ed 100644 --- a/ext_calckey_model/entity_ck/src/entities/note_favorite.rs +++ b/ext_calckey_model/entity_ck/src/entities/note_favorite.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/note_reaction.rs b/ext_calckey_model/entity_ck/src/entities/note_reaction.rs index ba4275b..a07edad 100644 --- a/ext_calckey_model/entity_ck/src/entities/note_reaction.rs +++ b/ext_calckey_model/entity_ck/src/entities/note_reaction.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/note_thread_muting.rs b/ext_calckey_model/entity_ck/src/entities/note_thread_muting.rs index 1fdca77..afd4998 100644 --- a/ext_calckey_model/entity_ck/src/entities/note_thread_muting.rs +++ b/ext_calckey_model/entity_ck/src/entities/note_thread_muting.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/note_unread.rs b/ext_calckey_model/entity_ck/src/entities/note_unread.rs index 772d6be..8892c66 100644 --- a/ext_calckey_model/entity_ck/src/entities/note_unread.rs +++ b/ext_calckey_model/entity_ck/src/entities/note_unread.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/note_watching.rs b/ext_calckey_model/entity_ck/src/entities/note_watching.rs index a243806..1f49a71 100644 --- a/ext_calckey_model/entity_ck/src/entities/note_watching.rs +++ b/ext_calckey_model/entity_ck/src/entities/note_watching.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/notification.rs b/ext_calckey_model/entity_ck/src/entities/notification.rs index e9dd675..9e522bf 100644 --- a/ext_calckey_model/entity_ck/src/entities/notification.rs +++ b/ext_calckey_model/entity_ck/src/entities/notification.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use super::sea_orm_active_enums::NotificationTypeEnum; use sea_orm::entity::prelude::*; @@ -24,8 +24,6 @@ pub struct Model { #[sea_orm(column_name = "followRequestId")] pub follow_request_id: Option, pub r#type: NotificationTypeEnum, - #[sea_orm(column_name = "userGroupInvitationId")] - pub user_group_invitation_id: Option, #[sea_orm(column_name = "customBody")] pub custom_body: Option, #[sea_orm(column_name = "customHeader")] @@ -78,14 +76,6 @@ pub enum Relation { on_delete = "Cascade" )] User1, - #[sea_orm( - belongs_to = "super::user_group_invitation::Entity", - from = "Column::UserGroupInvitationId", - to = "super::user_group_invitation::Column::Id", - on_update = "NoAction", - on_delete = "Cascade" - )] - UserGroupInvitation, } impl Related for Entity { @@ -106,10 +96,4 @@ impl Related for Entity { } } -impl Related for Entity { - fn to() -> RelationDef { - Relation::UserGroupInvitation.def() - } -} - impl ActiveModelBehavior for ActiveModel {} diff --git a/ext_calckey_model/entity_ck/src/entities/page.rs b/ext_calckey_model/entity_ck/src/entities/page.rs index 571a3ff..bd0091f 100644 --- a/ext_calckey_model/entity_ck/src/entities/page.rs +++ b/ext_calckey_model/entity_ck/src/entities/page.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use super::sea_orm_active_enums::PageVisibilityEnum; use sea_orm::entity::prelude::*; diff --git a/ext_calckey_model/entity_ck/src/entities/page_like.rs b/ext_calckey_model/entity_ck/src/entities/page_like.rs index 9e450d2..ac9a7b0 100644 --- a/ext_calckey_model/entity_ck/src/entities/page_like.rs +++ b/ext_calckey_model/entity_ck/src/entities/page_like.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/password_reset_request.rs b/ext_calckey_model/entity_ck/src/entities/password_reset_request.rs index c4de2a8..9585e01 100644 --- a/ext_calckey_model/entity_ck/src/entities/password_reset_request.rs +++ b/ext_calckey_model/entity_ck/src/entities/password_reset_request.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/poll.rs b/ext_calckey_model/entity_ck/src/entities/poll.rs index be489a0..cc428c9 100644 --- a/ext_calckey_model/entity_ck/src/entities/poll.rs +++ b/ext_calckey_model/entity_ck/src/entities/poll.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use super::sea_orm_active_enums::PollNotevisibilityEnum; use sea_orm::entity::prelude::*; diff --git a/ext_calckey_model/entity_ck/src/entities/poll_vote.rs b/ext_calckey_model/entity_ck/src/entities/poll_vote.rs index 01a46d4..88b21d1 100644 --- a/ext_calckey_model/entity_ck/src/entities/poll_vote.rs +++ b/ext_calckey_model/entity_ck/src/entities/poll_vote.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/prelude.rs b/ext_calckey_model/entity_ck/src/entities/prelude.rs index 5a654e2..33ad8c5 100644 --- a/ext_calckey_model/entity_ck/src/entities/prelude.rs +++ b/ext_calckey_model/entity_ck/src/entities/prelude.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 pub use super::abuse_user_report::Entity as AbuseUserReport; pub use super::access_token::Entity as AccessToken; @@ -49,10 +49,6 @@ pub use super::signin::Entity as Signin; pub use super::sw_subscription::Entity as SwSubscription; pub use super::used_username::Entity as UsedUsername; pub use super::user::Entity as User; -pub use super::user_group::Entity as UserGroup; -pub use super::user_group_invitation::Entity as UserGroupInvitation; -pub use super::user_group_invite::Entity as UserGroupInvite; -pub use super::user_group_joining::Entity as UserGroupJoining; pub use super::user_ip::Entity as UserIp; pub use super::user_keypair::Entity as UserKeypair; pub use super::user_list::Entity as UserList; diff --git a/ext_calckey_model/entity_ck/src/entities/promo_note.rs b/ext_calckey_model/entity_ck/src/entities/promo_note.rs index c1a381c..7de0ac4 100644 --- a/ext_calckey_model/entity_ck/src/entities/promo_note.rs +++ b/ext_calckey_model/entity_ck/src/entities/promo_note.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/promo_read.rs b/ext_calckey_model/entity_ck/src/entities/promo_read.rs index 2fc506e..a1d1790 100644 --- a/ext_calckey_model/entity_ck/src/entities/promo_read.rs +++ b/ext_calckey_model/entity_ck/src/entities/promo_read.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/registration_ticket.rs b/ext_calckey_model/entity_ck/src/entities/registration_ticket.rs index a8d7576..6ec3079 100644 --- a/ext_calckey_model/entity_ck/src/entities/registration_ticket.rs +++ b/ext_calckey_model/entity_ck/src/entities/registration_ticket.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/registry_item.rs b/ext_calckey_model/entity_ck/src/entities/registry_item.rs index ecd4949..80c76b4 100644 --- a/ext_calckey_model/entity_ck/src/entities/registry_item.rs +++ b/ext_calckey_model/entity_ck/src/entities/registry_item.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/relay.rs b/ext_calckey_model/entity_ck/src/entities/relay.rs index 39f2a14..f40fe44 100644 --- a/ext_calckey_model/entity_ck/src/entities/relay.rs +++ b/ext_calckey_model/entity_ck/src/entities/relay.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use super::sea_orm_active_enums::RelayStatusEnum; use sea_orm::entity::prelude::*; diff --git a/ext_calckey_model/entity_ck/src/entities/renote_muting.rs b/ext_calckey_model/entity_ck/src/entities/renote_muting.rs index 05e3526..0cdd404 100644 --- a/ext_calckey_model/entity_ck/src/entities/renote_muting.rs +++ b/ext_calckey_model/entity_ck/src/entities/renote_muting.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/sea_orm_active_enums.rs b/ext_calckey_model/entity_ck/src/entities/sea_orm_active_enums.rs index da7f3aa..531a145 100644 --- a/ext_calckey_model/entity_ck/src/entities/sea_orm_active_enums.rs +++ b/ext_calckey_model/entity_ck/src/entities/sea_orm_active_enums.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; @@ -8,8 +8,6 @@ use serde::{Deserialize, Serialize}; pub enum AntennaSrcEnum { #[sea_orm(string_value = "all")] All, - #[sea_orm(string_value = "group")] - Group, #[sea_orm(string_value = "home")] Home, #[sea_orm(string_value = "instances")] diff --git a/ext_calckey_model/entity_ck/src/entities/signin.rs b/ext_calckey_model/entity_ck/src/entities/signin.rs index 2bac895..030525b 100644 --- a/ext_calckey_model/entity_ck/src/entities/signin.rs +++ b/ext_calckey_model/entity_ck/src/entities/signin.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/sw_subscription.rs b/ext_calckey_model/entity_ck/src/entities/sw_subscription.rs index b633f8b..5903967 100644 --- a/ext_calckey_model/entity_ck/src/entities/sw_subscription.rs +++ b/ext_calckey_model/entity_ck/src/entities/sw_subscription.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/used_username.rs b/ext_calckey_model/entity_ck/src/entities/used_username.rs index 61dda26..7f38392 100644 --- a/ext_calckey_model/entity_ck/src/entities/used_username.rs +++ b/ext_calckey_model/entity_ck/src/entities/used_username.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/user.rs b/ext_calckey_model/entity_ck/src/entities/user.rs index 60862aa..d64e2a4 100644 --- a/ext_calckey_model/entity_ck/src/entities/user.rs +++ b/ext_calckey_model/entity_ck/src/entities/user.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; @@ -144,14 +144,6 @@ pub enum Relation { Signin, #[sea_orm(has_many = "super::sw_subscription::Entity")] SwSubscription, - #[sea_orm(has_many = "super::user_group::Entity")] - UserGroup, - #[sea_orm(has_many = "super::user_group_invitation::Entity")] - UserGroupInvitation, - #[sea_orm(has_many = "super::user_group_invite::Entity")] - UserGroupInvite, - #[sea_orm(has_many = "super::user_group_joining::Entity")] - UserGroupJoining, #[sea_orm(has_one = "super::user_keypair::Entity")] UserKeypair, #[sea_orm(has_many = "super::user_list::Entity")] @@ -332,30 +324,6 @@ impl Related for Entity { } } -impl Related for Entity { - fn to() -> RelationDef { - Relation::UserGroup.def() - } -} - -impl Related for Entity { - fn to() -> RelationDef { - Relation::UserGroupInvitation.def() - } -} - -impl Related for Entity { - fn to() -> RelationDef { - Relation::UserGroupInvite.def() - } -} - -impl Related for Entity { - fn to() -> RelationDef { - Relation::UserGroupJoining.def() - } -} - impl Related for Entity { fn to() -> RelationDef { Relation::UserKeypair.def() diff --git a/ext_calckey_model/entity_ck/src/entities/user_group.rs b/ext_calckey_model/entity_ck/src/entities/user_group.rs deleted file mode 100644 index d8c026a..0000000 --- a/ext_calckey_model/entity_ck/src/entities/user_group.rs +++ /dev/null @@ -1,62 +0,0 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 - -use sea_orm::entity::prelude::*; -use serde::{Deserialize, Serialize}; - -#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)] -#[sea_orm(table_name = "user_group")] -pub struct Model { - #[sea_orm(primary_key, auto_increment = false)] - pub id: String, - #[sea_orm(column_name = "createdAt")] - pub created_at: DateTimeWithTimeZone, - pub name: String, - #[sea_orm(column_name = "userId")] - pub user_id: String, - #[sea_orm(column_name = "isPrivate")] - pub is_private: bool, -} - -#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] -pub enum Relation { - #[sea_orm( - belongs_to = "super::user::Entity", - from = "Column::UserId", - to = "super::user::Column::Id", - on_update = "NoAction", - on_delete = "Cascade" - )] - User, - #[sea_orm(has_many = "super::user_group_invitation::Entity")] - UserGroupInvitation, - #[sea_orm(has_many = "super::user_group_invite::Entity")] - UserGroupInvite, - #[sea_orm(has_many = "super::user_group_joining::Entity")] - UserGroupJoining, -} - -impl Related for Entity { - fn to() -> RelationDef { - Relation::User.def() - } -} - -impl Related for Entity { - fn to() -> RelationDef { - Relation::UserGroupInvitation.def() - } -} - -impl Related for Entity { - fn to() -> RelationDef { - Relation::UserGroupInvite.def() - } -} - -impl Related for Entity { - fn to() -> RelationDef { - Relation::UserGroupJoining.def() - } -} - -impl ActiveModelBehavior for ActiveModel {} diff --git a/ext_calckey_model/entity_ck/src/entities/user_group_invitation.rs b/ext_calckey_model/entity_ck/src/entities/user_group_invitation.rs deleted file mode 100644 index 7441714..0000000 --- a/ext_calckey_model/entity_ck/src/entities/user_group_invitation.rs +++ /dev/null @@ -1,59 +0,0 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 - -use sea_orm::entity::prelude::*; -use serde::{Deserialize, Serialize}; - -#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)] -#[sea_orm(table_name = "user_group_invitation")] -pub struct Model { - #[sea_orm(primary_key, auto_increment = false)] - pub id: String, - #[sea_orm(column_name = "createdAt")] - pub created_at: DateTimeWithTimeZone, - #[sea_orm(column_name = "userId")] - pub user_id: String, - #[sea_orm(column_name = "userGroupId")] - pub user_group_id: String, -} - -#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] -pub enum Relation { - #[sea_orm(has_many = "super::notification::Entity")] - Notification, - #[sea_orm( - belongs_to = "super::user::Entity", - from = "Column::UserId", - to = "super::user::Column::Id", - on_update = "NoAction", - on_delete = "Cascade" - )] - User, - #[sea_orm( - belongs_to = "super::user_group::Entity", - from = "Column::UserGroupId", - to = "super::user_group::Column::Id", - on_update = "NoAction", - on_delete = "Cascade" - )] - UserGroup, -} - -impl Related for Entity { - fn to() -> RelationDef { - Relation::Notification.def() - } -} - -impl Related for Entity { - fn to() -> RelationDef { - Relation::User.def() - } -} - -impl Related for Entity { - fn to() -> RelationDef { - Relation::UserGroup.def() - } -} - -impl ActiveModelBehavior for ActiveModel {} diff --git a/ext_calckey_model/entity_ck/src/entities/user_group_invite.rs b/ext_calckey_model/entity_ck/src/entities/user_group_invite.rs deleted file mode 100644 index baea19d..0000000 --- a/ext_calckey_model/entity_ck/src/entities/user_group_invite.rs +++ /dev/null @@ -1,51 +0,0 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 - -use sea_orm::entity::prelude::*; -use serde::{Deserialize, Serialize}; - -#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)] -#[sea_orm(table_name = "user_group_invite")] -pub struct Model { - #[sea_orm(primary_key, auto_increment = false)] - pub id: String, - #[sea_orm(column_name = "createdAt")] - pub created_at: DateTimeWithTimeZone, - #[sea_orm(column_name = "userId")] - pub user_id: String, - #[sea_orm(column_name = "userGroupId")] - pub user_group_id: String, -} - -#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] -pub enum Relation { - #[sea_orm( - belongs_to = "super::user::Entity", - from = "Column::UserId", - to = "super::user::Column::Id", - on_update = "NoAction", - on_delete = "Cascade" - )] - User, - #[sea_orm( - belongs_to = "super::user_group::Entity", - from = "Column::UserGroupId", - to = "super::user_group::Column::Id", - on_update = "NoAction", - on_delete = "Cascade" - )] - UserGroup, -} - -impl Related for Entity { - fn to() -> RelationDef { - Relation::User.def() - } -} - -impl Related for Entity { - fn to() -> RelationDef { - Relation::UserGroup.def() - } -} - -impl ActiveModelBehavior for ActiveModel {} diff --git a/ext_calckey_model/entity_ck/src/entities/user_group_joining.rs b/ext_calckey_model/entity_ck/src/entities/user_group_joining.rs deleted file mode 100644 index a086642..0000000 --- a/ext_calckey_model/entity_ck/src/entities/user_group_joining.rs +++ /dev/null @@ -1,59 +0,0 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 - -use sea_orm::entity::prelude::*; -use serde::{Deserialize, Serialize}; - -#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)] -#[sea_orm(table_name = "user_group_joining")] -pub struct Model { - #[sea_orm(primary_key, auto_increment = false)] - pub id: String, - #[sea_orm(column_name = "createdAt")] - pub created_at: DateTimeWithTimeZone, - #[sea_orm(column_name = "userId")] - pub user_id: String, - #[sea_orm(column_name = "userGroupId")] - pub user_group_id: String, -} - -#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] -pub enum Relation { - #[sea_orm(has_many = "super::antenna::Entity")] - Antenna, - #[sea_orm( - belongs_to = "super::user::Entity", - from = "Column::UserId", - to = "super::user::Column::Id", - on_update = "NoAction", - on_delete = "Cascade" - )] - User, - #[sea_orm( - belongs_to = "super::user_group::Entity", - from = "Column::UserGroupId", - to = "super::user_group::Column::Id", - on_update = "NoAction", - on_delete = "Cascade" - )] - UserGroup, -} - -impl Related for Entity { - fn to() -> RelationDef { - Relation::Antenna.def() - } -} - -impl Related for Entity { - fn to() -> RelationDef { - Relation::User.def() - } -} - -impl Related for Entity { - fn to() -> RelationDef { - Relation::UserGroup.def() - } -} - -impl ActiveModelBehavior for ActiveModel {} diff --git a/ext_calckey_model/entity_ck/src/entities/user_ip.rs b/ext_calckey_model/entity_ck/src/entities/user_ip.rs index 9cd04ab..66042b9 100644 --- a/ext_calckey_model/entity_ck/src/entities/user_ip.rs +++ b/ext_calckey_model/entity_ck/src/entities/user_ip.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/user_keypair.rs b/ext_calckey_model/entity_ck/src/entities/user_keypair.rs index e2e61d0..ffcadb1 100644 --- a/ext_calckey_model/entity_ck/src/entities/user_keypair.rs +++ b/ext_calckey_model/entity_ck/src/entities/user_keypair.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/user_list.rs b/ext_calckey_model/entity_ck/src/entities/user_list.rs index 78f8cc5..2ba8418 100644 --- a/ext_calckey_model/entity_ck/src/entities/user_list.rs +++ b/ext_calckey_model/entity_ck/src/entities/user_list.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/user_list_joining.rs b/ext_calckey_model/entity_ck/src/entities/user_list_joining.rs index 3ce618b..fadc2e4 100644 --- a/ext_calckey_model/entity_ck/src/entities/user_list_joining.rs +++ b/ext_calckey_model/entity_ck/src/entities/user_list_joining.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/user_note_pining.rs b/ext_calckey_model/entity_ck/src/entities/user_note_pining.rs index 32747a3..dda71c9 100644 --- a/ext_calckey_model/entity_ck/src/entities/user_note_pining.rs +++ b/ext_calckey_model/entity_ck/src/entities/user_note_pining.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/user_pending.rs b/ext_calckey_model/entity_ck/src/entities/user_pending.rs index 6201eeb..3abad53 100644 --- a/ext_calckey_model/entity_ck/src/entities/user_pending.rs +++ b/ext_calckey_model/entity_ck/src/entities/user_pending.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/user_profile.rs b/ext_calckey_model/entity_ck/src/entities/user_profile.rs index 58b12a7..230de24 100644 --- a/ext_calckey_model/entity_ck/src/entities/user_profile.rs +++ b/ext_calckey_model/entity_ck/src/entities/user_profile.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use super::sea_orm_active_enums::UserProfileFfvisibilityEnum; use super::sea_orm_active_enums::UserProfileMutingnotificationtypesEnum; diff --git a/ext_calckey_model/entity_ck/src/entities/user_publickey.rs b/ext_calckey_model/entity_ck/src/entities/user_publickey.rs index 072d2bb..e34914d 100644 --- a/ext_calckey_model/entity_ck/src/entities/user_publickey.rs +++ b/ext_calckey_model/entity_ck/src/entities/user_publickey.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/user_security_key.rs b/ext_calckey_model/entity_ck/src/entities/user_security_key.rs index 66ace7f..f4ae393 100644 --- a/ext_calckey_model/entity_ck/src/entities/user_security_key.rs +++ b/ext_calckey_model/entity_ck/src/entities/user_security_key.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/entity_ck/src/entities/webhook.rs b/ext_calckey_model/entity_ck/src/entities/webhook.rs index 9b5f5df..f2df16d 100644 --- a/ext_calckey_model/entity_ck/src/entities/webhook.rs +++ b/ext_calckey_model/entity_ck/src/entities/webhook.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.10 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/ext_calckey_model/migration/src/lib.rs b/ext_calckey_model/migration/src/lib.rs index 5e4bde3..b04cc11 100644 --- a/ext_calckey_model/migration/src/lib.rs +++ b/ext_calckey_model/migration/src/lib.rs @@ -4,6 +4,7 @@ mod m20220101_000001_bootstrap; mod m20230729_201733_drop_messaging_integrations; mod m20230729_212237_user_unique_idx; mod m20230806_142918_drop_featured_note_option; +mod m20240107_005747_remove_user_groups; pub struct Migrator; @@ -15,6 +16,7 @@ impl MigratorTrait for Migrator { Box::new(m20230729_201733_drop_messaging_integrations::Migration), Box::new(m20230729_212237_user_unique_idx::Migration), Box::new(m20230806_142918_drop_featured_note_option::Migration), + Box::new(m20240107_005747_remove_user_groups::Migration), ] } } diff --git a/ext_calckey_model/migration/src/m20240107_005747_remove_user_groups.rs b/ext_calckey_model/migration/src/m20240107_005747_remove_user_groups.rs new file mode 100644 index 0000000..0c66b2f --- /dev/null +++ b/ext_calckey_model/migration/src/m20240107_005747_remove_user_groups.rs @@ -0,0 +1,181 @@ +use sea_orm_migration::prelude::*; + +#[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 "antenna" WHERE "src" = 'group'; + + ALTER TYPE "antenna_src_enum" RENAME TO "antenna_src_enum_old"; + CREATE TYPE "antenna_src_enum" AS ENUM('home', 'all', 'users', 'list', 'instances'); + ALTER TABLE "antenna" ALTER COLUMN "src" TYPE "antenna_src_enum" USING "src"::text::antenna_src_enum; + DROP TYPE "antenna_src_enum_old"; + + ALTER TABLE "antenna" DROP COLUMN "userGroupJoiningId"; + + ALTER TABLE "notification" DROP COLUMN "userGroupInvitationId"; + + ALTER TABLE "user_profile" ALTER COLUMN "emailNotificationTypes" + SET DEFAULT '["follow", "receiveFollowRequest"]'::jsonb; + + DROP TABLE "user_group_invitation"; + DROP TABLE "user_group_joining"; + DROP TABLE "user_group_invite"; + DROP TABLE "user_group"; + "#, + ) + .await?; + + Ok(()) + } + + async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> { + let db = manager.get_connection(); + + db.execute_unprepared( + r#" + create table user_group + ( + id varchar(32) not null + constraint "PK_3c29fba6fe013ec8724378ce7c9" + primary key, + "createdAt" timestamp with time zone not null, + name varchar(256) not null, + "userId" varchar(32) not null + constraint "FK_3d6b372788ab01be58853003c93" + references "user" + on delete cascade, + "isPrivate" boolean default false not null + ); + + comment on column user_group."createdAt" is 'The created date of the UserGroup.'; + + comment on column user_group."userId" is 'The ID of owner.'; + + create index "IDX_20e30aa35180e317e133d75316" + on user_group ("createdAt"); + + create index "IDX_3d6b372788ab01be58853003c9" + on user_group ("userId"); + + create table user_group_invitation + ( + id varchar(32) not null + constraint "PK_160c63ec02bf23f6a5c5e8140d6" + primary key, + "createdAt" timestamp with time zone not null, + "userId" varchar(32) not null + constraint "FK_bfbc6305547539369fe73eb144a" + references "user" + on delete cascade, + "userGroupId" varchar(32) not null + constraint "FK_5cc8c468090e129857e9fecce5a" + references user_group + on delete cascade + ); + + comment on column user_group_invitation."createdAt" is 'The created date of the UserGroupInvitation.'; + + comment on column user_group_invitation."userId" is 'The user ID.'; + + comment on column user_group_invitation."userGroupId" is 'The group ID.'; + + create index "IDX_bfbc6305547539369fe73eb144" + on user_group_invitation ("userId"); + + create index "IDX_5cc8c468090e129857e9fecce5" + on user_group_invitation ("userGroupId"); + + create unique index "IDX_e9793f65f504e5a31fbaedbf2f" + on user_group_invitation ("userId", "userGroupId"); + + create table user_group_joining + ( + id varchar(32) not null + constraint "PK_15f2425885253c5507e1599cfe7" + primary key, + "createdAt" timestamp with time zone not null, + "userId" varchar(32) not null + constraint "FK_f3a1b4bd0c7cabba958a0c0b231" + references "user" + on delete cascade, + "userGroupId" varchar(32) not null + constraint "FK_67dc758bc0566985d1b3d399865" + references user_group + on delete cascade + ); + + comment on column user_group_joining."createdAt" is 'The created date of the UserGroupJoining.'; + + comment on column user_group_joining."userId" is 'The user ID.'; + + comment on column user_group_joining."userGroupId" is 'The group ID.'; + + create index "IDX_f3a1b4bd0c7cabba958a0c0b23" + on user_group_joining ("userId"); + + create index "IDX_67dc758bc0566985d1b3d39986" + on user_group_joining ("userGroupId"); + + create unique index "IDX_d9ecaed8c6dc43f3592c229282" + on user_group_joining ("userId", "userGroupId"); + + + create table user_group_invite + ( + id varchar(32) not null + constraint "PK_3893884af0d3a5f4d01e7921a97" + primary key, + "createdAt" timestamp with time zone not null, + "userId" varchar(32) not null + constraint "FK_1039988afa3bf991185b277fe03" + references "user" + on delete cascade, + "userGroupId" varchar(32) not null + constraint "FK_e10924607d058004304611a436a" + references user_group + on delete cascade + ); + + alter table user_group_invite + owner to "example-calckey-user"; + + create index "IDX_1039988afa3bf991185b277fe0" + on user_group_invite ("userId"); + + create index "IDX_e10924607d058004304611a436" + on user_group_invite ("userGroupId"); + + create unique index "IDX_78787741f9010886796f2320a4" + on user_group_invite ("userId", "userGroupId"); + + ALTER TABLE "user_profile" ALTER COLUMN "emailNotificationTypes" + SET DEFAULT '["follow", "receiveFollowRequest", "groupInvited"]'::jsonb; + + alter table antenna add "userGroupJoiningId" varchar(32) + constraint "FK_ccbf5a8c0be4511133dcc50ddeb" + references user_group_joining + on delete cascade; + + alter table notification add column "userGroupInvitationId" varchar(32) + constraint "FK_8fe87814e978053a53b1beb7e98" + references user_group_invitation + on delete cascade; + + ALTER TYPE "antenna_src_enum" RENAME TO "antenna_src_enum_old"; + CREATE TYPE "antenna_src_enum" AS ENUM('home', 'all', 'users', 'list', 'group', 'instances'); + ALTER TABLE "antenna" ALTER COLUMN "src" TYPE "antenna_src_enum" USING "src"::text::antenna_src_enum; + DROP TYPE "antenna_src_enum_old"; + "#, + ) + .await?; + + Ok(()) + } +} diff --git a/fe_calckey/frontend/calckey-js/CHANGELOG.md b/fe_calckey/frontend/calckey-js/CHANGELOG.md deleted file mode 100644 index 88a5c24..0000000 --- a/fe_calckey/frontend/calckey-js/CHANGELOG.md +++ /dev/null @@ -1,29 +0,0 @@ -# 0.0.14 -- remove needless Object.freeze() - -# 0.0.13 -- expose ChannelConnection and Channels types - -# 0.0.12 -- fix a bug that cannot connect to streaming - -# 0.0.11 -- update user type -- add missing main stream types - -# 0.0.10 -- add consts - -# 0.0.9 -- add list of api permission -- Update Note type - -# 0.0.8 -- add type definition for `messagingMessage` event to main stream channel -- Update Note type - -# 0.0.7 -- Notificationsの型を修正 -- MessagingMessageの型を修正 -- UserLiteの型を修正 -- apiでネイティブfetchを格納する際に無名関数でラップするように diff --git a/fe_calckey/frontend/calckey-js/src/api.types.ts b/fe_calckey/frontend/calckey-js/src/api.types.ts index 1ebc95f..70818cb 100644 --- a/fe_calckey/frontend/calckey-js/src/api.types.ts +++ b/fe_calckey/frontend/calckey-js/src/api.types.ts @@ -18,7 +18,6 @@ import { Instance, LiteInstanceMetadata, MeDetailed, - MessagingMessage, Note, NoteFavorite, NoteReaction, @@ -30,7 +29,6 @@ import { Stats, User, UserDetailed, - UserGroup, UserList, UserSorting, } from "./entities"; @@ -703,7 +701,6 @@ export type Endpoints = { }; res: MeDetailed; }; - "i/user-group-invites": { req: TODO; res: TODO }; "i/2fa/done": { req: TODO; res: TODO }; "i/2fa/key-done": { req: TODO; res: TODO }; "i/2fa/password-less": { req: TODO; res: TODO }; @@ -713,40 +710,6 @@ export type Endpoints = { "i/2fa/remove-key": { req: TODO; res: TODO }; "i/2fa/unregister": { req: TODO; res: TODO }; - // messaging - "messaging/history": { - req: { limit?: number; group?: boolean }; - res: MessagingMessage[]; - }; - "messaging/messages": { - req: { - userId?: User["id"]; - groupId?: UserGroup["id"]; - limit?: number; - sinceId?: MessagingMessage["id"]; - untilId?: MessagingMessage["id"]; - markAsRead?: boolean; - }; - res: MessagingMessage[]; - }; - "messaging/messages/create": { - req: { - userId?: User["id"]; - groupId?: UserGroup["id"]; - text?: string; - fileId?: DriveFile["id"]; - }; - res: MessagingMessage; - }; - "messaging/messages/delete": { - req: { messageId: MessagingMessage["id"] }; - res: null; - }; - "messaging/messages/read": { - req: { messageId: MessagingMessage["id"] }; - res: null; - }; - // meta meta: { req: { detail?: boolean }; @@ -1010,17 +973,6 @@ export type Endpoints = { }; "users/gallery/posts": { req: TODO; res: TODO }; "users/get-frequently-replied-users": { req: TODO; res: TODO }; - "users/groups/create": { req: TODO; res: TODO }; - "users/groups/delete": { req: { groupId: UserGroup["id"] }; res: null }; - "users/groups/invitations/accept": { req: TODO; res: TODO }; - "users/groups/invitations/reject": { req: TODO; res: TODO }; - "users/groups/invite": { req: TODO; res: TODO }; - "users/groups/joined": { req: TODO; res: TODO }; - "users/groups/owned": { req: TODO; res: TODO }; - "users/groups/pull": { req: TODO; res: TODO }; - "users/groups/show": { req: TODO; res: TODO }; - "users/groups/transfer": { req: TODO; res: TODO }; - "users/groups/update": { req: TODO; res: TODO }; "users/lists/create": { req: { name: string }; res: UserList }; "users/lists/delete": { req: { listId: UserList["id"] }; res: null }; "users/lists/list": { req: NoParams; res: UserList[] }; diff --git a/fe_calckey/frontend/calckey-js/src/consts.ts b/fe_calckey/frontend/calckey-js/src/consts.ts index 5f5c815..f72b5f7 100644 --- a/fe_calckey/frontend/calckey-js/src/consts.ts +++ b/fe_calckey/frontend/calckey-js/src/consts.ts @@ -9,7 +9,6 @@ export const notificationTypes = [ "pollEnded", "receiveFollowRequest", "followRequestAccepted", - "groupInvited", "app", ] as const; @@ -49,8 +48,6 @@ export const permissions = [ "write:pages", "write:page-likes", "read:page-likes", - "read:user-groups", - "write:user-groups", "read:gallery", "write:gallery", "read:gallery-likes", diff --git a/fe_calckey/frontend/calckey-js/src/entities.ts b/fe_calckey/frontend/calckey-js/src/entities.ts index cc157fb..44238de 100644 --- a/fe_calckey/frontend/calckey-js/src/entities.ts +++ b/fe_calckey/frontend/calckey-js/src/entities.ts @@ -74,8 +74,6 @@ export type UserDetailed = UserLite & { url: string | null; }; -export type UserGroup = TODO; - export type UserList = { id: ID; createdAt: DateString; @@ -94,7 +92,6 @@ export type MeDetailed = UserDetailed & { hasUnreadAnnouncement: boolean; hasUnreadAntenna: boolean; hasUnreadMentions: boolean; - hasUnreadMessagingMessage: boolean; hasUnreadNotification: boolean; hasUnreadSpecifiedNotes: boolean; hideOnlineStatus: boolean; @@ -232,12 +229,6 @@ export type Notification = { user: User; userId: User["id"]; } - | { - type: "groupInvited"; - invitation: UserGroup; - user: User; - userId: User["id"]; - } | { type: "app"; header?: string | null; @@ -246,22 +237,6 @@ export type Notification = { } ); -export type MessagingMessage = { - id: ID; - createdAt: DateString; - file: DriveFile | null; - fileId: DriveFile["id"] | null; - isRead: boolean; - reads: User["id"][]; - text: string | null; - user: User; - userId: User["id"]; - recipient?: User | null; - recipientId: User["id"] | null; - group?: UserGroup | null; - groupId: UserGroup["id"] | null; -}; - export type CustomEmoji = { id: string; name: string; @@ -379,9 +354,8 @@ export type Antenna = { name: string; keywords: string[][]; // TODO excludeKeywords: string[][]; // TODO - src: "home" | "all" | "users" | "list" | "group" | "instances"; + src: "home" | "all" | "users" | "list" | "instances"; userListId: ID | null; // TODO - userGroupId: ID | null; // TODO users: string[]; // TODO instances: string[]; caseSensitive: boolean; diff --git a/fe_calckey/frontend/calckey-js/src/streaming.types.ts b/fe_calckey/frontend/calckey-js/src/streaming.types.ts index 7b1994c..078f855 100644 --- a/fe_calckey/frontend/calckey-js/src/streaming.types.ts +++ b/fe_calckey/frontend/calckey-js/src/streaming.types.ts @@ -3,12 +3,10 @@ import type { CustomEmoji, DriveFile, MeDetailed, - MessagingMessage, Note, Notification, PageEvent, User, - UserGroup, } from "./entities"; type FIXME = any; @@ -33,9 +31,6 @@ export type Channels = { readAllUnreadMentions: () => void; unreadSpecifiedNote: (payload: Note["id"]) => void; readAllUnreadSpecifiedNotes: () => void; - readAllMessagingMessages: () => void; - messagingMessage: (payload: MessagingMessage) => void; - unreadMessagingMessage: (payload: MessagingMessage) => void; readAllAntennas: () => void; unreadAntenna: (payload: Antenna) => void; readAllAnnouncements: () => void; @@ -97,23 +92,6 @@ export type Channels = { }; receives: null; }; - messaging: { - params: { - otherparty?: User["id"] | null; - group?: UserGroup["id"] | null; - }; - events: { - message: (payload: MessagingMessage) => void; - deleted: (payload: MessagingMessage["id"]) => void; - read: (payload: MessagingMessage["id"][]) => void; - typers: (payload: User[]) => void; - }; - receives: { - read: { - id: MessagingMessage["id"]; - }; - }; - }; serverStats: { params: null; events: { @@ -189,7 +167,5 @@ export type NoteUpdatedEvent = export type BroadcastEvents = { noteUpdated: (payload: NoteUpdatedEvent) => void; - emojiAdded: (payload: { - emoji: CustomEmoji; - }) => void; + emojiAdded: (payload: { emoji: CustomEmoji }) => void; }; diff --git a/fe_calckey/frontend/client/src/components/MkNotification.vue b/fe_calckey/frontend/client/src/components/MkNotification.vue index 9b7f9fd..04a0f09 100644 --- a/fe_calckey/frontend/client/src/components/MkNotification.vue +++ b/fe_calckey/frontend/client/src/components/MkNotification.vue @@ -35,10 +35,6 @@ v-else-if="notification.type === 'followRequestAccepted'" class="ph-check ph-bold" > - - {{ i18n.ts.groupInvited }}: - {{ notification.invitation.group.name }} -
- - | - -
-
@@ -358,21 +332,6 @@ onUnmounted(() => { }); const followRequestDone = ref(false); -const groupInviteDone = ref(false); - -const acceptGroupInvitation = () => { - groupInviteDone.value = true; - os.apiWithDialog("users/groups/invitations/accept", { - invitationId: props.notification.invitation.id, - }); -}; - -const rejectGroupInvitation = () => { - groupInviteDone.value = true; - os.api("users/groups/invitations/reject", { - invitationId: props.notification.invitation.id, - }); -}; useTooltip(reactionRef, (showing) => { if (props.notification.type !== "reaction") return; diff --git a/fe_calckey/frontend/client/src/navbar.ts b/fe_calckey/frontend/client/src/navbar.ts index e11d758..f74810a 100644 --- a/fe_calckey/frontend/client/src/navbar.ts +++ b/fe_calckey/frontend/client/src/navbar.ts @@ -51,14 +51,6 @@ export const navbarItemDef = reactive({ show: computed(() => $i != null), to: "/my/lists", }, - /* - groups: { - title: 'groups', - icon: 'ph-users-three ph-bold ph-lg', - show: computed(() => $i != null), - to: '/my/groups', - }, - */ antennas: { title: "antennas", icon: "ph-flying-saucer ph-bold ph-lg", @@ -87,11 +79,6 @@ export const navbarItemDef = reactive({ show: computed(() => $i != null), to: "/my/clips", }, - groups: { - title: "groups", - icon: "ph-users-three ph-bold ph-lg", - to: "/my/groups", - }, ui: { title: "switchUi", icon: "ph-layout ph-bold ph-lg", diff --git a/fe_calckey/frontend/client/src/pages/my-antennas/create.vue b/fe_calckey/frontend/client/src/pages/my-antennas/create.vue index 39950e8..484b093 100644 --- a/fe_calckey/frontend/client/src/pages/my-antennas/create.vue +++ b/fe_calckey/frontend/client/src/pages/my-antennas/create.vue @@ -18,7 +18,6 @@ let draft = $ref({ name: "", src: "all", userListId: null, - userGroupId: null, users: [], instances: [], keywords: [], diff --git a/fe_calckey/frontend/client/src/pages/my-antennas/editor.vue b/fe_calckey/frontend/client/src/pages/my-antennas/editor.vue index 52da64e..f25050f 100644 --- a/fe_calckey/frontend/client/src/pages/my-antennas/editor.vue +++ b/fe_calckey/frontend/client/src/pages/my-antennas/editor.vue @@ -12,7 +12,6 @@ {{ i18n.ts._antennaSources.users }} - @@ -31,20 +30,6 @@ {{ list.name }} - - - - src, @@ -159,13 +142,6 @@ watch( if (src === "list" && userLists === null) { userLists = await os.api("users/lists/list"); } - - if (src === "group" && userGroups === null) { - const groups1 = await os.api("users/groups/owned"); - const groups2 = await os.api("users/groups/joined"); - - userGroups = [...groups1, ...groups2]; - } } ); @@ -174,7 +150,6 @@ async function saveAntenna() { name, src, userListId, - userGroupId, withReplies, withFile, notify, diff --git a/fe_calckey/frontend/client/src/pages/my-groups/group.vue b/fe_calckey/frontend/client/src/pages/my-groups/group.vue deleted file mode 100644 index 4d4ca0d..0000000 --- a/fe_calckey/frontend/client/src/pages/my-groups/group.vue +++ /dev/null @@ -1,201 +0,0 @@ - - - - - diff --git a/fe_calckey/frontend/client/src/pages/my-groups/index.vue b/fe_calckey/frontend/client/src/pages/my-groups/index.vue deleted file mode 100644 index ccbbae5..0000000 --- a/fe_calckey/frontend/client/src/pages/my-groups/index.vue +++ /dev/null @@ -1,136 +0,0 @@ - - - - - diff --git a/fe_calckey/frontend/client/src/pages/settings/email.vue b/fe_calckey/frontend/client/src/pages/settings/email.vue index 6c73191..5dffcee 100644 --- a/fe_calckey/frontend/client/src/pages/settings/email.vue +++ b/fe_calckey/frontend/client/src/pages/settings/email.vue @@ -50,12 +50,6 @@ > {{ i18n.ts._notification._types.receiveFollowRequest }} - - {{ i18n.ts._notification._types.groupInvited }} - @@ -106,9 +100,6 @@ const emailNotification_follow = ref( const emailNotification_receiveFollowRequest = ref( $i!.emailNotificationTypes.includes("receiveFollowRequest") ); -const emailNotification_groupInvited = ref( - $i!.emailNotificationTypes.includes("groupInvited") -); const saveNotificationSettings = () => { os.api("i/update", { @@ -122,7 +113,6 @@ const saveNotificationSettings = () => { ? "receiveFollowRequest" : null, ], - ...[emailNotification_groupInvited.value ? "groupInvited" : null], ].filter((x) => x != null), }); }; @@ -134,7 +124,6 @@ watch( emailNotification_quote, emailNotification_follow, emailNotification_receiveFollowRequest, - emailNotification_groupInvited, ], () => { saveNotificationSettings(); diff --git a/fe_calckey/frontend/client/src/pages/settings/notifications.vue b/fe_calckey/frontend/client/src/pages/settings/notifications.vue index 7aa11ef..42bcedf 100644 --- a/fe_calckey/frontend/client/src/pages/settings/notifications.vue +++ b/fe_calckey/frontend/client/src/pages/settings/notifications.vue @@ -13,9 +13,6 @@ {{ i18n.ts.markAsReadAllUnreadNotes }} - {{ - i18n.ts.markAsReadAllTalkMessages - }} @@ -52,7 +49,6 @@ import { defineAsyncComponent } from "vue"; import { notificationTypes } from "calckey-js"; import FormButton from "@/components/MkButton.vue"; -import FormLink from "@/components/form/link.vue"; import FormSection from "@/components/form/section.vue"; import * as os from "@/os"; import { $i } from "@/account"; @@ -73,10 +69,6 @@ async function readAllUnreadNotes() { await os.api("i/read-all-unread-notes"); } -async function readAllMessagingMessages() { - await os.api("i/read-all-messaging-messages"); -} - async function readAllNotifications() { await os.api("notifications/mark-all-as-read"); } diff --git a/fe_calckey/frontend/client/src/router.ts b/fe_calckey/frontend/client/src/router.ts index 4df5275..e9f40bb 100644 --- a/fe_calckey/frontend/client/src/router.ts +++ b/fe_calckey/frontend/client/src/router.ts @@ -607,16 +607,6 @@ export const routes = [ component: page(() => import("./pages/my-clips/index.vue")), loginRequired: true, }, - { - path: "/my/groups", - component: page(() => import("./pages/my-groups/index.vue")), - loginRequired: true, - }, - { - path: "/my/groups/:groupId", - component: page(() => import("./pages/my-groups/group.vue")), - loginRequired: true, - }, { path: "/my/antennas/create", component: page(() => import("./pages/my-antennas/create.vue")), diff --git a/fe_calckey/frontend/client/src/scripts/get-user-menu.ts b/fe_calckey/frontend/client/src/scripts/get-user-menu.ts index 4ab994d..804ee88 100644 --- a/fe_calckey/frontend/client/src/scripts/get-user-menu.ts +++ b/fe_calckey/frontend/client/src/scripts/get-user-menu.ts @@ -41,29 +41,6 @@ export function getUserMenu( }); } - async function inviteGroup() { - const groups = await os.api("users/groups/owned"); - if (groups.length === 0) { - os.alert({ - type: "error", - text: i18n.ts.youHaveNoGroups, - }); - return; - } - const { canceled, result: groupId } = await os.select({ - title: i18n.ts.group, - items: groups.map((group) => ({ - value: group.id, - text: group.name, - })), - }); - if (canceled) return; - os.apiWithDialog("users/groups/invite", { - groupId: groupId, - userId: user.id, - }); - } - async function toggleMute() { if (magTransProperty(user, "mute", "isMuted")) { os.apiWithDialog("mute/delete", { @@ -304,14 +281,6 @@ export function getUserMenu( text: i18n.ts.addToList, action: pushList, }, - meId !== user.id - ? { - icon: "ph-users-three ph-bold ph-lg", - text: i18n.ts.inviteToGroup, - action: inviteGroup, - } - : undefined, - null, { icon: magTransProperty(user, "mute_renotes", "isRenoteMuted") ? "ph-eye ph-bold ph-lg" diff --git a/fe_calckey/frontend/client/src/ui/universal.vue b/fe_calckey/frontend/client/src/ui/universal.vue index 8f2a2b9..9f5bf32 100644 --- a/fe_calckey/frontend/client/src/ui/universal.vue +++ b/fe_calckey/frontend/client/src/ui/universal.vue @@ -136,11 +136,11 @@