gf4/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-08-09 00:38:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixes after merge

Browse Source
This commit is contained in:
phiresky 2023-08-24 16:34:19 +00:00
parent 10e494020c
commit 9c793472fb
3 changed files with 865 additions and 729 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1588
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
crates/apub/src/fetcher/site_or_community_or_user.rs
View File

@ -7,7 +7,7 @@ use activitypub_federation::{
config::Data, config::Data,
traits::{Actor, Object}, traits::{Actor, Object},
}; };
use chrono::NaiveDateTime; use chrono::{DateTime, NaiveDateTime, Utc};
use lemmy_api_common::context::LemmyContext; use lemmy_api_common::context::LemmyContext;
use lemmy_utils::error::LemmyError; use lemmy_utils::error::LemmyError;
use reqwest::Url; use reqwest::Url;
@ -33,7 +33,7 @@ impl Object for SiteOrCommunityOrUser {
type Kind = SiteOrPersonOrGroup; type Kind = SiteOrPersonOrGroup;
type Error = LemmyError; type Error = LemmyError;
fn last_refreshed_at(&self) -> Option<NaiveDateTime> { fn last_refreshed_at(&self) -> Option<DateTime<Utc>> {
Some(match self { Some(match self {
SiteOrCommunityOrUser::Site(p) => p.last_refreshed_at, SiteOrCommunityOrUser::Site(p) => p.last_refreshed_at,
SiteOrCommunityOrUser::UserOrCommunity(p) => p.last_refreshed_at()?, SiteOrCommunityOrUser::UserOrCommunity(p) => p.last_refreshed_at()?,

2
crates/db_schema/src/impls/instance.rs
View File

@ -6,7 +6,7 @@ use crate::{
utils::{functions::lower, get_conn, naive_now, now, DbPool}, utils::{functions::lower, get_conn, naive_now, now, DbPool},
}; };
use diesel::{ use diesel::{
dsl::{count_star, insert_into, now}, dsl::{count_star, insert_into},
result::Error, result::Error,
sql_types::{Nullable, Timestamptz}, sql_types::{Nullable, Timestamptz},
ExpressionMethods, ExpressionMethods,