@nina-protocol/nina-db 0.0.24 → 0.0.26

package/dist/knexfile.js

@@ -38,5 +38,6 @@ export default {
         migrations: {
             directory: './node_modules/@nina-protocol/nina-db/dist/migrations',
         },
+        debug: true,
     }
 };

package/dist/models/Account.js

@@ -4,7 +4,7 @@ import Hub from './Hub.js';
 import Post from './Post.js';
 import Release from './Release.js';
 import Verification from './Verification.js';
-export default class Account extends Model {
+class Account extends Model {
     static tableName = 'accounts';
     static idColumn = 'id';
     static jsonSchema = {
@@ -113,3 +113,4 @@ export default class Account extends Model {
         },
     });
 }
+export default Account;

package/dist/models/Exchange.js

@@ -1,7 +1,7 @@
 import { Model } from 'objection';
 import Account from './Account.js';
 import Release from './Release.js';
-export default class Exchange extends Model {
+class Exchange extends Model {
     static tableName = 'exchanges';
     static idColum = 'id';
     static jsonSchema = {
@@ -60,3 +60,4 @@ export default class Exchange extends Model {
         },
     });
 }
+export default Exchange;

package/dist/models/Hub.js

@@ -3,7 +3,7 @@ import { stripHtmlIfNeeded } from '../utils/index.js';
 import Account from './Account.js';
 import Release from './Release.js';
 import Post from './Post.js';
-export default class Hub extends Model {
+class Hub extends Model {
     static get tableName() {
         return 'hubs';
     }
@@ -81,3 +81,4 @@ export default class Hub extends Model {
         },
     });
 }
+export default Hub;

package/dist/models/Release.js

@@ -7,7 +7,7 @@ import Exchange from './Exchange.js';
 import Hub from './Hub.js';
 import Post from './Post.js';
 import axios from 'axios';
-export default class Release extends Model {
+class Release extends Model {
     static tableName = 'releases';
     static idColumn = 'id';
     static jsonSchema = {
@@ -76,7 +76,7 @@ export default class Release extends Model {
             publisherId,
         });
         await this.processRevenueShares(releaseAccount, release);
-        tweetNewRelease(metadata);
+        tweetNewRelease(metadata, publisherId);
         return release;
     };
     static processRevenueShares = async (releaseData, releaseRecord) => {
@@ -101,6 +101,7 @@ export default class Release extends Model {
         const publishedThroughHub = await this.$relatedQuery('publishedThroughHub');
         if (publishedThroughHub) {
             this.publishedThroughHub = publishedThroughHub.publicKey;
+            this.hub = publishedThroughHub;
         }
         this.publisher = publisher.publicKey;
         delete this.publisherId;
@@ -184,3 +185,4 @@ export default class Release extends Model {
         }
     });
 }
+export default Release;

package/dist/models/Verification.js

@@ -1,6 +1,6 @@
 import { Model } from 'objection';
 import Account from './Account.js';
-export default class Verification extends Model {
+class Verification extends Model {
     static get tableName() {
         return 'verifications';
     }
@@ -48,3 +48,4 @@ export default class Verification extends Model {
         },
     });
 }
+export default Verification;

package/dist/utils/index.js

@@ -1,5 +1,6 @@
 import striptags from 'striptags';
 import { TwitterApi } from 'twitter-api-v2';
+import Account from '../models/Account.js';
 const removeQuotesFromStartAndEndOfString = (string) => {
     return string.substring(1, string.length - 1).substring(-1, string.length - 1);
 };
@@ -14,7 +15,7 @@ export const stripHtmlIfNeeded = (object, value) => {
 export const decode = (byteArray) => {
     return new TextDecoder().decode(new Uint8Array(byteArray)).replaceAll(/\u0000/g, '');
 };
-export const tweetNewRelease = async (metadata) => {
+export const tweetNewRelease = async (metadata, publisherId) => {
     if (process.env.TWITTER_API_SECRET) {
         try {
             await new Promise(resolve => setTimeout(resolve, 60000));
@@ -25,6 +26,13 @@ export const tweetNewRelease = async (metadata) => {
                 accessSecret: process.env.TWITTER_ACCESS_TOKEN_SECRET,
             });
             let text = (`${metadata.properties.artist} - "${metadata.properties.title}"`).substr(0, 250);
+            const publisher = await Account.query().findById(publisherId);
+            if (publisher) {
+                const twitterVerification = (await publisher.$relatedQuery('verifications').where('type', 'twitter').andWhere('active', true))[0];
+                if (twitterVerification) {
+                    text = `${text} (@${twitterVerification.value})`;
+                }
+            }
             text = `${text} ${metadata.external_url}`;
             await client.v2.tweet(text);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nina-protocol/nina-db",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "description": "",
   "source": "src/index.js",
   "main": "dist/index.js",

package/src/knexfile.js

@@ -39,5 +39,6 @@ export default {
     migrations: {
       directory: './node_modules/@nina-protocol/nina-db/dist/migrations',
     },
+    debug: true,
   }
 };

package/src/models/Release.js

@@ -84,7 +84,7 @@ export default class Release extends Model {
       publisherId,
     })
     await this.processRevenueShares(releaseAccount, release);
-    tweetNewRelease(metadata);
+    tweetNewRelease(metadata, publisherId);
     return release;
   }
 
@@ -110,6 +110,7 @@ export default class Release extends Model {
     const publishedThroughHub = await this.$relatedQuery('publishedThroughHub');
     if (publishedThroughHub) {
       this.publishedThroughHub = publishedThroughHub.publicKey;
+      this.hub = publishedThroughHub;
     }
     this.publisher = publisher.publicKey;
     delete this.publisherId

package/src/utils/index.js

@@ -1,5 +1,6 @@
 import striptags from 'striptags';
 import { TwitterApi } from 'twitter-api-v2';
+import Account from '../models/Account.js';
 
 const removeQuotesFromStartAndEndOfString = (string) => {
   return string.substring(1, string.length - 1).substring(-1, string.length - 1);
@@ -18,7 +19,7 @@ export const decode = (byteArray) => {
   return new TextDecoder().decode(new Uint8Array(byteArray)).replaceAll(/\u0000/g, '');
 }
 
-export const tweetNewRelease = async (metadata) => {
+export const tweetNewRelease = async (metadata, publisherId) => {
   if (process.env.TWITTER_API_SECRET) {
     try {
       await new Promise(resolve => setTimeout(resolve, 60000))
@@ -28,8 +29,14 @@ export const tweetNewRelease = async (metadata) => {
         accessToken: process.env.TWITTER_ACCESS_TOKEN,
         accessSecret: process.env.TWITTER_ACCESS_TOKEN_SECRET,
       });
-  
       let text = (`${metadata.properties.artist} - "${metadata.properties.title}"`).substr(0, 250)
+      const publisher = await Account.query().findById(publisherId);
+      if (publisher) {
+        const twitterVerification = (await publisher.$relatedQuery('verifications').where('type', 'twitter').andWhere('active', true))[0]
+        if (twitterVerification) {
+          text = `${text} (@${twitterVerification.value})`
+        }
+      }
       text = `${text} ${metadata.external_url}`
       await client.v2.tweet(text);  
     } catch (error) {

package/src/node_modules/@nina-protocol/nina-db/dist/migrations/20230306215736_add_hub_updated_at.js

@@ -1,15 +0,0 @@
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-exports.up = function(knex) {
-  
-};
-
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-exports.down = function(knex) {
-  
-};