Index: CHANGELOG.de.md =================================================================== --- CHANGELOG.de.md (revision 1c2dcbaa5456f3903606d3d13a56c7661366fdda) +++ CHANGELOG.de.md (revision 737ea05350ed2cb26c87fffc0f5a108905f63c7e) @@ -8,5 +8,6 @@ ### Hinzugefügt - **Einen Beitrag im Fediverse melden.** Von einem Fediverse-Beitrag aus kannst du ihn jetzt den - Moderatoren seines Heimatservers melden, mit optionaler Begründung. + Moderatoren seines Heimatservers melden, mit optionaler Begründung — und meldet jemand deine Seite, + erscheint die Meldung in deinen Fediverse-Benachrichtigungen. - **Sprache eines Beitrags festlegen.** Wähle, in welcher Sprache du einen Beitrag geschrieben hast — im Fediverse funktionieren damit der Sprachfilter der Timeline und die Übersetzen-Schaltfläche. Index: CHANGELOG.md =================================================================== --- CHANGELOG.md (revision 1c2dcbaa5456f3903606d3d13a56c7661366fdda) +++ CHANGELOG.md (revision 737ea05350ed2cb26c87fffc0f5a108905f63c7e) @@ -8,5 +8,6 @@ ### Added - **Report a post to the fediverse.** From a fediverse post you can now report it to the moderators - of its own home server, with an optional reason. + of its own home server, with an optional reason — and if someone reports your site, the report + shows up in your fediverse notifications. - **Set a post's language.** Choose the language you wrote a post in — on the fediverse it enables timeline language filtering and the translate button. Index: CHANGELOG.nl.md =================================================================== --- CHANGELOG.nl.md (revision 1c2dcbaa5456f3903606d3d13a56c7661366fdda) +++ CHANGELOG.nl.md (revision 737ea05350ed2cb26c87fffc0f5a108905f63c7e) @@ -8,5 +8,6 @@ ### Toegevoegd - **Rapporteer een post op de fediverse.** Vanaf een fediverse-post kun je die nu melden bij de - moderators van de eigen server van die post, met een optionele reden. + moderators van de eigen server van die post, met een optionele reden — en meldt iemand jouw site, + dan verschijnt die melding in je fediverse-meldingen. - **Stel de taal van een post in.** Kies in welke taal je een post schreef — op de fediverse werkt daarmee het taalfilter van de tijdlijn en de vertaal-knop. Index: src/config/database.js =================================================================== --- src/config/database.js (revision 1c2dcbaa5456f3903606d3d13a56c7661366fdda) +++ src/config/database.js (revision 737ea05350ed2cb26c87fffc0f5a108905f63c7e) @@ -347,4 +347,15 @@ ); CREATE INDEX IF NOT EXISTS idx_poll_votes_post ON poll_votes(post_id); + CREATE TABLE IF NOT EXISTS ap_reports ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + slug TEXT NOT NULL, -- our site the report is about (its owner moderates) + actor_uri TEXT, -- the reporter's actor URI + actor_name TEXT, actor_handle TEXT, actor_icon TEXT, + content TEXT, -- the reason (plain text) + objects TEXT, -- JSON array of reported object URIs (our actor + statuses) + seen INTEGER DEFAULT 0, + created_at DATETIME DEFAULT CURRENT_TIMESTAMP + ); + CREATE INDEX IF NOT EXISTS idx_ap_reports_slug ON ap_reports(slug, created_at); `); // "Feature" a followed account: its posts show in the local Cirkel. Index: src/services/ActivityPubService.js =================================================================== --- src/services/ActivityPubService.js (revision 1c2dcbaa5456f3903606d3d13a56c7661366fdda) +++ src/services/ActivityPubService.js (revision 737ea05350ed2cb26c87fffc0f5a108905f63c7e) @@ -936,5 +936,5 @@ // Blocked actor/domain → silently drop (202, don't reveal the block). if (claimedActor && isBlockedAny(claimedActor)) { console.log('[AP] inbox dropped (blocked)', claimedActor, 'from', ip); return 202; } - const GATED = ['Create', 'Like', 'Announce', 'Follow', 'Delete', 'Undo', 'Accept', 'Reject', 'Add', 'Remove', 'Update']; + const GATED = ['Create', 'Like', 'Announce', 'Follow', 'Delete', 'Undo', 'Accept', 'Reject', 'Add', 'Remove', 'Update', 'Flag']; if (GATED.includes(type)) { if (!verified || !claimedActor || verified.id !== claimedActor) { @@ -942,4 +942,30 @@ return 401; } + } + + // A moderation report (Flag) about our content — store it for the targeted site's owner + // (each Klonkt site is moderated by its own owner). Signature is enforced (GATED). + if (type === 'Flag') { + const objs = Array.isArray(act.object) ? act.object : (act.object ? [act.object] : []); + const objectUris = objs.map((o) => (typeof o === 'string' ? o : (o && o.id))).filter(Boolean); + let targetSlug = null; + const noteIds = []; + for (const u of objectUris) { + const s = slugFromActorUrl(u); // one of our actors? + if (s) { targetSlug = targetSlug || s; continue; } + const pid = postIdFromNoteUrl(u, base); // one of our notes? + if (pid) noteIds.push(pid); + } + if (!targetSlug && noteIds.length) { + try { const r = db.prepare('SELECT s.slug FROM posts p JOIN sites s ON s.id = p.site_id WHERE p.id = ? LIMIT 1').get(noteIds[0]); if (r) targetSlug = r.slug; } catch { /* ignore */ } + } + if (!targetSlug) return 202; // not about us / can't tell → drop + const ai = actorInfo(await resolveActor(claimedActor).catch(() => null), claimedActor); + try { + db.prepare('INSERT INTO ap_reports (slug, actor_uri, actor_name, actor_handle, actor_icon, content, objects, created_at) VALUES (?,?,?,?,?,?,?,CURRENT_TIMESTAMP)') + .run(targetSlug, claimedActor || null, ai.name, ai.handle, ai.icon, HtmlSanitizerService.toPlainText(act.content || '').slice(0, 3000), JSON.stringify(objectUris.slice(0, 20))); + console.log('[AP] report received for', targetSlug, 'from', claimedActor); + } catch { /* ignore */ } + return 202; } @@ -2110,4 +2136,9 @@ }); } catch { /* ignore */ } + try { + for (const r of db.prepare('SELECT actor_uri, actor_name, actor_handle, actor_icon, content, created_at FROM ap_reports WHERE slug = ? ORDER BY created_at DESC LIMIT 50').all(slug)) { + out.push({ type: 'report', name: r.actor_name, handle: r.actor_handle, url: r.actor_uri, icon: r.actor_icon, content: r.content, created_at: r.created_at }); + } + } catch { /* ignore */ } out.sort((a, b) => new Date(b.created_at) - new Date(a.created_at)); return out.slice(0, limit || 60); Index: src/services/i18n.js =================================================================== --- src/services/i18n.js (revision 1c2dcbaa5456f3903606d3d13a56c7661366fdda) +++ src/services/i18n.js (revision 737ea05350ed2cb26c87fffc0f5a108905f63c7e) @@ -28,5 +28,5 @@ 'nav.language': 'Taal', 'nav.notifications': 'Meldingen', - 'notif.title': 'Meldingen', 'notif.empty': 'Nog geen meldingen.', 'notif.someone': 'Iemand', 'notif.followed': 'volgt je nu', 'notif.liked': 'likete je post', 'notif.boosted': 'boostte je post', 'notif.replied': 'reageerde op', 'blk.title': 'Blokkeren', 'blk.lead': 'Blokkeer een account of een heel domein — hun reacties, likes en posts verdwijnen en nieuwe worden geweigerd.', 'blk.block_btn': 'Blokkeren', 'blk.empty': 'Niks geblokkeerd.', 'blk.unblock': 'Deblokkeren', 'tl.block': 'Blokkeer', + 'notif.title': 'Meldingen', 'notif.empty': 'Nog geen meldingen.', 'notif.someone': 'Iemand', 'notif.followed': 'volgt je nu', 'notif.liked': 'likete je post', 'notif.boosted': 'boostte je post', 'notif.replied': 'reageerde op', 'notif.reported': 'rapporteerde je bij hun server', 'blk.title': 'Blokkeren', 'blk.lead': 'Blokkeer een account of een heel domein — hun reacties, likes en posts verdwijnen en nieuwe worden geweigerd.', 'blk.block_btn': 'Blokkeren', 'blk.empty': 'Niks geblokkeerd.', 'blk.unblock': 'Deblokkeren', 'tl.block': 'Blokkeer', 'notif.reply': '{actor} reageerde op je reactie', 'notif.comment': '{actor} reageerde op je post', 'notif.like': '{actor} vindt je post leuk', 'switch.agenda': 'Agenda', @@ -959,5 +959,5 @@ 'nav.language': 'Language', 'nav.notifications': 'Notifications', - 'notif.title': 'Notifications', 'notif.empty': 'No notifications yet.', 'notif.someone': 'Someone', 'notif.followed': 'followed you', 'notif.liked': 'liked your post', 'notif.boosted': 'boosted your post', 'notif.replied': 'replied to', 'blk.title': 'Blocking', 'blk.lead': 'Block an account or a whole domain — their replies, likes and posts disappear and new ones are refused.', 'blk.block_btn': 'Block', 'blk.empty': 'Nothing blocked.', 'blk.unblock': 'Unblock', 'tl.block': 'Block', + 'notif.title': 'Notifications', 'notif.empty': 'No notifications yet.', 'notif.someone': 'Someone', 'notif.followed': 'followed you', 'notif.liked': 'liked your post', 'notif.boosted': 'boosted your post', 'notif.replied': 'replied to', 'notif.reported': 'reported you to their server', 'blk.title': 'Blocking', 'blk.lead': 'Block an account or a whole domain — their replies, likes and posts disappear and new ones are refused.', 'blk.block_btn': 'Block', 'blk.empty': 'Nothing blocked.', 'blk.unblock': 'Unblock', 'tl.block': 'Block', 'notif.reply': '{actor} replied to your comment', 'notif.comment': '{actor} commented on your post', 'notif.like': '{actor} liked your post', 'switch.agenda': 'Agenda', @@ -1881,5 +1881,5 @@ 'nav.language': 'Sprache', 'nav.notifications': 'Benachrichtigungen', - 'notif.title': 'Benachrichtigungen', 'notif.empty': 'Noch keine Benachrichtigungen.', 'notif.someone': 'Jemand', 'notif.followed': 'folgt dir jetzt', 'notif.liked': 'gefällt dein Beitrag', 'notif.boosted': 'teilte deinen Beitrag', 'notif.replied': 'antwortete auf', 'blk.title': 'Blockieren', 'blk.lead': 'Blockiere ein Konto oder eine ganze Domain — ihre Antworten, Likes und Beiträge verschwinden und neue werden abgelehnt.', 'blk.block_btn': 'Blockieren', 'blk.empty': 'Nichts blockiert.', 'blk.unblock': 'Entsperren', 'tl.block': 'Blockieren', + 'notif.title': 'Benachrichtigungen', 'notif.empty': 'Noch keine Benachrichtigungen.', 'notif.someone': 'Jemand', 'notif.followed': 'folgt dir jetzt', 'notif.liked': 'gefällt dein Beitrag', 'notif.boosted': 'teilte deinen Beitrag', 'notif.replied': 'antwortete auf', 'notif.reported': 'hat dich bei ihrem Server gemeldet', 'blk.title': 'Blockieren', 'blk.lead': 'Blockiere ein Konto oder eine ganze Domain — ihre Antworten, Likes und Beiträge verschwinden und neue werden abgelehnt.', 'blk.block_btn': 'Blockieren', 'blk.empty': 'Nichts blockiert.', 'blk.unblock': 'Entsperren', 'tl.block': 'Blockieren', 'notif.reply': '{actor} hat auf deinen Kommentar geantwortet', 'notif.comment': '{actor} hat deinen Beitrag kommentiert', 'notif.like': '{actor} gefällt dein Beitrag', 'switch.agenda': 'Termine', Index: src/views/pages/fedi-notifications.ejs =================================================================== --- src/views/pages/fedi-notifications.ejs (revision 1c2dcbaa5456f3903606d3d13a56c7661366fdda) +++ src/views/pages/fedi-notifications.ejs (revision 737ea05350ed2cb26c87fffc0f5a108905f63c7e) @@ -7,5 +7,5 @@