skywatch.blue
A tool for parsing traffic on the jetstream and applying a moderation workstream based on regexp based rules
Refactor: Move LINK_SHORTENER to constants file
Move the `LINK_SHORTENER` constant from `rules/posts.ts` to
`rules/constants.ts` and remove the now duplicate declaration.
+1
-1
eslint.config.mjs
+1
-1
eslint.config.mjs
···
1
import eslint from "@eslint/js";
2
import stylistic from "@stylistic/eslint-plugin";
3
-
import { defineConfig } from "eslint/config";
4
import prettier from "eslint-config-prettier";
5
import importPlugin from "eslint-plugin-import";
6
import tseslint from "typescript-eslint";
7
8
export default defineConfig(
···
1
import eslint from "@eslint/js";
2
import stylistic from "@stylistic/eslint-plugin";
3
import prettier from "eslint-config-prettier";
4
import importPlugin from "eslint-plugin-import";
5
+
import { defineConfig } from "eslint/config";
6
import tseslint from "typescript-eslint";
7
8
export default defineConfig(
+2
rules/constants.ts
+2
rules/constants.ts
-5
rules/posts.ts
-5
rules/posts.ts
+2
-2
src/config.ts
+2
-2
src/config.ts
···
20
export const CURSOR_UPDATE_INTERVAL = process.env.CURSOR_UPDATE_INTERVAL
21
? Number(process.env.CURSOR_UPDATE_INTERVAL)
22
: 60000;
23
-
export const {LABEL_LIMIT} = process.env;
24
-
export const {LABEL_LIMIT_WAIT} = process.env;
25
export const REDIS_URL = process.env.REDIS_URL ?? "redis://redis:6379";
···
20
export const CURSOR_UPDATE_INTERVAL = process.env.CURSOR_UPDATE_INTERVAL
21
? Number(process.env.CURSOR_UPDATE_INTERVAL)
22
: 60000;
23
+
export const { LABEL_LIMIT } = process.env;
24
+
export const { LABEL_LIMIT_WAIT } = process.env;
25
export const REDIS_URL = process.env.REDIS_URL ?? "redis://redis:6379";
+21
-18
src/main.ts
+21
-18
src/main.ts
···
2
import type {
3
CommitCreateEvent,
4
CommitUpdateEvent,
5
-
IdentityEvent} from "@skyware/jetstream";
6
-
import {
7
-
Jetstream,
8
} from "@skyware/jetstream";
9
import {
10
CURSOR_UPDATE_INTERVAL,
11
FIREHOSE_URL,
···
112
"app.bsky.feed.post",
113
(event: CommitCreateEvent<"app.bsky.feed.post">) => {
114
const atURI = `at://${event.did}/app.bsky.feed.post/${event.commit.rkey}`;
115
-
const hasEmbed = Object.prototype.hasOwnProperty.call(event.commit.record, "embed");
116
-
const hasFacets = Object.prototype.hasOwnProperty.call(event.commit.record, "facets");
117
-
const hasText = Object.prototype.hasOwnProperty.call(event.commit.record, "text");
118
119
const tasks: Promise<void>[] = [];
120
···
136
137
// Check account age for quote posts
138
if (hasEmbed) {
139
-
const {embed} = event.commit.record;
140
if (
141
embed &&
142
typeof embed === "object" &&
···
170
if (hasFacets) {
171
// Check for facet spam (hidden mentions with duplicate byte positions)
172
const facets = event.commit.record.facets ?? null;
173
-
tasks.push(
174
-
checkFacetSpam(
175
-
event.did,
176
-
event.time_us,
177
-
atURI,
178
-
facets,
179
-
),
180
-
);
181
182
const hasLinkType = facets?.some((facet) =>
183
facet.features.some(
···
225
}
226
227
if (hasEmbed) {
228
-
const {embed} = event.commit.record;
229
if (
230
embed &&
231
typeof embed === "object" &&
232
"$type" in embed &&
233
embed.$type === "app.bsky.embed.external"
234
) {
235
-
const {external} = embed as { external: { uri: string } };
236
const posts: Post[] = [
237
{
238
did: event.did,
···
252
"$type" in embed &&
253
embed.$type === "app.bsky.embed.recordWithMedia"
254
) {
255
-
const {media} = embed as { media: { $type: string; external?: { uri: string } } };
256
if (media.$type === "app.bsky.embed.external" && media.external) {
257
const posts: Post[] = [
258
{
···
2
import type {
3
CommitCreateEvent,
4
CommitUpdateEvent,
5
+
IdentityEvent,
6
} from "@skyware/jetstream";
7
+
import { Jetstream } from "@skyware/jetstream";
8
import {
9
CURSOR_UPDATE_INTERVAL,
10
FIREHOSE_URL,
···
111
"app.bsky.feed.post",
112
(event: CommitCreateEvent<"app.bsky.feed.post">) => {
113
const atURI = `at://${event.did}/app.bsky.feed.post/${event.commit.rkey}`;
114
+
const hasEmbed = Object.prototype.hasOwnProperty.call(
115
+
event.commit.record,
116
+
"embed",
117
+
);
118
+
const hasFacets = Object.prototype.hasOwnProperty.call(
119
+
event.commit.record,
120
+
"facets",
121
+
);
122
+
const hasText = Object.prototype.hasOwnProperty.call(
123
+
event.commit.record,
124
+
"text",
125
+
);
126
127
const tasks: Promise<void>[] = [];
128
···
144
145
// Check account age for quote posts
146
if (hasEmbed) {
147
+
const { embed } = event.commit.record;
148
if (
149
embed &&
150
typeof embed === "object" &&
···
178
if (hasFacets) {
179
// Check for facet spam (hidden mentions with duplicate byte positions)
180
const facets = event.commit.record.facets ?? null;
181
+
tasks.push(checkFacetSpam(event.did, event.time_us, atURI, facets));
182
183
const hasLinkType = facets?.some((facet) =>
184
facet.features.some(
···
226
}
227
228
if (hasEmbed) {
229
+
const { embed } = event.commit.record;
230
if (
231
embed &&
232
typeof embed === "object" &&
233
"$type" in embed &&
234
embed.$type === "app.bsky.embed.external"
235
) {
236
+
const { external } = embed as { external: { uri: string } };
237
const posts: Post[] = [
238
{
239
did: event.did,
···
253
"$type" in embed &&
254
embed.$type === "app.bsky.embed.recordWithMedia"
255
) {
256
+
const { media } = embed as {
257
+
media: { $type: string; external?: { uri: string } };
258
+
};
259
if (media.$type === "app.bsky.embed.external" && media.external) {
260
const posts: Post[] = [
261
{
-3
src/rules/account/tests/countStarterPacks.test.ts
-3
src/rules/account/tests/countStarterPacks.test.ts
+5
-1
src/rules/facets/facets.ts
+5
-1
src/rules/facets/facets.ts
-1
src/rules/facets/tests/facets.test.ts
-1
src/rules/facets/tests/facets.test.ts
+1
-8
src/rules/handles/checkHandles.test.ts
+1
-8
src/rules/handles/checkHandles.test.ts
···
1
-
2
-
3
-
4
-
5
-
6
-
7
-
8
import { beforeEach, describe, expect, it, vi } from "vitest";
9
import {
10
createAccountComment,
···
277
});
278
279
it("should handle very long handles", async () => {
280
-
const longHandle = `spam-${ "a".repeat(1000)}`;
281
const time = Date.now();
282
await checkHandle("did:plc:user1", longHandle, time);
283
···
1
import { beforeEach, describe, expect, it, vi } from "vitest";
2
import {
3
createAccountComment,
···
270
});
271
272
it("should handle very long handles", async () => {
273
+
const longHandle = `spam-${"a".repeat(1000)}`;
274
const time = Date.now();
275
await checkHandle("did:plc:user1", longHandle, time);
276
+4
-1
src/rules/handles/checkHandles.ts
+4
-1
src/rules/handles/checkHandles.ts
-6
src/rules/posts/tests/checkPosts.test.ts
-6
src/rules/posts/tests/checkPosts.test.ts
-6
src/rules/profiles/tests/checkProfiles.test.ts
-6
src/rules/profiles/tests/checkProfiles.test.ts
-1
src/tests/accountThreshold.test.ts
-1
src/tests/accountThreshold.test.ts
-1
src/tests/agent.test.ts
-1
src/tests/agent.test.ts
-5
src/tests/moderation.test.ts
-5
src/tests/moderation.test.ts
-1
src/tests/redis.test.ts
-1
src/tests/redis.test.ts
+6
-6
src/tests/session.test.ts
+6
-6
src/tests/session.test.ts
···
1
-
import { describe, it, expect, beforeEach, afterEach } from "vitest";
2
import {
3
existsSync,
4
mkdirSync,
5
-
rmSync,
6
-
writeFileSync,
7
readFileSync,
8
unlinkSync,
9
-
chmodSync,
10
} from "node:fs";
11
import { join } from "node:path";
12
import type { SessionData } from "../session.js";
13
14
const TEST_DIR = join(process.cwd(), ".test-session");
···
136
writeFileSync(
137
TEST_SESSION_PATH,
138
JSON.stringify({ accessJwt: "token" }),
139
-
"utf-8"
140
);
141
142
const session = testLoadSession();
···
151
refreshJwt: "refresh",
152
handle: "test.bsky.social",
153
}),
154
-
"utf-8"
155
);
156
157
const session = testLoadSession();
···
1
import {
2
+
chmodSync,
3
existsSync,
4
mkdirSync,
5
readFileSync,
6
+
rmSync,
7
unlinkSync,
8
+
writeFileSync,
9
} from "node:fs";
10
import { join } from "node:path";
11
+
import { afterEach, beforeEach, describe, expect, it } from "vitest";
12
import type { SessionData } from "../session.js";
13
14
const TEST_DIR = join(process.cwd(), ".test-session");
···
136
writeFileSync(
137
TEST_SESSION_PATH,
138
JSON.stringify({ accessJwt: "token" }),
139
+
"utf-8",
140
);
141
142
const session = testLoadSession();
···
151
refreshJwt: "refresh",
152
handle: "test.bsky.social",
153
}),
154
+
"utf-8",
155
);
156
157
const session = testLoadSession();