Browse Source

upgrade joystream types to 0.16.1

Joystream Stats 3 years ago
parent
commit
fb74173bf8

+ 1 - 1
community-contributions/joystreamtelegrambot/package.json

@@ -23,12 +23,12 @@
     "tests": "ts-node src/tests.ts"
   },
   "dependencies": {
+    "@joystream/types": "^0.16.1",
     "moment": "^2.29.1",
     "node-telegram-bot-api": "^0.51.0",
     "ws": "^7.4.1"
   },
   "devDependencies": {
-    "@joystream/types": "^0.15.0",
     "@types/node-telegram-bot-api": "^0.51.0",
     "ts-node": "^9.0.0",
     "ts-node-dev": "^1.0.0-pre.63",

+ 7 - 3
community-contributions/joystreamtelegrambot/src/bot.ts

@@ -42,6 +42,7 @@ const main = async () => {
     api.rpc.system.name(),
     api.rpc.system.version(),
   ]);
+  log(`Subscribed to ${chain} on ${node} v${version}`);
 
   let council: Council = { round: 0, last: "" };
   let blocks: Block[] = [];
@@ -83,11 +84,11 @@ const main = async () => {
   const getReward = async (era: number) =>
     Number(await api.query.staking.erasValidatorReward(era));
 
-  log(`Subscribed to ${chain} on ${node} v${version}`);
   api.rpc.chain.subscribeNewHeads(
     async (header: Header): Promise<void> => {
       // current block
       const id = header.number.toNumber();
+
       if (lastBlock.id === id) return;
       const timestamp = (await api.query.timestamp.now()).toNumber();
       const duration = timestamp - lastBlock.timestamp;
@@ -163,8 +164,11 @@ const main = async () => {
       }
 
       printStatus(opts, { block: id, chain, posts, proposals });
-      lastBlock = block
+      lastBlock = block;
     }
   );
 };
-main().catch(() => exit(log));
+main().catch((error) => {
+  console.log(error);
+  exit(log);
+});

+ 3 - 3
community-contributions/joystreamtelegrambot/src/lib/announcements.ts

@@ -44,11 +44,11 @@ export const channels = async (
     const channel: Channel = await query("title", () =>
       api.query.contentWorkingGroup.channelById(id)
     );
-    const member: Member = { id: channel.owner, handle: "", url: "" };
-    member.handle = await memberHandle(api, member.id.toJSON());
+    const member: Member = { id: channel.owner.asMember, handle: "", url: "" };
+    member.handle = await memberHandle(api, member.id);
     member.url = `${domain}/#/members/${member.handle}`;
     messages.push(
-      `<b>Channel <a href="${domain}/#//media/channels/${id}">${channel.title}</a> by <a href="${member.url}">${member.handle} (${member.id})</a></b>`
+      `<b>Channel <a href="${domain}/#//media/channels/${id}">${id}</a> by <a href="${member.url}">${member.handle} (${member.id})</a></b>`
     );
   }
   sendMessage(messages.join("\r\n\r\n"));

+ 1 - 4
community-contributions/joystreamtelegrambot/src/lib/getters.ts

@@ -15,10 +15,7 @@ import { Proposal } from "@joystream/types/proposals";
 
 // channel
 
-export const currentChannelId = async (api: Api): Promise<number> => {
-  const id: ChannelId = await api.query.contentWorkingGroup.nextChannelId();
-  return id.toNumber() - 1;
-};
+export const currentChannelId = async (api: Api): Promise<number> => -1
 
 export const memberHandle = async (api: Api, id: MemberId): Promise<string> => {
   const membership: Membership = await api.query.members.membershipById(id);