Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into hailey/decrement-badge
Browse files Browse the repository at this point in the history
  • Loading branch information
devinivy committed Oct 4, 2024
2 parents d51e904 + 08ed0a5 commit a603380
Show file tree
Hide file tree
Showing 683 changed files with 29,341 additions and 7,924 deletions.
5 changes: 5 additions & 0 deletions .changeset/eleven-walls-cover.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@atproto/bsky": patch
---

Allow using a handle as "actor" param in app.bsky.graph.getLists
5 changes: 0 additions & 5 deletions .changeset/giant-starfishes-fry.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/happy-eggs-swim.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/hot-cows-scream.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/old-tips-sneeze.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@atproto/bsky": patch
---

Add missing dev-dependency
5 changes: 5 additions & 0 deletions .changeset/short-cougars-relate.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@atproto/ozone": patch
---

Add proper typings
2 changes: 1 addition & 1 deletion .github/workflows/build-and-push-bsky-ghcr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
push:
branches:
- main
- divy/mod-full-thread
- bsky-tweaks
env:
REGISTRY: ghcr.io
USERNAME: ${{ github.actor }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-and-push-ozone-aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
push:
branches:
- main
- divy/ozone-passthru
env:
REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
USERNAME: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_USERNAME }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-push-pds-ghcr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
push:
branches:
- main
- divy/starter-packs
- msieben/micro-optimizations
env:
REGISTRY: ghcr.io
USERNAME: ${{ github.actor }}
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v4
with:
version: 8
- uses: actions/setup-node@v3
with:
node-version: 18
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/repo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ jobs:
- uses: pnpm/action-setup@v4
name: Install pnpm
with:
version: 8
run_install: false
- uses: actions/setup-node@v4
with:
Expand All @@ -45,7 +44,6 @@ jobs:
- uses: pnpm/action-setup@v4
name: Install pnpm
with:
version: 8
run_install: false
- uses: actions/setup-node@v4
with:
Expand All @@ -66,7 +64,6 @@ jobs:
- uses: pnpm/action-setup@v4
name: Install pnpm
with:
version: 8
run_install: false
- uses: actions/setup-node@v4
with:
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
18
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ deps: ## Installs dependent libs using 'pnpm install'
nvm-setup: ## Use NVM to install and activate node+pnpm
nvm install 18
nvm use 18
npm install --global pnpm
corepack enable
39 changes: 39 additions & 0 deletions lexicons/app/bsky/actor/defs.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@
"labels": {
"type": "array",
"items": { "type": "ref", "ref": "com.atproto.label.defs#label" }
},
"pinnedPost": {
"type": "ref",
"ref": "com.atproto.repo.strongRef"
}
}
},
Expand Down Expand Up @@ -419,6 +423,15 @@
"type": "array",
"maxLength": 1000,
"items": { "type": "string", "maxLength": 100 }
},
"nuxs": {
"description": "Storage for NUXs the user has encountered.",
"type": "array",
"maxLength": 100,
"items": {
"type": "ref",
"ref": "app.bsky.actor.defs#nux"
}
}
}
},
Expand All @@ -429,6 +442,32 @@
"properties": {
"guide": { "type": "string", "maxLength": 100 }
}
},
"nux": {
"type": "object",
"description": "A new user experiences (NUX) storage object",
"required": ["id", "completed"],
"properties": {
"id": {
"type": "string",
"maxLength": 100
},
"completed": {
"type": "boolean",
"default": false
},
"data": {
"description": "Arbitrary data for the NUX. The structure is defined by the NUX itself. Limited to 300 characters.",
"type": "string",
"maxLength": 3000,
"maxGraphemes": 300
},
"expiresAt": {
"type": "string",
"format": "datetime",
"description": "The date and time at which the NUX will expire and should be considered completed."
}
}
}
}
}
4 changes: 4 additions & 0 deletions lexicons/app/bsky/actor/profile.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@
"type": "ref",
"ref": "com.atproto.repo.strongRef"
},
"pinnedPost": {
"type": "ref",
"ref": "com.atproto.repo.strongRef"
},
"createdAt": { "type": "string", "format": "datetime" }
}
}
Expand Down
15 changes: 15 additions & 0 deletions lexicons/app/bsky/embed/defs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"lexicon": 1,
"id": "app.bsky.embed.defs",
"defs": {
"aspectRatio": {
"type": "object",
"description": "width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit.",
"required": ["width", "height"],
"properties": {
"width": { "type": "integer", "minimum": 1 },
"height": { "type": "integer", "minimum": 1 }
}
}
}
}
19 changes: 8 additions & 11 deletions lexicons/app/bsky/embed/images.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,10 @@
"type": "string",
"description": "Alt text description of the image, for accessibility."
},
"aspectRatio": { "type": "ref", "ref": "#aspectRatio" }
}
},
"aspectRatio": {
"type": "object",
"description": "width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit.",
"required": ["width", "height"],
"properties": {
"width": { "type": "integer", "minimum": 1 },
"height": { "type": "integer", "minimum": 1 }
"aspectRatio": {
"type": "ref",
"ref": "app.bsky.embed.defs#aspectRatio"
}
}
},
"view": {
Expand Down Expand Up @@ -68,7 +62,10 @@
"type": "string",
"description": "Alt text description of the image, for accessibility."
},
"aspectRatio": { "type": "ref", "ref": "#aspectRatio" }
"aspectRatio": {
"type": "ref",
"ref": "app.bsky.embed.defs#aspectRatio"
}
}
}
}
Expand Down
11 changes: 11 additions & 0 deletions lexicons/app/bsky/embed/record.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"#viewRecord",
"#viewNotFound",
"#viewBlocked",
"#viewDetached",
"app.bsky.feed.defs#generatorView",
"app.bsky.graph.defs#listView",
"app.bsky.labeler.defs#labelerView",
Expand Down Expand Up @@ -49,12 +50,14 @@
"replyCount": { "type": "integer" },
"repostCount": { "type": "integer" },
"likeCount": { "type": "integer" },
"quoteCount": { "type": "integer" },
"embeds": {
"type": "array",
"items": {
"type": "union",
"refs": [
"app.bsky.embed.images#view",
"app.bsky.embed.video#view",
"app.bsky.embed.external#view",
"app.bsky.embed.record#view",
"app.bsky.embed.recordWithMedia#view"
Expand All @@ -80,6 +83,14 @@
"blocked": { "type": "boolean", "const": true },
"author": { "type": "ref", "ref": "app.bsky.feed.defs#blockedAuthor" }
}
},
"viewDetached": {
"type": "object",
"required": ["uri", "detached"],
"properties": {
"uri": { "type": "string", "format": "at-uri" },
"detached": { "type": "boolean", "const": true }
}
}
}
}
12 changes: 10 additions & 2 deletions lexicons/app/bsky/embed/recordWithMedia.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@
},
"media": {
"type": "union",
"refs": ["app.bsky.embed.images", "app.bsky.embed.external"]
"refs": [
"app.bsky.embed.images",
"app.bsky.embed.video",
"app.bsky.embed.external"
]
}
}
},
Expand All @@ -27,7 +31,11 @@
},
"media": {
"type": "union",
"refs": ["app.bsky.embed.images#view", "app.bsky.embed.external#view"]
"refs": [
"app.bsky.embed.images#view",
"app.bsky.embed.video#view",
"app.bsky.embed.external#view"
]
}
}
}
Expand Down
66 changes: 66 additions & 0 deletions lexicons/app/bsky/embed/video.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
"lexicon": 1,
"id": "app.bsky.embed.video",
"description": "A video embedded in a Bluesky record (eg, a post).",
"defs": {
"main": {
"type": "object",
"required": ["video"],
"properties": {
"video": {
"type": "blob",
"accept": ["video/mp4"],
"maxSize": 50000000
},
"captions": {
"type": "array",
"items": { "type": "ref", "ref": "#caption" },
"maxLength": 20
},
"alt": {
"type": "string",
"description": "Alt text description of the video, for accessibility.",
"maxGraphemes": 1000,
"maxLength": 10000
},
"aspectRatio": {
"type": "ref",
"ref": "app.bsky.embed.defs#aspectRatio"
}
}
},
"caption": {
"type": "object",
"required": ["lang", "file"],
"properties": {
"lang": {
"type": "string",
"format": "language"
},
"file": {
"type": "blob",
"accept": ["text/vtt"],
"maxSize": 20000
}
}
},
"view": {
"type": "object",
"required": ["cid", "playlist"],
"properties": {
"cid": { "type": "string", "format": "cid" },
"playlist": { "type": "string", "format": "uri" },
"thumbnail": { "type": "string", "format": "uri" },
"alt": {
"type": "string",
"maxGraphemes": 1000,
"maxLength": 10000
},
"aspectRatio": {
"type": "ref",
"ref": "app.bsky.embed.defs#aspectRatio"
}
}
}
}
}
Loading

0 comments on commit a603380

Please sign in to comment.