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

fixes

Browse Source
This commit is contained in:
phiresky 2023-07-23 21:00:16 +00:00
parent 4506309d83
commit 552120498b
5 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.lock generated
View File

@ -11,8 +11,7 @@ checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
[[package]] [[package]]
name = "activitypub_federation" name = "activitypub_federation"
version = "0.4.6" version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/phiresky/activitypub-federation-rust/?branch=raw-sending#7991eab37536067d312d75d4fbf2a769286d4dbe"
checksum = "4e6e7fefba6602240fcf612931b70640ad1e249dff833551ebc218f1c96a4193"
dependencies = [ dependencies = [
"activitystreams-kinds", "activitystreams-kinds",
"actix-web", "actix-web",

9
crates/db_schema/src/schema.rs
View File

@ -297,7 +297,7 @@ diesel::table! {
diesel::table! { diesel::table! {
federation_queue_state (domain) { federation_queue_state (domain) {
domain -> Text, domain -> Text,
last_successful_id -> Int4, last_successful_id -> Int8,
fail_count -> Int4, fail_count -> Int4,
last_retry -> Timestamptz, last_retry -> Timestamptz,
} }
@ -792,12 +792,18 @@ diesel::table! {
} }
diesel::table! { diesel::table! {
use diesel::sql_types::*;
use super::sql_types::ActorTypeEnum;
sent_activity (id) { sent_activity (id) {
id -> Int8, id -> Int8,
ap_id -> Text, ap_id -> Text,
data -> Json, data -> Json,
sensitive -> Bool, sensitive -> Bool,
published -> Timestamp, published -> Timestamp,
send_targets -> Jsonb,
actor_type -> ActorTypeEnum,
actor_apub_id -> Text,
} }
} }
@ -892,7 +898,6 @@ diesel::joinable!(custom_emoji_keyword -> custom_emoji (custom_emoji_id));
diesel::joinable!(email_verification -> local_user (local_user_id)); diesel::joinable!(email_verification -> local_user (local_user_id));
diesel::joinable!(federation_allowlist -> instance (instance_id)); diesel::joinable!(federation_allowlist -> instance (instance_id));
diesel::joinable!(federation_blocklist -> instance (instance_id)); diesel::joinable!(federation_blocklist -> instance (instance_id));
diesel::joinable!(federation_queue_state -> activity (last_successful_id));
diesel::joinable!(local_site -> site (site_id)); diesel::joinable!(local_site -> site (site_id));
diesel::joinable!(local_site_rate_limit -> local_site (local_site_id)); diesel::joinable!(local_site_rate_limit -> local_site (local_site_id));
diesel::joinable!(local_user -> person (person_id)); diesel::joinable!(local_user -> person (person_id));

21
migrations/2023-07-09-115243_persistent-activity-queue/up.sql
View File

@ -1,21 +0,0 @@
CREATE TYPE actor_type_enum AS enum(
'site',
'community',
'person'
);
ALTER TABLE activity
ADD COLUMN send_targets jsonb DEFAULT NULL,
ADD COLUMN actor_type actor_type_enum DEFAULT NULL,
ADD COLUMN actor_apub_id text DEFAULT NULL;
CREATE TABLE federation_queue_state(
domain text PRIMARY KEY,
last_successful_id integer NOT NULL,
fail_count integer NOT NULL,
last_retry timestamptz NOT NULL
);
-- for incremental fetches of followers
CREATE INDEX idx_community_follower_published ON community_follower(published);

2
migrations/2023-07-09-115243_persistent-activity-queue/down.sql → migrations/2023-08-01-115243_persistent-activity-queue/down.sql
View File

@ -1,4 +1,4 @@
ALTER TABLE activity ALTER TABLE sent_activity
DROP COLUMN send_targets, DROP COLUMN send_targets,
DROP COLUMN actor_apub_id, DROP COLUMN actor_apub_id,
DROP COLUMN actor_type; DROP COLUMN actor_type;

26
migrations/2023-08-01-115243_persistent-activity-queue/up.sql Normal file
View File

@ -0,0 +1,26 @@
CREATE TYPE actor_type_enum AS enum(
'site',
'community',
'person'
);
ALTER TABLE sent_activity
ADD COLUMN send_targets jsonb NOT NULL DEFAULT '{"inboxes": [], "community_followers_of": [], "all_instances": false}',
ADD COLUMN actor_type actor_type_enum NOT NULL DEFAULT 'person',
ADD COLUMN actor_apub_id text NOT NULL DEFAULT '';
ALTER TABLE sent_activity
ALTER COLUMN send_targets DROP DEFAULT,
ALTER COLUMN actor_type DROP DEFAULT,
ALTER COLUMN actor_apub_id DROP DEFAULT;
CREATE TABLE federation_queue_state(
domain text PRIMARY KEY,
last_successful_id bigint NOT NULL,
fail_count integer NOT NULL,
last_retry timestamptz NOT NULL
);
-- for incremental fetches of followers
CREATE INDEX idx_community_follower_published ON community_follower(published);