Skip to content

Commit

Permalink
Update atproto
Browse files Browse the repository at this point in the history
  • Loading branch information
mnogu committed Jun 9, 2024
1 parent 6b7aa4a commit 43eff57
Show file tree
Hide file tree
Showing 10 changed files with 98 additions and 6 deletions.
2 changes: 1 addition & 1 deletion atproto
Submodule atproto updated 41 files
+40 −0 lexicons/com/atproto/admin/searchAccounts.json
+4 −0 lexicons/com/atproto/admin/updateSubjectStatus.json
+60 −0 lexicons/tools/ozone/server/getConfig.json
+12 −0 packages/api/CHANGELOG.md
+1 −1 packages/api/package.json
+36 −0 packages/api/src/client/index.ts
+112 −0 packages/api/src/client/lexicons.ts
+39 −0 packages/api/src/client/types/com/atproto/admin/searchAccounts.ts
+1 −0 packages/api/src/client/types/com/atproto/admin/updateSubjectStatus.ts
+75 −0 packages/api/src/client/types/tools/ozone/server/getConfig.ts
+16 −0 packages/bsky/CHANGELOG.md
+1 −1 packages/bsky/package.json
+12 −0 packages/bsky/src/lexicon/index.ts
+51 −0 packages/bsky/src/lexicon/lexicons.ts
+49 −0 packages/bsky/src/lexicon/types/com/atproto/admin/searchAccounts.ts
+1 −0 packages/bsky/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
+22 −0 packages/dev-env/CHANGELOG.md
+1 −1 packages/dev-env/package.json
+1 −1 packages/dev-env/src/network.ts
+16 −0 packages/ozone/CHANGELOG.md
+1 −1 packages/ozone/package.json
+2 −0 packages/ozone/src/api/index.ts
+34 −0 packages/ozone/src/api/server/getConfig.ts
+34 −0 packages/ozone/src/lexicon/index.ts
+112 −0 packages/ozone/src/lexicon/lexicons.ts
+49 −0 packages/ozone/src/lexicon/types/com/atproto/admin/searchAccounts.ts
+1 −0 packages/ozone/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
+85 −0 packages/ozone/src/lexicon/types/tools/ozone/server/getConfig.ts
+52 −0 packages/ozone/tests/get-config.test.ts
+1 −1 packages/ozone/tests/lang.test.ts
+20 −0 packages/pds/CHANGELOG.md
+1 −1 packages/pds/package.json
+4 −1 packages/pds/src/account-manager/helpers/account.ts
+16 −3 packages/pds/src/api/com/atproto/admin/updateSubjectStatus.ts
+11 −1 packages/pds/src/api/com/atproto/server/activateAccount.ts
+11 −1 packages/pds/src/api/com/atproto/server/deactivateAccount.ts
+34 −0 packages/pds/src/lexicon/index.ts
+112 −0 packages/pds/src/lexicon/lexicons.ts
+49 −0 packages/pds/src/lexicon/types/com/atproto/admin/searchAccounts.ts
+1 −0 packages/pds/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
+85 −0 packages/pds/src/lexicon/types/tools/ozone/server/getConfig.ts
9 changes: 7 additions & 2 deletions chitose/com/atproto/admin/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from .get_account_infos import _get_account_infos
from .get_invite_codes import _get_invite_codes
from .get_subject_status import _get_subject_status
from .search_accounts import _search_accounts
from .send_email import _send_email
from .update_account_email import _update_account_email
from .update_account_handle import _update_account_handle
Expand Down Expand Up @@ -42,6 +43,10 @@ def get_subject_status(self, did: typing.Optional[str]=None, uri: typing.Optiona
"""Get the service-specific admin status of a subject (account, record, or blob)."""
return _get_subject_status(self.call, did, uri, blob)

def search_accounts(self, email: typing.Optional[str]=None, cursor: typing.Optional[str]=None, limit: typing.Optional[int]=None) -> bytes:
"""Get list of accounts that matches your search query."""
return _search_accounts(self.call, email, cursor, limit)

def update_account_password(self, did: str, password: str) -> bytes:
"""Update the password for a user account as an administrator."""
return _update_account_password(self.call, did, password)
Expand Down Expand Up @@ -74,9 +79,9 @@ def disable_invite_codes(self, codes: typing.Optional[list[str]]=None, accounts:
"""Disable some set of codes and/or all codes associated with a set of users."""
return _disable_invite_codes(self.call, codes, accounts)

def update_subject_status(self, subject: typing.Union[chitose.com.atproto.admin.defs.RepoRef, chitose.com.atproto.repo.strong_ref.StrongRef, chitose.com.atproto.admin.defs.RepoBlobRef], takedown: typing.Optional[chitose.com.atproto.admin.defs.StatusAttr]=None) -> bytes:
def update_subject_status(self, subject: typing.Union[chitose.com.atproto.admin.defs.RepoRef, chitose.com.atproto.repo.strong_ref.StrongRef, chitose.com.atproto.admin.defs.RepoBlobRef], takedown: typing.Optional[chitose.com.atproto.admin.defs.StatusAttr]=None, deactivated: typing.Optional[chitose.com.atproto.admin.defs.StatusAttr]=None) -> bytes:
"""Update the service-specific admin status of a subject (account, record, or blob)."""
return _update_subject_status(self.call, subject, takedown)
return _update_subject_status(self.call, subject, takedown, deactivated)

def send_email(self, recipient_did: str, content: str, sender_did: str, subject: typing.Optional[str]=None, comment: typing.Optional[str]=None) -> bytes:
"""Send email to a user's account email address.
Expand Down
9 changes: 9 additions & 0 deletions chitose/com/atproto/admin/search_accounts.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# GENERATED CODE - DO NOT MODIFY
""""""
from __future__ import annotations
import chitose
import typing

def _search_accounts(call: chitose.xrpc.XrpcCall, email: typing.Optional[str]=None, cursor: typing.Optional[str]=None, limit: typing.Optional[int]=None) -> bytes:
"""Get list of accounts that matches your search query."""
return call('com.atproto.admin.searchAccounts', [('email', email), ('cursor', cursor), ('limit', limit)], None, {})
4 changes: 2 additions & 2 deletions chitose/com/atproto/admin/update_subject_status.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
import chitose.com.atproto.repo.strong_ref
import typing

def _update_subject_status(call: chitose.xrpc.XrpcCall, subject: typing.Union[chitose.com.atproto.admin.defs.RepoRef, chitose.com.atproto.repo.strong_ref.StrongRef, chitose.com.atproto.admin.defs.RepoBlobRef], takedown: typing.Optional[chitose.com.atproto.admin.defs.StatusAttr]=None) -> bytes:
def _update_subject_status(call: chitose.xrpc.XrpcCall, subject: typing.Union[chitose.com.atproto.admin.defs.RepoRef, chitose.com.atproto.repo.strong_ref.StrongRef, chitose.com.atproto.admin.defs.RepoBlobRef], takedown: typing.Optional[chitose.com.atproto.admin.defs.StatusAttr]=None, deactivated: typing.Optional[chitose.com.atproto.admin.defs.StatusAttr]=None) -> bytes:
"""Update the service-specific admin status of a subject (account, record, or blob)."""
return call('com.atproto.admin.updateSubjectStatus', [], {'subject': subject, 'takedown': takedown}, {'Content-Type': 'application/json'})
return call('com.atproto.admin.updateSubjectStatus', [], {'subject': subject, 'takedown': takedown, 'deactivated': deactivated}, {'Content-Type': 'application/json'})
7 changes: 6 additions & 1 deletion chitose/tools/ozone/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from chitose.xrpc import XrpcSubscribe
from .communication import Communication_
from .moderation import Moderation_
from .server import Server_

class Ozone_:
"""We recommend calling methods in this class via the :doc:`chitose.BskyAgent <chitose>` class instead of creating instances of this class directly."""
Expand All @@ -18,4 +19,8 @@ def communication(self) -> Communication_:

@property
def moderation(self) -> Moderation_:
return Moderation_(self.call, self.subscribe)
return Moderation_(self.call, self.subscribe)

@property
def server(self) -> Server_:
return Server_(self.call, self.subscribe)
16 changes: 16 additions & 0 deletions chitose/tools/ozone/server/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# GENERATED CODE - DO NOT MODIFY
from __future__ import annotations
from chitose.xrpc import XrpcCall
from chitose.xrpc import XrpcSubscribe
from .get_config import _get_config

class Server_:
"""We recommend calling methods in this class via the :doc:`chitose.BskyAgent <chitose>` class instead of creating instances of this class directly."""

def __init__(self, call: XrpcCall, subscribe: XrpcSubscribe) -> None:
self.call = call
self.subscribe = subscribe

def get_config(self) -> bytes:
"""Get details about ozone's server configuration."""
return _get_config(self.call)
27 changes: 27 additions & 0 deletions chitose/tools/ozone/server/get_config.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# GENERATED CODE - DO NOT MODIFY
""""""
from __future__ import annotations
import chitose
import typing

def _get_config(call: chitose.xrpc.XrpcCall) -> bytes:
"""Get details about ozone's server configuration."""
return call('tools.ozone.server.getConfig', [], None, {})

class ServiceConfig(chitose.Object):
""""""

def __init__(self, url: typing.Optional[str]=None) -> None:
self.url = url

def to_dict(self) -> dict[str, typing.Any]:
return {'url': self.url, '$type': 'tools.ozone.server.getConfig#serviceConfig'}

class ViewerConfig(chitose.Object):
""""""

def __init__(self, role: typing.Optional[typing.Literal['tools.ozone.team.defs#roleAdmin', 'tools.ozone.team.defs#roleModerator', 'tools.ozone.team.defs#roleTriage']]=None) -> None:
self.role = role

def to_dict(self) -> dict[str, typing.Any]:
return {'role': self.role, '$type': 'tools.ozone.server.getConfig#viewerConfig'}
8 changes: 8 additions & 0 deletions docs/source/chitose.com.atproto.admin.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,14 @@ chitose.com.atproto.admin.get\_subject\_status module
:undoc-members:
:show-inheritance:

chitose.com.atproto.admin.search\_accounts module
-------------------------------------------------

.. automodule:: chitose.com.atproto.admin.search_accounts
:members:
:undoc-members:
:show-inheritance:

chitose.com.atproto.admin.send\_email module
--------------------------------------------

Expand Down
1 change: 1 addition & 0 deletions docs/source/chitose.tools.ozone.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Subpackages

chitose.tools.ozone.communication
chitose.tools.ozone.moderation
chitose.tools.ozone.server

Module contents
---------------
Expand Down
21 changes: 21 additions & 0 deletions docs/source/chitose.tools.ozone.server.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
chitose.tools.ozone.server package
==================================

Submodules
----------

chitose.tools.ozone.server.get\_config module
---------------------------------------------

.. automodule:: chitose.tools.ozone.server.get_config
:members:
:undoc-members:
:show-inheritance:

Module contents
---------------

.. automodule:: chitose.tools.ozone.server
:members:
:undoc-members:
:show-inheritance:

0 comments on commit 43eff57

Please sign in to comment.