Merge pull request #288 from BanklessDAO/develop

Develop

.env.prod

@@ -1,14 +1,7 @@
 NODE_ENV=production
-DISCORD_BOT_ACTIVITY="Day 18: I made a new friend, I call him Mad Hatter"
+DISCORD_BOT_ACTIVITY="gm degens"
 MONGODB_PREFIX=mongodb+srv
-FAQS_PAGE_ID=29353e63-e864-411a-abc0-061d04906c16
 DISCORD_SERVER_ID=834499078434979890
-DISCORD_BOUNTY_BOARD_SOS_ID=159014522542096384
-
-# Notion
-NOTION_DEV_GUILD_PROJECTS_DATABASE_ID=6e19505bc44b4e0eb77b8e41b46e4a3b
-NOTION_GUEST_PASS_DATABASE_ID=15fae33760724cf7b696a981d53e50cb
-NOTION_SCOAP_SQUAD_DB_ID=5721032d3a5c4758830f6d42116060f7
 
 # Roles
 DISCORD_ROLE_GENESIS_SQUAD=839004775751352341
@@ -22,28 +15,14 @@ DISCORD_ROLE_GUEST_PASS=848369657281773599
 DISCORD_ROLE_DEVELOPERS_GUILD=843924063591727195
 DISCORD_ROLE_AFK=908763988685365329
 
-DISCORD_ROLE_FIRST_QUEST_START=908020809090605086
-DISCORD_ROLE_FIRST_QUEST_WELCOME=867168413222305812
-DISCORD_ROLE_FIRST_QUEST_MEMBERSHIP=880120061711495199
-DISCORD_ROLE_FIRST_QUEST_SCHOLAR=867168503399579718
-DISCORD_ROLE_FIRST_QUEST_FIREHOSE=867168464652075078
-DISCORD_ROLE_FIRST_QUEST_GUEST_PASS=878140166743687188
-DISCORD_ROLE_FIRST_QUEST=867168624901095464
-DISCORD_ROLE_FIRST_QUEST_COMPLETE=867952779619086386
-
-DISCORD_ROLE_FIRST_QUEST_PROJECT=899439765626191873
-
 # Channels
 DISCORD_CHANNEL_BOUNTY_BOARD_ID=850402063741091880
 DISCORD_STAGE_COMMUNITY_CALL_ID=848928397010010112
 DISCORD_CHANNEL_DEV_WORKROOM_ID=841349002330505266
 DISCORD_CHANNEL_WRITERS_ROOM_ID=841332222946312232
-DISCORD_CHANNEL_SCOAP_SQUAD_ID=897296738447159296
-DISCORD_CHANNEL_SUPPORT_ID=834499078434979893
-DISCORD_CHANNEL_FIRST_QUEST_PROJECT_ID=856268240494133319
 
 # Logger
-LOGDNA_APP_NAME=degen
+LOGDNA_APP_NAME=degen-tbd
 LOGDNA_DEFAULT_LEVEL=info
 
 # POAP
@@ -55,9 +34,6 @@ DAO_CURRENT_SEASON=2
 DAO_CURRENT_SEASON_END_DATE=2022-01-07T04:00:00.000Z
 DAO_GUEST_PASS_EXPIRATION_DAYS=14
 
-# URLs
-DAO_BOUNTY_BOARD_URL=https://bountyboard.bankless.community/
-
 # Twitter
 TWITTER_API_TOKEN=
 TWITTER_API_SECRET=

.github/workflows/build-test.yml

@@ -3,7 +3,7 @@ on:
     pull_request:
       branches:
         - 'develop'
-        - 'DEGEN'
+        - 'main'
         - 'hotfix/**'
         - 'release/**'
 jobs:

.github/workflows/deploy-prod.yml

@@ -2,7 +2,7 @@ name: Deploy to Production Environment
 on:
   push:
     branches:
-      - 'DEGEN'
+      - 'main'
 jobs:
   deploy-prod:
     environment:
@@ -26,8 +26,8 @@ jobs:
         uses: AkhileshNS/heroku-deploy@v3.12.12
         with:
           heroku_api_key: ${{secrets.PROD_HEROKU_API_KEY}}
-          heroku_app_name: 'degen-poap'
-          heroku_email: 'bankless@nonsensecodes.io'
+          heroku_app_name: 'degen-tbd'
+          heroku_email: 'bankless-dao-devops'
           procfile: 'worker: yarn prod'
         env:
           HD_DISCORD_BOT_TOKEN: ${{secrets.PROD_DISCORD_TOKEN}}
@@ -37,12 +37,11 @@ jobs:
           HD_MONGODB_USERNAME: ${{secrets.PROD_MONGODB_USERNAME}}
           HD_MONGODB_PASS: ${{secrets.PROD_MONGODB_PASS}}
           HD_MONGODB_CLUSTER: ${{secrets.PROD_MONGODB_CLUSTER}}
-          HD_NOTION_TOKEN: ${{secrets.PROD_NOTION_TOKEN}}
           HD_LOGDNA_TOKEN: ${{secrets.PROD_LOGDNA_TOKEN}}
-          HD_TWITTER_API_TOKEN: ${{secrets.PROD_TWITTER_API_TOKEN}}
+          HD_TWITTER_API_TOKEN: ${{secrets.PROD_TWITTER_API_KEY}}
           HD_TWITTER_API_SECRET: ${{secrets.PROD_TWITTER_API_SECRET}}
-          HD_TWITTER_BEARER_TOKEN: ${{secrets.PROD_TWITTER_API_BEARER_TOKEN}}
-          HD_TWITTER_ACCESS_TOKEN_SECRET: ${{secrets.PROD_TWITTER_API_ACCESS_TOKEN_SECRET}}
+          HD_TWITTER_BEARER_TOKEN: ${{secrets.PROD_TWITTER_BEARER_TOKEN}}
+          HD_TWITTER_ACCESS_TOKEN_SECRET: ${{secrets.PROD_TWITTER_API_SECRET}}
           HD_POAP_DOMAIN: ${{secrets.PROD_POAP_DOMAIN}}
           HD_POAP_AUDIENCE: ${{secrets.PROD_POAP_AUDIENCE}}
           HD_POAP_CLIENT_ID: ${{secrets.PROD_POAP_CLIENT_ID}}

.github/workflows/deploy-qa.yml

@@ -41,7 +41,6 @@ jobs:
                   HD_MONGODB_USERNAME: ${{secrets.QA_MONGODB_USERNAME}}
                   HD_MONGODB_PASS: ${{secrets.QA_MONGODB_PASS}}
                   HD_MONGODB_CLUSTER: ${{secrets.QA_MONGODB_CLUSTER}}
-                  HD_NOTION_TOKEN: ${{secrets.QA_NOTION_TOKEN}}
                   HD_LOGDNA_TOKEN: ${{secrets.QA_LOGDNA_TOKEN}}
                   HD_TWITTER_API_TOKEN: ${{secrets.QA_TWITTER_API_TOKEN}}
                   HD_TWITTER_API_SECRET: ${{secrets.QA_TWITTER_API_SECRET}}

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 2.5.0
+## 2.5.0-RELEASE (2022-01-03)
 
 1. Integrate sentry.io
    - misc message enhancements
@@ -14,6 +14,7 @@
    - disable poap commands for bad poap organizers
    - display additional distribution results info
    - reorganize code
+3. Setup new bot
 
 ## 2.4.1-RELEASE (2021-12-20)
 

package.json

@@ -1,5 +1,5 @@
 {
-    "name": "degen",
+    "name": "degen-tbd",
     "version": "2.5.0",
     "description": "Administrative and Utilitarian bot for the Bankless Discord Server.",
     "main": "app.js",

src/app/events/Ready.ts

@@ -18,7 +18,7 @@ export default class implements DiscordEvent {
 
 	async execute(client: Client): Promise<any> {
 		try {
-			Log.info('The Sun will never set on the DAO. Neither will I. DEGEN is ready for service.');
+			Log.info('Starting up degen-tbd');
 
 			if (client.user) {
 				Log.debug(`setting status: ${process.env.DISCORD_BOT_ACTIVITY}`);
@@ -30,7 +30,7 @@ export default class implements DiscordEvent {
 			await POAPService.runAutoEndSetup(client, constants.PLATFORM_TYPE_TWITTER).catch(Log.error);
 			await POAPService.clearExpiredPOAPs();
 
-			Log.info('DEGEN is ready!');
+			Log.info('degen-tbd is ready!');
 		} catch (e) {
 			LogUtils.logError('Error processing event ready', e);
 		}

src/app/schema/poap/poapUnclaimedParticipants.json

@@ -3,7 +3,6 @@
 		"bsonType": "object",
 		"required": [
 			"discordUserId",
-			"discordUserTag",
 			"discordServerId",
 			"poapLink",
 			"expiresAt"
@@ -14,23 +13,23 @@
 				"description": "The event for the discussion which can be any alphanumeric text."
 			},
 			"discordUserId": {
-				"bsonType": "string",
+				"bsonType": ["string"],
 				"description": "Discord Id of the user that is configured to use this command."
 			},
 			"discordUserTag": {
-				"bsonType": "string",
+				"bsonType": ["string", "null"],
 				"description": "Discord tag of the participant."
 			},
 			"discordServerId": {
-				"bsonType": "string",
+				"bsonType": ["string"],
 				"description": "Identifier for the discord guild."
 			},
 			"poapLink": {
-				"bsonType": "string",
+				"bsonType": ["string"],
 				"description": "POAP URL to redeem."
 			},
 			"expiresAt": {
-				"bsonType": "string",
+				"bsonType": ["string"],
 				"description": "ISO date string of when the poap link expires"
 			}
 		}