···

       
11
       
11
       
 
       
  resolveFromIdentity,

     

       
12
       
12
       
 
       
  type Session,

     

       
13
       
13
       
 
       
} from "@atcute/oauth-browser-client";

     

       
14
       
14
       
-
       
import { $type, Did, Handle } from "@atcute/lexicons";

     

       
14
       
14
       
+
       
import { $type, ActorIdentifier, Did, Handle } from "@atcute/lexicons";

     

       
15
       
15
       
 
       
import { ComAtprotoRepoApplyWrites } from "@atcute/atproto";

     

       
16
       
16
       
 
       
import { AppBskyGraphFollow } from "@atcute/bluesky";

     

       
17
       
17
       
 
       


     
···

       
47
       
47
       
 
       
let rpc: Client;

     

       
48
       
48
       
 
       
let agent: OAuthUserAgent;

     

       
49
       
49
       
 
       
let manager: CredentialManager;

     

       
50
       
50
       
+
       
let agentDID: string;

     

       
50
       
51
       
 
       


     

       
51
       
52
       
 
       
const resolveDid = async (did: string) => {

     

       
52
       
53
       
 
       
  const res = await fetch(

     
···

       
112
       
113
       
 
       
    if (session) {

     

       
113
       
114
       
 
       
      agent = new OAuthUserAgent(session);

     

       
114
       
115
       
 
       
      rpc = new Client({ handler: agent });

     

       
116
       
116
       
+
       
      agentDID = agent.sub;

     

       
115
       
117
       
 
       


     

       
116
       
118
       
 
       
      setLoginState(true);

     

       
117
       
119
       
 
       
      setHandle(await resolveDid(agent.sub));

     
···

       
149
       
151
       
 
       


     

       
150
       
152
       
 
       
  const loginBsky = async (login: string) => {

     

       
151
       
153
       
 
       
    if (password()) {

     

       
152
       
152
       
-
       
      const agentDID = login.startsWith("did:") ? login : await resolveHandle(login);

     

       
154
       
154
       
+
       
      agentDID = login.startsWith("did:") ? login : await resolveHandle(login);

     

       
153
       
155
       
 
       
      manager = new CredentialManager({ service: await getPDS(agentDID) });

     

       
154
       
156
       
 
       
      rpc = new Client({ handler: manager });

     

       
155
       
157
       
 
       


     
···

       
245
       
247
       
 
       
      const fetchPage = async (cursor?: string) => {

     

       
246
       
248
       
 
       
        return await rpc.get("com.atproto.repo.listRecords", {

     

       
247
       
249
       
 
       
          params: {

     

       
248
       
248
       
-
       
            repo: agent.sub,

     

       
250
       
250
       
+
       
            repo: agentDID as ActorIdentifier,

     

       
249
       
251
       
 
       
            collection: "app.bsky.graph.follow",

     

       
250
       
252
       
 
       
            limit: PAGE_LIMIT,

     

       
251
       
253
       
 
       
            cursor: cursor,

     
···

       
306
       
308
       
 
       
              viewer.blocking || viewer.blockingByList ?

     

       
307
       
309
       
 
       
                RepoStatus.BLOCKEDBY | RepoStatus.BLOCKING

     

       
308
       
310
       
 
       
              : RepoStatus.BLOCKEDBY;

     

       
309
       
309
       
-
       
          } else if (res.data.did.includes(agent.sub)) {

     

       
311
       
311
       
+
       
          } else if (res.data.did.includes(agentDID)) {

     

       
310
       
312
       
 
       
            status = RepoStatus.YOURSELF;

     

       
311
       
313
       
 
       
          } else if (viewer.blocking || viewer.blockingByList) {

     

       
312
       
314
       
 
       
            status = RepoStatus.BLOCKING;

     
···

       
361
       
363
       
 
       
    for (let i = 0; i < writes.length; i += BATCHSIZE) {

     

       
362
       
364
       
 
       
      await rpc.post("com.atproto.repo.applyWrites", {

     

       
363
       
365
       
 
       
        input: {

     

       
364
       
364
       
-
       
          repo: agent.sub,

     

       
366
       
366
       
+
       
          repo: agentDID as ActorIdentifier,

     

       
365
       
367
       
 
       
          writes: writes.slice(i, i + BATCHSIZE),

     

       
366
       
368
       
 
       
        },

     

       
367
       
369
       
 
       
      });