From c9338027f26170dffc95a052ecfc3def1bf3a729 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Fri, 3 Jul 2020 14:20:28 +0200
Subject: Migrate user and group to new activitystreams library

---
 server/src/apub/post.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server/src/apub/post.rs')

diff --git a/server/src/apub/post.rs b/server/src/apub/post.rs
index 60cb0b55..255629e8 100644
--- a/server/src/apub/post.rs
+++ b/server/src/apub/post.rs
@@ -164,7 +164,7 @@ impl FromApub for PostForm {
 
   /// Parse an ActivityPub page received from another instance into a Lemmy post.
   async fn from_apub(
-    page: &PageExt,
+    page: &mut PageExt,
     client: &Client,
     pool: &DbPool,
   ) -> Result<PostForm, LemmyError> {
-- 
cgit v1.2.3


From 80aef61aed29d25099835ee4769bb8e1e363eb47 Mon Sep 17 00:00:00 2001
From: nutomic <nutomic@noreply.yerbamate.dev>
Date: Fri, 10 Jul 2020 18:15:41 +0000
Subject: Split code into cargo workspaces (#67)

More fixes

- fixed docker builds
- fixed mentions regex test
- fixed DATABASE_URL stuff
- change schema path in diesel.toml

Address review comments

- add jsonb column back into activity table
- remove authors field from cargo.toml
- adjust LEMMY_DATABASE_URL env var usage
- rename all occurences of LEMMY_DATABASE_URL to DATABASE_URL

Decouple utils and db

Split code into cargo workspaces

Co-authored-by: Felix Ableitner <me@nutomic.com>
Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/67
---
 server/src/apub/post.rs | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'server/src/apub/post.rs')

diff --git a/server/src/apub/post.rs b/server/src/apub/post.rs
index 255629e8..ba0372c4 100644
--- a/server/src/apub/post.rs
+++ b/server/src/apub/post.rs
@@ -6,7 +6,6 @@ use crate::{
     create_tombstone,
     extensions::page_extension::PageExtension,
     fetcher::{get_or_fetch_and_upsert_remote_community, get_or_fetch_and_upsert_remote_user},
-    get_apub_protocol_string,
     ActorType,
     ApubLikeableType,
     ApubObjectType,
@@ -15,17 +14,9 @@ use crate::{
     ToApub,
   },
   blocking,
-  convert_datetime,
-  db::{
-    community::Community,
-    post::{Post, PostForm},
-    user::User_,
-    Crud,
-  },
   routes::DbPoolParam,
   DbPool,
   LemmyError,
-  Settings,
 };
 use activitystreams::{
   activity::{Create, Delete, Dislike, Like, Remove, Undo, Update},
@@ -36,6 +27,13 @@ use activitystreams::{
 use activitystreams_ext::Ext1;
 use activitystreams_new::object::Tombstone;
 use actix_web::{body::Body, client::Client, web, HttpResponse};
+use lemmy_db::{
+  community::Community,
+  post::{Post, PostForm},
+  user::User_,
+  Crud,
+};
+use lemmy_utils::{convert_datetime, get_apub_protocol_string, settings::Settings};
 use serde::Deserialize;
 
 #[derive(Deserialize)]
-- 
cgit v1.2.3