From: Dessalines <tyhou13@gmx.com>
Date: Tue, 8 Dec 2020 18:17:55 +0000 (-0500)
Subject: Merge branch 'main' into move_views_to_diesel
X-Git-Url: http://these/git/%22/display/44b525e5-4101b003e005e70a-d472d963/static/%7Bthis.captchaPngSrc%28%29%7D?a=commitdiff_plain;h=46e38bf7141f8df336dc883deb768a7599a36728;p=lemmy.git

Merge branch 'main' into move_views_to_diesel
---

46e38bf7141f8df336dc883deb768a7599a36728
diff --cc docs/src/about/goals.md
index ea86db07,e7d8e8dc..0ce019fc
--- a/docs/src/about/goals.md
+++ b/docs/src/about/goals.md
@@@ -36,20 -36,3 +36,4 @@@
  - [Rust docker build](https://shaneutt.com/blog/rust-fast-small-docker-image-builds/)
  - [Zurb mentions](https://github.com/zurb/tribute)
  - [TippyJS](https://github.com/atomiks/tippyjs)
 +- [SQL function indexes](https://sorentwo.com/2013/12/30/let-postgres-do-the-work.html)
- 
- ## Activitypub guides
- 
- - https://blog.joinmastodon.org/2018/06/how-to-implement-a-basic-activitypub-server/
- - https://raw.githubusercontent.com/w3c/activitypub/gh-pages/activitypub-tutorial.txt
- - https://github.com/tOkeshu/activitypub-example
- - https://blog.joinmastodon.org/2018/07/how-to-make-friends-and-verify-requests/
- - Use the [activitypub crate.](https://docs.rs/activitypub/0.1.4/activitypub/)
- - https://docs.rs/activitypub/0.1.4/activitypub/
- - [Activitypub vocab.](https://www.w3.org/TR/activitystreams-vocabulary/)
- - [Activitypub main](https://www.w3.org/TR/activitypub/)
- - [Federation.md](https://github.com/dariusk/gathio/blob/7fc93dbe9d4d99457a0e85c6c532112f415b7af2/FEDERATION.md)
- - [Activitypub implementers guide](https://socialhub.activitypub.rocks/t/draft-guide-for-new-activitypub-implementers/479)
- - [Data storage questions](https://socialhub.activitypub.rocks/t/data-storage-questions/579/3)
- - [Activitypub as it has been understood](https://flak.tedunangst.com/post/ActivityPub-as-it-has-been-understood)
- - [Asonix http signatures in rust](https://git.asonix.dog/Aardwolf/http-signature-normalization)
diff --cc lemmy_api/src/community.rs
index dcd9be05,d7de0e6b..fe7748f9
--- a/lemmy_api/src/community.rs
+++ b/lemmy_api/src/community.rs
@@@ -18,12 -19,8 +18,13 @@@ use lemmy_db::
    naive_now,
    post::Post,
    site::*,
 -  user_view::*,
 +  views::{
 +    community_follower_view::CommunityFollowerView,
 +    community_moderator_view::CommunityModeratorView,
 +    community_view::{CommunityQueryBuilder, CommunityView},
 +    user_view::UserViewSafe,
 +  },
+   ApubObject,
    Bannable,
    Crud,
    Followable,
diff --cc lemmy_apub/src/activities/receive/community.rs
index 80c911b1,b1866283..16b0c4e3
--- a/lemmy_apub/src/activities/receive/community.rs
+++ b/lemmy_apub/src/activities/receive/community.rs
@@@ -4,7 -4,7 +4,7 @@@ use activitystreams::
    base::{AnyBase, ExtendsExt},
  };
  use anyhow::Context;
- use lemmy_db::{community::Community, views::community_view::CommunityView};
 -use lemmy_db::{community::Community, community_view::CommunityView, ApubObject};
++use lemmy_db::{community::Community, views::community_view::CommunityView, ApubObject};
  use lemmy_structs::{blocking, community::CommunityResponse};
  use lemmy_utils::{location_info, LemmyError};
  use lemmy_websocket::{messages::SendCommunityRoomMessage, LemmyContext, UserOperation};
diff --cc lemmy_apub/src/fetcher.rs
index 0eb33cb7,ad977f5b..7556580e
--- a/lemmy_apub/src/fetcher.rs
+++ b/lemmy_apub/src/fetcher.rs
@@@ -13,15 -13,16 +13,15 @@@ use anyhow::{anyhow, Context}
  use chrono::NaiveDateTime;
  use diesel::result::Error::NotFound;
  use lemmy_db::{
-   comment::{Comment, CommentForm},
+   comment::Comment,
    comment_view::CommentView,
-   community::{Community, CommunityForm, CommunityModerator, CommunityModeratorForm},
+   community::{Community, CommunityModerator, CommunityModeratorForm},
 -  community_view::CommunityView,
    naive_now,
-   post::{Post, PostForm},
+   post::Post,
    post_view::PostView,
-   user::{UserForm, User_},
+   user::User_,
 -  user_view::UserView,
 +  views::{community_view::CommunityView, user_view::UserViewSafe},
-   Crud,
+   ApubObject,
    Joinable,
    SearchType,
  };
diff --cc lemmy_apub/src/inbox/community_inbox.rs
index 37ae444e,4bdad2fa..1c7b32e9
--- a/lemmy_apub/src/inbox/community_inbox.rs
+++ b/lemmy_apub/src/inbox/community_inbox.rs
@@@ -28,8 -28,9 +28,9 @@@ use actix_web::{web, HttpRequest, HttpR
  use anyhow::{anyhow, Context};
  use lemmy_db::{
    community::{Community, CommunityFollower, CommunityFollowerForm},
 -  community_view::CommunityUserBanView,
    user::User_,
 +  views::community_user_ban_view::CommunityUserBanView,
+   ApubObject,
    DbPool,
    Followable,
  };